diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-11-26 22:41:28 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-11-26 22:41:28 -0500 |
| commit | ff1ea52fa317a5658b6415b25169c5e531f54876 (patch) | |
| tree | 88fd243ddb02de7e3b2b0f55aba91796785b5a63 /drivers | |
| parent | b5faa4b89e4d83203b1f44f143a351b518f7cda2 (diff) | |
| parent | f44d9efd3510776216938fef84adc99cc0e12412 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-x86
* git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-x86:
x86: fix APIC related bootup crash on Athlon XP CPUs
time: add ADJ_OFFSET_SS_READ
x86: export the symbol empty_zero_page on the 32-bit x86 architecture
x86: fix kprobes_64.c inlining borkage
pci: use pci=bfsort for HP DL385 G2, DL585 G2
x86: correctly set UTS_MACHINE for "make ARCH=x86"
lockdep: annotate do_debug() trap handler
x86: turn off iommu merge by default
x86: fix ACPI compile for LOCAL_APIC=n
x86: printk kernel version in WARN_ON and other dump_stack users
ACPI: Set max_cstate to 1 for early Opterons.
x86: fix NMI watchdog & 'stopped time' problem
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/acpi/processor_idle.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/acpi/processor_idle.c b/drivers/acpi/processor_idle.c index 7b6c20eeeaff..b1fbee3f7fe1 100644 --- a/drivers/acpi/processor_idle.c +++ b/drivers/acpi/processor_idle.c | |||
| @@ -1673,6 +1673,7 @@ int __cpuinit acpi_processor_power_init(struct acpi_processor *pr, | |||
| 1673 | 1673 | ||
| 1674 | if (!first_run) { | 1674 | if (!first_run) { |
| 1675 | dmi_check_system(processor_power_dmi_table); | 1675 | dmi_check_system(processor_power_dmi_table); |
| 1676 | max_cstate = acpi_processor_cstate_check(max_cstate); | ||
| 1676 | if (max_cstate < ACPI_C_STATES_MAX) | 1677 | if (max_cstate < ACPI_C_STATES_MAX) |
| 1677 | printk(KERN_NOTICE | 1678 | printk(KERN_NOTICE |
| 1678 | "ACPI: processor limited to max C-state %d\n", | 1679 | "ACPI: processor limited to max C-state %d\n", |