diff options
author | Shaohua Li <shaohua.li@intel.com> | 2006-02-03 15:51:20 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-02-04 19:43:14 -0500 |
commit | 396bd50fed9c91f7aa1ac66f4b2880ca58c332ff (patch) | |
tree | 4af5353b10a1e67087815a6e838614f02bd7cbc3 | |
parent | 9391a3f9c7f17bdd82adf9a98905450642cc8970 (diff) |
[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>
-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 14751dda7dcf..673a2fe9923c 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) | |||
937 | * multi-chassis. Use available data to take a good guess. | 937 | * multi-chassis. Use available data to take a good guess. |
938 | * If in doubt, go HPET. | 938 | * If in doubt, go HPET. |
939 | */ | 939 | */ |
940 | __init int oem_force_hpet_timer(void) | 940 | __cpuinit int oem_force_hpet_timer(void) |
941 | { | 941 | { |
942 | int i, clusters, zeros; | 942 | int i, clusters, zeros; |
943 | unsigned id; | 943 | unsigned id; |
diff --git a/arch/x86_64/kernel/time.c b/arch/x86_64/kernel/time.c index c1f76055b578..c0844bffbf84 100644 --- a/arch/x86_64/kernel/time.c +++ b/arch/x86_64/kernel/time.c | |||
@@ -963,7 +963,7 @@ void __init time_init(void) | |||
963 | * Make an educated guess if the TSC is trustworthy and synchronized | 963 | * Make an educated guess if the TSC is trustworthy and synchronized |
964 | * over all CPUs. | 964 | * over all CPUs. |
965 | */ | 965 | */ |
966 | __init int unsynchronized_tsc(void) | 966 | __cpuinit int unsynchronized_tsc(void) |
967 | { | 967 | { |
968 | #ifdef CONFIG_SMP | 968 | #ifdef CONFIG_SMP |
969 | if (oem_force_hpet_timer()) | 969 | if (oem_force_hpet_timer()) |