69 files changed, 460 insertions, 595 deletions

diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig
index 71ba04721beb..d0e8a1dbf822 100644
--- a/arch/powerpc/Kconfig
+++ b/arch/powerpc/Kconfig
@@ -95,6 +95,10 @@ config GENERIC_FIND_NEXT_BIT
         bool
         default y
 
+config GENERIC_FIND_BIT_LE
+        bool
+        default y
+
 config GENERIC_GPIO
         bool
         help
@@ -135,6 +139,8 @@ config PPC
         select HAVE_SPARSE_IRQ
         select IRQ_PER_CPU
         select GENERIC_HARDIRQS_NO_DEPRECATED
+        select GENERIC_IRQ_SHOW
+        select GENERIC_IRQ_SHOW_LEVEL
 
 config EARLY_PRINTK
         bool
@@ -768,11 +774,19 @@ config HAS_RAPIDIO
 
 config RAPIDIO
         bool "RapidIO support"
-        depends on HAS_RAPIDIO
+        depends on HAS_RAPIDIO || PCI
         help
           If you say Y here, the kernel will include drivers and
           infrastructure code to support RapidIO interconnect devices.
 
+config FSL_RIO
+        bool "Freescale Embedded SRIO Controller support"
+        depends on RAPIDIO && HAS_RAPIDIO
+        default "n"
+        ---help---
+          Include support for RapidIO controller on Freescale embedded
+          processors (MPC8548, MPC8641, etc).
+
 source "drivers/rapidio/Kconfig"
 
 endmenu
diff --git a/arch/powerpc/include/asm/bitops.h b/arch/powerpc/include/asm/bitops.h
index 8a7e9314c68a..2e561876fc89 100644
--- a/arch/powerpc/include/asm/bitops.h
+++ b/arch/powerpc/include/asm/bitops.h
@@ -281,68 +281,56 @@ unsigned long __arch_hweight64(__u64 w);
 
 /* Little-endian versions */
 
-static __inline__ int test_le_bit(unsigned long nr,
-                                  __const__ unsigned long *addr)
+static __inline__ int test_bit_le(unsigned long nr,
+                                  __const__ void *addr)
 {
         __const__ unsigned char *tmp = (__const__ unsigned char *) addr;
         return (tmp[nr >> 3] >> (nr & 7)) & 1;
 }
 
-#define __set_le_bit(nr, addr) \
-        __set_bit((nr) ^ BITOP_LE_SWIZZLE, (addr))
-#define __clear_le_bit(nr, addr) \
-        __clear_bit((nr) ^ BITOP_LE_SWIZZLE, (addr))
+static inline void __set_bit_le(int nr, void *addr)
+{
+        __set_bit(nr ^ BITOP_LE_SWIZZLE, addr);
+}
+
+static inline void __clear_bit_le(int nr, void *addr)
+{
+        __clear_bit(nr ^ BITOP_LE_SWIZZLE, addr);
+}
+
+static inline int test_and_set_bit_le(int nr, void *addr)
+{
+        return test_and_set_bit(nr ^ BITOP_LE_SWIZZLE, addr);
+}
 
-#define test_and_set_le_bit(nr, addr) \
-        test_and_set_bit((nr) ^ BITOP_LE_SWIZZLE, (addr))
-#define test_and_clear_le_bit(nr, addr) \
-        test_and_clear_bit((nr) ^ BITOP_LE_SWIZZLE, (addr))
+static inline int test_and_clear_bit_le(int nr, void *addr)
+{
+        return test_and_clear_bit(nr ^ BITOP_LE_SWIZZLE, addr);
+}
+
+static inline int __test_and_set_bit_le(int nr, void *addr)
+{
+        return __test_and_set_bit(nr ^ BITOP_LE_SWIZZLE, addr);
+}
 
-#define __test_and_set_le_bit(nr, addr) \
-        __test_and_set_bit((nr) ^ BITOP_LE_SWIZZLE, (addr))
-#define __test_and_clear_le_bit(nr, addr) \
-        __test_and_clear_bit((nr) ^ BITOP_LE_SWIZZLE, (addr))
+static inline int __test_and_clear_bit_le(int nr, void *addr)
+{
+        return __test_and_clear_bit(nr ^ BITOP_LE_SWIZZLE, addr);
+}
 
