xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'clocksource/cleanup' into next/cleanup

Browse Source 
Clockevent cleanup series from Shawn Guo.

Resolved move/change conflict in mach-pxa/time.c due to the sys_timer
cleanup.

* clocksource/cleanup:
  clocksource: use clockevents_config_and_register() where possible
  ARM: use clockevents_config_and_register() where possible
  clockevents: export clockevents_config_and_register for module use
  + sync to Linux 3.8-rc3

Signed-off-by: Olof Johansson <olof@lixom.net>

Conflicts:
	arch/arm/mach-pxa/time.c
This commit is contained in:
Olof Johansson
2013-01-14 10:20:02 -08:00
parent 00c82d6440 77cc982f6a
commit 8d84981e39
1434 changed files with 8056 additions and 8080 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
arch/arm/mach-footbridge/dc21285-timer.c
View File

@@ -101,10 +101,6 @@ void __init footbridge_timer_init(void)
setup_irq(ce->irq, &footbridge_timer_irq);
clockevents_calc_mult_shift(ce, mem_fclk_21285, 5);
ce->max_delta_ns = clockevent_delta2ns(0xffffff, ce);
ce->min_delta_ns = clockevent_delta2ns(0x000004, ce);
ce->cpumask = cpumask_of(smp_processor_id());
clockevents_register_device(ce);
clockevents_config_and_register(ce, mem_fclk_21285, 0x4, 0xffffff);
}