From: Andrew Morton <akpm@osdl.org>

Cc: John Stultz <johnstul@us.ibm.com>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Andi Kleen <ak@muc.de>
Cc: Roman Zippel <zippel@linux-m68k.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
---

 arch/x86_64/kernel/hpet.c |    5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff -puN arch/x86_64/kernel/hpet.c~time-x86_64-split-x86_64-kernel-timec-up-tidy arch/x86_64/kernel/hpet.c
--- a/arch/x86_64/kernel/hpet.c~time-x86_64-split-x86_64-kernel-timec-up-tidy
+++ a/arch/x86_64/kernel/hpet.c
@@ -12,7 +12,7 @@
 #include <asm/timex.h>
 #include <asm/hpet.h>
 
-int nohpet __initdata = 0;
+int nohpet __initdata;
 
 unsigned long hpet_address;
 unsigned long hpet_period;	/* fsecs / HPET clock */
@@ -37,7 +37,7 @@ static __init int late_hpet_init(void)
 	if (!hpet_address)
         	return 0;
 
-	memset(&hd, 0, sizeof (hd));
+	memset(&hd, 0, sizeof(hd));
 
 	ntimer = hpet_readl(HPET_ID);
 	ntimer = (ntimer & HPET_ID_NUMBER) >> HPET_ID_NUMBER_SHIFT;
@@ -160,7 +160,6 @@ unsigned int __init hpet_calibrate_tsc(v
 	unsigned long flags;
 
 	local_irq_save(flags);
-	local_irq_disable();
 
 	hpet_start = hpet_readl(HPET_COUNTER);
 	rdtscl(tsc_start);
_