Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp

Conflicts:
	litmus/sched_cedf.c

1 files changed, 47 insertions, 49 deletions

diff --git a/arch/parisc/kernel/irq.c b/arch/parisc/kernel/irq.c
index efbcee5d2220..c0b1affc06a8 100644
--- a/arch/parisc/kernel/irq.c
+++ b/arch/parisc/kernel/irq.c
@@ -52,9 +52,9 @@ static volatile unsigned long cpu_eiem = 0;
 */
 static DEFINE_PER_CPU(unsigned long, local_ack_eiem) = ~0UL;
 
-static void cpu_disable_irq(unsigned int irq)
+static void cpu_mask_irq(struct irq_data *d)
 {
-        unsigned long eirr_bit = EIEM_MASK(irq);
+        unsigned long eirr_bit = EIEM_MASK(d->irq);
 
         cpu_eiem &= ~eirr_bit;
         /* Do nothing on the other CPUs.  If they get this interrupt,
@@ -63,7 +63,7 @@ static void cpu_disable_irq(unsigned int irq)
          * then gets disabled */
 }
 
-static void cpu_enable_irq(unsigned int irq)
+static void __cpu_unmask_irq(unsigned int irq)
 {
         unsigned long eirr_bit = EIEM_MASK(irq);
 
@@ -75,18 +75,14 @@ static void cpu_enable_irq(unsigned int irq)
         smp_send_all_nop();
 }
 
-static unsigned int cpu_startup_irq(unsigned int irq)
+static void cpu_unmask_irq(struct irq_data *d)
 {
-        cpu_enable_irq(irq);
-        return 0;
+        __cpu_unmask_irq(d->irq);
 }
 
-void no_ack_irq(unsigned int irq) { }
-void no_end_irq(unsigned int irq) { }
-
-void cpu_ack_irq(unsigned int irq)
+void cpu_ack_irq(struct irq_data *d)
 {
-        unsigned long mask = EIEM_MASK(irq);
+        unsigned long mask = EIEM_MASK(d->irq);
         int cpu = smp_processor_id();
 
         /* Clear in EIEM so we can no longer process */
@@ -99,9 +95,9 @@ void cpu_ack_irq(unsigned int irq)
         mtctl(mask, 23);
 }
 
-void cpu_end_irq(unsigned int irq)
+void cpu_eoi_irq(struct irq_data *d)
 {
-        unsigned long mask = EIEM_MASK(irq);
+        unsigned long mask = EIEM_MASK(d->irq);
         int cpu = smp_processor_id();
 
         /* set it in the eiems---it's no longer in process */
@@ -112,17 +108,13 @@ void cpu_end_irq(unsigned int irq)
 }
 
 #ifdef CONFIG_SMP
-int cpu_check_affinity(unsigned int irq, const struct cpumask *dest)
+int cpu_check_affinity(struct irq_data *d, const struct cpumask *dest)
 {
         int cpu_dest;
 
         /* timer and ipi have to always be received on all CPUs */
-        if (CHECK_IRQ_PER_CPU(irq)) {
-                /* Bad linux design decision.  The mask has already
-                 * been set; we must reset it */
-                cpumask_setall(irq_desc[irq].affinity);
+        if (irqd_is_per_cpu(d))
                 return -EINVAL;
-        }
 
         /* whatever mask they set, we just allow one CPU */
         cpu_dest = first_cpu(*dest);
@@ -130,35 +122,34 @@ int cpu_check_affinity(unsigned int irq, const struct cpumask *dest)
         return cpu_dest;
 }
 
-static int cpu_set_affinity_irq(unsigned int irq, const struct cpumask *dest)
+static int cpu_set_affinity_irq(struct irq_data *d, const struct cpumask *dest,
+                                bool force)
 {
         int cpu_dest;
 
-        cpu_dest = cpu_check_affinity(irq, dest);
+        cpu_dest = cpu_check_affinity(d, dest);
         if (cpu_dest < 0)
                 return -1;
 
-        cpumask_copy(irq_desc[irq].affinity, dest);
+        cpumask_copy(d->affinity, dest);
 
         return 0;
 }
 #endif
 
 static struct irq_chip cpu_interrupt_type = {
-        .name           = "CPU",
-        .startup        = cpu_startup_irq,
-        .shutdown       = cpu_disable_irq,
-        .enable         = cpu_enable_irq,
-        .disable        = cpu_disable_irq,
-        .ack            = cpu_ack_irq,
-        .end            = cpu_end_irq,
+        .name                   = "CPU",
+        .irq_mask               = cpu_mask_irq,
+        .irq_unmask             = cpu_unmask_irq,
+        .irq_ack                = cpu_ack_irq,
+        .irq_eoi                = cpu_eoi_irq,
 #ifdef CONFIG_SMP
-        .set_affinity   = cpu_set_affinity_irq,
+        .irq_set_affinity       = cpu_set_affinity_irq,
 #endif
         /* XXX: Needs to be written.  We managed without it so far, but
          * we really ought to write it.
          */
-        .retrigger      = NULL,
+        .irq_retrigger  = NULL,
 };
 
 int show_interrupts(struct seq_file *p, void *v)
