Skip to content

L
linux-davinci
Commit 590f47a1 authored by Linus Torvalds's avatar Linus Torvalds
Browse files
Options

Merge master.kernel.org:/pub/scm/linux/kernel/git/davej/cpufreq

parents a9b2e917 094ce7fd
Show whitespace changes
Inline Side-by-side
Showing with 8 additions and 5 deletions
arch/i386/kernel/cpu/cpufreq/powernow-k8.c
View file @ 590f47a1
...@@ -735,12 +735,15 @@ static int powernow_k8_cpu_init_acpi(struct powernow_k8_data *data) ...@@ -735,12 +735,15 @@ static int powernow_k8_cpu_init_acpi(struct powernow_k8_data *data)
} }
for (i = 0; i < data->acpi_data.state_count; i++) { for (i = 0; i < data->acpi_data.state_count; i++) {
u32 fid;
u32 vid;
if (data->exttype) { if (data->exttype) {
u32 fid = data->acpi_data.states[i].status & FID_MASK; fid = data->acpi_data.states[i].status & FID_MASK;
u32 vid = (data->acpi_data.states[i].status >> VID_SHIFT) & VID_MASK; vid = (data->acpi_data.states[i].status >> VID_SHIFT) & VID_MASK;
} else { } else {
u32 fid = data->acpi_data.states[i].control & FID_MASK; fid = data->acpi_data.states[i].control & FID_MASK;
u32 vid = (data->acpi_data.states[i].control >> VID_SHIFT) & VID_MASK; vid = (data->acpi_data.states[i].control >> VID_SHIFT) & VID_MASK;
} }
dprintk(" %d : fid 0x%x, vid 0x%x\n", i, fid, vid); dprintk(" %d : fid 0x%x, vid 0x%x\n", i, fid, vid);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment