diff options
author | Shaohua Li <shaohua.li@intel.com> | 2011-01-24 03:00:01 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-01-24 14:57:34 -0500 |
commit | ec30f343d61391ab23705e50a525da1d55395780 (patch) | |
tree | 6ac84bc7a34074cbbac22403e2afcc07abdaf838 /drivers/idle/intel_idle.c | |
parent | 34686fe689bf62d34af5379240caf7c446607ead (diff) |
fix a shutdown regression in intel_idle
Fix a shutdown regression caused by 2a2d31c8dc6f ("intel_idle: open
broadcast clock event"). The clockevent framework can automatically
shutdown broadcast timers for hotremove CPUs. And we get a shutdown
regression when we shutdown broadcast timer for hot remove CPU, so just
delete some code.
Also fix some section mismatch.
Reported-by: Ari Savolainen <ari.m.savolainen@gmail.com>
Signed-off-by: Shaohua Li <shaohua.li@intel.com>
Tested-by: Linus Torvalds <torvalds@linux-foundation.org>
Cc: stable@kernel.org
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/idle/intel_idle.c')
-rw-r--r-- | drivers/idle/intel_idle.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/drivers/idle/intel_idle.c b/drivers/idle/intel_idle.c index 7acb32e7f817..1fa091e05690 100644 --- a/drivers/idle/intel_idle.c +++ b/drivers/idle/intel_idle.c | |||
@@ -263,7 +263,7 @@ static void __setup_broadcast_timer(void *arg) | |||
263 | clockevents_notify(reason, &cpu); | 263 | clockevents_notify(reason, &cpu); |
264 | } | 264 | } |
265 | 265 | ||
266 | static int __cpuinit setup_broadcast_cpuhp_notify(struct notifier_block *n, | 266 | static int setup_broadcast_cpuhp_notify(struct notifier_block *n, |
267 | unsigned long action, void *hcpu) | 267 | unsigned long action, void *hcpu) |
268 | { | 268 | { |
269 | int hotcpu = (unsigned long)hcpu; | 269 | int hotcpu = (unsigned long)hcpu; |
@@ -273,15 +273,11 @@ static int __cpuinit setup_broadcast_cpuhp_notify(struct notifier_block *n, | |||
273 | smp_call_function_single(hotcpu, __setup_broadcast_timer, | 273 | smp_call_function_single(hotcpu, __setup_broadcast_timer, |
274 | (void *)true, 1); | 274 | (void *)true, 1); |
275 | break; | 275 | break; |
276 | case CPU_DOWN_PREPARE: | ||
277 | smp_call_function_single(hotcpu, __setup_broadcast_timer, | ||
278 | (void *)false, 1); | ||
279 | break; | ||
280 | } | 276 | } |
281 | return NOTIFY_OK; | 277 | return NOTIFY_OK; |
282 | } | 278 | } |
283 | 279 | ||
284 | static struct notifier_block __cpuinitdata setup_broadcast_notifier = { | 280 | static struct notifier_block setup_broadcast_notifier = { |
285 | .notifier_call = setup_broadcast_cpuhp_notify, | 281 | .notifier_call = setup_broadcast_cpuhp_notify, |
286 | }; | 282 | }; |
287 | 283 | ||