aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86_64/kernel/time.c
diff options
context:
space:
mode:
authorShaohua Li <shaohua.li@intel.com>2006-02-03 15:51:20 -0500
committerLinus Torvalds <torvalds@g5.osdl.org>2006-02-04 19:43:14 -0500
commit396bd50fed9c91f7aa1ac66f4b2880ca58c332ff (patch)
tree4af5353b10a1e67087815a6e838614f02bd7cbc3 /arch/x86_64/kernel/time.c
parent9391a3f9c7f17bdd82adf9a98905450642cc8970 (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>
Diffstat (limited to 'arch/x86_64/kernel/time.c')
-rw-r--r--arch/x86_64/kernel/time.c2
1 files changed, 1 insertions, 1 deletions
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())