From: Shaohua Li Date: Fri, 3 Feb 2006 20:51:20 +0000 (+0100) Subject: [PATCH] x86_64: mark two routines as __cpuinit X-Git-Tag: v2.6.16-rc3~189 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=396bd50fed9c91f7aa1ac66f4b2880ca58c332ff;p=linux-2.6-omap-h63xx.git [PATCH] x86_64: mark two routines as __cpuinit SIgned-off-by: Shaohua Li Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds --- diff --git a/arch/x86_64/kernel/apic.c b/arch/x86_64/kernel/apic.c index 14751dda7dc..673a2fe9923 100644 --- a/arch/x86_64/kernel/apic.c +++ b/arch/x86_64/kernel/apic.c @@ -937,7 +937,7 @@ void smp_apic_timer_interrupt(struct pt_regs *regs) * multi-chassis. Use available data to take a good guess. * If in doubt, go HPET. */ -__init int oem_force_hpet_timer(void) +__cpuinit int oem_force_hpet_timer(void) { int i, clusters, zeros; unsigned id; diff --git a/arch/x86_64/kernel/time.c b/arch/x86_64/kernel/time.c index c1f76055b57..c0844bffbf8 100644 --- a/arch/x86_64/kernel/time.c +++ b/arch/x86_64/kernel/time.c @@ -963,7 +963,7 @@ void __init time_init(void) * Make an educated guess if the TSC is trustworthy and synchronized * over all CPUs. */ -__init int unsynchronized_tsc(void) +__cpuinit int unsynchronized_tsc(void) { #ifdef CONFIG_SMP if (oem_force_hpet_timer())