diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-01-06 17:32:52 -0500 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-01-06 17:32:52 -0500 |
| commit | 4073723acb9cdcdbe4df9c0e0c376c65d1697e43 (patch) | |
| tree | f41c17eac157b1223ce104845cf9b1e5a9e6a83d /arch/arm/kernel/smp_twd.c | |
| parent | 58daf18cdcab550262a5f4681e1f1e073e21965a (diff) | |
| parent | 4ec3eb13634529c0bc7466658d84d0bbe3244aea (diff) | |
Merge branch 'misc' into devel
Conflicts:
arch/arm/Kconfig
arch/arm/common/Makefile
arch/arm/kernel/Makefile
arch/arm/kernel/smp.c
Diffstat (limited to 'arch/arm/kernel/smp_twd.c')
| -rw-r--r-- | arch/arm/kernel/smp_twd.c | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/arch/arm/kernel/smp_twd.c b/arch/arm/kernel/smp_twd.c index 67f933ec4177..dd790745b3ef 100644 --- a/arch/arm/kernel/smp_twd.c +++ b/arch/arm/kernel/smp_twd.c | |||
| @@ -145,13 +145,3 @@ void __cpuinit twd_timer_setup(struct clock_event_device *clk) | |||
| 145 | 145 | ||
| 146 | clockevents_register_device(clk); | 146 | clockevents_register_device(clk); |
| 147 | } | 147 | } |
| 148 | |||
| 149 | #ifdef CONFIG_HOTPLUG_CPU | ||
| 150 | /* | ||
| 151 | * take a local timer down | ||
| 152 | */ | ||
| 153 | void twd_timer_stop(void) | ||
| 154 | { | ||
| 155 | __raw_writel(0, twd_base + TWD_TIMER_CONTROL); | ||
| 156 | } | ||
| 157 | #endif | ||