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: Srivatsa S. Bhat <srivatsa.bhat@linux.vnet.ibm.com>
Reviewed-by: Paul 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.com
Signed-off-by: Ingo Molnar <mingo@kernel.org>

1 files changed, 3 insertions, 0 deletions

diff --git a/include/linux/perf_event.h b/include/linux/perf_event.h
index 2e902359aee5..06478056da03 100644
--- a/include/linux/perf_event.h
+++ b/include/linux/perf_event.h
@@ -803,10 +803,13 @@ static inline void perf_event_task_tick(void)				{ }
 do {                                                                    \
         static struct notifier_block fn##_nb __cpuinitdata =            \
                 { .notifier_call = fn, .priority = CPU_PRI_PERF };      \
+        unsigned long flags;                                            \
         fn(&fn##_nb, (unsigned long)CPU_UP_PREPARE,                     \
                 (void *)(unsigned long)smp_processor_id());             \
+        local_irq_save(flags);                                          \
         fn(&fn##_nb, (unsigned long)CPU_STARTING,                       \
                 (void *)(unsigned long)smp_processor_id());             \
+        local_irq_restore(flags);                                       \
         fn(&fn##_nb, (unsigned long)CPU_ONLINE,                         \
                 (void *)(unsigned long)smp_processor_id());             \
         register_cpu_notifier(&fn##_nb);                                \