diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-01-06 17:31:35 -0500 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-01-06 17:32:03 -0500 |
| commit | 4ec3eb13634529c0bc7466658d84d0bbe3244aea (patch) | |
| tree | b491daac2ccfc7b8ca88e171a43f66888463568a /arch/arm/kernel/smp_twd.c | |
| parent | 24056f525051a9e186af28904b396320e18bf9a0 (diff) | |
| parent | 15095bb0fe779c0403091bda7adce5fb3bb9ca35 (diff) | |
Merge branch 'smp' into misc
Conflicts:
arch/arm/kernel/entry-armv.S
arch/arm/mm/ioremap.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 35882fbf37f9..24585d97c104 100644 --- a/arch/arm/kernel/smp_twd.c +++ b/arch/arm/kernel/smp_twd.c | |||
| @@ -150,13 +150,3 @@ void __cpuinit twd_timer_setup(struct clock_event_device *clk) | |||
| 150 | 150 | ||
| 151 | clockevents_register_device(clk); | 151 | clockevents_register_device(clk); |
| 152 | } | 152 | } |
| 153 | |||
| 154 | #ifdef CONFIG_HOTPLUG_CPU | ||
| 155 | /* | ||
| 156 | * take a local timer down | ||
| 157 | */ | ||
| 158 | void twd_timer_stop(void) | ||
| 159 | { | ||
| 160 | __raw_writel(0, twd_base + TWD_TIMER_CONTROL); | ||
| 161 | } | ||
| 162 | #endif | ||