From: Thomas Gleixner <tglx@linutronix.de>

Make variables static.

[akpm@linux-foundation.org: build fix]
[rjw@sisk.pl: Fix CPU hotplug breakage on HP nx6325]
Signed-off-by: Chris Wright <chrisw@sous-sol.org>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Cc: Andi Kleen <ak@suse.de>
Cc: john stultz <johnstul@us.ibm.com>
Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

 arch/x86_64/kernel/apic.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff -puN arch/x86_64/kernel/apic.c~x86_64-cleanup-apic-c arch/x86_64/kernel/apic.c
--- a/arch/x86_64/kernel/apic.c~x86_64-cleanup-apic-c
+++ a/arch/x86_64/kernel/apic.c
@@ -41,8 +41,8 @@
 #include <asm/apic.h>
 
 int apic_verbosity;
-int apic_calibrate_pmtmr __initdata;
-int disable_apic_timer __initdata;
+static int apic_calibrate_pmtmr __initdata;
+int disable_apic_timer __cpuinitdata;
 
 /* Local APIC timer works in C2? */
 int local_apic_timer_c2_ok;
_