From a47da4125fc4043db64e4a9957e6cef873451468 Mon Sep 17 00:00:00 2001 From: Thomas Gleixner Date: Thu, 20 Aug 2009 16:51:07 +0200 Subject: [PATCH] --- yaml --- r: 163730 b: refs/heads/master c: dd0a70c8f921708eba29ef9f30dde1f14a74af05 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/x86/kernel/time.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 8e84aab7851e..def17c5b2939 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2d826404f0bdcac2a4dd7e3c446b70d6a3b63b78 +refs/heads/master: dd0a70c8f921708eba29ef9f30dde1f14a74af05 diff --git a/trunk/arch/x86/kernel/time.c b/trunk/arch/x86/kernel/time.c index fda0c34da757..fcece00356a4 100644 --- a/trunk/arch/x86/kernel/time.c +++ b/trunk/arch/x86/kernel/time.c @@ -108,6 +108,7 @@ void __init hpet_time_init(void) static void x86_late_time_init(void) { x86_init.timers.timer_init(); + tsc_init(); } /* @@ -116,6 +117,5 @@ static void x86_late_time_init(void) */ void __init time_init(void) { - tsc_init(); late_time_init = x86_late_time_init; }