From e8fcc8e65e6dcac014fe5e4f475a1036724a1c4e Mon Sep 17 00:00:00 2001
From: Andi Kleen <ak@suse.de>
Date: Thu, 16 Feb 2006 23:42:07 +0100
Subject: [PATCH] --- yaml --- r: 20421 b: refs/heads/master c:
 7fd67843b96f90f59c9a244a1bc25137978a3ff9 h: refs/heads/master i:   20419:
 51331bb20792623bfec085b4283134cf4872744f v: v3

---
 [refs]                           | 2 +-
 trunk/arch/x86_64/kernel/apic.c  | 1 +
 trunk/arch/x86_64/kernel/time.c  | 3 +--
 trunk/include/asm-x86_64/proto.h | 1 +
 4 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index acaeae32371d..7223f0fef676 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ab68805955ee3dd84a6aa76cd70e61fde996968d
+refs/heads/master: 7fd67843b96f90f59c9a244a1bc25137978a3ff9
diff --git a/trunk/arch/x86_64/kernel/apic.c b/trunk/arch/x86_64/kernel/apic.c
index 7a0a3e8d5d72..e5b14c57eaa0 100644
--- a/trunk/arch/x86_64/kernel/apic.c
+++ b/trunk/arch/x86_64/kernel/apic.c
@@ -1152,6 +1152,7 @@ __setup("noapicmaintimer", setup_noapicmaintimer);
 static __init int setup_apicpmtimer(char *s)
 {
 	apic_calibrate_pmtmr = 1;
+	notsc_setup(NULL);
 	return setup_apicmaintimer(NULL);
 }
 __setup("apicpmtimer", setup_apicpmtimer);
diff --git a/trunk/arch/x86_64/kernel/time.c b/trunk/arch/x86_64/kernel/time.c
index 3c58c30506a1..67841d11ed1f 100644
--- a/trunk/arch/x86_64/kernel/time.c
+++ b/trunk/arch/x86_64/kernel/time.c
@@ -1327,8 +1327,7 @@ static int __init nohpet_setup(char *s)
 
 __setup("nohpet", nohpet_setup);
 
-
-static int __init notsc_setup(char *s)
+int __init notsc_setup(char *s)
 {
 	notsc = 1;
 	return 0;
diff --git a/trunk/include/asm-x86_64/proto.h b/trunk/include/asm-x86_64/proto.h
index c99832e7bf3f..eca3f2d633db 100644
--- a/trunk/include/asm-x86_64/proto.h
+++ b/trunk/include/asm-x86_64/proto.h
@@ -133,6 +133,7 @@ extern int fix_aperture;
 extern int force_iommu;
 
 extern int reboot_force;
+extern int notsc_setup(char *);
 
 extern void smp_local_timer_interrupt(struct pt_regs * regs);