Commit 6760bca9 authored by Srivatsa S. Bhat's avatar Srivatsa S. Bhat Committed by Ingo Molnar

perf, cpu hotplug: Run CPU_STARTING notifiers with irqs disabled

The CPU_STARTING notifiers are supposed to be run with irqs
disabled. But the perf_cpu_notifier() macro invokes them without
doing that. Fix it.
Signed-off-by: default avatarSrivatsa S. Bhat <srivatsa.bhat@linux.vnet.ibm.com>
Reviewed-by: default avatarPaul E. McKenney <paulmck@linux.vnet.ibm.com>
Cc: peterz@infradead.org
Cc: acme@ghostprotocols.net
Link: http://lkml.kernel.org/r/20121016075809.3572.47848.stgit@srivatsabhat.in.ibm.comSigned-off-by: default avatarIngo Molnar <mingo@kernel.org>
parent bffd5fc2
...@@ -803,10 +803,13 @@ static inline void perf_event_task_tick(void) { } ...@@ -803,10 +803,13 @@ static inline void perf_event_task_tick(void) { }
do { \ do { \
static struct notifier_block fn##_nb __cpuinitdata = \ static struct notifier_block fn##_nb __cpuinitdata = \
{ .notifier_call = fn, .priority = CPU_PRI_PERF }; \ { .notifier_call = fn, .priority = CPU_PRI_PERF }; \
unsigned long flags; \
fn(&fn##_nb, (unsigned long)CPU_UP_PREPARE, \ fn(&fn##_nb, (unsigned long)CPU_UP_PREPARE, \
(void *)(unsigned long)smp_processor_id()); \ (void *)(unsigned long)smp_processor_id()); \
local_irq_save(flags); \
fn(&fn##_nb, (unsigned long)CPU_STARTING, \ fn(&fn##_nb, (unsigned long)CPU_STARTING, \
(void *)(unsigned long)smp_processor_id()); \ (void *)(unsigned long)smp_processor_id()); \
local_irq_restore(flags); \
fn(&fn##_nb, (unsigned long)CPU_ONLINE, \ fn(&fn##_nb, (unsigned long)CPU_ONLINE, \
(void *)(unsigned long)smp_processor_id()); \ (void *)(unsigned long)smp_processor_id()); \
register_cpu_notifier(&fn##_nb); \ register_cpu_notifier(&fn##_nb); \
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment