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>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: john stultz <johnstul@us.ibm.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

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

diff -puN arch/i386/kernel/hpet.c~x86_64-restore-restore-nohpet-cmdline arch/i386/kernel/hpet.c
--- a/arch/i386/kernel/hpet.c~x86_64-restore-restore-nohpet-cmdline
+++ a/arch/i386/kernel/hpet.c
@@ -49,6 +49,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);
_