diff options
author | Feng Tang <feng.tang@intel.com> | 2011-02-14 11:13:31 -0500 |
---|---|---|
committer | Thomas Gleixner <tglx@linutronix.de> | 2011-02-14 12:20:43 -0500 |
commit | 6b617e224dfac0b64ed70dacdac50be6eb78a6a1 (patch) | |
tree | 6c7f45ab80c5c6d8f9005b12ad45c182c9b9f449 /arch/x86/kernel | |
parent | 991cfffa7c19aa648546aff666595af896e568ba (diff) |
x86/platform: Add a wallclock_init func to x86_init.timers ops
Some wall clock devices use MMIO based HW register, this new
function will give them a chance to do some initialization work
before their get/set_time service get called, which is usually
in early kernel boot phase.
Signed-off-by: Feng Tang <feng.tang@intel.com>
Signed-off-by: Jacob Pan <jacob.jun.pan@linux.intel.com>
Signed-off-by: Alan Cox <alan@linux.intel.com>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'arch/x86/kernel')
-rw-r--r-- | arch/x86/kernel/setup.c | 2 | ||||
-rw-r--r-- | arch/x86/kernel/x86_init.c | 1 |
2 files changed, 3 insertions, 0 deletions
diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c index 21c6746338af..68d535a77df0 100644 --- a/arch/x86/kernel/setup.c +++ b/arch/x86/kernel/setup.c | |||
@@ -1059,6 +1059,8 @@ void __init setup_arch(char **cmdline_p) | |||
1059 | #endif | 1059 | #endif |
1060 | x86_init.oem.banner(); | 1060 | x86_init.oem.banner(); |
1061 | 1061 | ||
1062 | x86_init.timers.wallclock_init(); | ||
1063 | |||
1062 | mcheck_init(); | 1064 | mcheck_init(); |
1063 | 1065 | ||
1064 | local_irq_save(flags); | 1066 | local_irq_save(flags); |
diff --git a/arch/x86/kernel/x86_init.c b/arch/x86/kernel/x86_init.c index ceb2911aa439..c11514e9128b 100644 --- a/arch/x86/kernel/x86_init.c +++ b/arch/x86/kernel/x86_init.c | |||
@@ -70,6 +70,7 @@ struct x86_init_ops x86_init __initdata = { | |||
70 | .setup_percpu_clockev = setup_boot_APIC_clock, | 70 | .setup_percpu_clockev = setup_boot_APIC_clock, |
71 | .tsc_pre_init = x86_init_noop, | 71 | .tsc_pre_init = x86_init_noop, |
72 | .timer_init = hpet_time_init, | 72 | .timer_init = hpet_time_init, |
73 | .wallclock_init = x86_init_noop, | ||
73 | }, | 74 | }, |
74 | 75 | ||
75 | .iommu = { | 76 | .iommu = { |