diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-07-29 17:40:08 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-07-29 17:40:08 -0400 |
| commit | 590f47a1d945c611530a85057e9ad7a3bbb50578 (patch) | |
| tree | 226626fbdb53f3a8fea19134100091be4aefc900 | |
| parent | a9b2e9170bdf1dd27ca4aa9a63048065d252d116 (diff) | |
| parent | 094ce7fde493a1196b8152f9f9e73c20e24a2b05 (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/davej/cpufreq
| -rw-r--r-- | arch/i386/kernel/cpu/cpufreq/powernow-k8.c | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/arch/i386/kernel/cpu/cpufreq/powernow-k8.c b/arch/i386/kernel/cpu/cpufreq/powernow-k8.c index de5deebc0154..ab6e0611303d 100644 --- a/arch/i386/kernel/cpu/cpufreq/powernow-k8.c +++ b/arch/i386/kernel/cpu/cpufreq/powernow-k8.c | |||
| @@ -735,12 +735,15 @@ static int powernow_k8_cpu_init_acpi(struct powernow_k8_data *data) | |||
| 735 | } | 735 | } |
| 736 | 736 | ||
| 737 | for (i = 0; i < data->acpi_data.state_count; i++) { | 737 | for (i = 0; i < data->acpi_data.state_count; i++) { |
| 738 | if (data->exttype) { | 738 | u32 fid; |
| 739 | u32 fid = data->acpi_data.states[i].status & FID_MASK; | 739 | u32 vid; |
| 740 | u32 vid = (data->acpi_data.states[i].status >> VID_SHIFT) & VID_MASK; | 740 | |
| 741 | if (data->exttype) { | ||
| 742 | fid = data->acpi_data.states[i].status & FID_MASK; | ||
| 743 | vid = (data->acpi_data.states[i].status >> VID_SHIFT) & VID_MASK; | ||
| 741 | } else { | 744 | } else { |
| 742 | u32 fid = data->acpi_data.states[i].control & FID_MASK; | 745 | fid = data->acpi_data.states[i].control & FID_MASK; |
| 743 | u32 vid = (data->acpi_data.states[i].control >> VID_SHIFT) & VID_MASK; | 746 | vid = (data->acpi_data.states[i].control >> VID_SHIFT) & VID_MASK; |
| 744 | } | 747 | } |
| 745 | 748 | ||
| 746 | dprintk(" %d : fid 0x%x, vid 0x%x\n", i, fid, vid); | 749 | dprintk(" %d : fid 0x%x, vid 0x%x\n", i, fid, vid); |