summaryrefslogtreecommitdiffstats
path: root/arch/x86_64/kernel/apic.c
diff options
context:
space:
mode:
authorSteve French <sfrench@us.ibm.com>2006-02-15 04:36:31 +0100
committerSteve French <sfrench@us.ibm.com>2006-02-15 04:36:31 +0100
commit0ed3f64ec3a7ad29e83e03607115eeffa32f553c (patch)
tree528681b043e947cfc51527d56098f586b6dfa217 /arch/x86_64/kernel/apic.c
parent[CIFS] SessionSetup cleanup part 2 (diff)
parent[PATCH] neofb: avoid resetting display config on unblank (diff)
downloadlinux-0ed3f64ec3a7ad29e83e03607115eeffa32f553c.tar.xz
linux-0ed3f64ec3a7ad29e83e03607115eeffa32f553c.zip
Merge with /pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Signed-off-by: Steve French <sfrench@us.ibm.com>
Diffstat (limited to 'arch/x86_64/kernel/apic.c')
-rw-r--r--arch/x86_64/kernel/apic.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86_64/kernel/apic.c b/arch/x86_64/kernel/apic.c
index 6147770b4347..7a0a3e8d5d72 100644
--- a/arch/x86_64/kernel/apic.c
+++ b/arch/x86_64/kernel/apic.c
@@ -708,7 +708,7 @@ static void setup_APIC_timer(unsigned int clocks)
local_irq_save(flags);
/* wait for irq slice */
- if (vxtime.hpet_address) {
+ if (vxtime.hpet_address && hpet_use_timer) {
int trigger = hpet_readl(HPET_T0_CMP);
while (hpet_readl(HPET_COUNTER) >= trigger)
/* do nothing */ ;