• R/O
  • HTTP
  • SSH

linux-2.4.36: Commit

2.4.36-stable kernel tree

Commit MetaInfo

Revisionc324de46ca1b3e0c8ab025bc865e8be75392072a (tree)
Zeit2005-07-01 08:02:17
AutorAndi Kleen <ak@suse...>
CommiterMarcelo Tosatti

Log Message

[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>

Ändern Zusammenfassung


--- a/arch/x86_64/kernel/io_apic.c
+++ b/arch/x86_64/kernel/io_apic.c
@@ -222,7 +222,6 @@ static int __init ioapic_setup(char *str)
223223 __setup("apic", ioapic_setup);
225-#ifndef CONFIG_SMP
226225 #include <asm/pci-direct.h>
227226 #include <linux/pci_ids.h>
228227 #include <linux/pci.h>
@@ -279,7 +278,6 @@ void __init check_ioapic(void)
279278 }
280279 }
281280 }
284282 static int __init ioapic_pirq_setup(char *str)
285283 {
--- a/arch/x86_64/kernel/setup.c
+++ b/arch/x86_64/kernel/setup.c
@@ -304,7 +304,7 @@ void __init setup_arch(char **cmdline_p)
304304 #endif
306306 paging_init();
307-#if !defined(CONFIG_SMP) && defined(CONFIG_X86_IO_APIC)
307+#if defined(CONFIG_X86_IO_APIC)
308308 extern void check_ioapic(void);
309309 check_ioapic();
310310 #endif
Show on old repository browser