diff options
| author | Shaohua Li <shaohua.li@intel.com> | 2006-02-03 21:51:20 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-02-04 16:43:14 -0800 |
| commit | 396bd50fed9c91f7aa1ac66f4b2880ca58c332ff (patch) | |
| tree | 4af5353b10a1e67087815a6e838614f02bd7cbc3 /arch | |
| parent | 9391a3f9c7f17bdd82adf9a98905450642cc8970 (diff) | |
| download | kernel_samsung_espresso10-396bd50fed9c91f7aa1ac66f4b2880ca58c332ff.zip kernel_samsung_espresso10-396bd50fed9c91f7aa1ac66f4b2880ca58c332ff.tar.gz kernel_samsung_espresso10-396bd50fed9c91f7aa1ac66f4b2880ca58c332ff.tar.bz2 | |
[PATCH] x86_64: mark two routines as __cpuinit
SIgned-off-by: Shaohua Li<shaohua.li@intel.com>
Signed-off-by: Andi Kleen <ak@suse.de>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/x86_64/kernel/apic.c | 2 | ||||
| -rw-r--r-- | arch/x86_64/kernel/time.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/x86_64/kernel/apic.c b/arch/x86_64/kernel/apic.c index 14751dd..673a2fe 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 c1f7605..c0844bf 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()) |