| Revision | c324de46ca1b3e0c8ab025bc865e8be75392072a (tree) |
|---|---|
| Zeit | 2005-07-01 08:02:17 |
| Autor | Andi Kleen <ak@suse...> |
| Commiter | Marcelo Tosatti |
[PATCH] x86-64: Enable Nvidia timer override workaround for SMP kernels too
>From Tymm Twillman
In the 2.4.30/31 kernels there is now a backport from the 2.6 kernels of
a workaround for buggy timer overrides in the ACPI tables for many
nvidia chipset based motherboards. Unfortunately the code for this on
x86-64 based systems is conditionally compiled in only for non-SMP
kernels. This is a patch to remove the conditional and allow the code
to be compiled in for SMP kernels as well (we've seen a number of SMP
motherboards which intermittently lock up during boot, and otherwise
sometimes seem unstable without the workaround). Patch so far has been
tested across numerous reboots and several hours uptime.
Signed-off-by: Andi Kleen <ak@suse.de>
arch/x86_64/kernel/io_apic.c (diff) arch/x86_64/kernel/setup.c (diff)| @@ -222,7 +222,6 @@ static int __init ioapic_setup(char *str) | ||
| 222 | 222 | |
| 223 | 223 | __setup("apic", ioapic_setup); |
| 224 | 224 | |
| 225 | -#ifndef CONFIG_SMP | |
| 226 | 225 | #include <asm/pci-direct.h> |
| 227 | 226 | #include <linux/pci_ids.h> |
| 228 | 227 | #include <linux/pci.h> |
| @@ -279,7 +278,6 @@ void __init check_ioapic(void) | ||
| 279 | 278 | } |
| 280 | 279 | } |
| 281 | 280 | } |
| 282 | -#endif | |
| 283 | 281 | |
| 284 | 282 | static int __init ioapic_pirq_setup(char *str) |
| 285 | 283 | { |
| @@ -304,7 +304,7 @@ void __init setup_arch(char **cmdline_p) | ||
| 304 | 304 | #endif |
| 305 | 305 | |
| 306 | 306 | paging_init(); |
| 307 | -#if !defined(CONFIG_SMP) && defined(CONFIG_X86_IO_APIC) | |
| 307 | +#if defined(CONFIG_X86_IO_APIC) | |
| 308 | 308 | extern void check_ioapic(void); |
| 309 | 309 | check_ioapic(); |
| 310 | 310 | #endif |
Linux Kernel Documents
Fork