[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <20070508094737.GX3505@sequoia.sous-sol.org>
Date: Tue, 8 May 2007 02:47:37 -0700
From: Chris Wright <chrisw@...s-sol.org>
To: Thomas Gleixner <tglx@...utronix.de>
Cc: Chris Wright <chrisw@...s-sol.org>,
LKML <linux-kernel@...r.kernel.org>,
Venkatesh Pallipadi <venkatesh.pallipadi@...el.com>,
john stultz <johnstul@...ibm.com>, Ingo Molnar <mingo@...e.hu>,
Arjan van de Ven <arjan@...radead.org>,
Steven Rostedt <rostedt@...dmis.org>, Andi Kleen <ak@...e.de>,
Andrew Morton <akpm@...ux-foundation.org>
Subject: [PATCH 5/5] x86_64: restore restore nohpet cmdline
Lost when merged with i386. Happy to drop, but I suspect Andi would
rather not break existing users (I noticed because it was part of my
testing). If dropped, Documentation needs updating.
Signed-off-by: Chris Wright <chrisw@...s-sol.org>
---
arch/i386/kernel/hpet.c | 8 ++++++++
1 file changed, 8 insertions(+)
--- tglx.orig/arch/i386/kernel/hpet.c
+++ tglx/arch/i386/kernel/hpet.c
@@ -78,6 +78,14 @@ static int __init hpet_setup(char* str)
return 1;
}
__setup("hpet=", hpet_setup);
+#ifdef CONFIG_X86_64
+static int __init disable_hpet(char *str)
+{
+ boot_hpet_disable = 1;
+ return 1;
+}
+__setup("nohpet", disable_hpet);
+#endif
static inline int is_hpet_capable(void)
{
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists