[patch -mm 25/28] x86_64: restore restore nohpet cmdline

Thomas Gleixner
2007-06-23T13:30:32Z

[-- Attachment #1: x86_64-restore-nohpet-cmdline.patch --]
[-- Type: text/plain, Size: 1049 bytes --]

From: Chris Wright <chrisw@sous-sol.org>

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@sous-sol.org>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Cc: Andi Kleen <ak@suse.de>

---
arch/i386/kernel/hpet.c | 7 +++++++
1 file changed, 7 insertions(+)

Index: linux-2.6.22-rc4-mm/arch/i386/kernel/hpet.c
===================================================================
--- linux-2.6.22-rc4-mm.orig/arch/i386/kernel/hpet.c 2007-06-23 14:39:00.000000000 +0200
+++ linux-2.6.22-rc4-mm/arch/i386/kernel/hpet.c 2007-06-23 14:39:00.000000000 +0200
@@ -89,6 +89,13 @@ static int __init hpet_setup(char* str)
}
__setup("hpet=", hpet_setup);

+static int __init disable_hpet(char *str)
+{
+ boot_hpet_disable = 1;
+ return 1;
+}
+__setup("nohpet", disable_hpet);
+
static inline int is_hpet_capable(void)
{
return (!boot_hpet_disable && hpet_address);

--