@@ -178,10 +169,11 @@ int show_interrupts(struct seq_file *p, void *v)
         }
 
         if (i < NR_IRQS) {
+                struct irq_desc *desc = irq_to_desc(i);
                 struct irqaction *action;
 
-                raw_spin_lock_irqsave(&irq_desc[i].lock, flags);
-                action = irq_desc[i].action;
+                raw_spin_lock_irqsave(&desc->lock, flags);
+                action = desc->action;
                 if (!action)
                         goto skip;
                 seq_printf(p, "%3d: ", i);
@@ -192,7 +184,7 @@ int show_interrupts(struct seq_file *p, void *v)
                 seq_printf(p, "%10u ", kstat_irqs(i));
 #endif
 
-                seq_printf(p, " %14s", irq_desc[i].chip->name);
+                seq_printf(p, " %14s", irq_desc_get_chip(desc)->name);
 #ifndef PARISC_IRQ_CR16_COUNTS
                 seq_printf(p, "  %s", action->name);
 
@@ -224,7 +216,7 @@ int show_interrupts(struct seq_file *p, void *v)
 
                 seq_putc(p, '\n');
  skip:
-                raw_spin_unlock_irqrestore(&irq_desc[i].lock, flags);
+                raw_spin_unlock_irqrestore(&desc->lock, flags);
         }
 
         return 0;
@@ -242,15 +234,16 @@ int show_interrupts(struct seq_file *p, void *v)
 
 int cpu_claim_irq(unsigned int irq, struct irq_chip *type, void *data)
 {
-        if (irq_desc[irq].action)
+        if (irq_has_action(irq))
                 return -EBUSY;
-        if (irq_desc[irq].chip != &cpu_interrupt_type)
+        if (irq_get_chip(irq) != &cpu_interrupt_type)
                 return -EBUSY;
 
+        /* for iosapic interrupts */
         if (type) {
-                irq_desc[irq].chip = type;
-                irq_desc[irq].chip_data = data;
-                cpu_interrupt_type.enable(irq);
+                irq_set_chip_and_handler(irq, type, handle_percpu_irq);
+                irq_set_chip_data(irq, data);
+                __cpu_unmask_irq(irq);
         }
         return 0;
 }
@@ -299,7 +292,8 @@ int txn_alloc_irq(unsigned int bits_wide)
 unsigned long txn_affinity_addr(unsigned int irq, int cpu)
 {
 #ifdef CONFIG_SMP
-        cpumask_copy(irq_desc[irq].affinity, cpumask_of(cpu));
+        struct irq_data *d = irq_get_irq_data(irq);
+        cpumask_copy(d->affinity, cpumask_of(cpu));
 #endif
 
         return per_cpu(cpu_data, cpu).txn_addr;
@@ -343,6 +337,7 @@ void do_cpu_irq_mask(struct pt_regs *regs)
         unsigned long eirr_val;
         int irq, cpu = smp_processor_id();
 #ifdef CONFIG_SMP
+        struct irq_desc *desc;
         cpumask_t dest;
 #endif
 
@@ -356,8 +351,9 @@ void do_cpu_irq_mask(struct pt_regs *regs)
         irq = eirr_to_irq(eirr_val);
 
 #ifdef CONFIG_SMP
-        cpumask_copy(&dest, irq_desc[irq].affinity);
-        if (CHECK_IRQ_PER_CPU(irq_desc[irq].status) &&
+        desc = irq_to_desc(irq);
+        cpumask_copy(&dest, desc->irq_data.affinity);
+        if (irqd_is_per_cpu(&desc->irq_data) &&
             !cpu_isset(smp_processor_id(), dest)) {
                 int cpu = first_cpu(dest);
 
@@ -368,7 +364,7 @@ void do_cpu_irq_mask(struct pt_regs *regs)
                 goto set_out;
         }
 #endif
-        __do_IRQ(irq);
+        generic_handle_irq(irq);
 
  out:
         irq_exit();
@@ -398,14 +394,15 @@ static void claim_cpu_irqs(void)
 {
         int i;
         for (i = CPU_IRQ_BASE; i <= CPU_IRQ_MAX; i++) {
-                irq_desc[i].chip = &cpu_interrupt_type;
+                irq_set_chip_and_handler(i, &cpu_interrupt_type,
+                                         handle_percpu_irq);
         }
 
-        irq_desc[TIMER_IRQ].action = &timer_action;
-        irq_desc[TIMER_IRQ].status = IRQ_PER_CPU;
+        irq_set_handler(TIMER_IRQ, handle_percpu_irq);
+        setup_irq(TIMER_IRQ, &timer_action);
 #ifdef CONFIG_SMP
-        irq_desc[IPI_IRQ].action = &ipi_action;
-        irq_desc[IPI_IRQ].status = IRQ_PER_CPU;
+        irq_set_handler(IPI_IRQ, handle_percpu_irq);
+        setup_irq(IPI_IRQ, &ipi_action);
 #endif
 }
 
@@ -423,3 +420,4 @@ void __init init_IRQ(void)
         set_eiem(cpu_eiem);     /* EIEM : enable all external intr */
 
 }
+