diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-02-07 18:36:08 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-02-07 18:36:08 -0500 |
| commit | 21d37bbc65e39a26856de6b14be371ff24e0d03f (patch) | |
| tree | a04bb72e191cae13f47462c57bb1641c42b7b52b /drivers/acpi/processor_throttling.c | |
| parent | bff288c19e8b6217ddd660d4fa42c29a0ab1d58c (diff) | |
| parent | 57e1c5c87db512629dd44ddeb882a5aaf0e4299e (diff) | |
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6
* 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6: (140 commits)
ACPICA: reduce table header messages to fit within 80 columns
asus-laptop: merge with ACPICA table update
ACPI: bay: Convert ACPI Bay driver to be compatible with sysfs update.
ACPI: bay: new driver is EXPERIMENTAL
ACPI: bay: make drive_bays static
ACPI: bay: make bay a platform driver
ACPI: bay: remove prototype procfs code
ACPI: bay: delete unused variable
ACPI: bay: new driver adding removable drive bay support
ACPI: dock: check if parent is on dock
ACPICA: fix gcc build warnings
Altix: Add ACPI SSDT PCI device support (hotplug)
Altix: ACPI SSDT PCI device support
ACPICA: reduce conflicts with Altix patch series
ACPI_NUMA: fix HP IA64 simulator issue with extended memory domain
ACPI: fix HP RX2600 IA64 boot
ACPI: build fix for IBM x440 - CONFIG_X86_SUMMIT
ACPICA: Update version to 20070126
ACPICA: Fix for incorrect parameter passed to AcpiTbDeleteTable during table load.
ACPICA: Update copyright to 2007.
...
Diffstat (limited to 'drivers/acpi/processor_throttling.c')
| -rw-r--r-- | drivers/acpi/processor_throttling.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/acpi/processor_throttling.c b/drivers/acpi/processor_throttling.c index 0ec7dcde0063..89dff3639abe 100644 --- a/drivers/acpi/processor_throttling.c +++ b/drivers/acpi/processor_throttling.c | |||
| @@ -125,7 +125,7 @@ int acpi_processor_set_throttling(struct acpi_processor *pr, int state) | |||
| 125 | /* Used to clear all duty_value bits */ | 125 | /* Used to clear all duty_value bits */ |
| 126 | duty_mask = pr->throttling.state_count - 1; | 126 | duty_mask = pr->throttling.state_count - 1; |
| 127 | 127 | ||
| 128 | duty_mask <<= acpi_fadt.duty_offset; | 128 | duty_mask <<= acpi_gbl_FADT.duty_offset; |
| 129 | duty_mask = ~duty_mask; | 129 | duty_mask = ~duty_mask; |
| 130 | } | 130 | } |
| 131 | 131 | ||
| @@ -208,7 +208,7 @@ int acpi_processor_get_throttling_info(struct acpi_processor *pr) | |||
| 208 | return 0; | 208 | return 0; |
| 209 | } | 209 | } |
| 210 | 210 | ||
| 211 | pr->throttling.state_count = 1 << acpi_fadt.duty_width; | 211 | pr->throttling.state_count = 1 << acpi_gbl_FADT.duty_width; |
| 212 | 212 | ||
| 213 | /* | 213 | /* |
| 214 | * Compute state values. Note that throttling displays a linear power/ | 214 | * Compute state values. Note that throttling displays a linear power/ |