Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 151766fce8bee0e3e6076c8b829f9fcc0a2412ae

Authored by Feng Tang
Committed by Thomas Gleixner
1 parent f9369910a6
Exists in smarc-l5.0.0_1.0.0-ga and in 5 other branches imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga

Revert "x86/platform: Add a wallclock_init func to x86_platforms ops" 

This reverts commit cf8ff6b6ab0e99dd3058852f4ec76a6140abadec.

Just found this commit is a function duplicatation of commit 6b617e22
"x86/platform: Add a wallclock_init func to x86_init.timers ops".
Let's revert it and sorry for the noise.

Signed-off-by: Feng Tang <feng.tang@intel.com>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: H. Peter Anvin <hpa@linux.intel.com>
Cc: Jacob Pan <jacob.jun.pan@linux.intel.com>
Cc: Alan Cox <alan@linux.intel.com>
Cc: Dirk Brandewie <dirk.brandewie@gmail.com>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>

Showing 3 changed files with 0 additions and 6 deletions Side-by-side Diff

arch/x86/include/asm/x86_init.h
Diff comments   View file @ 151766f
... ... @@ -156,7 +156,6 @@
156 156 /**
157 157 * struct x86_platform_ops - platform specific runtime functions
158 158 * @calibrate_tsc: calibrate TSC
159   - * @wallclock_init: init the wallclock device
160 159 * @get_wallclock: get time from HW clock like RTC etc.
161 160 * @set_wallclock: set time back to HW clock
162 161 * @is_untracked_pat_range exclude from PAT logic
... ... @@ -167,7 +166,6 @@
167 166 */
168 167 struct x86_platform_ops {
169 168 unsigned long (*calibrate_tsc)(void);
170   - void (*wallclock_init)(void);
171 169 unsigned long (*get_wallclock)(void);
172 170 int (*set_wallclock)(unsigned long nowtime);
173 171 void (*iommu_shutdown)(void);
arch/x86/kernel/setup.c
Diff comments   View file @ 151766f
... ... @@ -1027,8 +1027,6 @@
1027 1027  
1028 1028 x86_init.timers.wallclock_init();
1029 1029  
1030   - x86_platform.wallclock_init();
1031   -
1032 1030 mcheck_init();
1033 1031  
1034 1032 arch_init_ideal_nops();
arch/x86/kernel/x86_init.c
Diff comments   View file @ 151766f
... ... @@ -29,7 +29,6 @@
29 29 void __init x86_init_pgd_noop(pgd_t *unused) { }
30 30 int __init iommu_init_noop(void) { return 0; }
31 31 void iommu_shutdown_noop(void) { }
32   -void wallclock_init_noop(void) { }
33 32  
34 33 /*
35 34 * The platform setup functions are preset with the default functions
... ... @@ -101,7 +100,6 @@
101 100  
102 101 struct x86_platform_ops x86_platform = {
103 102 .calibrate_tsc = native_calibrate_tsc,
104   - .wallclock_init = wallclock_init_noop,
105 103 .get_wallclock = mach_get_cmos_time,
106 104 .set_wallclock = mach_set_rtc_mmss,
107 105 .iommu_shutdown = iommu_shutdown_noop,