Merge branch 'linus' into perfcounters/core-v2

[karo-tx-linux.git] / arch / powerpc / kernel / irq.c

diff --git a/arch/powerpc/kernel/irq.c b/arch/powerpc/kernel/irq.c
index 17efb7118db1140296bf8fa447b1b1133867c398..0d2e37c57738f8398e22985c393231e0dc9c0bbf 100644 (file)
--- a/arch/powerpc/kernel/irq.c
+++ b/arch/powerpc/kernel/irq.c
@@ -104,6 +104,13 @@ static inline notrace void set_soft_enabled(unsigned long enable)
        : : "r" (enable), "i" (offsetof(struct paca_struct, soft_enabled)));
 }
 
+#ifdef CONFIG_PERF_COUNTERS
+notrace void __weak perf_counter_do_pending(void)
+{
+       set_perf_counter_pending(0);
+}
+#endif
+
 notrace void raw_local_irq_restore(unsigned long en)
 {
        /*
@@ -135,6 +142,9 @@ notrace void raw_local_irq_restore(unsigned long en)
                        iseries_handle_interrupts();
        }
 
+       if (get_perf_counter_pending())
+               perf_counter_do_pending();
+
        /*
         * if (get_paca()->hard_enabled) return;
         * But again we need to take care that gcc gets hard_enabled directly
@@ -171,7 +181,7 @@ int show_interrupts(struct seq_file *p, void *v)
 {
        int i = *(loff_t *)v, j;
        struct irqaction *action;
-       irq_desc_t *desc;
+       struct irq_desc *desc;
        unsigned long flags;
 
        if (i == 0) {
@@ -231,7 +241,7 @@ void fixup_irqs(cpumask_t map)
                if (irq_desc[irq].status & IRQ_PER_CPU)
                        continue;
 
-               cpus_and(mask, irq_desc[irq].affinity, map);
+               cpumask_and(&mask, irq_desc[irq].affinity, &map);
                if (any_online_cpu(mask) == NR_CPUS) {
                        printk("Breaking affinity for irq %i\n", irq);
                        mask = map;
@@ -1038,7 +1048,7 @@ arch_initcall(irq_late_init);
 static int virq_debug_show(struct seq_file *m, void *private)
 {
        unsigned long flags;
-       irq_desc_t *desc;
+       struct irq_desc *desc;
        const char *p;
        char none[] = "none";
        int i;