-#define find_first_zero_le_bit(addr, size) generic_find_next_zero_le_bit((addr), (size), 0)
-unsigned long generic_find_next_zero_le_bit(const unsigned long *addr,
+#define find_first_zero_bit_le(addr, size) \
+        find_next_zero_bit_le((addr), (size), 0)
+unsigned long find_next_zero_bit_le(const void *addr,
                                     unsigned long size, unsigned long offset);
 
-unsigned long generic_find_next_le_bit(const unsigned long *addr,
+unsigned long find_next_bit_le(const void *addr,
                                     unsigned long size, unsigned long offset);
 /* Bitmap functions for the ext2 filesystem */
 
-#define ext2_set_bit(nr,addr) \
-        __test_and_set_le_bit((nr), (unsigned long*)addr)
-#define ext2_clear_bit(nr, addr) \
-        __test_and_clear_le_bit((nr), (unsigned long*)addr)
-
 #define ext2_set_bit_atomic(lock, nr, addr) \
-        test_and_set_le_bit((nr), (unsigned long*)addr)
+        test_and_set_bit_le((nr), (unsigned long*)addr)
 #define ext2_clear_bit_atomic(lock, nr, addr) \
-        test_and_clear_le_bit((nr), (unsigned long*)addr)
-
-#define ext2_test_bit(nr, addr)      test_le_bit((nr),(unsigned long*)addr)
-
-#define ext2_find_first_zero_bit(addr, size) \
-        find_first_zero_le_bit((unsigned long*)addr, size)
-#define ext2_find_next_zero_bit(addr, size, off) \
-        generic_find_next_zero_le_bit((unsigned long*)addr, size, off)
-
-#define ext2_find_next_bit(addr, size, off) \
-        generic_find_next_le_bit((unsigned long *)addr, size, off)
-/* Bitmap functions for the minix filesystem.  */
-
-#define minix_test_and_set_bit(nr,addr) \
-        __test_and_set_le_bit(nr, (unsigned long *)addr)
-#define minix_set_bit(nr,addr) \
-        __set_le_bit(nr, (unsigned long *)addr)
-#define minix_test_and_clear_bit(nr,addr) \
-        __test_and_clear_le_bit(nr, (unsigned long *)addr)
-#define minix_test_bit(nr,addr) \
-        test_le_bit(nr, (unsigned long *)addr)
-
-#define minix_find_first_zero_bit(addr,size) \
-        find_first_zero_le_bit((unsigned long *)addr, size)
+        test_and_clear_bit_le((nr), (unsigned long*)addr)
 
 #include <asm-generic/bitops/sched.h>
 
diff --git a/arch/powerpc/include/asm/mpic.h b/arch/powerpc/include/asm/mpic.h
index 946ec4947da2..7005ee0b074d 100644
--- a/arch/powerpc/include/asm/mpic.h
+++ b/arch/powerpc/include/asm/mpic.h
@@ -367,6 +367,10 @@ struct mpic
 #define MPIC_SINGLE_DEST_CPU            0x00001000
 /* Enable CoreInt delivery of interrupts */
 #define MPIC_ENABLE_COREINT             0x00002000
+/* Disable resetting of the MPIC.
+ * NOTE: This flag trumps MPIC_WANTS_RESET.
+ */
+#define MPIC_NO_RESET                   0x00004000
 
 /* MPIC HW modification ID */
 #define MPIC_REGSET_MASK                0xf0000000
diff --git a/arch/powerpc/include/asm/ptrace.h b/arch/powerpc/include/asm/ptrace.h
index 0175a676b34b..48223f9b8728 100644
--- a/arch/powerpc/include/asm/ptrace.h
+++ b/arch/powerpc/include/asm/ptrace.h
@@ -125,8 +125,10 @@ extern int ptrace_put_reg(struct task_struct *task, int regno,
 #endif /* ! __powerpc64__ */
 #define TRAP(regs)              ((regs)->trap & ~0xF)
 #ifdef __powerpc64__
+#define NV_REG_POISON           0xdeadbeefdeadbeefUL
 #define CHECK_FULL_REGS(regs)   BUG_ON(regs->trap & 1)
 #else
+#define NV_REG_POISON           0xdeadbeef
 #define CHECK_FULL_REGS(regs)                                                 \
 do {                                                                          \
         if ((regs)->trap & 1)                                                 \
diff --git a/arch/powerpc/include/asm/thread_info.h b/arch/powerpc/include/asm/thread_info.h
index 65eb85976a03..d8529ef13b23 100644
--- a/arch/powerpc/include/asm/thread_info.h
+++ b/arch/powerpc/include/asm/thread_info.h
@@ -72,7 +72,7 @@ struct thread_info {
 
 #define __HAVE_ARCH_THREAD_INFO_ALLOCATOR
 
-extern struct thread_info *alloc_thread_info(struct task_struct *tsk);
+extern struct thread_info *alloc_thread_info_node(struct task_struct *tsk, int node);
 extern void free_thread_info(struct thread_info *ti);
 
 #endif /* THREAD_SHIFT < PAGE_SHIFT */
diff --git a/arch/powerpc/include/asm/types.h b/arch/powerpc/include/asm/types.h
index a5aea0ca34e9..8947b9827bc4 100644
--- a/arch/powerpc/include/asm/types.h
+++ b/arch/powerpc/include/asm/types.h
@@ -44,13 +44,6 @@ typedef struct {
 
 typedef __vector128 vector128;
 
-#if defined(__powerpc64__) || defined(CONFIG_PHYS_64BIT)
-typedef u64 dma_addr_t;
-#else
-typedef u32 dma_addr_t;
-#endif
-typedef u64 dma64_addr_t;
-
 typedef struct {
         unsigned long entry;
         unsigned long toc;
diff --git a/arch/powerpc/kernel/cpu_setup_fsl_booke.S b/arch/powerpc/kernel/cpu_setup_fsl_booke.S
index 5c518ad3445c..913611105c1f 100644
--- a/arch/powerpc/kernel/cpu_setup_fsl_booke.S
+++ b/arch/powerpc/kernel/cpu_setup_fsl_booke.S
@@ -64,7 +64,7 @@ _GLOBAL(__setup_cpu_e500v2)
         bl      __e500_icache_setup
         bl      __e500_dcache_setup
         bl      __setup_e500_ivors
-#ifdef CONFIG_RAPIDIO
+#ifdef CONFIG_FSL_RIO
         /* Ensure that RFXE is set */
         mfspr   r3,SPRN_HID1
         oris    r3,r3,HID1_RFXE@h
diff --git a/arch/powerpc/kernel/crash_dump.c b/arch/powerpc/kernel/crash_dump.c
index 0a2af50243cb..424afb6b8fba 100644
--- a/arch/powerpc/kernel/crash_dump.c
+++ b/arch/powerpc/kernel/crash_dump.c
@@ -28,9 +28,6 @@
 #define DBG(fmt...)
 #endif
 
-/* Stores the physical address of elf header of crash image. */
-unsigned long long elfcorehdr_addr = ELFCORE_ADDR_MAX;
-
 #ifndef CONFIG_RELOCATABLE
 void __init reserve_kdump_trampoline(void)
 {
@@ -72,20 +69,6 @@ void __init setup_kdump_trampoline(void)
 }
 #endif /* CONFIG_RELOCATABLE */
 
-/*
- * Note: elfcorehdr_addr is not just limited to vmcore. It is also used by
- * is_kdump_kernel() to determine if we are booting after a panic. Hence
- * ifdef it under CONFIG_CRASH_DUMP and not CONFIG_PROC_VMCORE.
- */
-static int __init parse_elfcorehdr(char *p)
-{
-        if (p)
-                elfcorehdr_addr = memparse(p, &p);
-
-        return 1;
-}
-__setup("elfcorehdr=", parse_elfcorehdr);
-
 static int __init parse_savemaxmem(char *p)
 {
         if (p)
diff --git a/arch/powerpc/kernel/irq.c b/arch/powerpc/kernel/irq.c
index 0a5570338b96..63625e0650b5 100644
--- a/arch/powerpc/kernel/irq.c
+++ b/arch/powerpc/kernel/irq.c
@@ -195,7 +195,7 @@ notrace void arch_local_irq_restore(unsigned long en)
 EXPORT_SYMBOL(arch_local_irq_restore);
 #endif /* CONFIG_PPC64 */
 
-static int show_other_interrupts(struct seq_file *p, int prec)
+int arch_show_interrupts(struct seq_file *p, int prec)
 {
         int j;
 
@@ -231,65 +231,6 @@ static int show_other_interrupts(struct seq_file *p, int prec)
         return 0;
 }
 
-int show_interrupts(struct seq_file *p, void *v)
-{
-        unsigned long flags, any_count = 0;
-        int i = *(loff_t *) v, j, prec;
-        struct irqaction *action;
-        struct irq_desc *desc;
-        struct irq_chip *chip;
-
-        if (i > nr_irqs)
-                return 0;
-
-        for (prec = 3, j = 1000; prec < 10 && j <= nr_irqs; ++prec)
-                j *= 10;
-
-        if (i == nr_irqs)
-                return show_other_interrupts(p, prec);
-
-        /* print header */
-        if (i == 0) {
-                seq_printf(p, "%*s", prec + 8, "");
-                for_each_online_cpu(j)
-                        seq_printf(p, "CPU%-8d", j);
-                seq_putc(p, '\n');
-        }
-
-        desc = irq_to_desc(i);
-        if (!desc)
-                return 0;
-
-        raw_spin_lock_irqsave(&desc->lock, flags);
-        for_each_online_cpu(j)
-                any_count |= kstat_irqs_cpu(i, j);
-        action = desc->action;
-        if (!action && !any_count)
-                goto out;
-
-        seq_printf(p, "%*d: ", prec, i);
-        for_each_online_cpu(j)
-                seq_printf(p, "%10u ", kstat_irqs_cpu(i, j));
-
-        chip = get_irq_desc_chip(desc);
-        if (chip)
-                seq_printf(p, "  %-16s", chip->name);
-        else
-                seq_printf(p, "  %-16s", "None");
-        seq_printf(p, " %-8s", (desc->status & IRQ_LEVEL) ? "Level" : "Edge");
-
-        if (action) {
-                seq_printf(p, "     %s", action->name);
-                while ((action = action->next) != NULL)
-                        seq_printf(p, ", %s", action->name);
-        }
-
-        seq_putc(p, '\n');
-out:
-        raw_spin_unlock_irqrestore(&desc->lock, flags);
-        return 0;
-}
-
 /*
  * /proc/stat helpers
  */
@@ -315,24 +256,26 @@ void fixup_irqs(const struct cpumask *map)
         alloc_cpumask_var(&mask, GFP_KERNEL);
 
         for_each_irq(irq) {
+                struct irq_data *data;
                 struct irq_chip *chip;
 
                 desc = irq_to_desc(irq);
                 if (!desc)
                         continue;
 
-                if (desc->status & IRQ_PER_CPU)
+                data = irq_desc_get_irq_data(desc);
+                if (irqd_is_per_cpu(data))
                         continue;
 
-                chip = get_irq_desc_chip(desc);
+                chip = irq_data_get_irq_chip(data);
 
-                cpumask_and(mask, desc->irq_data.affinity, map);
+                cpumask_and(mask, data->affinity, map);
                 if (cpumask_any(mask) >= nr_cpu_ids) {
                         printk("Breaking affinity for irq %i\n", irq);
                         cpumask_copy(mask, map);
                 }
                 if (chip->irq_set_affinity)
-                        chip->irq_set_affinity(&desc->irq_data, mask, true);
+                        chip->irq_set_affinity(data, mask, true);
                 else if (desc->action && !(warned++))
                         printk("Cannot set affinity for irq %i\n", irq);
         }
@@ -618,7 +561,7 @@ struct irq_host *irq_alloc_host(struct device_node *of_node,
                         smp_wmb();
 
                         /* Clear norequest flags */
-                        irq_to_desc(i)->status &= ~IRQ_NOREQUEST;
+                        irq_clear_status_flags(i, IRQ_NOREQUEST);
 
                         /* Legacy flags are left to default at this point,
                          * one can then use irq_create_mapping() to
@@ -827,8 +770,8 @@ unsigned int irq_create_of_mapping(struct device_node *controller,
 
         /* Set type if specified and different than the current one */
         if (type != IRQ_TYPE_NONE &&
-            type != (irq_to_desc(virq)->status & IRQF_TRIGGER_MASK))
-                set_irq_type(virq, type);
+            type != (irqd_get_trigger_type(irq_get_irq_data(virq))))
+                irq_set_irq_type(virq, type);
         return virq;
 }
 EXPORT_SYMBOL_GPL(irq_create_of_mapping);
@@ -851,7 +794,7 @@ void irq_dispose_mapping(unsigned int virq)
                 return;
 
         /* remove chip and handler */
-        set_irq_chip_and_handler(virq, NULL, NULL);
+        irq_set_chip_and_handler(virq, NULL, NULL);
 
         /* Make sure it's completed */
         synchronize_irq(virq);
@@ -1156,7 +1099,7 @@ static int virq_debug_show(struct seq_file *m, void *private)
                         seq_printf(m, "%5d  ", i);
                         seq_printf(m, "0x%05lx  ", virq_to_hw(i));
 
-                        chip = get_irq_desc_chip(desc);
+                        chip = irq_desc_get_chip(desc);
                         if (chip && chip->name)
                                 p = chip->name;
                         else
diff --git a/arch/powerpc/kernel/machine_kexec.c b/arch/powerpc/kernel/machine_kexec.c
index bd1e1ff17b2d..7ee50f0547cb 100644
--- a/arch/powerpc/kernel/machine_kexec.c
+++ b/arch/powerpc/kernel/machine_kexec.c
@@ -31,17 +31,17 @@ void machine_kexec_mask_interrupts(void) {
                 if (!desc)
                         continue;
 
-                chip = get_irq_desc_chip(desc);
+                chip = irq_desc_get_chip(desc);
                 if (!chip)
                         continue;
 
-                if (chip->irq_eoi && desc->status & IRQ_INPROGRESS)
+                if (chip->irq_eoi && irqd_irq_inprogress(&desc->irq_data))
                         chip->irq_eoi(&desc->irq_data);
 
                 if (chip->irq_mask)
                         chip->irq_mask(&desc->irq_data);
 
-                if (chip->irq_disable && !(desc->status & IRQ_DISABLED))
+                if (chip->irq_disable && !irqd_irq_disabled(&desc->irq_data))
                         chip->irq_disable(&desc->irq_data);
         }
 }
diff --git a/arch/powerpc/kernel/pci-common.c b/arch/powerpc/kernel/pci-common.c
index 3cd85faa8ac6..893af2a9cd03 100644
--- a/arch/powerpc/kernel/pci-common.c
+++ b/arch/powerpc/kernel/pci-common.c
@@ -261,7 +261,7 @@ int pci_read_irq_line(struct pci_dev *pci_dev)
 
                 virq = irq_create_mapping(NULL, line);
                 if (virq != NO_IRQ)
-                        set_irq_type(virq, IRQ_TYPE_LEVEL_LOW);
+                        irq_set_irq_type(virq, IRQ_TYPE_LEVEL_LOW);
         } else {
                 pr_debug(" Got one, spec %d cells (0x%08x 0x%08x...) on %s\n",
                          oirq.size, oirq.specifier[0], oirq.specifier[1],
diff --git a/arch/powerpc/kernel/pci_dn.c b/arch/powerpc/kernel/pci_dn.c
index 29852688ceaa..d225d99fe39d 100644
--- a/arch/powerpc/kernel/pci_dn.c
+++ b/arch/powerpc/kernel/pci_dn.c
@@ -176,11 +176,14 @@ static void *is_devfn_node(struct device_node *dn, void *data)
  */
 struct device_node *fetch_dev_dn(struct pci_dev *dev)
 {
-        struct device_node *orig_dn = dev->dev.of_node;
+        struct pci_controller *phb = dev->sysdata;
         struct device_node *dn;
         unsigned long searchval = (dev->bus->number << 8) | dev->devfn;
 
-        dn = traverse_pci_devices(orig_dn, is_devfn_node, (void *)searchval);
+        if (WARN_ON(!phb))
+                return NULL;
+
+        dn = traverse_pci_devices(phb->dn, is_devfn_node, (void *)searchval);
         if (dn)
                 dev->dev.of_node = dn;
         return dn;
diff --git a/arch/powerpc/kernel/process.c b/arch/powerpc/kernel/process.c
index 8303a6c65ef7..f74f355a9617 100644
--- a/arch/powerpc/kernel/process.c
+++ b/arch/powerpc/kernel/process.c
@@ -1218,11 +1218,11 @@ void __ppc64_runlatch_off(void)
 
 static struct kmem_cache *thread_info_cache;
 
-struct thread_info *alloc_thread_info(struct task_struct *tsk)
+struct thread_info *alloc_thread_info_node(struct task_struct *tsk, int node)
 {
         struct thread_info *ti;
 
-        ti = kmem_cache_alloc(thread_info_cache, GFP_KERNEL);
+        ti = kmem_cache_alloc_node(thread_info_cache, GFP_KERNEL, node);
         if (unlikely(ti == NULL))
                 return NULL;
 #ifdef CONFIG_DEBUG_STACK_USAGE
diff --git a/arch/powerpc/kernel/ptrace.c b/arch/powerpc/kernel/ptrace.c
index 906536998291..895b082f1e48 100644
--- a/arch/powerpc/kernel/ptrace.c
+++ b/arch/powerpc/kernel/ptrace.c
@@ -229,12 +229,16 @@ static int gpr_get(struct task_struct *target, const struct user_regset *regset,
                    unsigned int pos, unsigned int count,
                    void *kbuf, void __user *ubuf)
 {
-        int ret;
+        int i, ret;
 
         if (target->thread.regs == NULL)
                 return -EIO;
 
-        CHECK_FULL_REGS(target->thread.regs);
+        if (!FULL_REGS(target->thread.regs)) {
+                /* We have a partial register set.  Fill 14-31 with bogus values */
+                for (i = 14; i < 32; i++)
+                        target->thread.regs->gpr[i] = NV_REG_POISON;
+        }
 
         ret = user_regset_copyout(&pos, &count, &kbuf, &ubuf,
                                   target->thread.regs,
@@ -641,11 +645,16 @@ static int gpr32_get(struct task_struct *target,
         compat_ulong_t *k = kbuf;
         compat_ulong_t __user *u = ubuf;
         compat_ulong_t reg;
+        int i;
 
         if (target->thread.regs == NULL)
                 return -EIO;
 
-        CHECK_FULL_REGS(target->thread.regs);
+        if (!FULL_REGS(target->thread.regs)) {
+                /* We have a partial register set.  Fill 14-31 with bogus values */
+                for (i = 14; i < 32; i++)
+                        target->thread.regs->gpr[i] = NV_REG_POISON; 
+        }
 
         pos /= sizeof(reg);
         count /= sizeof(reg);
diff --git a/arch/powerpc/kernel/vdso.c b/arch/powerpc/kernel/vdso.c
index fd8728729abc..142ab1008c3b 100644
--- a/arch/powerpc/kernel/vdso.c
+++ b/arch/powerpc/kernel/vdso.c
@@ -820,17 +820,17 @@ static int __init vdso_init(void)
 }
 arch_initcall(vdso_init);
 
-int in_gate_area_no_task(unsigned long addr)
+int in_gate_area_no_mm(unsigned long addr)
 {
         return 0;
 }
 
-int in_gate_area(struct task_struct *task, unsigned long addr)
+int in_gate_area(struct mm_struct *mm, unsigned long addr)
 {
         return 0;
 }
 
-struct vm_area_struct *get_gate_vma(struct task_struct *tsk)
+struct vm_area_struct *get_gate_vma(struct mm_struct *mm)
 {
         return NULL;
 }
diff --git a/arch/powerpc/platforms/512x/mpc5121_ads_cpld.c b/arch/powerpc/platforms/512x/mpc5121_ads_cpld.c
index fde0ea50c97d..cfc4b2009982 100644
--- a/arch/powerpc/platforms/512x/mpc5121_ads_cpld.c
+++ b/arch/powerpc/platforms/512x/mpc5121_ads_cpld.c
@@ -132,8 +132,8 @@ static int
 cpld_pic_host_map(struct irq_host *h, unsigned int virq,
                              irq_hw_number_t hw)
 {
-        irq_to_desc(virq)->status |= IRQ_LEVEL;
-        set_irq_chip_and_handler(virq, &cpld_pic, handle_level_irq);
+        irq_set_status_flags(virq, IRQ_LEVEL);
+        irq_set_chip_and_handler(virq, &cpld_pic, handle_level_irq);
         return 0;
 }
 
@@ -198,7 +198,7 @@ mpc5121_ads_cpld_pic_init(void)
                 goto end;
         }
 
-        set_irq_chained_handler(cascade_irq, cpld_pic_cascade);
+        irq_set_chained_handler(cascade_irq, cpld_pic_cascade);
 end:
         of_node_put(np);
 }
diff --git a/arch/powerpc/platforms/52xx/media5200.c b/arch/powerpc/platforms/52xx/media5200.c
index 2bd1e6cf1f58..57a6a349e932 100644
--- a/arch/powerpc/platforms/52xx/media5200.c
+++ b/arch/powerpc/platforms/52xx/media5200.c
@@ -82,7 +82,7 @@ static struct irq_chip media5200_irq_chip = {
 
 void media5200_irq_cascade(unsigned int virq, struct irq_desc *desc)
 {
-        struct irq_chip *chip = get_irq_desc_chip(desc);
+        struct irq_chip *chip = irq_desc_get_chip(desc);
         int sub_virq, val;
         u32 status, enable;
 
@@ -107,7 +107,7 @@ void media5200_irq_cascade(unsigned int virq, struct irq_desc *desc)
         /* Processing done; can reenable the cascade now */
         raw_spin_lock(&desc->lock);
         chip->irq_ack(&desc->irq_data);
-        if (!(desc->status & IRQ_DISABLED))
+        if (!irqd_irq_disabled(&desc->irq_data))
                 chip->irq_unmask(&desc->irq_data);
         raw_spin_unlock(&desc->lock);
 }
@@ -115,15 +115,10 @@ void media5200_irq_cascade(unsigned int virq, struct irq_desc *desc)
 static int media5200_irq_map(struct irq_host *h, unsigned int virq,
                              irq_hw_number_t hw)
 {
-        struct irq_desc *desc = irq_to_desc(virq);
-
         pr_debug("%s: h=%p, virq=%i, hwirq=%i\n", __func__, h, virq, (int)hw);
-        set_irq_chip_data(virq, &media5200_irq);
-        set_irq_chip_and_handler(virq, &media5200_irq_chip, handle_level_irq);
-        set_irq_type(virq, IRQ_TYPE_LEVEL_LOW);
-        desc->status &= ~(IRQ_TYPE_SENSE_MASK | IRQ_LEVEL);
-        desc->status |= IRQ_TYPE_LEVEL_LOW | IRQ_LEVEL;
-
+        irq_set_chip_data(virq, &media5200_irq);
+        irq_set_chip_and_handler(virq, &media5200_irq_chip, handle_level_irq);
+        irq_set_status_flags(virq, IRQ_LEVEL);
         return 0;
 }
 
@@ -187,8 +182,8 @@ static void __init media5200_init_irq(void)
 
         media5200_irq.irqhost->host_data = &media5200_irq;
 
-        set_irq_data(cascade_virq, &media5200_irq);
-        set_irq_chained_handler(cascade_virq, media5200_irq_cascade);
+        irq_set_handler_data(cascade_virq, &media5200_irq);
+        irq_set_chained_handler(cascade_virq, media5200_irq_cascade);
 
         return;
 
diff --git a/arch/powerpc/platforms/52xx/mpc52xx_gpt.c b/arch/powerpc/platforms/52xx/mpc52xx_gpt.c
index 6da44f0f2934..6c39b9cc2fa3 100644
--- a/arch/powerpc/platforms/52xx/mpc52xx_gpt.c
+++ b/arch/powerpc/platforms/52xx/mpc52xx_gpt.c
@@ -192,7 +192,7 @@ static struct irq_chip mpc52xx_gpt_irq_chip = {
 
 void mpc52xx_gpt_irq_cascade(unsigned int virq, struct irq_desc *desc)
 {
-        struct mpc52xx_gpt_priv *gpt = get_irq_data(virq);
+        struct mpc52xx_gpt_priv *gpt = irq_get_handler_data(virq);
         int sub_virq;
         u32 status;
 
@@ -209,8 +209,8 @@ static int mpc52xx_gpt_irq_map(struct irq_host *h, unsigned int virq,
         struct mpc52xx_gpt_priv *gpt = h->host_data;
 
         dev_dbg(gpt->dev, "%s: h=%p, virq=%i\n", __func__, h, virq);
-        set_irq_chip_data(virq, gpt);
-        set_irq_chip_and_handler(virq, &mpc52xx_gpt_irq_chip, handle_edge_irq);
+        irq_set_chip_data(virq, gpt);
+        irq_set_chip_and_handler(virq, &mpc52xx_gpt_irq_chip, handle_edge_irq);
 
         return 0;
 }
@@ -259,8 +259,8 @@ mpc52xx_gpt_irq_setup(struct mpc52xx_gpt_priv *gpt, struct device_node *node)
         }
 
         gpt->irqhost->host_data = gpt;
-        set_irq_data(cascade_virq, gpt);
-        set_irq_chained_handler(cascade_virq, mpc52xx_gpt_irq_cascade);
+        irq_set_handler_data(cascade_virq, gpt);
+        irq_set_chained_handler(cascade_virq, mpc52xx_gpt_irq_cascade);
 
         /* If the GPT is currently disabled, then change it to be in Input
          * Capture mode.  If the mode is non-zero, then the pin could be
diff --git a/arch/powerpc/platforms/52xx/mpc52xx_pic.c b/arch/powerpc/platforms/52xx/mpc52xx_pic.c
index 9f3ed582d082..3ddea96273ca 100644
--- a/arch/powerpc/platforms/52xx/mpc52xx_pic.c
+++ b/arch/powerpc/platforms/52xx/mpc52xx_pic.c
@@ -214,7 +214,7 @@ static int mpc52xx_extirq_set_type(struct irq_data *d, unsigned int flow_type)
         ctrl_reg |= (type << (22 - (l2irq * 2)));
         out_be32(&intr->ctrl, ctrl_reg);
 
-        __set_irq_handler_unlocked(d->irq, handler);
+        __irq_set_handler_locked(d->irq, handler);
 
         return 0;
 }
@@ -414,7 +414,7 @@ static int mpc52xx_irqhost_map(struct irq_host *h, unsigned int virq,
                 else
                         hndlr = handle_level_irq;
 
-                set_irq_chip_and_handler(virq, &mpc52xx_extirq_irqchip, hndlr);
+                irq_set_chip_and_handler(virq, &mpc52xx_extirq_irqchip, hndlr);
                 pr_debug("%s: External IRQ%i virq=%x, hw=%x. type=%x\n",
                          __func__, l2irq, virq, (int)irq, type);
                 return 0;
@@ -431,7 +431,7 @@ static int mpc52xx_irqhost_map(struct irq_host *h, unsigned int virq,
                 return -EINVAL;
         }
 
-        set_irq_chip_and_handler(virq, irqchip, handle_level_irq);
+        irq_set_chip_and_handler(virq, irqchip, handle_level_irq);
         pr_debug("%s: virq=%x, l1=%i, l2=%i\n", __func__, virq, l1irq, l2irq);
 
         return 0;
diff --git a/arch/powerpc/platforms/82xx/pq2ads-pci-pic.c b/arch/powerpc/platforms/82xx/pq2ads-pci-pic.c
index 926dfdaaf57a..4a4eb6ffa12f 100644
--- a/arch/powerpc/platforms/82xx/pq2ads-pci-pic.c
+++ b/arch/powerpc/platforms/82xx/pq2ads-pci-pic.c
@@ -81,7 +81,7 @@ static struct irq_chip pq2ads_pci_ic = {
 
 static void pq2ads_pci_irq_demux(unsigned int irq, struct irq_desc *desc)
 {
-        struct pq2ads_pci_pic *priv = get_irq_desc_data(desc);
+        struct pq2ads_pci_pic *priv = irq_desc_get_handler_data(desc);
         u32 stat, mask, pend;
         int bit;
 
@@ -106,17 +106,17 @@ static void pq2ads_pci_irq_demux(unsigned int irq, struct irq_desc *desc)
 static int pci_pic_host_map(struct irq_host *h, unsigned int virq,
                             irq_hw_number_t hw)
 {
-        irq_to_desc(virq)->status |= IRQ_LEVEL;
-        set_irq_chip_data(virq, h->host_data);
-        set_irq_chip_and_handler(virq, &pq2ads_pci_ic, handle_level_irq);
+        irq_set_status_flags(virq, IRQ_LEVEL);
+        irq_set_chip_data(virq, h->host_data);
+        irq_set_chip_and_handler(virq, &pq2ads_pci_ic, handle_level_irq);
         return 0;
 }
 
 static void pci_host_unmap(struct irq_host *h, unsigned int virq)
 {
         /* remove chip and handler */
-        set_irq_chip_data(virq, NULL);
-        set_irq_chip(virq, NULL);
+        irq_set_chip_data(virq, NULL);
+        irq_set_chip(virq, NULL);
 }
 
 static struct irq_host_ops pci_pic_host_ops = {
@@ -175,8 +175,8 @@ int __init pq2ads_pci_init_irq(void)
 
         priv->host = host;
         host->host_data = priv;
-        set_irq_data(irq, priv);
-        set_irq_chained_handler(irq, pq2ads_pci_irq_demux);
+        irq_set_handler_data(irq, priv);
+        irq_set_chained_handler(irq, pq2ads_pci_irq_demux);
 
         of_node_put(np);
         return 0;
diff --git a/arch/powerpc/platforms/85xx/ksi8560.c b/arch/powerpc/platforms/85xx/ksi8560.c
index 64447e48f3d5..c46f9359be15 100644
--- a/arch/powerpc/platforms/85xx/ksi8560.c
+++ b/arch/powerpc/platforms/85xx/ksi8560.c
@@ -56,7 +56,7 @@ static void machine_restart(char *cmd)
 
 static void cpm2_cascade(unsigned int irq, struct irq_desc *desc)
 {
-        struct irq_chip *chip = get_irq_desc_chip(desc);
+        struct irq_chip *chip = irq_desc_get_chip(desc);
         int cascade_irq;
 
         while ((cascade_irq = cpm2_get_irq()) >= 0)
@@ -106,7 +106,7 @@ static void __init ksi8560_pic_init(void)
 
         cpm2_pic_init(np);
         of_node_put(np);
-        set_irq_chained_handler(irq, cpm2_cascade);
+        irq_set_chained_handler(irq, cpm2_cascade);
 #endif
 }
 
diff --git a/arch/powerpc/platforms/85xx/mpc85xx_ads.c b/arch/powerpc/platforms/85xx/mpc85xx_ads.c
index 1352d1107bfd..3b2c9bb66199 100644
--- a/arch/powerpc/platforms/85xx/mpc85xx_ads.c
+++ b/arch/powerpc/platforms/85xx/mpc85xx_ads.c
@@ -50,7 +50,7 @@ static int mpc85xx_exclude_device(struct pci_controller *hose,
 
 static void cpm2_cascade(unsigned int irq, struct irq_desc *desc)
 {
-        struct irq_chip *chip = get_irq_desc_chip(desc);
+        struct irq_chip *chip = irq_desc_get_chip(desc);
         int cascade_irq;
 
         while ((cascade_irq = cpm2_get_irq()) >= 0)
@@ -101,7 +101,7 @@ static void __init mpc85xx_ads_pic_init(void)
 
         cpm2_pic_init(np);
         of_node_put(np);
-        set_irq_chained_handler(irq, cpm2_cascade);
+        irq_set_chained_handler(irq, cpm2_cascade);
 #endif
 }
 
diff --git a/arch/powerpc/platforms/85xx/mpc85xx_cds.c b/arch/powerpc/platforms/85xx/mpc85xx_cds.c
index 458d91fba91d..6299a2a51ae8 100644
--- a/arch/powerpc/platforms/85xx/mpc85xx_cds.c
+++ b/arch/powerpc/platforms/85xx/mpc85xx_cds.c
@@ -255,7 +255,7 @@ static int mpc85xx_cds_8259_attach(void)
         }
 
         /* Success. Connect our low-level cascade handler. */
-        set_irq_handler(cascade_irq, mpc85xx_8259_cascade_handler);
+        irq_set_handler(cascade_irq, mpc85xx_8259_cascade_handler);
 
         return 0;
 }
diff --git a/arch/powerpc/platforms/85xx/mpc85xx_ds.c b/arch/powerpc/platforms/85xx/mpc85xx_ds.c
index 793ead7993ab..c7b97f70312e 100644
--- a/arch/powerpc/platforms/85xx/mpc85xx_ds.c
+++ b/arch/powerpc/platforms/85xx/mpc85xx_ds.c
@@ -47,7 +47,7 @@
 #ifdef CONFIG_PPC_I8259
 static void mpc85xx_8259_cascade(unsigned int irq, struct irq_desc *desc)
 {
-        struct irq_chip *chip = get_irq_desc_chip(desc);
+        struct irq_chip *chip = irq_desc_get_chip(desc);
         unsigned int cascade_irq = i8259_irq();
 
         if (cascade_irq != NO_IRQ) {
@@ -122,7 +122,7 @@ void __init mpc85xx_ds_pic_init(void)
         i8259_init(cascade_node, 0);
         of_node_put(cascade_node);
 
-        set_irq_chained_handler(cascade_irq, mpc85xx_8259_cascade);
+        irq_set_chained_handler(cascade_irq, mpc85xx_8259_cascade);
 #endif  /* CONFIG_PPC_I8259 */
 }
 
diff --git a/arch/powerpc/platforms/85xx/sbc8560.c b/arch/powerpc/platforms/85xx/sbc8560.c
index d7e28ec3e072..d2dfd465fbf6 100644
--- a/arch/powerpc/platforms/85xx/sbc8560.c
+++ b/arch/powerpc/platforms/85xx/sbc8560.c
@@ -41,7 +41,7 @@
 
 static void cpm2_cascade(unsigned int irq, struct irq_desc *desc)
 {
-        struct irq_chip *chip = get_irq_desc_chip(desc);
+        struct irq_chip *chip = irq_desc_get_chip(desc);
         int cascade_irq;
 
         while ((cascade_irq = cpm2_get_irq()) >= 0)
@@ -92,7 +92,7 @@ static void __init sbc8560_pic_init(void)
 
         cpm2_pic_init(np);
         of_node_put(np);
-        set_irq_chained_handler(irq, cpm2_cascade);
+        irq_set_chained_handler(irq, cpm2_cascade);
 #endif
 }
 
diff --git a/arch/powerpc/platforms/85xx/socrates_fpga_pic.c b/arch/powerpc/platforms/85xx/socrates_fpga_pic.c
index 79d85aca4767..db864623b4ae 100644
--- a/arch/powerpc/platforms/85xx/socrates_fpga_pic.c
+++ b/arch/powerpc/platforms/85xx/socrates_fpga_pic.c
@@ -93,7 +93,7 @@ static inline unsigned int socrates_fpga_pic_get_irq(unsigned int irq)
 
 void socrates_fpga_pic_cascade(unsigned int irq, struct irq_desc *desc)
 {
-        struct irq_chip *chip = get_irq_desc_chip(desc);
+        struct irq_chip *chip = irq_desc_get_chip(desc);
         unsigned int cascade_irq;
 
         /*
@@ -245,9 +245,9 @@ static int socrates_fpga_pic_host_map(struct irq_host *h, unsigned int virq,
                 irq_hw_number_t hwirq)
 {
         /* All interrupts are LEVEL sensitive */
-        irq_to_desc(virq)->status |= IRQ_LEVEL;
-        set_irq_chip_and_handler(virq, &socrates_fpga_pic_chip,
-                        handle_fasteoi_irq);
+        irq_set_status_flags(virq, IRQ_LEVEL);
+        irq_set_chip_and_handler(virq, &socrates_fpga_pic_chip,
+                                 handle_fasteoi_irq);
 
         return 0;
 }
@@ -308,8 +308,8 @@ void socrates_fpga_pic_init(struct device_node *pic)
                         pr_warning("FPGA PIC: can't get irq%d.\n", i);
                         continue;
                 }
-                set_irq_chained_handler(socrates_fpga_irqs[i],
-                                socrates_fpga_pic_cascade);
+                irq_set_chained_handler(socrates_fpga_irqs[i],
+                                        socrates_fpga_pic_cascade);
         }
 
         socrates_fpga_pic_iobase = of_iomap(pic, 0);
diff --git a/arch/powerpc/platforms/85xx/stx_gp3.c b/arch/powerpc/platforms/85xx/stx_gp3.c
index 2b62b064eac7..5387e9f06bdb 100644
--- a/arch/powerpc/platforms/85xx/stx_gp3.c
+++ b/arch/powerpc/platforms/85xx/stx_gp3.c
@@ -46,7 +46,7 @@
 
 static void cpm2_cascade(unsigned int irq, struct irq_desc *desc)
 {
-        struct irq_chip *chip = get_irq_desc_chip(desc);
+        struct irq_chip *chip = irq_desc_get_chip(desc);
         int cascade_irq;
 
         while ((cascade_irq = cpm2_get_irq()) >= 0)
@@ -102,7 +102,7 @@ static void __init stx_gp3_pic_init(void)
 
         cpm2_pic_init(np);
         of_node_put(np);
-        set_irq_chained_handler(irq, cpm2_cascade);
+        irq_set_chained_handler(irq, cpm2_cascade);
 #endif
 }
 
diff --git a/arch/powerpc/platforms/85xx/tqm85xx.c b/arch/powerpc/platforms/85xx/tqm85xx.c
index 2265b68e3279..325de772725a 100644
--- a/arch/powerpc/platforms/85xx/tqm85xx.c
+++ b/arch/powerpc/platforms/85xx/tqm85xx.c
@@ -44,7 +44,7 @@
 
 static void cpm2_cascade(unsigned int irq, struct irq_desc *desc)
 {
-        struct irq_chip *chip = get_irq_desc_chip(desc);
+        struct irq_chip *chip = irq_desc_get_chip(desc);
         int cascade_irq;
 
         while ((cascade_irq = cpm2_get_irq()) >= 0)
@@ -100,7 +100,7 @@ static void __init tqm85xx_pic_init(void)
 
         cpm2_pic_init(np);
         of_node_put(np);
-        set_irq_chained_handler(irq, cpm2_cascade);
+        irq_set_chained_handler(irq, cpm2_cascade);
 #endif
 }
 
diff --git a/arch/powerpc/platforms/86xx/gef_pic.c b/arch/powerpc/platforms/86xx/gef_pic.c
index 0adfe3b740cd..0beec7d5566b 100644
--- a/arch/powerpc/platforms/86xx/gef_pic.c
+++ b/arch/powerpc/platforms/86xx/gef_pic.c
@@ -95,7 +95,7 @@ static int gef_pic_cascade_irq;
 
 void gef_pic_cascade(unsigned int irq, struct irq_desc *desc)
 {
-        struct irq_chip *chip = get_irq_desc_chip(desc);
+        struct irq_chip *chip = irq_desc_get_chip(desc);
         unsigned int cascade_irq;
 
         /*
@@ -163,8 +163,8 @@ static int gef_pic_host_map(struct irq_host *h, unsigned int virq,
                           irq_hw_number_t hwirq)
 {
         /* All interrupts are LEVEL sensitive */
-        irq_to_desc(virq)->status |= IRQ_LEVEL;
-        set_irq_chip_and_handler(virq, &gef_pic_chip, handle_level_irq);
+        irq_set_status_flags(virq, IRQ_LEVEL);
+        irq_set_chip_and_handler(virq, &gef_pic_chip, handle_level_irq);
 
         return 0;
 }
@@ -225,7 +225,7 @@ void __init gef_pic_init(struct device_node *np)
                 return;
 
         /* Chain with parent controller */
-        set_irq_chained_handler(gef_pic_cascade_irq, gef_pic_cascade);
+        irq_set_chained_handler(gef_pic_cascade_irq, gef_pic_cascade);
 }
 
 /*
diff --git a/arch/powerpc/platforms/86xx/pic.c b/arch/powerpc/platforms/86xx/pic.c
index cbe33639b478..8ef8960abda6 100644
--- a/arch/powerpc/platforms/86xx/pic.c
+++ b/arch/powerpc/platforms/86xx/pic.c
@@ -19,7 +19,7 @@
 #ifdef CONFIG_PPC_I8259
 static void mpc86xx_8259_cascade(unsigned int irq, struct irq_desc *desc)
 {
-        struct irq_chip *chip = get_irq_desc_chip(desc);
+        struct irq_chip *chip = irq_desc_get_chip(desc);
         unsigned int cascade_irq = i8259_irq();
 
         if (cascade_irq != NO_IRQ)
@@ -77,6 +77,6 @@ void __init mpc86xx_init_irq(void)
         i8259_init(cascade_node, 0);
         of_node_put(cascade_node);
 
-        set_irq_chained_handler(cascade_irq, mpc86xx_8259_cascade);
+        irq_set_chained_handler(cascade_irq, mpc86xx_8259_cascade);
 #endif
 }
diff --git a/arch/powerpc/platforms/8xx/m8xx_setup.c b/arch/powerpc/platforms/8xx/m8xx_setup.c
index fabb108e8744..9ecce995dd4b 100644
--- a/arch/powerpc/platforms/8xx/m8xx_setup.c
+++ b/arch/powerpc/platforms/8xx/m8xx_setup.c
@@ -226,11 +226,11 @@ static void cpm_cascade(unsigned int irq, struct irq_desc *desc)
 
                 generic_handle_irq(cascade_irq);
 
-                chip = get_irq_desc_chip(cdesc);
+                chip = irq_desc_get_chip(cdesc);
                 chip->irq_eoi(&cdesc->irq_data);
         }
 
-        chip = get_irq_desc_chip(desc);
+        chip = irq_desc_get_chip(desc);
         chip->irq_eoi(&desc->irq_data);
 }
 
@@ -251,5 +251,5 @@ void __init mpc8xx_pics_init(void)
 
         irq = cpm_pic_init();
         if (irq != NO_IRQ)
-                set_irq_chained_handler(irq, cpm_cascade);
+                irq_set_chained_handler(irq, cpm_cascade);
 }
diff --git a/arch/powerpc/platforms/cell/Kconfig b/arch/powerpc/platforms/cell/Kconfig
index 48cd7d2e1b75..81239ebed83f 100644
--- a/arch/powerpc/platforms/cell/Kconfig
+++ b/arch/powerpc/platforms/cell/Kconfig
@@ -9,6 +9,7 @@ config PPC_CELL_COMMON
         select PPC_INDIRECT_IO
         select PPC_NATIVE
         select PPC_RTAS
+        select IRQ_EDGE_EOI_HANDLER
 
 config PPC_CELL_NATIVE
         bool
diff --git a/arch/powerpc/platforms/cell/axon_msi.c b/arch/powerpc/platforms/cell/axon_msi.c
index c48b66a67e42..bb5ebf8fa80b 100644
--- a/arch/powerpc/platforms/cell/axon_msi.c
+++ b/arch/powerpc/platforms/cell/axon_msi.c
@@ -93,8 +93,8 @@ static void msic_dcr_write(struct axon_msic *msic, unsigned int dcr_n, u32 val)
 
 static void axon_msi_cascade(unsigned int irq, struct irq_desc *desc)
 {
-        struct irq_chip *chip = get_irq_desc_chip(desc);
-        struct axon_msic *msic = get_irq_data(irq);
+        struct irq_chip *chip = irq_desc_get_chip(desc);
+        struct axon_msic *msic = irq_get_handler_data(irq);
         u32 write_offset, msi;
         int idx;
         int retry = 0;
@@ -287,7 +287,7 @@ static int axon_msi_setup_msi_irqs(struct pci_dev *dev, int nvec, int type)
                 }
                 dev_dbg(&dev->dev, "axon_msi: allocated virq 0x%x\n", virq);
 
-                set_irq_msi(virq, entry);
+                irq_set_msi_desc(virq, entry);
                 msg.data = virq;
                 write_msi_msg(virq, &msg);
         }
@@ -305,7 +305,7 @@ static void axon_msi_teardown_msi_irqs(struct pci_dev *dev)
                 if (entry->irq == NO_IRQ)
                         continue;
 
-                set_irq_msi(entry->irq, NULL);
+                irq_set_msi_desc(entry->irq, NULL);
                 irq_dispose_mapping(entry->irq);
         }
 }
@@ -320,7 +320,7 @@ static struct irq_chip msic_irq_chip = {
 static int msic_host_map(struct irq_host *h, unsigned int virq,
                          irq_hw_number_t hw)
 {
-        set_irq_chip_and_handler(virq, &msic_irq_chip, handle_simple_irq);
+        irq_set_chip_and_handler(virq, &msic_irq_chip, handle_simple_irq);
 
         return 0;
 }
@@ -400,8 +400,8 @@ static int axon_msi_probe(struct platform_device *device)
 
         msic->irq_host->host_data = msic;
 
-        set_irq_data(virq, msic);
-        set_irq_chained_handler(virq, axon_msi_cascade);
+        irq_set_handler_data(virq, msic);
+        irq_set_chained_handler(virq, axon_msi_cascade);
         pr_devel("axon_msi: irq 0x%x setup for axon_msi\n", virq);
 
         /* Enable the MSIC hardware */
diff --git a/arch/powerpc/platforms/cell/beat_interrupt.c b/arch/powerpc/platforms/cell/beat_interrupt.c
index 0b8f7d7135c5..4cb9e147c307 100644
--- a/arch/powerpc/platforms/cell/beat_interrupt.c
+++ b/arch/powerpc/platforms/cell/beat_interrupt.c
@@ -136,15 +136,14 @@ static void beatic_pic_host_unmap(struct irq_host *h, unsigned int virq)
 static int beatic_pic_host_map(struct irq_host *h, unsigned int virq,
                                irq_hw_number_t hw)
 {
-        struct irq_desc *desc = irq_to_desc(virq);
         int64_t err;
 
         err = beat_construct_and_connect_irq_plug(virq, hw);
         if (err < 0)
                 return -EIO;
 
-        desc->status |= IRQ_LEVEL;
-        set_irq_chip_and_handler(virq, &beatic_pic, handle_fasteoi_irq);
+        irq_set_status_flags(virq, IRQ_LEVEL);
+        irq_set_chip_and_handler(virq, &beatic_pic, handle_fasteoi_irq);
         return 0;
 }
 
diff --git a/arch/powerpc/platforms/cell/interrupt.c b/arch/powerpc/platforms/cell/interrupt.c
index 624d26e72f1d..a19bec078703 100644
--- a/arch/powerpc/platforms/cell/interrupt.c
+++ b/arch/powerpc/platforms/cell/interrupt.c
@@ -101,9 +101,9 @@ static void iic_ioexc_eoi(struct irq_data *d)
 
 static void iic_ioexc_cascade(unsigned int irq, struct irq_desc *desc)
 {
-        struct irq_chip *chip = get_irq_desc_chip(desc);
+        struct irq_chip *chip = irq_desc_get_chip(desc);
         struct cbe_iic_regs __iomem *node_iic =
-                (void __iomem *)get_irq_desc_data(desc);
+                (void __iomem *)irq_desc_get_handler_data(desc);
         unsigned int base = (irq & 0xffffff00) | IIC_IRQ_TYPE_IOEXC;
         unsigned long bits, ack;
         int cascade;
@@ -235,67 +235,19 @@ static int iic_host_match(struct irq_host *h, struct device_node *node)
                                     "IBM,CBEA-Internal-Interrupt-Controller");
 }
 
-extern int noirqdebug;
-
-static void handle_iic_irq(unsigned int irq, struct irq_desc *desc)
-{
-        struct irq_chip *chip = get_irq_desc_chip(desc);
-
-        raw_spin_lock(&desc->lock);
-
-        desc->status &= ~(IRQ_REPLAY | IRQ_WAITING);
-
-        /*
-         * If we're currently running this IRQ, or its disabled,
-         * we shouldn't process the IRQ. Mark it pending, handle
-         * the necessary masking and go out
-         */
-        if (unlikely((desc->status & (IRQ_INPROGRESS | IRQ_DISABLED)) ||
-                    !desc->action)) {
-                desc->status |= IRQ_PENDING;
-                goto out_eoi;
-        }
-
-        kstat_incr_irqs_this_cpu(irq, desc);
-
-        /* Mark the IRQ currently in progress.*/
-        desc->status |= IRQ_INPROGRESS;
-
-        do {
-                struct irqaction *action = desc->action;
-                irqreturn_t action_ret;
-
-                if (unlikely(!action))
-                        goto out_eoi;
-
-                desc->status &= ~IRQ_PENDING;
-                raw_spin_unlock(&desc->lock);
-                action_ret = handle_IRQ_event(irq, action);
-                if (!noirqdebug)
-                        note_interrupt(irq, desc, action_ret);
-                raw_spin_lock(&desc->lock);
-
-        } while ((desc->status & (IRQ_PENDING | IRQ_DISABLED)) == IRQ_PENDING);
-
-        desc->status &= ~IRQ_INPROGRESS;
-out_eoi:
-        chip->irq_eoi(&desc->irq_data);
-        raw_spin_unlock(&desc->lock);
-}
-
 static int iic_host_map(struct irq_host *h, unsigned int virq,
                         irq_hw_number_t hw)
 {
         switch (hw & IIC_IRQ_TYPE_MASK) {
         case IIC_IRQ_TYPE_IPI:
-                set_irq_chip_and_handler(virq, &iic_chip, handle_percpu_irq);
+                irq_set_chip_and_handler(virq, &iic_chip, handle_percpu_irq);
                 break;
         case IIC_IRQ_TYPE_IOEXC:
-                set_irq_chip_and_handler(virq, &iic_ioexc_chip,
+                irq_set_chip_and_handler(virq, &iic_ioexc_chip,
                                          handle_iic_irq);
                 break;
         default:
-                set_irq_chip_and_handler(virq, &iic_chip, handle_iic_irq);
+                irq_set_chip_and_handler(virq, &iic_chip, handle_edge_eoi_irq);
         }
         return 0;
 }
@@ -412,8 +364,8 @@ static int __init setup_iic(void)
                  * irq_data is a generic pointer that gets passed back
                  * to us later, so the forced cast is fine.
                  */
-                set_irq_data(cascade, (void __force *)node_iic);
-                set_irq_chained_handler(cascade , iic_ioexc_cascade);
+                irq_set_handler_data(cascade, (void __force *)node_iic);
+                irq_set_chained_handler(cascade, iic_ioexc_cascade);
                 out_be64(&node_iic->iic_ir,
                          (1 << 12)              /* priority */ |
                          (node << 4)            /* dest node */ |
diff --git a/arch/powerpc/platforms/cell/setup.c b/arch/powerpc/platforms/cell/setup.c
index 6a28d027d959..fd57bfe00edf 100644
--- a/arch/powerpc/platforms/cell/setup.c
+++ b/arch/powerpc/platforms/cell/setup.c
@@ -187,8 +187,8 @@ machine_subsys_initcall(cell, cell_publish_devices);
 
 static void cell_mpic_cascade(unsigned int irq, struct irq_desc *desc)
 {
-        struct irq_chip *chip = get_irq_desc_chip(desc);
-        struct mpic *mpic = get_irq_desc_data(desc);
+        struct irq_chip *chip = irq_desc_get_chip(desc);
+        struct mpic *mpic = irq_desc_get_handler_data(desc);
         unsigned int virq;
 
         virq = mpic_get_one_irq(mpic);
@@ -223,8 +223,8 @@ static void __init mpic_init_IRQ(void)
 
                 printk(KERN_INFO "%s : hooking up to IRQ %d\n",
                        dn->full_name, virq);
-                set_irq_data(virq, mpic);
-                set_irq_chained_handler(virq, cell_mpic_cascade);
+                irq_set_handler_data(virq, mpic);
+                irq_set_chained_handler(virq, cell_mpic_cascade);
         }
 }
 
diff --git a/arch/powerpc/platforms/cell/spider-pic.c b/arch/powerpc/platforms/cell/spider-pic.c
index b38cdfc1deb8..c5cf50e6b45a 100644
--- a/arch/powerpc/platforms/cell/spider-pic.c
+++ b/arch/powerpc/platforms/cell/spider-pic.c
@@ -102,7 +102,7 @@ static void spider_ack_irq(struct irq_data *d)
 
         /* Reset edge detection logic if necessary
          */
-        if (irq_to_desc(d->irq)->status & IRQ_LEVEL)
+        if (irqd_is_level_type(d))
                 return;
 
         /* Only interrupts 47 to 50 can be set to edge */
@@ -119,7 +119,6 @@ static int spider_set_irq_type(struct irq_data *d, unsigned int type)
         struct spider_pic *pic = spider_virq_to_pic(d->irq);
         unsigned int hw = irq_map[d->irq].hwirq;
         void __iomem *cfg = spider_get_irq_config(pic, hw);
-        struct irq_desc *desc = irq_to_desc(d->irq);
         u32 old_mask;
         u32 ic;
 
@@ -147,12 +146,6 @@ static int spider_set_irq_type(struct irq_data *d, unsigned int type)
                 return -EINVAL;
         }
 
-        /* Update irq_desc */
-        desc->status &= ~(IRQ_TYPE_SENSE_MASK | IRQ_LEVEL);
-        desc->status |= type & IRQ_TYPE_SENSE_MASK;
-        if (type & (IRQ_TYPE_LEVEL_HIGH | IRQ_TYPE_LEVEL_LOW))
-                desc->status |= IRQ_LEVEL;
-
         /* Configure the source. One gross hack that was there before and
          * that I've kept around is the priority to the BE which I set to
          * be the same as the interrupt source number. I don't know wether
@@ -178,10 +171,10 @@ static struct irq_chip spider_pic = {
 static int spider_host_map(struct irq_host *h, unsigned int virq,
                         irq_hw_number_t hw)
 {
-        set_irq_chip_and_handler(virq, &spider_pic, handle_level_irq);
+        irq_set_chip_and_handler(virq, &spider_pic, handle_level_irq);
 
         /* Set default irq type */
-        set_irq_type(virq, IRQ_TYPE_NONE);
+        irq_set_irq_type(virq, IRQ_TYPE_NONE);
 
         return 0;
 }
@@ -207,8 +200,8 @@ static struct irq_host_ops spider_host_ops = {
 
 static void spider_irq_cascade(unsigned int irq, struct irq_desc *desc)
 {
-        struct irq_chip *chip = get_irq_desc_chip(desc);
-        struct spider_pic *pic = get_irq_desc_data(desc);
+        struct irq_chip *chip = irq_desc_get_chip(desc);
+        struct spider_pic *pic = irq_desc_get_handler_data(desc);
         unsigned int cs, virq;
 
         cs = in_be32(pic->regs + TIR_CS) >> 24;
@@ -328,8 +321,8 @@ static void __init spider_init_one(struct device_node *of_node, int chip,
         virq = spider_find_cascade_and_node(pic);
         if (virq == NO_IRQ)
                 return;
-        set_irq_data(virq, pic);
-        set_irq_chained_handler(virq, spider_irq_cascade);
+        irq_set_handler_data(virq, pic);
+        irq_set_chained_handler(virq, spider_irq_cascade);
 
         printk(KERN_INFO "spider_pic: node %d, addr: 0x%lx %s\n",
                pic->node_id, addr, of_node->full_name);
diff --git a/arch/powerpc/platforms/chrp/setup.c b/arch/powerpc/platforms/chrp/setup.c
index 4c1288451a21..122786498419 100644
--- a/arch/powerpc/platforms/chrp/setup.c
+++ b/arch/powerpc/platforms/chrp/setup.c
@@ -365,7 +365,7 @@ void __init chrp_setup_arch(void)
 
 static void chrp_8259_cascade(unsigned int irq, struct irq_desc *desc)
 {
-        struct irq_chip *chip = get_irq_desc_chip(desc);
+        struct irq_chip *chip = irq_desc_get_chip(desc);
         unsigned int cascade_irq = i8259_irq();
 
         if (cascade_irq != NO_IRQ)
@@ -517,7 +517,7 @@ static void __init chrp_find_8259(void)
                 if (cascade_irq == NO_IRQ)
                         printk(KERN_ERR "i8259: failed to map cascade irq\n");
                 else
-                        set_irq_chained_handler(cascade_irq,
+                        irq_set_chained_handler(cascade_irq,
                                                 chrp_8259_cascade);
         }
 }
diff --git a/arch/powerpc/platforms/embedded6xx/flipper-pic.c b/arch/powerpc/platforms/embedded6xx/flipper-pic.c
index 0aca0e28a8e5..12aa62b6f227 100644
--- a/arch/powerpc/platforms/embedded6xx/flipper-pic.c
+++ b/arch/powerpc/platforms/embedded6xx/flipper-pic.c
@@ -101,16 +101,16 @@ static struct irq_host *flipper_irq_host;
 static int flipper_pic_map(struct irq_host *h, unsigned int virq,
                            irq_hw_number_t hwirq)
 {
-        set_irq_chip_data(virq, h->host_data);
-        irq_to_desc(virq)->status |= IRQ_LEVEL;
-        set_irq_chip_and_handler(virq, &flipper_pic, handle_level_irq);
+        irq_set_chip_data(virq, h->host_data);
+        irq_set_status_flags(virq, IRQ_LEVEL);
+        irq_set_chip_and_handler(virq, &flipper_pic, handle_level_irq);
         return 0;
 }
 
 static void flipper_pic_unmap(struct irq_host *h, unsigned int irq)
 {
-        set_irq_chip_data(irq, NULL);
-        set_irq_chip(irq, NULL);
+        irq_set_chip_data(irq, NULL);
+        irq_set_chip(irq, NULL);
 }
 
 static int flipper_pic_match(struct irq_host *h, struct device_node *np)
diff --git a/arch/powerpc/platforms/embedded6xx/hlwd-pic.c b/arch/powerpc/platforms/embedded6xx/hlwd-pic.c
index 35e448bd8479..2bdddfc9d520 100644
--- a/arch/powerpc/platforms/embedded6xx/hlwd-pic.c
+++ b/arch/powerpc/platforms/embedded6xx/hlwd-pic.c
@@ -94,16 +94,16 @@ static struct irq_host *hlwd_irq_host;
 static int hlwd_pic_map(struct irq_host *h, unsigned int virq,
                            irq_hw_number_t hwirq)
 {
-        set_irq_chip_data(virq, h->host_data);
-        irq_to_desc(virq)->status |= IRQ_LEVEL;
-        set_irq_chip_and_handler(virq, &hlwd_pic, handle_level_irq);
+        irq_set_chip_data(virq, h->host_data);
+        irq_set_status_flags(virq, IRQ_LEVEL);
+        irq_set_chip_and_handler(virq, &hlwd_pic, handle_level_irq);
         return 0;
 }
 
 static void hlwd_pic_unmap(struct irq_host *h, unsigned int irq)
 {
-        set_irq_chip_data(irq, NULL);
-        set_irq_chip(irq, NULL);
+        irq_set_chip_data(irq, NULL);
+        irq_set_chip(irq, NULL);
 }
 
 static struct irq_host_ops hlwd_irq_host_ops = {
@@ -129,8 +129,8 @@ static unsigned int __hlwd_pic_get_irq(struct irq_host *h)
 static void hlwd_pic_irq_cascade(unsigned int cascade_virq,
                                       struct irq_desc *desc)
 {
-        struct irq_chip *chip = get_irq_desc_chip(desc);
-        struct irq_host *irq_host = get_irq_data(cascade_virq);
+        struct irq_chip *chip = irq_desc_get_chip(desc);
+        struct irq_host *irq_host = irq_get_handler_data(cascade_virq);
         unsigned int virq;
 
         raw_spin_lock(&desc->lock);
@@ -145,7 +145,7 @@ static void hlwd_pic_irq_cascade(unsigned int cascade_virq,
 
         raw_spin_lock(&desc->lock);
         chip->irq_ack(&desc->irq_data); /* IRQ_LEVEL */
-        if (!(desc->status & IRQ_DISABLED) && chip->irq_unmask)
+        if (!irqd_irq_disabled(&desc->irq_data) && chip->irq_unmask)
                 chip->irq_unmask(&desc->irq_data);
         raw_spin_unlock(&desc->lock);
 }
@@ -218,8 +218,8 @@ void hlwd_pic_probe(void)
                         host = hlwd_pic_init(np);
                         BUG_ON(!host);
                         cascade_virq = irq_of_parse_and_map(np, 0);
-                        set_irq_data(cascade_virq, host);
-                        set_irq_chained_handler(cascade_virq,
+                        irq_set_handler_data(cascade_virq, host);
+                        irq_set_chained_handler(cascade_virq,
                                                 hlwd_pic_irq_cascade);
                         hlwd_irq_host = host;
                         break;
diff --git a/arch/powerpc/platforms/embedded6xx/holly.c b/arch/powerpc/platforms/embedded6xx/holly.c
index b21fde589ca7..487bda0d18d8 100644
--- a/arch/powerpc/platforms/embedded6xx/holly.c
+++ b/arch/powerpc/platforms/embedded6xx/holly.c
@@ -198,8 +198,8 @@ static void __init holly_init_IRQ(void)
         cascade_pci_irq = irq_of_parse_and_map(tsi_pci, 0);
         pr_debug("%s: tsi108 cascade_pci_irq = 0x%x\n", __func__, (u32) cascade_pci_irq);
         tsi108_pci_int_init(cascade_node);
-        set_irq_data(cascade_pci_irq, mpic);
-        set_irq_chained_handler(cascade_pci_irq, tsi108_irq_cascade);
+        irq_set_handler_data(cascade_pci_irq, mpic);
+        irq_set_chained_handler(cascade_pci_irq, tsi108_irq_cascade);
 #endif
         /* Configure MPIC outputs to CPU0 */
         tsi108_write_reg(TSI108_MPIC_OFFSET + 0x30c, 0);
diff --git a/arch/powerpc/platforms/embedded6xx/mpc7448_hpc2.c b/arch/powerpc/platforms/embedded6xx/mpc7448_hpc2.c
index 7a2ba39d7811..1cb907c94359 100644
--- a/arch/powerpc/platforms/embedded6xx/mpc7448_hpc2.c
+++ b/arch/powerpc/platforms/embedded6xx/mpc7448_hpc2.c
@@ -153,8 +153,8 @@ static void __init mpc7448_hpc2_init_IRQ(void)
         DBG("%s: tsi108 cascade_pci_irq = 0x%x\n", __func__,
             (u32) cascade_pci_irq);
         tsi108_pci_int_init(cascade_node);
-        set_irq_data(cascade_pci_irq, mpic);
-        set_irq_chained_handler(cascade_pci_irq, tsi108_irq_cascade);
+        irq_set_handler_data(cascade_pci_irq, mpic);
+        irq_set_chained_handler(cascade_pci_irq, tsi108_irq_cascade);
 #endif
         /* Configure MPIC outputs to CPU0 */
         tsi108_write_reg(TSI108_MPIC_OFFSET + 0x30c, 0);
diff --git a/arch/powerpc/platforms/iseries/irq.c b/arch/powerpc/platforms/iseries/irq.c
index 4fb96f0b2df6..52a6889832c7 100644
--- a/arch/powerpc/platforms/iseries/irq.c
+++ b/arch/powerpc/platforms/iseries/irq.c
@@ -220,7 +220,7 @@ void __init iSeries_activate_IRQs()
                 if (!desc)
                         continue;
 
-                chip = get_irq_desc_chip(desc);
+                chip = irq_desc_get_chip(desc);
                 if (chip && chip->irq_startup) {
                         raw_spin_lock_irqsave(&desc->lock, flags);
                         chip->irq_startup(&desc->irq_data);
@@ -346,7 +346,7 @@ unsigned int iSeries_get_irq(void)
 static int iseries_irq_host_map(struct irq_host *h, unsigned int virq,
                                 irq_hw_number_t hw)
 {
-        set_irq_chip_and_handler(virq, &iseries_pic, handle_fasteoi_irq);
+        irq_set_chip_and_handler(virq, &iseries_pic, handle_fasteoi_irq);
 
         return 0;
 }
diff --git a/arch/powerpc/platforms/maple/pci.c b/arch/powerpc/platforms/maple/pci.c
index 04296ffff8bf..dd2e48b28508 100644
--- a/arch/powerpc/platforms/maple/pci.c
+++ b/arch/powerpc/platforms/maple/pci.c
@@ -498,7 +498,7 @@ void __devinit maple_pci_irq_fixup(struct pci_dev *dev)
                 printk(KERN_DEBUG "Fixup U4 PCIe IRQ\n");
                 dev->irq = irq_create_mapping(NULL, 1);
                 if (dev->irq != NO_IRQ)
-                        set_irq_type(dev->irq, IRQ_TYPE_LEVEL_LOW);
+                        irq_set_irq_type(dev->irq, IRQ_TYPE_LEVEL_LOW);
         }
 
         /* Hide AMD8111 IDE interrupt when in legacy mode so
diff --git a/arch/powerpc/platforms/pasemi/setup.c b/arch/powerpc/platforms/pasemi/setup.c
index a6067b38d2ca..7c858e6f843c 100644
--- a/arch/powerpc/platforms/pasemi/setup.c
+++ b/arch/powerpc/platforms/pasemi/setup.c
@@ -239,7 +239,7 @@ static __init void pas_init_IRQ(void)
         if (nmiprop) {
                 nmi_virq = irq_create_mapping(NULL, *nmiprop);
                 mpic_irq_set_priority(nmi_virq, 15);
-                set_irq_type(nmi_virq, IRQ_TYPE_EDGE_RISING);
+                irq_set_irq_type(nmi_virq, IRQ_TYPE_EDGE_RISING);
                 mpic_unmask_irq(irq_get_irq_data(nmi_virq));
         }
 
diff --git a/arch/powerpc/platforms/powermac/pci.c b/arch/powerpc/platforms/powermac/pci.c
index 3bc075c788ef..ab6898942700 100644
--- a/arch/powerpc/platforms/powermac/pci.c
+++ b/arch/powerpc/platforms/powermac/pci.c
@@ -988,7 +988,7 @@ void __devinit pmac_pci_irq_fixup(struct pci_dev *dev)
             dev->vendor == PCI_VENDOR_ID_DEC &&
             dev->device == PCI_DEVICE_ID_DEC_TULIP_PLUS) {
                 dev->irq = irq_create_mapping(NULL, 60);
-                set_irq_type(dev->irq, IRQ_TYPE_LEVEL_LOW);
+                irq_set_irq_type(dev->irq, IRQ_TYPE_LEVEL_LOW);
         }
 #endif /* CONFIG_PPC32 */
 }
diff --git a/arch/powerpc/platforms/powermac/pic.c b/arch/powerpc/platforms/powermac/pic.c
index c55812bb6a51..023f24086a0a 100644
--- a/arch/powerpc/platforms/powermac/pic.c
+++ b/arch/powerpc/platforms/powermac/pic.c
@@ -157,7 +157,7 @@ static unsigned int pmac_startup_irq(struct irq_data *d)
         int i = src >> 5;
 
         raw_spin_lock_irqsave(&pmac_pic_lock, flags);
-        if ((irq_to_desc(d->irq)->status & IRQ_LEVEL) == 0)
+        if (!irqd_is_level_type(d))
                 out_le32(&pmac_irq_hw[i]->ack, bit);
         __set_bit(src, ppc_cached_irq_mask);
         __pmac_set_irq_mask(src, 0);
@@ -289,7 +289,6 @@ static int pmac_pic_host_match(struct irq_host *h, struct device_node *node)
 static int pmac_pic_host_map(struct irq_host *h, unsigned int virq,
                              irq_hw_number_t hw)
 {
-        struct irq_desc *desc = irq_to_desc(virq);
         int level;
 
         if (hw >= max_irqs)
@@ -300,9 +299,9 @@ static int pmac_pic_host_map(struct irq_host *h, unsigned int virq,
          */
         level = !!(level_mask[hw >> 5] & (1UL << (hw & 0x1f)));
         if (level)
-                desc->status |= IRQ_LEVEL;
-        set_irq_chip_and_handler(virq, &pmac_pic, level ?
-                                 handle_level_irq : handle_edge_irq);
+                irq_set_status_flags(virq, IRQ_LEVEL);
+        irq_set_chip_and_handler(virq, &pmac_pic,
+                                 level ? handle_level_irq : handle_edge_irq);
         return 0;
 }
 
@@ -472,8 +471,8 @@ int of_irq_map_oldworld(struct device_node *device, int index,
 
 static void pmac_u3_cascade(unsigned int irq, struct irq_desc *desc)
 {
-        struct irq_chip *chip = get_irq_desc_chip(desc);
-        struct mpic *mpic = get_irq_desc_data(desc);
+        struct irq_chip *chip = irq_desc_get_chip(desc);
+        struct mpic *mpic = irq_desc_get_handler_data(desc);
         unsigned int cascade_irq = mpic_get_one_irq(mpic);
 
         if (cascade_irq != NO_IRQ)
@@ -591,8 +590,8 @@ static int __init pmac_pic_probe_mpic(void)
                 of_node_put(slave);
                 return 0;
         }
-        set_irq_data(cascade, mpic2);
-        set_irq_chained_handler(cascade, pmac_u3_cascade);
+        irq_set_handler_data(cascade, mpic2);
+        irq_set_chained_handler(cascade, pmac_u3_cascade);
 
         of_node_put(slave);
         return 0;
diff --git a/arch/powerpc/platforms/ps3/interrupt.c b/arch/powerpc/platforms/ps3/interrupt.c
index 3988c86682a5..f2f6413b81d3 100644
--- a/arch/powerpc/platforms/ps3/interrupt.c
+++ b/arch/powerpc/platforms/ps3/interrupt.c
@@ -194,7 +194,7 @@ static int ps3_virq_setup(enum ps3_cpu_binding cpu, unsigned long outlet,
         pr_debug("%s:%d: outlet %lu => cpu %u, virq %u\n", __func__, __LINE__,
                 outlet, cpu, *virq);
 
-        result = set_irq_chip_data(*virq, pd);
+        result = irq_set_chip_data(*virq, pd);
 
         if (result) {
                 pr_debug("%s:%d: set_irq_chip_data failed\n",
@@ -221,12 +221,12 @@ fail_create:
 
 static int ps3_virq_destroy(unsigned int virq)
 {
-        const struct ps3_private *pd = get_irq_chip_data(virq);
+        const struct ps3_private *pd = irq_get_chip_data(virq);
 
         pr_debug("%s:%d: ppe_id %llu, thread_id %llu, virq %u\n", __func__,
                 __LINE__, pd->ppe_id, pd->thread_id, virq);
 
-        set_irq_chip_data(virq, NULL);
+        irq_set_chip_data(virq, NULL);
         irq_dispose_mapping(virq);
 
         pr_debug("%s:%d <-\n", __func__, __LINE__);
@@ -256,7 +256,7 @@ int ps3_irq_plug_setup(enum ps3_cpu_binding cpu, unsigned long outlet,
                 goto fail_setup;
         }
 
-        pd = get_irq_chip_data(*virq);
+        pd = irq_get_chip_data(*virq);
 
         /* Binds outlet to cpu + virq. */
 
@@ -291,7 +291,7 @@ EXPORT_SYMBOL_GPL(ps3_irq_plug_setup);
 int ps3_irq_plug_destroy(unsigned int virq)
 {
         int result;
-        const struct ps3_private *pd = get_irq_chip_data(virq);
+        const struct ps3_private *pd = irq_get_chip_data(virq);
 
         pr_debug("%s:%d: ppe_id %llu, thread_id %llu, virq %u\n", __func__,
                 __LINE__, pd->ppe_id, pd->thread_id, virq);
@@ -661,7 +661,7 @@ static void dump_bmp(struct ps3_private* pd) {};
 
 static void ps3_host_unmap(struct irq_host *h, unsigned int virq)
 {
-        set_irq_chip_data(virq, NULL);
+        irq_set_chip_data(virq, NULL);
 }
 
 static int ps3_host_map(struct irq_host *h, unsigned int virq,
@@ -670,7 +670,7 @@ static int ps3_host_map(struct irq_host *h, unsigned int virq,
         pr_debug("%s:%d: hwirq %lu, virq %u\n", __func__, __LINE__, hwirq,
                 virq);
 
-        set_irq_chip_and_handler(virq, &ps3_irq_chip, handle_fasteoi_irq);
+        irq_set_chip_and_handler(virq, &ps3_irq_chip, handle_fasteoi_irq);
 
         return 0;
 }
diff --git a/arch/powerpc/platforms/pseries/msi.c b/arch/powerpc/platforms/pseries/msi.c
index 18ac801f8e90..38d24e7e7bb1 100644
--- a/arch/powerpc/platforms/pseries/msi.c
+++ b/arch/powerpc/platforms/pseries/msi.c
@@ -137,7 +137,7 @@ static void rtas_teardown_msi_irqs(struct pci_dev *pdev)
                 if (entry->irq == NO_IRQ)
                         continue;
 
-                set_irq_msi(entry->irq, NULL);
+                irq_set_msi_desc(entry->irq, NULL);
                 irq_dispose_mapping(entry->irq);
         }
 
@@ -437,7 +437,7 @@ static int rtas_setup_msi_irqs(struct pci_dev *pdev, int nvec, int type)
                 }
 
                 dev_dbg(&pdev->dev, "rtas_msi: allocated virq %d\n", virq);
-                set_irq_msi(virq, entry);
+                irq_set_msi_desc(virq, entry);
 
                 /* Read config space back so we can restore after reset */
                 read_msi_msg(virq, &msg);
diff --git a/arch/powerpc/platforms/pseries/setup.c b/arch/powerpc/platforms/pseries/setup.c
index 2a0089a2c829..c319d04aa799 100644
--- a/arch/powerpc/platforms/pseries/setup.c
+++ b/arch/powerpc/platforms/pseries/setup.c
@@ -114,7 +114,7 @@ static void __init fwnmi_init(void)
 
 static void pseries_8259_cascade(unsigned int irq, struct irq_desc *desc)
 {
-        struct irq_chip *chip = get_irq_desc_chip(desc);
+        struct irq_chip *chip = irq_desc_get_chip(desc);
         unsigned int cascade_irq = i8259_irq();
 
         if (cascade_irq != NO_IRQ)
@@ -169,7 +169,7 @@ static void __init pseries_setup_i8259_cascade(void)
                 printk(KERN_DEBUG "pic: PCI 8259 intack at 0x%016lx\n", intack);
         i8259_init(found, intack);
         of_node_put(found);
-        set_irq_chained_handler(cascade, pseries_8259_cascade);
+        irq_set_chained_handler(cascade, pseries_8259_cascade);
 }
 
 static void __init pseries_mpic_init_IRQ(void)
diff --git a/arch/powerpc/platforms/pseries/xics.c b/arch/powerpc/platforms/pseries/xics.c
index 01fea46c0335..6c1e638f0ce9 100644
--- a/arch/powerpc/platforms/pseries/xics.c
+++ b/arch/powerpc/platforms/pseries/xics.c
@@ -470,8 +470,8 @@ static int xics_host_map(struct irq_host *h, unsigned int virq,
         /* Insert the interrupt mapping into the radix tree for fast lookup */
         irq_radix_revmap_insert(xics_host, virq, hw);
 
-        irq_to_desc(virq)->status |= IRQ_LEVEL;
-        set_irq_chip_and_handler(virq, xics_irq_chip, handle_fasteoi_irq);
+        irq_set_status_flags(virq, IRQ_LEVEL);
+        irq_set_chip_and_handler(virq, xics_irq_chip, handle_fasteoi_irq);
         return 0;
 }
 
@@ -600,7 +600,7 @@ static void xics_request_ipi(void)
          * IPIs are marked IRQF_DISABLED as they must run with irqs
          * disabled
          */
-        set_irq_handler(ipi, handle_percpu_irq);
+        irq_set_handler(ipi, handle_percpu_irq);
         if (firmware_has_feature(FW_FEATURE_LPAR))
                 rc = request_irq(ipi, xics_ipi_action_lpar,
                                 IRQF_DISABLED|IRQF_PERCPU, "IPI", NULL);
@@ -912,7 +912,7 @@ void xics_migrate_irqs_away(void)
                 if (desc == NULL || desc->action == NULL)
                         continue;
 
-                chip = get_irq_desc_chip(desc);
+                chip = irq_desc_get_chip(desc);
                 if (chip == NULL || chip->irq_set_affinity == NULL)
                         continue;
 
diff --git a/arch/powerpc/sysdev/Makefile b/arch/powerpc/sysdev/Makefile
index 9c2973479142..1e0c933ef772 100644
--- a/arch/powerpc/sysdev/Makefile
+++ b/arch/powerpc/sysdev/Makefile
@@ -20,7 +20,7 @@ obj-$(CONFIG_FSL_GTM)		+= fsl_gtm.o
 obj-$(CONFIG_MPC8xxx_GPIO)      += mpc8xxx_gpio.o
 obj-$(CONFIG_FSL_85XX_CACHE_SRAM)       += fsl_85xx_l2ctlr.o fsl_85xx_cache_sram.o
 obj-$(CONFIG_SIMPLE_GPIO)       += simple_gpio.o
-obj-$(CONFIG_RAPIDIO)           += fsl_rio.o
+obj-$(CONFIG_FSL_RIO)           += fsl_rio.o
 obj-$(CONFIG_TSI108_BRIDGE)     += tsi108_pci.o tsi108_dev.o
 obj-$(CONFIG_QUICC_ENGINE)      += qe_lib/
 obj-$(CONFIG_PPC_BESTCOMM)      += bestcomm/
diff --git a/arch/powerpc/sysdev/cpm1.c b/arch/powerpc/sysdev/cpm1.c
index 0476bcc7c3e1..8b5aba263323 100644
--- a/arch/powerpc/sysdev/cpm1.c
+++ b/arch/powerpc/sysdev/cpm1.c
@@ -103,8 +103,8 @@ static int cpm_pic_host_map(struct irq_host *h, unsigned int virq,
 {
         pr_debug("cpm_pic_host_map(%d, 0x%lx)\n", virq, hw);
 
-        irq_to_desc(virq)->status |= IRQ_LEVEL;
-        set_irq_chip_and_handler(virq, &cpm_pic, handle_fasteoi_irq);
+        irq_set_status_flags(virq, IRQ_LEVEL);
+        irq_set_chip_and_handler(virq, &cpm_pic, handle_fasteoi_irq);
         return 0;
 }
 
diff --git a/arch/powerpc/sysdev/cpm2_pic.c b/arch/powerpc/sysdev/cpm2_pic.c
index 473032556715..5495c1be472b 100644
--- a/arch/powerpc/sysdev/cpm2_pic.c
+++ b/arch/powerpc/sysdev/cpm2_pic.c
@@ -115,32 +115,25 @@ static void cpm2_ack(struct irq_data *d)
 
 static void cpm2_end_irq(struct irq_data *d)
 {
-        struct irq_desc *desc;
         int     bit, word;
         unsigned int irq_nr = virq_to_hw(d->irq);
 
-        desc = irq_to_desc(irq_nr);
-        if (!(desc->status & (IRQ_DISABLED|IRQ_INPROGRESS))
-                        && desc->action) {
-
-                bit = irq_to_siubit[irq_nr];
-                word = irq_to_siureg[irq_nr];
+        bit = irq_to_siubit[irq_nr];
+        word = irq_to_siureg[irq_nr];
 
-                ppc_cached_irq_mask[word] |= 1 << bit;
-                out_be32(&cpm2_intctl->ic_simrh + word, ppc_cached_irq_mask[word]);
+        ppc_cached_irq_mask[word] |= 1 << bit;
+        out_be32(&cpm2_intctl->ic_simrh + word, ppc_cached_irq_mask[word]);
 
-                /*
-                 * Work around large numbers of spurious IRQs on PowerPC 82xx
-                 * systems.
-                 */
-                mb();
-        }
+        /*
+         * Work around large numbers of spurious IRQs on PowerPC 82xx
+         * systems.
+         */
+        mb();
 }
 
 static int cpm2_set_irq_type(struct irq_data *d, unsigned int flow_type)
 {
         unsigned int src = virq_to_hw(d->irq);
-        struct irq_desc *desc = irq_to_desc(d->irq);
         unsigned int vold, vnew, edibit;
 
         /* Port C interrupts are either IRQ_TYPE_EDGE_FALLING or
@@ -162,13 +155,11 @@ static int cpm2_set_irq_type(struct irq_data *d, unsigned int flow_type)
                         goto err_sense;
         }
 
-        desc->status &= ~(IRQ_TYPE_SENSE_MASK | IRQ_LEVEL);
-        desc->status |= flow_type & IRQ_TYPE_SENSE_MASK;
-        if (flow_type & IRQ_TYPE_LEVEL_LOW)  {
-                desc->status |= IRQ_LEVEL;
-                desc->handle_irq = handle_level_irq;
-        } else
-                desc->handle_irq = handle_edge_irq;
+        irqd_set_trigger_type(d, flow_type);
+        if (flow_type & IRQ_TYPE_LEVEL_LOW)
+                __irq_set_handler_locked(d->irq, handle_level_irq);
+        else
+                __irq_set_handler_locked(d->irq, handle_edge_irq);
 
         /* internal IRQ senses are LEVEL_LOW
          * EXT IRQ and Port C IRQ senses are programmable
@@ -179,7 +170,8 @@ static int cpm2_set_irq_type(struct irq_data *d, unsigned int flow_type)
                 if (src >= CPM2_IRQ_PORTC15 && src <= CPM2_IRQ_PORTC0)
                         edibit = (31 - (CPM2_IRQ_PORTC0 - src));
                 else
-                        return (flow_type & IRQ_TYPE_LEVEL_LOW) ? 0 : -EINVAL;
+                        return (flow_type & IRQ_TYPE_LEVEL_LOW) ?
+                                IRQ_SET_MASK_OK_NOCOPY : -EINVAL;
 
         vold = in_be32(&cpm2_intctl->ic_siexr);
 
@@ -190,7 +182,7 @@ static int cpm2_set_irq_type(struct irq_data *d, unsigned int flow_type)
 
         if (vold != vnew)
                 out_be32(&cpm2_intctl->ic_siexr, vnew);
-        return 0;
+        return IRQ_SET_MASK_OK_NOCOPY;
 
 err_sense:
         pr_err("CPM2 PIC: sense type 0x%x not supported\n", flow_type);
@@ -204,6 +196,7 @@ static struct irq_chip cpm2_pic = {
         .irq_ack = cpm2_ack,
         .irq_eoi = cpm2_end_irq,
         .irq_set_type = cpm2_set_irq_type,
+        .flags = IRQCHIP_EOI_IF_HANDLED,
 };
 
 unsigned int cpm2_get_irq(void)
@@ -226,8 +219,8 @@ static int cpm2_pic_host_map(struct irq_host *h, unsigned int virq,
 {
         pr_debug("cpm2_pic_host_map(%d, 0x%lx)\n", virq, hw);
 
-        irq_to_desc(virq)->status |= IRQ_LEVEL;
-        set_irq_chip_and_handler(virq, &cpm2_pic, handle_level_irq);
+        irq_set_status_flags(virq, IRQ_LEVEL);
+        irq_set_chip_and_handler(virq, &cpm2_pic, handle_level_irq);
         return 0;
 }
 
diff --git a/arch/powerpc/sysdev/fsl_msi.c b/arch/powerpc/sysdev/fsl_msi.c
index 58e09b2833f2..d5679dc1e20f 100644
--- a/arch/powerpc/sysdev/fsl_msi.c
+++ b/arch/powerpc/sysdev/fsl_msi.c
@@ -64,10 +64,10 @@ static int fsl_msi_host_map(struct irq_host *h, unsigned int virq,
         struct fsl_msi *msi_data = h->host_data;
         struct irq_chip *chip = &fsl_msi_chip;
 
-        irq_to_desc(virq)->status |= IRQ_TYPE_EDGE_FALLING;
+        irq_set_status_flags(virq, IRQ_TYPE_EDGE_FALLING);
 
-        set_irq_chip_data(virq, msi_data);
-        set_irq_chip_and_handler(virq, chip, handle_edge_irq);
+        irq_set_chip_data(virq, msi_data);
+        irq_set_chip_and_handler(virq, chip, handle_edge_irq);
 
         return 0;
 }
@@ -110,8 +110,8 @@ static void fsl_teardown_msi_irqs(struct pci_dev *pdev)
         list_for_each_entry(entry, &pdev->msi_list, list) {
                 if (entry->irq == NO_IRQ)
                         continue;
-                msi_data = get_irq_data(entry->irq);
-                set_irq_msi(entry->irq, NULL);
+                msi_data = irq_get_handler_data(entry->irq);
+                irq_set_msi_desc(entry->irq, NULL);
                 msi_bitmap_free_hwirqs(&msi_data->bitmap,
                                        virq_to_hw(entry->irq), 1);
                 irq_dispose_mapping(entry->irq);
@@ -168,8 +168,8 @@ static int fsl_setup_msi_irqs(struct pci_dev *pdev, int nvec, int type)
                         rc = -ENOSPC;
                         goto out_free;
                 }
-                set_irq_data(virq, msi_data);
-                set_irq_msi(virq, entry);
+                irq_set_handler_data(virq, msi_data);
+                irq_set_msi_desc(virq, entry);
 
                 fsl_compose_msi_msg(pdev, hwirq, &msg, msi_data);
                 write_msi_msg(virq, &msg);
@@ -183,7 +183,8 @@ out_free:
 
 static void fsl_msi_cascade(unsigned int irq, struct irq_desc *desc)
 {
-        struct irq_chip *chip = get_irq_desc_chip(desc);
+        struct irq_chip *chip = irq_desc_get_chip(desc);
+        struct irq_data *idata = irq_desc_get_irq_data(desc);
         unsigned int cascade_irq;
         struct fsl_msi *msi_data;
         int msir_index = -1;
@@ -192,20 +193,20 @@ static void fsl_msi_cascade(unsigned int irq, struct irq_desc *desc)
         u32 have_shift = 0;
         struct fsl_msi_cascade_data *cascade_data;
 
-        cascade_data = (struct fsl_msi_cascade_data *)get_irq_data(irq);
+        cascade_data = (struct fsl_msi_cascade_data *)irq_get_handler_data(irq);
         msi_data = cascade_data->msi_data;
 
         raw_spin_lock(&desc->lock);
         if ((msi_data->feature &  FSL_PIC_IP_MASK) == FSL_PIC_IP_IPIC) {
                 if (chip->irq_mask_ack)
-                        chip->irq_mask_ack(&desc->irq_data);
+                        chip->irq_mask_ack(idata);
                 else {
-                        chip->irq_mask(&desc->irq_data);
-                        chip->irq_ack(&desc->irq_data);
+                        chip->irq_mask(idata);
+                        chip->irq_ack(idata);
                 }
         }
 
-        if (unlikely(desc->status & IRQ_INPROGRESS))
+        if (unlikely(irqd_irq_inprogress(idata)))
                 goto unlock;
 
         msir_index = cascade_data->index;
@@ -213,7 +214,7 @@ static void fsl_msi_cascade(unsigned int irq, struct irq_desc *desc)
         if (msir_index >= NR_MSI_REG)
                 cascade_irq = NO_IRQ;
 
-        desc->status |= IRQ_INPROGRESS;
+        irqd_set_chained_irq_inprogress(idata);
         switch (msi_data->feature & FSL_PIC_IP_MASK) {
         case FSL_PIC_IP_MPIC:
                 msir_value = fsl_msi_read(msi_data->msi_regs,
@@ -235,15 +236,15 @@ static void fsl_msi_cascade(unsigned int irq, struct irq_desc *desc)
                 have_shift += intr_index + 1;
                 msir_value = msir_value >> (intr_index + 1);
         }
-        desc->status &= ~IRQ_INPROGRESS;
+        irqd_clr_chained_irq_inprogress(idata);
 
         switch (msi_data->feature & FSL_PIC_IP_MASK) {
         case FSL_PIC_IP_MPIC:
-                chip->irq_eoi(&desc->irq_data);
+                chip->irq_eoi(idata);
                 break;
         case FSL_PIC_IP_IPIC:
-                if (!(desc->status & IRQ_DISABLED) && chip->irq_unmask)
-                        chip->irq_unmask(&desc->irq_data);
+                if (!irqd_irq_disabled(idata) && chip->irq_unmask)
+                        chip->irq_unmask(idata);
                 break;
         }
 unlock:
@@ -261,7 +262,7 @@ static int fsl_of_msi_remove(struct platform_device *ofdev)
         for (i = 0; i < NR_MSI_REG; i++) {
                 virq = msi->msi_virqs[i];
                 if (virq != NO_IRQ) {
-                        cascade_data = get_irq_data(virq);
+                        cascade_data = irq_get_handler_data(virq);
                         kfree(cascade_data);
                         irq_dispose_mapping(virq);
                 }
@@ -297,8 +298,8 @@ static int __devinit fsl_msi_setup_hwirq(struct fsl_msi *msi,
         msi->msi_virqs[irq_index] = virt_msir;
         cascade_data->index = offset + irq_index;
         cascade_data->msi_data = msi;
-        set_irq_data(virt_msir, cascade_data);
-        set_irq_chained_handler(virt_msir, fsl_msi_cascade);
+        irq_set_handler_data(virt_msir, cascade_data);
+        irq_set_chained_handler(virt_msir, fsl_msi_cascade);
 
         return 0;
 }
diff --git a/arch/powerpc/sysdev/fsl_rio.c b/arch/powerpc/sysdev/fsl_rio.c
index 3eff2c3a9ad5..14232d57369c 100644
--- a/arch/powerpc/sysdev/fsl_rio.c
+++ b/arch/powerpc/sysdev/fsl_rio.c
@@ -482,7 +482,7 @@ fsl_rio_config_write(struct rio_mport *mport, int index, u16 destid,
 }
 
 /**
- * rio_hw_add_outb_message - Add message to the MPC85xx outbound message queue
+ * fsl_add_outb_message - Add message to the MPC85xx outbound message queue
  * @mport: Master port with outbound message queue
  * @rdev: Target of outbound message
  * @mbox: Outbound mailbox
@@ -492,8 +492,8 @@ fsl_rio_config_write(struct rio_mport *mport, int index, u16 destid,
  * Adds the @buffer message to the MPC85xx outbound message queue. Returns
  * %0 on success or %-EINVAL on failure.
  */
-int
-rio_hw_add_outb_message(struct rio_mport *mport, struct rio_dev *rdev, int mbox,
+static int
+fsl_add_outb_message(struct rio_mport *mport, struct rio_dev *rdev, int mbox,
                         void *buffer, size_t len)
 {
         struct rio_priv *priv = mport->priv;
@@ -502,9 +502,8 @@ rio_hw_add_outb_message(struct rio_mport *mport, struct rio_dev *rdev, int mbox,
                                         + priv->msg_tx_ring.tx_slot;
         int ret = 0;
 
-        pr_debug
-            ("RIO: rio_hw_add_outb_message(): destid %4.4x mbox %d buffer %8.8x len %8.8x\n",
-             rdev->destid, mbox, (int)buffer, len);
+        pr_debug("RIO: fsl_add_outb_message(): destid %4.4x mbox %d buffer " \
+                 "%8.8x len %8.8x\n", rdev->destid, mbox, (int)buffer, len);
 
         if ((len < 8) || (len > RIO_MAX_MSG_SIZE)) {
                 ret = -EINVAL;
@@ -554,8 +553,6 @@ rio_hw_add_outb_message(struct rio_mport *mport, struct rio_dev *rdev, int mbox,
         return ret;
 }
 
-EXPORT_SYMBOL_GPL(rio_hw_add_outb_message);
-
 /**
  * fsl_rio_tx_handler - MPC85xx outbound message interrupt handler
  * @irq: Linux interrupt number
@@ -600,7 +597,7 @@ fsl_rio_tx_handler(int irq, void *dev_instance)
 }
 
 /**
- * rio_open_outb_mbox - Initialize MPC85xx outbound mailbox
+ * fsl_open_outb_mbox - Initialize MPC85xx outbound mailbox
  * @mport: Master port implementing the outbound message unit
  * @dev_id: Device specific pointer to pass on event
  * @mbox: Mailbox to open
@@ -610,7 +607,8 @@ fsl_rio_tx_handler(int irq, void *dev_instance)
  * and enables the outbound message unit. Returns %0 on success and
  * %-EINVAL or %-ENOMEM on failure.
  */
-int rio_open_outb_mbox(struct rio_mport *mport, void *dev_id, int mbox, int entries)
+static int
+fsl_open_outb_mbox(struct rio_mport *mport, void *dev_id, int mbox, int entries)
 {
         int i, j, rc = 0;
         struct rio_priv *priv = mport->priv;
@@ -706,14 +704,14 @@ int rio_open_outb_mbox(struct rio_mport *mport, void *dev_id, int mbox, int entr
 }
 
 /**
- * rio_close_outb_mbox - Shut down MPC85xx outbound mailbox
+ * fsl_close_outb_mbox - Shut down MPC85xx outbound mailbox
  * @mport: Master port implementing the outbound message unit
  * @mbox: Mailbox to close
  *
  * Disables the outbound message unit, free all buffers, and
  * frees the outbound message interrupt.
  */
-void rio_close_outb_mbox(struct rio_mport *mport, int mbox)
+static void fsl_close_outb_mbox(struct rio_mport *mport, int mbox)
 {
         struct rio_priv *priv = mport->priv;
         /* Disable inbound message unit */
@@ -770,7 +768,7 @@ fsl_rio_rx_handler(int irq, void *dev_instance)
 }
 
 /**
- * rio_open_inb_mbox - Initialize MPC85xx inbound mailbox
+ * fsl_open_inb_mbox - Initialize MPC85xx inbound mailbox
  * @mport: Master port implementing the inbound message unit
  * @dev_id: Device specific pointer to pass on event
  * @mbox: Mailbox to open
@@ -780,7 +778,8 @@ fsl_rio_rx_handler(int irq, void *dev_instance)
  * and enables the inbound message unit. Returns %0 on success
  * and %-EINVAL or %-ENOMEM on failure.
  */
-int rio_open_inb_mbox(struct rio_mport *mport, void *dev_id, int mbox, int entries)
+static int
+fsl_open_inb_mbox(struct rio_mport *mport, void *dev_id, int mbox, int entries)
 {
         int i, rc = 0;
         struct rio_priv *priv = mport->priv;
@@ -844,14 +843,14 @@ int rio_open_inb_mbox(struct rio_mport *mport, void *dev_id, int mbox, int entri
 }
 
 /**
- * rio_close_inb_mbox - Shut down MPC85xx inbound mailbox
+ * fsl_close_inb_mbox - Shut down MPC85xx inbound mailbox
  * @mport: Master port implementing the inbound message unit
  * @mbox: Mailbox to close
  *
  * Disables the inbound message unit, free all buffers, and
  * frees the inbound message interrupt.
  */
-void rio_close_inb_mbox(struct rio_mport *mport, int mbox)
+static void fsl_close_inb_mbox(struct rio_mport *mport, int mbox)
 {
         struct rio_priv *priv = mport->priv;
         /* Disable inbound message unit */
@@ -866,7 +865,7 @@ void rio_close_inb_mbox(struct rio_mport *mport, int mbox)
 }
 
 /**
- * rio_hw_add_inb_buffer - Add buffer to the MPC85xx inbound message queue
+ * fsl_add_inb_buffer - Add buffer to the MPC85xx inbound message queue
  * @mport: Master port implementing the inbound message unit
  * @mbox: Inbound mailbox number
  * @buf: Buffer to add to inbound queue
@@ -874,12 +873,12 @@ void rio_close_inb_mbox(struct rio_mport *mport, int mbox)
  * Adds the @buf buffer to the MPC85xx inbound message queue. Returns
  * %0 on success or %-EINVAL on failure.
  */
-int rio_hw_add_inb_buffer(struct rio_mport *mport, int mbox, void *buf)
+static int fsl_add_inb_buffer(struct rio_mport *mport, int mbox, void *buf)
 {
         int rc = 0;
         struct rio_priv *priv = mport->priv;
 
-        pr_debug("RIO: rio_hw_add_inb_buffer(), msg_rx_ring.rx_slot %d\n",
+        pr_debug("RIO: fsl_add_inb_buffer(), msg_rx_ring.rx_slot %d\n",
                  priv->msg_rx_ring.rx_slot);
 
         if (priv->msg_rx_ring.virt_buffer[priv->msg_rx_ring.rx_slot]) {
@@ -898,17 +897,15 @@ int rio_hw_add_inb_buffer(struct rio_mport *mport, int mbox, void *buf)
         return rc;
 }
 
-EXPORT_SYMBOL_GPL(rio_hw_add_inb_buffer);
-
 /**
- * rio_hw_get_inb_message - Fetch inbound message from the MPC85xx message unit
+ * fsl_get_inb_message - Fetch inbound message from the MPC85xx message unit
  * @mport: Master port implementing the inbound message unit
  * @mbox: Inbound mailbox number
  *
  * Gets the next available inbound message from the inbound message queue.
  * A pointer to the message is returned on success or NULL on failure.
  */
-void *rio_hw_get_inb_message(struct rio_mport *mport, int mbox)
+static void *fsl_get_inb_message(struct rio_mport *mport, int mbox)
 {
         struct rio_priv *priv = mport->priv;
         u32 phys_buf, virt_buf;
@@ -945,8 +942,6 @@ void *rio_hw_get_inb_message(struct rio_mport *mport, int mbox)
         return buf;
 }
 
-EXPORT_SYMBOL_GPL(rio_hw_get_inb_message);
-
 /**
  * fsl_rio_dbell_handler - MPC85xx doorbell interrupt handler
  * @irq: Linux interrupt number
@@ -1293,28 +1288,6 @@ err_out:
         return rc;
 }
 
-static char *cmdline = NULL;
-
-static int fsl_rio_get_hdid(int index)
-{
-        /* XXX Need to parse multiple entries in some format */
-        if (!cmdline)
-                return -1;
-
-        return simple_strtol(cmdline, NULL, 0);
-}
-
-static int fsl_rio_get_cmdline(char *s)
-{
-        if (!s)
-                return 0;
-
-        cmdline = s;
-        return 1;
-}
-
-__setup("riohdid=", fsl_rio_get_cmdline);
-
 static inline void fsl_rio_info(struct device *dev, u32 ccsr)
 {
         const char *str;
@@ -1431,13 +1404,19 @@ int fsl_rio_setup(struct platform_device *dev)
         ops->cwrite = fsl_rio_config_write;
         ops->dsend = fsl_rio_doorbell_send;
         ops->pwenable = fsl_rio_pw_enable;
+        ops->open_outb_mbox = fsl_open_outb_mbox;
+        ops->open_inb_mbox = fsl_open_inb_mbox;
+        ops->close_outb_mbox = fsl_close_outb_mbox;
+        ops->close_inb_mbox = fsl_close_inb_mbox;
+        ops->add_outb_message = fsl_add_outb_message;
+        ops->add_inb_buffer = fsl_add_inb_buffer;
+        ops->get_inb_message = fsl_get_inb_message;
 
         port = kzalloc(sizeof(struct rio_mport), GFP_KERNEL);
         if (!port) {
                 rc = -ENOMEM;
                 goto err_port;
         }
-        port->id = 0;
         port->index = 0;
 
         priv = kzalloc(sizeof(struct rio_priv), GFP_KERNEL);
@@ -1453,6 +1432,14 @@ int fsl_rio_setup(struct platform_device *dev)
         port->iores.flags = IORESOURCE_MEM;
         port->iores.name = "rio_io_win";
 
+        if (request_resource(&iomem_resource, &port->iores) < 0) {
+                dev_err(&dev->dev, "RIO: Error requesting master port region"
+                        " 0x%016llx-0x%016llx\n",
+                        (u64)port->iores.start, (u64)port->iores.end);
+                        rc = -ENOMEM;
+                        goto err_res;
+        }
+
         priv->pwirq   = irq_of_parse_and_map(dev->dev.of_node, 0);
         priv->bellirq = irq_of_parse_and_map(dev->dev.of_node, 2);
         priv->txirq = irq_of_parse_and_map(dev->dev.of_node, 3);
@@ -1468,8 +1455,6 @@ int fsl_rio_setup(struct platform_device *dev)
         priv->dev = &dev->dev;
 
         port->ops = ops;
-        port->host_deviceid = fsl_rio_get_hdid(port->id);
-
         port->priv = priv;
         port->phys_efptr = 0x100;
         rio_register_mport(port);
@@ -1559,6 +1544,7 @@ int fsl_rio_setup(struct platform_device *dev)
         return 0;
 err:
         iounmap(priv->regs_win);
+err_res:
         kfree(priv);
 err_priv:
         kfree(port);
@@ -1572,18 +1558,10 @@ err_ops:
  */
 static int __devinit fsl_of_rio_rpn_probe(struct platform_device *dev)
 {
-        int rc;
         printk(KERN_INFO "Setting up RapidIO peer-to-peer network %s\n",
                         dev->dev.of_node->full_name);
 
-        rc = fsl_rio_setup(dev);
-        if (rc)
-                goto out;
-
-        /* Enumerate all registered ports */
-        rc = rio_init_mports();
-out:
-        return rc;
+        return fsl_rio_setup(dev);
 };
 
 static const struct of_device_id fsl_of_rio_rpn_ids[] = {
diff --git a/arch/powerpc/sysdev/i8259.c b/arch/powerpc/sysdev/i8259.c
index aeda4c8d0a0a..142770cb84b6 100644
--- a/arch/powerpc/sysdev/i8259.c
+++ b/arch/powerpc/sysdev/i8259.c
@@ -175,13 +175,13 @@ static int i8259_host_map(struct irq_host *h, unsigned int virq,
 
         /* We block the internal cascade */
         if (hw == 2)
-                irq_to_desc(virq)->status |= IRQ_NOREQUEST;
+                irq_set_status_flags(virq, IRQ_NOREQUEST);
 
         /* We use the level handler only for now, we might want to
          * be more cautious here but that works for now
          */
-        irq_to_desc(virq)->status |= IRQ_LEVEL;
-        set_irq_chip_and_handler(virq, &i8259_pic, handle_level_irq);
+        irq_set_status_flags(virq, IRQ_LEVEL);
+        irq_set_chip_and_handler(virq, &i8259_pic, handle_level_irq);
         return 0;
 }
 
@@ -191,7 +191,7 @@ static void i8259_host_unmap(struct irq_host *h, unsigned int virq)
         i8259_mask_irq(irq_get_irq_data(virq));
 
         /* remove chip and handler */
-        set_irq_chip_and_handler(virq, NULL, NULL);
+        irq_set_chip_and_handler(virq, NULL, NULL);
 
         /* Make sure it's completed */
         synchronize_irq(virq);
diff --git a/arch/powerpc/sysdev/ipic.c b/arch/powerpc/sysdev/ipic.c
index 497047dc986e..fa438be962b7 100644
--- a/arch/powerpc/sysdev/ipic.c
+++ b/arch/powerpc/sysdev/ipic.c
@@ -605,7 +605,6 @@ static int ipic_set_irq_type(struct irq_data *d, unsigned int flow_type)
 {
         struct ipic *ipic = ipic_from_irq(d->irq);
         unsigned int src = ipic_irq_to_hw(d->irq);
-        struct irq_desc *desc = irq_to_desc(d->irq);
         unsigned int vold, vnew, edibit;
 
         if (flow_type == IRQ_TYPE_NONE)
@@ -623,17 +622,16 @@ static int ipic_set_irq_type(struct irq_data *d, unsigned int flow_type)
                 printk(KERN_ERR "ipic: edge sense not supported on internal "
                                 "interrupts\n");
                 return -EINVAL;
+
         }
 
-        desc->status &= ~(IRQ_TYPE_SENSE_MASK | IRQ_LEVEL);
-        desc->status |= flow_type & IRQ_TYPE_SENSE_MASK;
+        irqd_set_trigger_type(d, flow_type);
         if (flow_type & IRQ_TYPE_LEVEL_LOW)  {
-                desc->status |= IRQ_LEVEL;
-                desc->handle_irq = handle_level_irq;
-                desc->irq_data.chip = &ipic_level_irq_chip;
+                __irq_set_handler_locked(d->irq, handle_level_irq);
+                d->chip = &ipic_level_irq_chip;
         } else {
-                desc->handle_irq = handle_edge_irq;
-                desc->irq_data.chip = &ipic_edge_irq_chip;
+                __irq_set_handler_locked(d->irq, handle_edge_irq);
+                d->chip = &ipic_edge_irq_chip;
         }
 
         /* only EXT IRQ senses are programmable on ipic
@@ -655,7 +653,7 @@ static int ipic_set_irq_type(struct irq_data *d, unsigned int flow_type)
         }
         if (vold != vnew)
                 ipic_write(ipic->regs, IPIC_SECNR, vnew);
-        return 0;
+        return IRQ_SET_MASK_OK_NOCOPY;
 }
 
 /* level interrupts and edge interrupts have different ack operations */
@@ -687,11 +685,11 @@ static int ipic_host_map(struct irq_host *h, unsigned int virq,
 {
         struct ipic *ipic = h->host_data;
 
-        set_irq_chip_data(virq, ipic);
-        set_irq_chip_and_handler(virq, &ipic_level_irq_chip, handle_level_irq);
+        irq_set_chip_data(virq, ipic);
+        irq_set_chip_and_handler(virq, &ipic_level_irq_chip, handle_level_irq);
 
         /* Set default irq type */
-        set_irq_type(virq, IRQ_TYPE_NONE);
+        irq_set_irq_type(virq, IRQ_TYPE_NONE);
 
         return 0;
 }
diff --git a/arch/powerpc/sysdev/mpc8xx_pic.c b/arch/powerpc/sysdev/mpc8xx_pic.c
index 1a75a7fb4a99..f550e23632f8 100644
--- a/arch/powerpc/sysdev/mpc8xx_pic.c
+++ b/arch/powerpc/sysdev/mpc8xx_pic.c
@@ -72,13 +72,6 @@ static void mpc8xx_end_irq(struct irq_data *d)
 
 static int mpc8xx_set_irq_type(struct irq_data *d, unsigned int flow_type)
 {
-        struct irq_desc *desc = irq_to_desc(d->irq);
-
-        desc->status &= ~(IRQ_TYPE_SENSE_MASK | IRQ_LEVEL);
-        desc->status |= flow_type & IRQ_TYPE_SENSE_MASK;
-        if (flow_type & (IRQ_TYPE_LEVEL_HIGH | IRQ_TYPE_LEVEL_LOW))
-                desc->status |= IRQ_LEVEL;
-
         if (flow_type & IRQ_TYPE_EDGE_FALLING) {
                 irq_hw_number_t hw = (unsigned int)irq_map[d->irq].hwirq;
                 unsigned int siel = in_be32(&siu_reg->sc_siel);
@@ -87,7 +80,7 @@ static int mpc8xx_set_irq_type(struct irq_data *d, unsigned int flow_type)
                 if ((hw & 1) == 0) {
                         siel |= (0x80000000 >> hw);
                         out_be32(&siu_reg->sc_siel, siel);
-                        desc->handle_irq = handle_edge_irq;
+                        __irq_set_handler_locked(irq, handle_edge_irq);
                 }
         }
         return 0;
@@ -124,7 +117,7 @@ static int mpc8xx_pic_host_map(struct irq_host *h, unsigned int virq,
         pr_debug("mpc8xx_pic_host_map(%d, 0x%lx)\n", virq, hw);
 
         /* Set default irq handle */
-        set_irq_chip_and_handler(virq, &mpc8xx_pic, handle_level_irq);
+        irq_set_chip_and_handler(virq, &mpc8xx_pic, handle_level_irq);
         return 0;
 }
 
diff --git a/arch/powerpc/sysdev/mpc8xxx_gpio.c b/arch/powerpc/sysdev/mpc8xxx_gpio.c
index 232e701245d7..0892a2841c2b 100644
--- a/arch/powerpc/sysdev/mpc8xxx_gpio.c
+++ b/arch/powerpc/sysdev/mpc8xxx_gpio.c
@@ -145,7 +145,7 @@ static int mpc8xxx_gpio_to_irq(struct gpio_chip *gc, unsigned offset)
 
 static void mpc8xxx_gpio_irq_cascade(unsigned int irq, struct irq_desc *desc)
 {
-        struct mpc8xxx_gpio_chip *mpc8xxx_gc = get_irq_desc_data(desc);
+        struct mpc8xxx_gpio_chip *mpc8xxx_gc = irq_desc_get_handler_data(desc);
         struct of_mm_gpio_chip *mm = &mpc8xxx_gc->mm_gc;
         unsigned int mask;
 
@@ -278,9 +278,9 @@ static int mpc8xxx_gpio_irq_map(struct irq_host *h, unsigned int virq,
         if (mpc8xxx_gc->of_dev_id_data)
                 mpc8xxx_irq_chip.irq_set_type = mpc8xxx_gc->of_dev_id_data;
 
-        set_irq_chip_data(virq, h->host_data);
-        set_irq_chip_and_handler(virq, &mpc8xxx_irq_chip, handle_level_irq);
-        set_irq_type(virq, IRQ_TYPE_NONE);
+        irq_set_chip_data(virq, h->host_data);
+        irq_set_chip_and_handler(virq, &mpc8xxx_irq_chip, handle_level_irq);
+        irq_set_irq_type(virq, IRQ_TYPE_NONE);
 
         return 0;
 }
@@ -369,8 +369,8 @@ static void __init mpc8xxx_add_controller(struct device_node *np)
         out_be32(mm_gc->regs + GPIO_IER, 0xffffffff);
         out_be32(mm_gc->regs + GPIO_IMR, 0);
 
-        set_irq_data(hwirq, mpc8xxx_gc);
-        set_irq_chained_handler(hwirq, mpc8xxx_gpio_irq_cascade);
+        irq_set_handler_data(hwirq, mpc8xxx_gc);
+        irq_set_chained_handler(hwirq, mpc8xxx_gpio_irq_cascade);
 
 skip_irq:
         return;
diff --git a/arch/powerpc/sysdev/mpic.c b/arch/powerpc/sysdev/mpic.c
index eb7021815e2d..f91c065bed5a 100644
--- a/arch/powerpc/sysdev/mpic.c
+++ b/arch/powerpc/sysdev/mpic.c
@@ -147,6 +147,16 @@ static u32 mpic_infos[][MPIC_IDX_END] = {
 
 #endif /* CONFIG_MPIC_WEIRD */
 
+static inline unsigned int mpic_processor_id(struct mpic *mpic)
+{
+        unsigned int cpu = 0;
+
+        if (mpic->flags & MPIC_PRIMARY)
+                cpu = hard_smp_processor_id();
+
+        return cpu;
+}
+
 /*
  * Register accessor functions
  */
@@ -210,19 +220,14 @@ static inline void _mpic_ipi_write(struct mpic *mpic, unsigned int ipi, u32 valu
 
 static inline u32 _mpic_cpu_read(struct mpic *mpic, unsigned int reg)
 {
-        unsigned int cpu = 0;
+        unsigned int cpu = mpic_processor_id(mpic);
 
-        if (mpic->flags & MPIC_PRIMARY)
-                cpu = hard_smp_processor_id();
         return _mpic_read(mpic->reg_type, &mpic->cpuregs[cpu], reg);
 }
 
 static inline void _mpic_cpu_write(struct mpic *mpic, unsigned int reg, u32 value)
 {
-        unsigned int cpu = 0;
-
-        if (mpic->flags & MPIC_PRIMARY)
-                cpu = hard_smp_processor_id();
+        unsigned int cpu = mpic_processor_id(mpic);
 
         _mpic_write(mpic->reg_type, &mpic->cpuregs[cpu], reg, value);
 }
@@ -356,7 +361,7 @@ static inline void mpic_ht_end_irq(struct mpic *mpic, unsigned int source)
 }
 
 static void mpic_startup_ht_interrupt(struct mpic *mpic, unsigned int source,
-                                      unsigned int irqflags)
+                                      bool level)
 {
         struct mpic_irq_fixup *fixup = &mpic->fixups[source];
         unsigned long flags;
@@ -365,14 +370,14 @@ static void mpic_startup_ht_interrupt(struct mpic *mpic, unsigned int source,
         if (fixup->base == NULL)
                 return;
 
-        DBG("startup_ht_interrupt(0x%x, 0x%x) index: %d\n",
-            source, irqflags, fixup->index);
+        DBG("startup_ht_interrupt(0x%x) index: %d\n",
+            source, fixup->index);
         raw_spin_lock_irqsave(&mpic->fixup_lock, flags);
         /* Enable and configure */
         writeb(0x10 + 2 * fixup->index, fixup->base + 2);
         tmp = readl(fixup->base + 4);
         tmp &= ~(0x23U);
-        if (irqflags & IRQ_LEVEL)
+        if (level)
                 tmp |= 0x22;
         writel(tmp, fixup->base + 4);
         raw_spin_unlock_irqrestore(&mpic->fixup_lock, flags);
@@ -384,8 +389,7 @@ static void mpic_startup_ht_interrupt(struct mpic *mpic, unsigned int source,
 #endif
 }
 
-static void mpic_shutdown_ht_interrupt(struct mpic *mpic, unsigned int source,
-                                       unsigned int irqflags)
+static void mpic_shutdown_ht_interrupt(struct mpic *mpic, unsigned int source)
 {
         struct mpic_irq_fixup *fixup = &mpic->fixups[source];
         unsigned long flags;
@@ -394,7 +398,7 @@ static void mpic_shutdown_ht_interrupt(struct mpic *mpic, unsigned int source,
         if (fixup->base == NULL)
                 return;
 
-        DBG("shutdown_ht_interrupt(0x%x, 0x%x)\n", source, irqflags);
+        DBG("shutdown_ht_interrupt(0x%x)\n", source);
 
         /* Disable */
         raw_spin_lock_irqsave(&mpic->fixup_lock, flags);
@@ -611,7 +615,7 @@ static struct mpic *mpic_find(unsigned int irq)
         if (irq < NUM_ISA_INTERRUPTS)
                 return NULL;
 
-        return get_irq_chip_data(irq);
+        return irq_get_chip_data(irq);
 }
 
 /* Determine if the linux irq is an IPI */
@@ -645,7 +649,7 @@ static inline struct mpic * mpic_from_ipi(struct irq_data *d)
 /* Get the mpic structure from the irq number */
 static inline struct mpic * mpic_from_irq(unsigned int irq)
 {
-        return get_irq_chip_data(irq);
+        return irq_get_chip_data(irq);
 }
 
 /* Get the mpic structure from the irq data */
@@ -733,7 +737,7 @@ static void mpic_unmask_ht_irq(struct irq_data *d)
 
         mpic_unmask_irq(d);
 
-        if (irq_to_desc(d->irq)->status & IRQ_LEVEL)
+        if (irqd_is_level_type(d))
                 mpic_ht_end_irq(mpic, src);
 }
 
@@ -743,7 +747,7 @@ static unsigned int mpic_startup_ht_irq(struct irq_data *d)
         unsigned int src = mpic_irq_to_hw(d->irq);
 
         mpic_unmask_irq(d);
-        mpic_startup_ht_interrupt(mpic, src, irq_to_desc(d->irq)->status);
+        mpic_startup_ht_interrupt(mpic, src, irqd_is_level_type(d));
 
         return 0;
 }
@@ -753,7 +757,7 @@ static void mpic_shutdown_ht_irq(struct irq_data *d)
         struct mpic *mpic = mpic_from_irq_data(d);
         unsigned int src = mpic_irq_to_hw(d->irq);
 
-        mpic_shutdown_ht_interrupt(mpic, src, irq_to_desc(d->irq)->status);
+        mpic_shutdown_ht_interrupt(mpic, src);
         mpic_mask_irq(d);
 }
 
@@ -770,7 +774,7 @@ static void mpic_end_ht_irq(struct irq_data *d)
          * latched another edge interrupt coming in anyway
          */
 
-        if (irq_to_desc(d->irq)->status & IRQ_LEVEL)
+        if (irqd_is_level_type(d))
                 mpic_ht_end_irq(mpic, src);
         mpic_eoi(mpic);
 }
@@ -859,7 +863,6 @@ int mpic_set_irq_type(struct irq_data *d, unsigned int flow_type)
 {
         struct mpic *mpic = mpic_from_irq_data(d);
         unsigned int src = mpic_irq_to_hw(d->irq);
-        struct irq_desc *desc = irq_to_desc(d->irq);
         unsigned int vecpri, vold, vnew;
 
         DBG("mpic: set_irq_type(mpic:@%p,virq:%d,src:0x%x,type:0x%x)\n",
@@ -874,10 +877,7 @@ int mpic_set_irq_type(struct irq_data *d, unsigned int flow_type)
         if (flow_type == IRQ_TYPE_NONE)
                 flow_type = IRQ_TYPE_LEVEL_LOW;
 
-        desc->status &= ~(IRQ_TYPE_SENSE_MASK | IRQ_LEVEL);
-        desc->status |= flow_type & IRQ_TYPE_SENSE_MASK;
-        if (flow_type & (IRQ_TYPE_LEVEL_HIGH | IRQ_TYPE_LEVEL_LOW))
-                desc->status |= IRQ_LEVEL;
+        irqd_set_trigger_type(d, flow_type);
 
         if (mpic_is_ht_interrupt(mpic, src))
                 vecpri = MPIC_VECPRI_POLARITY_POSITIVE |
@@ -892,7 +892,7 @@ int mpic_set_irq_type(struct irq_data *d, unsigned int flow_type)
         if (vold != vnew)
                 mpic_irq_write(src, MPIC_INFO(IRQ_VECTOR_PRI), vnew);
 
-        return 0;
+        return IRQ_SET_MASK_OK_NOCOPY;;
 }
 
 void mpic_set_vector(unsigned int virq, unsigned int vector)
@@ -913,6 +913,20 @@ void mpic_set_vector(unsigned int virq, unsigned int vector)
         mpic_irq_write(src, MPIC_INFO(IRQ_VECTOR_PRI), vecpri);
 }
 
+void mpic_set_destination(unsigned int virq, unsigned int cpuid)
+{
+        struct mpic *mpic = mpic_from_irq(virq);
+        unsigned int src = mpic_irq_to_hw(virq);
+
+        DBG("mpic: set_destination(mpic:@%p,virq:%d,src:%d,cpuid:0x%x)\n",
+            mpic, virq, src, cpuid);
+
+        if (src >= mpic->irq_count)
+                return;
+
+        mpic_irq_write(src, MPIC_INFO(IRQ_DESTINATION), 1 << cpuid);
+}
+
 static struct irq_chip mpic_irq_chip = {
         .irq_mask       = mpic_mask_irq,
         .irq_unmask     = mpic_unmask_irq,
@@ -964,8 +978,8 @@ static int mpic_host_map(struct irq_host *h, unsigned int virq,
                 WARN_ON(!(mpic->flags & MPIC_PRIMARY));
 
                 DBG("mpic: mapping as IPI\n");
-                set_irq_chip_data(virq, mpic);
-                set_irq_chip_and_handler(virq, &mpic->hc_ipi,
+                irq_set_chip_data(virq, mpic);
+                irq_set_chip_and_handler(virq, &mpic->hc_ipi,
                                          handle_percpu_irq);
                 return 0;
         }
@@ -987,11 +1001,21 @@ static int mpic_host_map(struct irq_host *h, unsigned int virq,
 
         DBG("mpic: mapping to irq chip @%p\n", chip);
 
-        set_irq_chip_data(virq, mpic);
-        set_irq_chip_and_handler(virq, chip, handle_fasteoi_irq);
+        irq_set_chip_data(virq, mpic);
+        irq_set_chip_and_handler(virq, chip, handle_fasteoi_irq);
 
         /* Set default irq type */
-        set_irq_type(virq, IRQ_TYPE_NONE);
+        irq_set_irq_type(virq, IRQ_TYPE_NONE);
+
+        /* If the MPIC was reset, then all vectors have already been
+         * initialized.  Otherwise, a per source lazy initialization
+         * is done here.
+         */
+        if (!mpic_is_ipi(mpic, hw) && (mpic->flags & MPIC_NO_RESET)) {
+                mpic_set_vector(virq, hw);
+                mpic_set_destination(virq, mpic_processor_id(mpic));
+                mpic_irq_set_priority(virq, 8);
+        }
 
         return 0;
 }
@@ -1040,6 +1064,11 @@ static struct irq_host_ops mpic_host_ops = {
         .xlate = mpic_host_xlate,
 };
 
+static int mpic_reset_prohibited(struct device_node *node)
+{
+        return node && of_get_property(node, "pic-no-reset", NULL);
+}
+
 /*
  * Exported functions
  */
@@ -1160,7 +1189,15 @@ struct mpic * __init mpic_alloc(struct device_node *node,
         mpic_map(mpic, node, paddr, &mpic->tmregs, MPIC_INFO(TIMER_BASE), 0x1000);
 
         /* Reset */
-        if (flags & MPIC_WANTS_RESET) {
+
+        /* When using a device-node, reset requests are only honored if the MPIC
+         * is allowed to reset.
+         */
+        if (mpic_reset_prohibited(node))
+                mpic->flags |= MPIC_NO_RESET;
+
+        if ((flags & MPIC_WANTS_RESET) && !(mpic->flags & MPIC_NO_RESET)) {
+                printk(KERN_DEBUG "mpic: Resetting\n");
                 mpic_write(mpic->gregs, MPIC_INFO(GREG_GLOBAL_CONF_0),
                            mpic_read(mpic->gregs, MPIC_INFO(GREG_GLOBAL_CONF_0))
                            | MPIC_GREG_GCONF_RESET);
@@ -1320,22 +1357,21 @@ void __init mpic_init(struct mpic *mpic)
 
         mpic_pasemi_msi_init(mpic);
 
-        if (mpic->flags & MPIC_PRIMARY)
-                cpu = hard_smp_processor_id();
-        else
-                cpu = 0;
+        cpu = mpic_processor_id(mpic);
 
-        for (i = 0; i < mpic->num_sources; i++) {
-                /* start with vector = source number, and masked */
-                u32 vecpri = MPIC_VECPRI_MASK | i |
-                        (8 << MPIC_VECPRI_PRIORITY_SHIFT);
+        if (!(mpic->flags & MPIC_NO_RESET)) {
+                for (i = 0; i < mpic->num_sources; i++) {
+                        /* start with vector = source number, and masked */
+                        u32 vecpri = MPIC_VECPRI_MASK | i |
+                                (8 << MPIC_VECPRI_PRIORITY_SHIFT);
                 
-                /* check if protected */
-                if (mpic->protected && test_bit(i, mpic->protected))
-                        continue;
-                /* init hw */
-                mpic_irq_write(i, MPIC_INFO(IRQ_VECTOR_PRI), vecpri);
-                mpic_irq_write(i, MPIC_INFO(IRQ_DESTINATION), 1 << cpu);
+                        /* check if protected */
+                        if (mpic->protected && test_bit(i, mpic->protected))
+                                continue;
+                        /* init hw */
+                        mpic_irq_write(i, MPIC_INFO(IRQ_VECTOR_PRI), vecpri);
+                        mpic_irq_write(i, MPIC_INFO(IRQ_DESTINATION), 1 << cpu);
+                }
         }
         
         /* Init spurious vector */
diff --git a/arch/powerpc/sysdev/mpic_pasemi_msi.c b/arch/powerpc/sysdev/mpic_pasemi_msi.c
index 0b7794acfce1..38e62382070c 100644
--- a/arch/powerpc/sysdev/mpic_pasemi_msi.c
+++ b/arch/powerpc/sysdev/mpic_pasemi_msi.c
@@ -81,7 +81,7 @@ static void pasemi_msi_teardown_msi_irqs(struct pci_dev *pdev)
                 if (entry->irq == NO_IRQ)
                         continue;
 
-                set_irq_msi(entry->irq, NULL);
+                irq_set_msi_desc(entry->irq, NULL);
                 msi_bitmap_free_hwirqs(&msi_mpic->msi_bitmap,
                                        virq_to_hw(entry->irq), ALLOC_CHUNK);
                 irq_dispose_mapping(entry->irq);
@@ -131,9 +131,9 @@ static int pasemi_msi_setup_msi_irqs(struct pci_dev *pdev, int nvec, int type)
                  */
                 mpic_set_vector(virq, 0);
 
-                set_irq_msi(virq, entry);
-                set_irq_chip(virq, &mpic_pasemi_msi_chip);
-                set_irq_type(virq, IRQ_TYPE_EDGE_RISING);
+                irq_set_msi_desc(virq, entry);
+                irq_set_chip(virq, &mpic_pasemi_msi_chip);
+                irq_set_irq_type(virq, IRQ_TYPE_EDGE_RISING);
 
                 pr_debug("pasemi_msi: allocated virq 0x%x (hw 0x%x) " \
                          "addr 0x%x\n", virq, hwirq, msg.address_lo);
diff --git a/arch/powerpc/sysdev/mpic_u3msi.c b/arch/powerpc/sysdev/mpic_u3msi.c
index 71900ac78270..9a7aa0ed9c1c 100644
--- a/arch/powerpc/sysdev/mpic_u3msi.c
+++ b/arch/powerpc/sysdev/mpic_u3msi.c
@@ -129,7 +129,7 @@ static void u3msi_teardown_msi_irqs(struct pci_dev *pdev)
                 if (entry->irq == NO_IRQ)
                         continue;
 
-                set_irq_msi(entry->irq, NULL);
+                irq_set_msi_desc(entry->irq, NULL);
                 msi_bitmap_free_hwirqs(&msi_mpic->msi_bitmap,
                                        virq_to_hw(entry->irq), 1);
                 irq_dispose_mapping(entry->irq);
@@ -166,9 +166,9 @@ static int u3msi_setup_msi_irqs(struct pci_dev *pdev, int nvec, int type)
                         return -ENOSPC;
                 }
 
-                set_irq_msi(virq, entry);
-                set_irq_chip(virq, &mpic_u3msi_chip);
-                set_irq_type(virq, IRQ_TYPE_EDGE_RISING);
+                irq_set_msi_desc(virq, entry);
+                irq_set_chip(virq, &mpic_u3msi_chip);
+                irq_set_irq_type(virq, IRQ_TYPE_EDGE_RISING);
 
                 pr_debug("u3msi: allocated virq 0x%x (hw 0x%x) addr 0x%lx\n",
                           virq, hwirq, (unsigned long)addr);
diff --git a/arch/powerpc/sysdev/mv64x60_pic.c b/arch/powerpc/sysdev/mv64x60_pic.c
index bc61ebb8987c..e9c633c7c083 100644
--- a/arch/powerpc/sysdev/mv64x60_pic.c
+++ b/arch/powerpc/sysdev/mv64x60_pic.c
@@ -213,11 +213,12 @@ static int mv64x60_host_map(struct irq_host *h, unsigned int virq,
 {
         int level1;
 
-        irq_to_desc(virq)->status |= IRQ_LEVEL;
+        irq_set_status_flags(virq, IRQ_LEVEL);
 
         level1 = (hwirq & MV64x60_LEVEL1_MASK) >> MV64x60_LEVEL1_OFFSET;
         BUG_ON(level1 > MV64x60_LEVEL1_GPP);
-        set_irq_chip_and_handler(virq, mv64x60_chips[level1], handle_level_irq);
+        irq_set_chip_and_handler(virq, mv64x60_chips[level1],
+                                 handle_level_irq);
 
         return 0;
 }
diff --git a/arch/powerpc/sysdev/qe_lib/qe_ic.c b/arch/powerpc/sysdev/qe_lib/qe_ic.c
index 8c9ded8ea07c..832d6924ad1c 100644
--- a/arch/powerpc/sysdev/qe_lib/qe_ic.c
+++ b/arch/powerpc/sysdev/qe_lib/qe_ic.c
@@ -189,7 +189,7 @@ static inline void qe_ic_write(volatile __be32  __iomem * base, unsigned int reg
 
 static inline struct qe_ic *qe_ic_from_irq(unsigned int virq)
 {
-        return get_irq_chip_data(virq);
+        return irq_get_chip_data(virq);
 }
 
 static inline struct qe_ic *qe_ic_from_irq_data(struct irq_data *d)
@@ -267,10 +267,10 @@ static int qe_ic_host_map(struct irq_host *h, unsigned int virq,
         /* Default chip */
         chip = &qe_ic->hc_irq;
 
-        set_irq_chip_data(virq, qe_ic);
-        irq_to_desc(virq)->status |= IRQ_LEVEL;
+        irq_set_chip_data(virq, qe_ic);
+        irq_set_status_flags(virq, IRQ_LEVEL);
 
-        set_irq_chip_and_handler(virq, chip, handle_level_irq);
+        irq_set_chip_and_handler(virq, chip, handle_level_irq);
 
         return 0;
 }
@@ -386,13 +386,13 @@ void __init qe_ic_init(struct device_node *node, unsigned int flags,
 
         qe_ic_write(qe_ic->regs, QEIC_CICR, temp);
 
-        set_irq_data(qe_ic->virq_low, qe_ic);
-        set_irq_chained_handler(qe_ic->virq_low, low_handler);
+        irq_set_handler_data(qe_ic->virq_low, qe_ic);
+        irq_set_chained_handler(qe_ic->virq_low, low_handler);
 
         if (qe_ic->virq_high != NO_IRQ &&
                         qe_ic->virq_high != qe_ic->virq_low) {
-                set_irq_data(qe_ic->virq_high, qe_ic);
-                set_irq_chained_handler(qe_ic->virq_high, high_handler);
+                irq_set_handler_data(qe_ic->virq_high, qe_ic);
+                irq_set_chained_handler(qe_ic->virq_high, high_handler);
         }
 }
 
diff --git a/arch/powerpc/sysdev/tsi108_pci.c b/arch/powerpc/sysdev/tsi108_pci.c
index 02c91db90037..4d18658116e5 100644
--- a/arch/powerpc/sysdev/tsi108_pci.c
+++ b/arch/powerpc/sysdev/tsi108_pci.c
@@ -391,8 +391,8 @@ static int pci_irq_host_map(struct irq_host *h, unsigned int virq,
         DBG("%s(%d, 0x%lx)\n", __func__, virq, hw);
         if ((virq >= 1) && (virq <= 4)){
                 irq = virq + IRQ_PCI_INTAD_BASE - 1;
-                irq_to_desc(irq)->status |= IRQ_LEVEL;
-                set_irq_chip(irq, &tsi108_pci_irq);
+                irq_set_status_flags(irq, IRQ_LEVEL);
+                irq_set_chip(irq, &tsi108_pci_irq);
         }
         return 0;
 }
@@ -431,7 +431,7 @@ void __init tsi108_pci_int_init(struct device_node *node)
 
 void tsi108_irq_cascade(unsigned int irq, struct irq_desc *desc)
 {
-        struct irq_chip *chip = get_irq_desc_chip(desc);
+        struct irq_chip *chip = irq_desc_get_chip(desc);
         unsigned int cascade_irq = get_pci_source();
 
         if (cascade_irq != NO_IRQ)
diff --git a/arch/powerpc/sysdev/uic.c b/arch/powerpc/sysdev/uic.c
index 835f7958b237..5d9138516628 100644
--- a/arch/powerpc/sysdev/uic.c
+++ b/arch/powerpc/sysdev/uic.c
@@ -57,7 +57,6 @@ struct uic {
 
 static void uic_unmask_irq(struct irq_data *d)
 {
-        struct irq_desc *desc = irq_to_desc(d->irq);
         struct uic *uic = irq_data_get_irq_chip_data(d);
         unsigned int src = uic_irq_to_hw(d->irq);
         unsigned long flags;
@@ -66,7 +65,7 @@ static void uic_unmask_irq(struct irq_data *d)
         sr = 1 << (31-src);
         spin_lock_irqsave(&uic->lock, flags);
         /* ack level-triggered interrupts here */
-        if (desc->status & IRQ_LEVEL)
+        if (irqd_is_level_type(d))
                 mtdcr(uic->dcrbase + UIC_SR, sr);
         er = mfdcr(uic->dcrbase + UIC_ER);
         er |= sr;
@@ -101,7 +100,6 @@ static void uic_ack_irq(struct irq_data *d)
 
 static void uic_mask_ack_irq(struct irq_data *d)
 {
-        struct irq_desc *desc = irq_to_desc(d->irq);
         struct uic *uic = irq_data_get_irq_chip_data(d);
         unsigned int src = uic_irq_to_hw(d->irq);
         unsigned long flags;
@@ -120,7 +118,7 @@ static void uic_mask_ack_irq(struct irq_data *d)
          * level interrupts are ack'ed after the actual
          * isr call in the uic_unmask_irq()
          */
-        if (!(desc->status & IRQ_LEVEL))
+        if (!irqd_is_level_type(d))
                 mtdcr(uic->dcrbase + UIC_SR, sr);
         spin_unlock_irqrestore(&uic->lock, flags);
 }
@@ -129,7 +127,6 @@ static int uic_set_irq_type(struct irq_data *d, unsigned int flow_type)
 {
         struct uic *uic = irq_data_get_irq_chip_data(d);
         unsigned int src = uic_irq_to_hw(d->irq);
-        struct irq_desc *desc = irq_to_desc(d->irq);
         unsigned long flags;
         int trigger, polarity;
         u32 tr, pr, mask;
@@ -166,11 +163,6 @@ static int uic_set_irq_type(struct irq_data *d, unsigned int flow_type)
         mtdcr(uic->dcrbase + UIC_PR, pr);
         mtdcr(uic->dcrbase + UIC_TR, tr);
 
-        desc->status &= ~(IRQ_TYPE_SENSE_MASK | IRQ_LEVEL);
-        desc->status |= flow_type & IRQ_TYPE_SENSE_MASK;
-        if (!trigger)
-                desc->status |= IRQ_LEVEL;
-
         spin_unlock_irqrestore(&uic->lock, flags);
 
         return 0;
@@ -190,13 +182,13 @@ static int uic_host_map(struct irq_host *h, unsigned int virq,
 {
         struct uic *uic = h->host_data;
 
-        set_irq_chip_data(virq, uic);
+        irq_set_chip_data(virq, uic);
         /* Despite the name, handle_level_irq() works for both level
          * and edge irqs on UIC.  FIXME: check this is correct */
-        set_irq_chip_and_handler(virq, &uic_irq_chip, handle_level_irq);
+        irq_set_chip_and_handler(virq, &uic_irq_chip, handle_level_irq);
 
         /* Set default irq type */
-        set_irq_type(virq, IRQ_TYPE_NONE);
+        irq_set_irq_type(virq, IRQ_TYPE_NONE);
 
         return 0;
 }
@@ -220,17 +212,18 @@ static struct irq_host_ops uic_host_ops = {
 
 void uic_irq_cascade(unsigned int virq, struct irq_desc *desc)
 {
-        struct irq_chip *chip = get_irq_desc_chip(desc);
-        struct uic *uic = get_irq_data(virq);
+        struct irq_chip *chip = irq_desc_get_chip(desc);
+        struct irq_data *idata = irq_desc_get_irq_data(desc);
+        struct uic *uic = irq_get_handler_data(virq);
         u32 msr;
         int src;
         int subvirq;
 
         raw_spin_lock(&desc->lock);
-        if (desc->status & IRQ_LEVEL)
-                chip->irq_mask(&desc->irq_data);
+        if (irqd_is_level_type(idata))
+                chip->irq_mask(idata);
         else
-                chip->irq_mask_ack(&desc->irq_data);
+                chip->irq_mask_ack(idata);
         raw_spin_unlock(&desc->lock);
 
         msr = mfdcr(uic->dcrbase + UIC_MSR);
@@ -244,10 +237,10 @@ void uic_irq_cascade(unsigned int virq, struct irq_desc *desc)
 
 uic_irq_ret:
         raw_spin_lock(&desc->lock);
-        if (desc->status & IRQ_LEVEL)
-                chip->irq_ack(&desc->irq_data);
-        if (!(desc->status & IRQ_DISABLED) && chip->irq_unmask)
-                chip->irq_unmask(&desc->irq_data);
+        if (irqd_is_level_type(idata))
+                chip->irq_ack(idata);
+        if (!irqd_irq_disabled(idata) && chip->irq_unmask)
+                chip->irq_unmask(idata);
         raw_spin_unlock(&desc->lock);
 }
 
@@ -336,8 +329,8 @@ void __init uic_init_tree(void)
 
                         cascade_virq = irq_of_parse_and_map(np, 0);
 
-                        set_irq_data(cascade_virq, uic);
-                        set_irq_chained_handler(cascade_virq, uic_irq_cascade);
+                        irq_set_handler_data(cascade_virq, uic);
+                        irq_set_chained_handler(cascade_virq, uic_irq_cascade);
 
                         /* FIXME: setup critical cascade?? */
                 }
diff --git a/arch/powerpc/sysdev/xilinx_intc.c b/arch/powerpc/sysdev/xilinx_intc.c
index 7436f3ed4df6..0a13fc19e287 100644
--- a/arch/powerpc/sysdev/xilinx_intc.c
+++ b/arch/powerpc/sysdev/xilinx_intc.c
@@ -79,12 +79,6 @@ static void xilinx_intc_mask(struct irq_data *d)
 
 static int xilinx_intc_set_type(struct irq_data *d, unsigned int flow_type)
 {
-        struct irq_desc *desc = irq_to_desc(d->irq);
-
-        desc->status &= ~(IRQ_TYPE_SENSE_MASK | IRQ_LEVEL);
-        desc->status |= flow_type & IRQ_TYPE_SENSE_MASK;
-        if (flow_type & (IRQ_TYPE_LEVEL_HIGH | IRQ_TYPE_LEVEL_LOW))
-                desc->status |= IRQ_LEVEL;
         return 0;
 }
 
@@ -170,15 +164,15 @@ static int xilinx_intc_xlate(struct irq_host *h, struct device_node *ct,
 static int xilinx_intc_map(struct irq_host *h, unsigned int virq,
                                   irq_hw_number_t irq)
 {
-        set_irq_chip_data(virq, h->host_data);
+        irq_set_chip_data(virq, h->host_data);
 
         if (xilinx_intc_typetable[irq] == IRQ_TYPE_LEVEL_HIGH ||
             xilinx_intc_typetable[irq] == IRQ_TYPE_LEVEL_LOW) {
-                set_irq_chip_and_handler(virq, &xilinx_intc_level_irqchip,
-                        handle_level_irq);
+                irq_set_chip_and_handler(virq, &xilinx_intc_level_irqchip,
+                                         handle_level_irq);
         } else {
-                set_irq_chip_and_handler(virq, &xilinx_intc_edge_irqchip,
-                        handle_edge_irq);
+                irq_set_chip_and_handler(virq, &xilinx_intc_edge_irqchip,
+                                         handle_edge_irq);
         }
         return 0;
 }
@@ -229,7 +223,7 @@ int xilinx_intc_get_irq(void)
  */
 static void xilinx_i8259_cascade(unsigned int irq, struct irq_desc *desc)
 {
-        struct irq_chip *chip = get_irq_desc_chip(desc);
+        struct irq_chip *chip = irq_desc_get_chip(desc);
         unsigned int cascade_irq = i8259_irq();
 
         if (cascade_irq)
@@ -256,7 +250,7 @@ static void __init xilinx_i8259_setup_cascade(void)
         }
 
         i8259_init(cascade_node, 0);
-        set_irq_chained_handler(cascade_irq, xilinx_i8259_cascade);
+        irq_set_chained_handler(cascade_irq, xilinx_i8259_cascade);
 
         /* Program irq 7 (usb/audio), 14/15 (ide) to level sensitive */
         /* This looks like a dirty hack to me --gcl */
diff --git a/arch/powerpc/xmon/xmon.c b/arch/powerpc/xmon/xmon.c
index d17d04cfb2cd..33794c1d92c3 100644
--- a/arch/powerpc/xmon/xmon.c
+++ b/arch/powerpc/xmon/xmon.c
@@ -821,7 +821,7 @@ cmds(struct pt_regs *excp)
                                 memzcan();
                                 break;
                         case 'i':
-                                show_mem();
+                                show_mem(0);
                                 break;
                         default:
                                 termch = cmd;