tree ff7a2eeceb0f8a036a681e434c4d45cd4b915f38
parent 0a65800243742480b4b594b619b759749a3cfef4
author Andi Kleen <[EMAIL PROTECTED]> Sun, 17 Apr 2005 05:25:17 -0700
committer Linus Torvalds <[EMAIL PROTECTED]> Sun, 17 Apr 2005 05:25:17 -0700

[PATCH] x86_64: Add acpi_skip_timer_override option

Add acpi_skip_timer_override option.  It was missing previously.

Signed-off-by: Andi Kleen <[EMAIL PROTECTED]>
Signed-off-by: Andrew Morton <[EMAIL PROTECTED]>
Signed-off-by: Linus Torvalds <[EMAIL PROTECTED]>

 x86_64/kernel/setup.c |    4 ++++
 1 files changed, 4 insertions(+)

Index: arch/x86_64/kernel/setup.c
===================================================================
--- 72f9a3b376c604e7619ef265c7dc351644f45359/arch/x86_64/kernel/setup.c  
(mode:100644 sha1:666fe8bcca0e7a7051699ceff20da2877c37ed37)
+++ ff7a2eeceb0f8a036a681e434c4d45cd4b915f38/arch/x86_64/kernel/setup.c  
(mode:100644 sha1:c091fa1145140673c948e05fe899426b3e766e4e)
@@ -327,6 +327,10 @@
                else if (!memcmp(from, "acpi=strict", 11)) {
                        acpi_strict = 1;
                }
+#ifdef CONFIG_X86_IO_APIC
+               else if (!memcmp(from, "acpi_skip_timer_override", 24))
+                       acpi_skip_timer_override = 1;
+#endif
 #endif
 
                if (!memcmp(from, "nolapic", 7) ||
-
To unsubscribe from this list: send the line "unsubscribe bk-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to