diff options
| author | Tony Luck <tony.luck@intel.com> | 2005-11-03 09:09:08 -0800 |
|---|---|---|
| committer | Tony Luck <tony.luck@intel.com> | 2005-11-03 09:09:08 -0800 |
| commit | 55725495f2175d0be2a5ed4135c2ea298b470001 (patch) | |
| tree | 6005d0c7a95d994bf7ec8e6410dbd5a573e86fdf /arch/i386/kernel/time.c | |
| parent | 067794a1170ef61e295aea1719cf4a1ce20200f8 (diff) | |
| parent | 06024f217d607369f0ee0071034ebb03071d5fb2 (diff) | |
Auto-update from upstream
Diffstat (limited to 'arch/i386/kernel/time.c')
| -rw-r--r-- | arch/i386/kernel/time.c | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/arch/i386/kernel/time.c b/arch/i386/kernel/time.c index 07471bba2dc..41c5b2dc620 100644 --- a/arch/i386/kernel/time.c +++ b/arch/i386/kernel/time.c @@ -440,8 +440,8 @@ static int time_init_device(void) device_initcall(time_init_device); -extern void (*late_time_init)(void); #ifdef CONFIG_HPET_TIMER +extern void (*late_time_init)(void); /* Duplicate of time_init() below, with hpet_enable part added */ static void __init hpet_time_init(void) { @@ -458,11 +458,6 @@ static void __init hpet_time_init(void) printk(KERN_INFO "Using %s for high-res timesource\n",cur_timer->name); time_init_hook(); - -#ifdef CONFIG_X86_LOCAL_APIC - if (enable_local_apic >= 0) - APIC_late_time_init(); -#endif } #endif @@ -487,9 +482,4 @@ void __init time_init(void) printk(KERN_INFO "Using %s for high-res timesource\n",cur_timer->name); time_init_hook(); - -#ifdef CONFIG_X86_LOCAL_APIC - if (enable_local_apic >= 0) - late_time_init = APIC_late_time_init; -#endif } |