Merge branch 'for-linus' of git://git.kernel.dk/linux-block

[~andy/linux] / arch / powerpc / kernel / irq.c

diff --git a/arch/powerpc/kernel/irq.c b/arch/powerpc/kernel/irq.c
index 641da9e868ce192848e925f5778183c16a1e2928..1b415027ec0e3c8031c18b5d1dabfeebff054fc5 100644 (file)
--- a/arch/powerpc/kernel/irq.c
+++ b/arch/powerpc/kernel/irq.c
@@ -277,7 +277,7 @@ EXPORT_SYMBOL(arch_local_irq_restore);
  * NOTE: This is called with interrupts hard disabled but not marked
  * as such in paca->irq_happened, so we need to resync this.
  */
-void restore_interrupts(void)
+void notrace restore_interrupts(void)
 {
        if (irqs_disabled()) {
                local_paca->irq_happened |= PACA_IRQ_HARD_DIS;
@@ -587,7 +587,7 @@ int irq_choose_cpu(const struct cpumask *mask)
 {
        int cpuid;
 
-       if (cpumask_equal(mask, cpu_all_mask)) {
+       if (cpumask_equal(mask, cpu_online_mask)) {
                static int irq_rover;
                static DEFINE_RAW_SPINLOCK(irq_rover_lock);
                unsigned long flags;