Merge branch 'irq-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip into next

Pull core irq updates from Thomas Gleixner:
 "The irq department delivers:

   - Another tree wide update to get rid of the horrible create_irq
     interface along with its even more horrible variants.  That also
     gets rid of the last leftovers of the initial sparse irq hackery.
     arch/driver specific changes have been either acked or ignored.

   - A fix for the spurious interrupt detection logic with threaded
     interrupts.

   - A new ARM SoC interrupt controller

   - The usual pile of fixes and improvements all over the place"

* 'irq-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (40 commits)
  Documentation: brcmstb-l2: Add Broadcom STB Level-2 interrupt controller binding
  irqchip: brcmstb-l2: Add Broadcom Set Top Box Level-2 interrupt controller
  genirq: Improve documentation to match current implementation
  ARM: iop13xx: fix msi support with sparse IRQ
  genirq: Provide !SMP stub for irq_set_affinity_notifier()
  irqchip: armada-370-xp: Move the devicetree binding documentation
  irqchip: gic: Use mask field in GICC_IAR
  genirq: Remove dynamic_irq mess
  ia64: Use irq_init_desc
  genirq: Replace dynamic_irq_init/cleanup
  genirq: Remove irq_reserve_irq[s]
  genirq: Replace reserve_irqs in core code
  s390: Avoid call to irq_reserve_irqs()
  s390: Remove pointless arch_show_interrupts()
  s390: pci: Check return value of alloc_irq_desc() proper
  sh: intc: Remove pointless irq_reserve_irqs() invocation
  x86, irq: Remove pointless irq_reserve_irqs() call
  genirq: Make create/destroy_irq() ia64 private
  tile: Use SPARSE_IRQ
  tile: pci: Use irq_alloc/free_hwirq()
  ...

28 files changed, 88 insertions, 245 deletions

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 071dce78959a..ad89a033f17f 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -480,6 +480,7 @@ config ARCH_IOP13XX
         select PCI
         select PLAT_IOP
         select VMSPLIT_1G
+        select SPARSE_IRQ
         help
           Support for Intel's IOP13XX (XScale) family of processors.
 
diff --git a/arch/arm/mach-iop13xx/include/mach/irqs.h b/arch/arm/mach-iop13xx/include/mach/irqs.h
index 054e7acb5bfa..e8d24d32121a 100644
--- a/arch/arm/mach-iop13xx/include/mach/irqs.h
+++ b/arch/arm/mach-iop13xx/include/mach/irqs.h
@@ -191,6 +191,4 @@ static inline u32 read_intpnd_3(void)
 #define NR_IOP13XX_IRQS (IRQ_IOP13XX_HPI + 1)
 #endif
 
-#define NR_IRQS         NR_IOP13XX_IRQS
-
 #endif /* _IOP13XX_IRQ_H_ */
diff --git a/arch/arm/mach-iop13xx/include/mach/time.h b/arch/arm/mach-iop13xx/include/mach/time.h
index f1c00d6d560b..15bc9bb78a6b 100644
--- a/arch/arm/mach-iop13xx/include/mach/time.h
+++ b/arch/arm/mach-iop13xx/include/mach/time.h
@@ -1,5 +1,8 @@
 #ifndef _IOP13XX_TIME_H_
 #define _IOP13XX_TIME_H_
+
+#include <mach/irqs.h>
+
 #define IRQ_IOP_TIMER0 IRQ_IOP13XX_TIMER0
 
 #define IOP_TMR_EN          0x02
diff --git a/arch/arm/mach-iop13xx/iq81340mc.c b/arch/arm/mach-iop13xx/iq81340mc.c
index 02a8228ac2d3..9cd07d396093 100644
--- a/arch/arm/mach-iop13xx/iq81340mc.c
+++ b/arch/arm/mach-iop13xx/iq81340mc.c
@@ -93,4 +93,5 @@ MACHINE_START(IQ81340MC, "Intel IQ81340MC")
         .init_time      = iq81340mc_timer_init,
         .init_machine   = iq81340mc_init,
         .restart        = iop13xx_restart,
+        .nr_irqs        = NR_IOP13XX_IRQS,
 MACHINE_END
diff --git a/arch/arm/mach-iop13xx/iq81340sc.c b/arch/arm/mach-iop13xx/iq81340sc.c
index 1b80f10722b3..b3ec11cb707e 100644
--- a/arch/arm/mach-iop13xx/iq81340sc.c
+++ b/arch/arm/mach-iop13xx/iq81340sc.c
@@ -95,4 +95,5 @@ MACHINE_START(IQ81340SC, "Intel IQ81340SC")
         .init_time      = iq81340sc_timer_init,
         .init_machine   = iq81340sc_init,
         .restart        = iop13xx_restart,
+        .nr_irqs        = NR_IOP13XX_IRQS,
 MACHINE_END
diff --git a/arch/arm/mach-iop13xx/msi.c b/arch/arm/mach-iop13xx/msi.c
index 560d5b2dec22..e7730cf9c15d 100644
--- a/arch/arm/mach-iop13xx/msi.c
+++ b/arch/arm/mach-iop13xx/msi.c
@@ -23,10 +23,7 @@
 #include <linux/msi.h>
 #include <asm/mach/irq.h>
 #include <asm/irq.h>
-
-
-#define IOP13XX_NUM_MSI_IRQS 128
-static DECLARE_BITMAP(msi_irq_in_use, IOP13XX_NUM_MSI_IRQS);
+#include <mach/irqs.h>
 
 /* IMIPR0 CP6 R8 Page 1
  */
@@ -121,41 +118,6 @@ void __init iop13xx_msi_init(void)
         irq_set_chained_handler(IRQ_IOP13XX_INBD_MSI, iop13xx_msi_handler);
 }
 
-/*
- * Dynamic irq allocate and deallocation
- */
-int create_irq(void)
-{
-        int irq, pos;
-
-again:
-        pos = find_first_zero_bit(msi_irq_in_use, IOP13XX_NUM_MSI_IRQS);
-        irq = IRQ_IOP13XX_MSI_0 + pos;
-        if (irq > NR_IRQS)
-                return -ENOSPC;
-        /* test_and_set_bit operates on 32-bits at a time */
-        if (test_and_set_bit(pos, msi_irq_in_use))
-                goto again;
-
-        dynamic_irq_init(irq);
-
-        return irq;
-}
-
-void destroy_irq(unsigned int irq)
-{
-        int pos = irq - IRQ_IOP13XX_MSI_0;
-
-        dynamic_irq_cleanup(irq);
-
-        clear_bit(pos, msi_irq_in_use);
-}
-
-void arch_teardown_msi_irq(unsigned int irq)
-{
-        destroy_irq(irq);
-}
-
 static void iop13xx_msi_nop(struct irq_data *d)
 {
         return;
@@ -172,12 +134,17 @@ static struct irq_chip iop13xx_msi_chip = {
 
 int arch_setup_msi_irq(struct pci_dev *pdev, struct msi_desc *desc)
 {
-        int id, irq = create_irq();
+        int id, irq = irq_alloc_desc_from(IRQ_IOP13XX_MSI_0, -1);
         struct msi_msg msg;
 
         if (irq < 0)
                 return irq;
 
+        if (irq >= NR_IOP13XX_IRQS) {
+                irq_free_desc(irq);
+                return -ENOSPC;
+        }
+
         irq_set_msi_desc(irq, desc);
 
         msg.address_hi = 0x0;
@@ -191,3 +158,8 @@ int arch_setup_msi_irq(struct pci_dev *pdev, struct msi_desc *desc)
 
         return 0;
 }
+
+void arch_teardown_msi_irq(unsigned int irq)
+{
+        irq_free_desc(irq);
+}
diff --git a/arch/arm/mach-iop13xx/setup.c b/arch/arm/mach-iop13xx/setup.c
index 96e6c7a6793b..bca96f433495 100644
--- a/arch/arm/mach-iop13xx/setup.c
+++ b/arch/arm/mach-iop13xx/setup.c
@@ -27,6 +27,7 @@
 #include <mach/hardware.h>
 #include <asm/irq.h>
 #include <asm/hardware/iop_adma.h>
+#include <mach/irqs.h>
 
 #define IOP13XX_UART_XTAL 33334000
 #define IOP13XX_SETUP_DEBUG 0
diff --git a/arch/arm/mach-iop13xx/tpmi.c b/arch/arm/mach-iop13xx/tpmi.c
index 6fdad7a0425a..db511ec2b1df 100644
--- a/arch/arm/mach-iop13xx/tpmi.c
+++ b/arch/arm/mach-iop13xx/tpmi.c
@@ -24,6 +24,7 @@
 #include <linux/io.h>
 #include <asm/irq.h>
 #include <asm/sizes.h>
+#include <mach/irqs.h>
 
 /* assumes CONTROLLER_ONLY# is never asserted in the ESSR register */
 #define IOP13XX_TPMI_MMR(dev)   IOP13XX_REG_ADDR32_PHYS(0x48000 + (dev << 12))
diff --git a/arch/ia64/Kconfig b/arch/ia64/Kconfig
index 12c3afee0f6f..2f3abcf8f6bc 100644
--- a/arch/ia64/Kconfig
+++ b/arch/ia64/Kconfig
@@ -32,6 +32,7 @@ config IA64
         select GENERIC_IRQ_PROBE
         select GENERIC_PENDING_IRQ if SMP
         select GENERIC_IRQ_SHOW
+        select GENERIC_IRQ_LEGACY
         select ARCH_WANT_OPTIONAL_GPIOLIB
         select ARCH_HAVE_NMI_SAFE_CMPXCHG
         select GENERIC_IOMAP
diff --git a/arch/ia64/include/asm/hw_irq.h b/arch/ia64/include/asm/hw_irq.h
index a681d02cb324..029bab36cd91 100644
--- a/arch/ia64/include/asm/hw_irq.h
+++ b/arch/ia64/include/asm/hw_irq.h
@@ -132,7 +132,6 @@ extern int reserve_irq_vector (int vector);
 extern void __setup_vector_irq(int cpu);
 extern void ia64_send_ipi (int cpu, int vector, int delivery_mode, int redirect);
 extern void ia64_native_register_percpu_irq (ia64_vector vec, struct irqaction *action);
-extern int check_irq_used (int irq);
 extern void destroy_and_reserve_irq (unsigned int irq);
 
 #if defined(CONFIG_SMP) && (defined(CONFIG_IA64_GENERIC) || defined(CONFIG_IA64_DIG))
diff --git a/arch/ia64/include/asm/irq.h b/arch/ia64/include/asm/irq.h
index 91b920fd7d53..820667cbea7e 100644
--- a/arch/ia64/include/asm/irq.h
+++ b/arch/ia64/include/asm/irq.h
@@ -31,4 +31,7 @@ bool is_affinity_mask_valid(const struct cpumask *cpumask);
 
 #define is_affinity_mask_valid is_affinity_mask_valid
 
+int create_irq(void);
+void destroy_irq(unsigned int irq);
+
 #endif /* _ASM_IA64_IRQ_H */
diff --git a/arch/ia64/include/asm/irq_remapping.h b/arch/ia64/include/asm/irq_remapping.h
index a8687b1d8906..e3b3556e2e1b 100644
--- a/arch/ia64/include/asm/irq_remapping.h
+++ b/arch/ia64/include/asm/irq_remapping.h
@@ -1,4 +1,6 @@
 #ifndef __IA64_INTR_REMAPPING_H
 #define __IA64_INTR_REMAPPING_H
 #define irq_remapping_enabled 0
+#define dmar_alloc_hwirq        create_irq
+#define dmar_free_hwirq         destroy_irq
 #endif
diff --git a/arch/ia64/kernel/iosapic.c b/arch/ia64/kernel/iosapic.c
index 19f107be734e..cd44a57c73be 100644
--- a/arch/ia64/kernel/iosapic.c
+++ b/arch/ia64/kernel/iosapic.c
@@ -735,7 +735,7 @@ iosapic_register_intr (unsigned int gsi,
                 rte = find_rte(irq, gsi);
                 if(iosapic_intr_info[irq].count == 0) {
                         assign_irq_vector(irq);
-                        dynamic_irq_init(irq);
+                        irq_init_desc(irq);
                 } else if (rte->refcnt != NO_REF_RTE) {
                         rte->refcnt++;
                         goto unlock_iosapic_lock;
diff --git a/arch/ia64/kernel/irq_ia64.c b/arch/ia64/kernel/irq_ia64.c
index 0884f5ecbcc3..03ea78ed64a9 100644
--- a/arch/ia64/kernel/irq_ia64.c
+++ b/arch/ia64/kernel/irq_ia64.c
@@ -93,14 +93,6 @@ static int irq_status[NR_IRQS] = {
         [0 ... NR_IRQS -1] = IRQ_UNUSED
 };
 
-int check_irq_used(int irq)
-{
-        if (irq_status[irq] == IRQ_USED)
-                return 1;
-
-        return -1;
-}
-
 static inline int find_unassigned_irq(void)
 {
         int irq;
@@ -390,8 +382,7 @@ void destroy_and_reserve_irq(unsigned int irq)
 {
         unsigned long flags;
 
-        dynamic_irq_cleanup(irq);
-
+        irq_init_desc(irq);
         spin_lock_irqsave(&vector_lock, flags);
         __clear_irq_vector(irq);
         irq_status[irq] = IRQ_RSVD;
@@ -424,13 +415,13 @@ int create_irq(void)
  out:
         spin_unlock_irqrestore(&vector_lock, flags);
         if (irq >= 0)
-                dynamic_irq_init(irq);
+                irq_init_desc(irq);
         return irq;
 }
 
 void destroy_irq(unsigned int irq)
 {
-        dynamic_irq_cleanup(irq);
+        irq_init_desc(irq);
         clear_irq_vector(irq);
 }
 
diff --git a/arch/mips/pci/msi-xlp.c b/arch/mips/pci/msi-xlp.c
index afd8405e0188..3249685e03ad 100644
--- a/arch/mips/pci/msi-xlp.c
+++ b/arch/mips/pci/msi-xlp.c
@@ -206,14 +206,8 @@ static struct irq_chip xlp_msix_chip = {
         .irq_unmask     = unmask_msi_irq,
 };
 
-void destroy_irq(unsigned int irq)
-{
-            /* nothing to do yet */
-}
-
 void arch_teardown_msi_irq(unsigned int irq)
 {
-        destroy_irq(irq);
 }
 
 /*
@@ -298,10 +292,8 @@ static int xlp_setup_msi(uint64_t lnkbase, int node, int link,
 
         xirq = xirq + msivec;           /* msi mapped to global irq space */
         ret = irq_set_msi_desc(xirq, desc);
-        if (ret < 0) {
-                destroy_irq(xirq);
+        if (ret < 0)
                 return ret;
-        }
 
         write_msi_msg(xirq, &msg);
         return 0;
diff --git a/arch/mips/pci/pci-xlr.c b/arch/mips/pci/pci-xlr.c
index 4427abbd48b5..0dde80332d3a 100644
--- a/arch/mips/pci/pci-xlr.c
+++ b/arch/mips/pci/pci-xlr.c
@@ -214,14 +214,8 @@ static int get_irq_vector(const struct pci_dev *dev)
 }
 
 #ifdef CONFIG_PCI_MSI
-void destroy_irq(unsigned int irq)
-{
-            /* nothing to do yet */
-}
-
 void arch_teardown_msi_irq(unsigned int irq)
 {
-        destroy_irq(irq);
 }
 
 int arch_setup_msi_irq(struct pci_dev *dev, struct msi_desc *desc)
@@ -263,10 +257,8 @@ int arch_setup_msi_irq(struct pci_dev *dev, struct msi_desc *desc)
                 MSI_DATA_DELIVERY_FIXED;
 
         ret = irq_set_msi_desc(irq, desc);
-        if (ret < 0) {
-                destroy_irq(irq);
+        if (ret < 0)
                 return ret;
-        }
 
         write_msi_msg(irq, &msg);
         return 0;
diff --git a/arch/s390/kernel/irq.c b/arch/s390/kernel/irq.c
index c7463aa0014b..99b0b09646ca 100644
--- a/arch/s390/kernel/irq.c
+++ b/arch/s390/kernel/irq.c
@@ -92,7 +92,6 @@ static const struct irq_class irqclass_sub_desc[NR_ARCH_IRQS] = {
 
 void __init init_IRQ(void)
 {
-        irq_reserve_irqs(0, THIN_INTERRUPT);
         init_cio_interrupts();
         init_airq_interrupts();
         init_ext_interrupts();
@@ -151,9 +150,9 @@ out:
         return 0;
 }
 
-int arch_show_interrupts(struct seq_file *p, int prec)
+unsigned int arch_dynirq_lower_bound(unsigned int from)
 {
-        return 0;
+        return from < THIN_INTERRUPT ? THIN_INTERRUPT : from;
 }
 
 /*
diff --git a/arch/s390/pci/pci.c b/arch/s390/pci/pci.c
index bdf02570d1df..9ddc51eeb8d6 100644
--- a/arch/s390/pci/pci.c
+++ b/arch/s390/pci/pci.c
@@ -401,11 +401,11 @@ static void zpci_irq_handler(struct airq_struct *airq)
 int arch_setup_msi_irqs(struct pci_dev *pdev, int nvec, int type)
 {
         struct zpci_dev *zdev = get_zdev(pdev);
-        unsigned int hwirq, irq, msi_vecs;
+        unsigned int hwirq, msi_vecs;
         unsigned long aisb;
         struct msi_desc *msi;
         struct msi_msg msg;
-        int rc;
+        int rc, irq;
 
         if (type == PCI_CAP_ID_MSI && nvec > 1)
                 return 1;
@@ -433,7 +433,7 @@ int arch_setup_msi_irqs(struct pci_dev *pdev, int nvec, int type)
         list_for_each_entry(msi, &pdev->msi_list, list) {
                 rc = -EIO;
                 irq = irq_alloc_desc(0);        /* Alloc irq on node 0 */
-                if (irq == NO_IRQ)
+                if (irq < 0)
                         goto out_msi;
                 rc = irq_set_msi_desc(irq, msi);
                 if (rc)
diff --git a/arch/tile/Kconfig b/arch/tile/Kconfig
index 85258ca43ff5..4f3006b600e3 100644
--- a/arch/tile/Kconfig
+++ b/arch/tile/Kconfig
@@ -125,6 +125,8 @@ config HVC_TILE
 
 config TILEGX
         bool "Building for TILE-Gx (64-bit) processor"
+        select SPARSE_IRQ
+        select GENERIC_IRQ_LEGACY_ALLOC_HWIRQ
         select HAVE_FUNCTION_TRACER
         select HAVE_FUNCTION_TRACE_MCOUNT_TEST
         select HAVE_FUNCTION_GRAPH_TRACER
diff --git a/arch/tile/include/asm/irq.h b/arch/tile/include/asm/irq.h
index 33cff9a3058b..1fe86911838b 100644
--- a/arch/tile/include/asm/irq.h
+++ b/arch/tile/include/asm/irq.h
@@ -18,10 +18,12 @@
 #include <linux/hardirq.h>
 
 /* The hypervisor interface provides 32 IRQs. */
-#define NR_IRQS 32
+#define NR_IRQS                 32
 
 /* IRQ numbers used for linux IPIs. */
-#define IRQ_RESCHEDULE 0
+#define IRQ_RESCHEDULE  0
+/* Interrupts for dynamic allocation start at 1. Let the core allocate irq0 */
+#define NR_IRQS_LEGACY  1
 
 #define irq_canonicalize(irq)   (irq)
 
diff --git a/arch/tile/kernel/irq.c b/arch/tile/kernel/irq.c
index 906a76bdb31d..637f2ffaa5f5 100644
--- a/arch/tile/kernel/irq.c
+++ b/arch/tile/kernel/irq.c
@@ -54,13 +54,6 @@ static DEFINE_PER_CPU(unsigned long, irq_disable_mask)
  */
 static DEFINE_PER_CPU(int, irq_depth);
 
-/* State for allocating IRQs on Gx. */
-#if CHIP_HAS_IPI()
-static unsigned long available_irqs = ((1UL << NR_IRQS) - 1) &
-                                      (~(1UL << IRQ_RESCHEDULE));
-static DEFINE_SPINLOCK(available_irqs_lock);
-#endif
-
 #if CHIP_HAS_IPI()
 /* Use SPRs to manipulate device interrupts. */
 #define mask_irqs(irq_mask) __insn_mtspr(SPR_IPI_MASK_SET_K, irq_mask)
@@ -278,38 +271,11 @@ int arch_show_interrupts(struct seq_file *p, int prec)
         return 0;
 }
 
-/*
- * Generic, controller-independent functions:
- */
-
 #if CHIP_HAS_IPI()
-int create_irq(void)
+int arch_setup_hwirq(unsigned int irq, int node)
 {
-        unsigned long flags;
-        int result;
-
-        spin_lock_irqsave(&available_irqs_lock, flags);
-        if (available_irqs == 0)
-                result = -ENOMEM;
-        else {
-                result = __ffs(available_irqs);
-                available_irqs &= ~(1UL << result);
-                dynamic_irq_init(result);
-        }
-        spin_unlock_irqrestore(&available_irqs_lock, flags);
-
-        return result;
+        return irq >= NR_IRQS ? -EINVAL : 0;
 }
-EXPORT_SYMBOL(create_irq);
 
-void destroy_irq(unsigned int irq)
-{
-        unsigned long flags;
-
-        spin_lock_irqsave(&available_irqs_lock, flags);
-        available_irqs |= (1UL << irq);
-        dynamic_irq_cleanup(irq);
-        spin_unlock_irqrestore(&available_irqs_lock, flags);
-}
-EXPORT_SYMBOL(destroy_irq);
+void arch_teardown_hwirq(unsigned int irq) { }
 #endif
diff --git a/arch/tile/kernel/pci_gx.c b/arch/tile/kernel/pci_gx.c
index 077b7bc437e5..e39f9c542807 100644
--- a/arch/tile/kernel/pci_gx.c
+++ b/arch/tile/kernel/pci_gx.c
@@ -350,10 +350,9 @@ static int tile_init_irqs(struct pci_controller *controller)
                 int cpu;
 
                 /* Ask the kernel to allocate an IRQ. */
-                irq = create_irq();
-                if (irq < 0) {
+                irq = irq_alloc_hwirq(-1);
+                if (!irq) {
                         pr_err("PCI: no free irq vectors, failed for %d\n", i);
-
                         goto free_irqs;
                 }
                 controller->irq_intx_table[i] = irq;
@@ -382,7 +381,7 @@ static int tile_init_irqs(struct pci_controller *controller)
 
 free_irqs:
         for (j = 0; j < i; j++)
-                destroy_irq(controller->irq_intx_table[j]);
+                irq_free_hwirq(controller->irq_intx_table[j]);
 
         return -1;
 }
@@ -1500,9 +1499,9 @@ int arch_setup_msi_irq(struct pci_dev *pdev, struct msi_desc *desc)
         int irq;
         int ret;
 
-        irq = create_irq();
-        if (irq < 0)
-                return irq;
+        irq = irq_alloc_hwirq(-1);
+        if (!irq)
+                return -ENOSPC;
 
         /*
          * Since we use a 64-bit Mem-Map to accept the MSI write, we fail
@@ -1601,11 +1600,11 @@ hv_msi_config_failure:
         /* Free mem-map */
 msi_mem_map_alloc_failure:
 is_64_failure:
-        destroy_irq(irq);
+        irq_free_hwirq(irq);
         return ret;
 }
 
 void arch_teardown_msi_irq(unsigned int irq)
 {
-        destroy_irq(irq);
+        irq_free_hwirq(irq);
 }
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
index 7d5feb5908dd..7a01d4335029 100644
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@ -833,6 +833,7 @@ config X86_LOCAL_APIC
 config X86_IO_APIC
         def_bool y
         depends on X86_64 || SMP || X86_32_NON_STANDARD || X86_UP_IOAPIC || PCI_MSI
+        select GENERIC_IRQ_LEGACY_ALLOC_HWIRQ
 
 config X86_REROUTE_FOR_BROKEN_BOOT_IRQS
         bool "Reroute for broken boot IRQs"
diff --git a/arch/x86/include/asm/io_apic.h b/arch/x86/include/asm/io_apic.h
index 459e50a424d1..90f97b4b9347 100644
--- a/arch/x86/include/asm/io_apic.h
+++ b/arch/x86/include/asm/io_apic.h
@@ -168,8 +168,6 @@ extern int save_ioapic_entries(void);
 extern void mask_ioapic_entries(void);
 extern int restore_ioapic_entries(void);
 
-extern int get_nr_irqs_gsi(void);
-
 extern void setup_ioapic_ids_from_mpc(void);
 extern void setup_ioapic_ids_from_mpc_nocheck(void);
 
diff --git a/arch/x86/include/asm/irq_remapping.h b/arch/x86/include/asm/irq_remapping.h
index d806b228d2c0..b7747c4c2cf2 100644
--- a/arch/x86/include/asm/irq_remapping.h
+++ b/arch/x86/include/asm/irq_remapping.h
@@ -103,4 +103,7 @@ static inline bool setup_remapped_irq(int irq,
 }
 #endif /* CONFIG_IRQ_REMAP */
 
+#define dmar_alloc_hwirq()      irq_alloc_hwirq(-1)
+#define dmar_free_hwirq         irq_free_hwirq
+
 #endif /* __X86_IRQ_REMAPPING_H */
diff --git a/arch/x86/kernel/apic/io_apic.c b/arch/x86/kernel/apic/io_apic.c
index 992060e09897..9d0a9795a0f8 100644
--- a/arch/x86/kernel/apic/io_apic.c
+++ b/arch/x86/kernel/apic/io_apic.c
@@ -206,9 +206,6 @@ int __init arch_early_irq_init(void)
         count = ARRAY_SIZE(irq_cfgx);
         node = cpu_to_node(0);
 
-        /* Make sure the legacy interrupts are marked in the bitmap */
-        irq_reserve_irqs(0, legacy_pic->nr_legacy_irqs);
-
         for (i = 0; i < count; i++) {
                 irq_set_chip_data(i, &cfg[i]);
                 zalloc_cpumask_var_node(&cfg[i].domain, GFP_KERNEL, node);
@@ -281,18 +278,6 @@ static struct irq_cfg *alloc_irq_and_cfg_at(unsigned int at, int node)
         return cfg;
 }
 
-static int alloc_irqs_from(unsigned int from, unsigned int count, int node)
-{
-        return irq_alloc_descs_from(from, count, node);
-}
-
-static void free_irq_at(unsigned int at, struct irq_cfg *cfg)
-{
-        free_irq_cfg(at, cfg);
-        irq_free_desc(at);
-}
-
-
 struct io_apic {
         unsigned int index;
         unsigned int unused[3];
@@ -2916,98 +2901,39 @@ static int __init ioapic_init_ops(void)
 device_initcall(ioapic_init_ops);
 
 /*
- * Dynamic irq allocate and deallocation
+ * Dynamic irq allocate and deallocation. Should be replaced by irq domains!
  */
-unsigned int __create_irqs(unsigned int from, unsigned int count, int node)
+int arch_setup_hwirq(unsigned int irq, int node)
 {
-        struct irq_cfg **cfg;
+        struct irq_cfg *cfg;
         unsigned long flags;
-        int irq, i;
-
-        if (from < nr_irqs_gsi)
-                from = nr_irqs_gsi;
+        int ret;
 
-        cfg = kzalloc_node(count * sizeof(cfg[0]), GFP_KERNEL, node);
+        cfg = alloc_irq_cfg(irq, node);
         if (!cfg)
-                return 0;
-
-        irq = alloc_irqs_from(from, count, node);
-        if (irq < 0)
-                goto out_cfgs;
-
-        for (i = 0; i < count; i++) {
-                cfg[i] = alloc_irq_cfg(irq + i, node);
-                if (!cfg[i])
-                        goto out_irqs;
-        }
+                return -ENOMEM;
 
         raw_spin_lock_irqsave(&vector_lock, flags);
-        for (i = 0; i < count; i++)
-                if (__assign_irq_vector(irq + i, cfg[i], apic->target_cpus()))
-                        goto out_vecs;
-        raw_spin_unlock_irqrestore(&vector_lock, flags);
-
-        for (i = 0; i < count; i++) {
-                irq_set_chip_data(irq + i, cfg[i]);
-                irq_clear_status_flags(irq + i, IRQ_NOREQUEST);
-        }
-
-        kfree(cfg);
-        return irq;
-
-out_vecs:
-        for (i--; i >= 0; i--)
-                __clear_irq_vector(irq + i, cfg[i]);
+        ret = __assign_irq_vector(irq, cfg, apic->target_cpus());
         raw_spin_unlock_irqrestore(&vector_lock, flags);
-out_irqs:
-        for (i = 0; i < count; i++)
-                free_irq_at(irq + i, cfg[i]);
-out_cfgs:
-        kfree(cfg);
-        return 0;
-}
 
-unsigned int create_irq_nr(unsigned int from, int node)
-{
-        return __create_irqs(from, 1, node);
-}
-
-int create_irq(void)
-{
-        int node = cpu_to_node(0);
-        unsigned int irq_want;
-        int irq;
-
-        irq_want = nr_irqs_gsi;
-        irq = create_irq_nr(irq_want, node);
-
-        if (irq == 0)
-                irq = -1;
-
-        return irq;
+        if (!ret)
+                irq_set_chip_data(irq, cfg);
+        else
+                free_irq_cfg(irq, cfg);
+        return ret;
 }
 
-void destroy_irq(unsigned int irq)
+void arch_teardown_hwirq(unsigned int irq)
 {
         struct irq_cfg *cfg = irq_get_chip_data(irq);
         unsigned long flags;
 
-        irq_set_status_flags(irq, IRQ_NOREQUEST|IRQ_NOPROBE);
-
         free_remapped_irq(irq);
-
         raw_spin_lock_irqsave(&vector_lock, flags);
         __clear_irq_vector(irq, cfg);
         raw_spin_unlock_irqrestore(&vector_lock, flags);
-        free_irq_at(irq, cfg);
-}
-
-void destroy_irqs(unsigned int irq, unsigned int count)
-{
-        unsigned int i;
-
-        for (i = 0; i < count; i++)
-                destroy_irq(irq + i);
+        free_irq_cfg(irq, cfg);
 }
 
 /*
@@ -3136,8 +3062,8 @@ int setup_msi_irq(struct pci_dev *dev, struct msi_desc *msidesc,
 
 int native_setup_msi_irqs(struct pci_dev *dev, int nvec, int type)
 {
-        unsigned int irq, irq_want;
         struct msi_desc *msidesc;
+        unsigned int irq;
         int node, ret;
 
         /* Multiple MSI vectors only supported with interrupt remapping */
@@ -3145,28 +3071,25 @@ int native_setup_msi_irqs(struct pci_dev *dev, int nvec, int type)
                 return 1;
 
         node = dev_to_node(&dev->dev);
-        irq_want = nr_irqs_gsi;
+
         list_for_each_entry(msidesc, &dev->msi_list, list) {
-                irq = create_irq_nr(irq_want, node);
-                if (irq == 0)
+                irq = irq_alloc_hwirq(node);
+                if (!irq)
                         return -ENOSPC;
 
-                irq_want = irq + 1;
-
                 ret = setup_msi_irq(dev, msidesc, irq, 0);
-                if (ret < 0)
-                        goto error;
+                if (ret < 0) {
+                        irq_free_hwirq(irq);
+                        return ret;
+                }
+
         }
         return 0;
-
-error:
-        destroy_irq(irq);
-        return ret;
 }
 
 void native_teardown_msi_irq(unsigned int irq)
 {
-        destroy_irq(irq);
+        irq_free_hwirq(irq);
 }
 
 #ifdef CONFIG_DMAR_TABLE
@@ -3420,11 +3343,6 @@ static void __init probe_nr_irqs_gsi(void)
         printk(KERN_DEBUG "nr_irqs_gsi: %d\n", nr_irqs_gsi);
 }
 
-int get_nr_irqs_gsi(void)
-{
-        return nr_irqs_gsi;
-}
-
 unsigned int arch_dynirq_lower_bound(unsigned int from)
 {
         return from < nr_irqs_gsi ? nr_irqs_gsi : from;
diff --git a/arch/x86/kernel/hpet.c b/arch/x86/kernel/hpet.c
index 4177bfbc80b0..5f5a147d1cd2 100644
--- a/arch/x86/kernel/hpet.c
+++ b/arch/x86/kernel/hpet.c
@@ -479,7 +479,7 @@ static int hpet_msi_next_event(unsigned long delta,
 static int hpet_setup_msi_irq(unsigned int irq)
 {
         if (x86_msi.setup_hpet_msi(irq, hpet_blockid)) {
-                destroy_irq(irq);
+                irq_free_hwirq(irq);
                 return -EINVAL;
         }
         return 0;
@@ -487,9 +487,8 @@ static int hpet_setup_msi_irq(unsigned int irq)
 
 static int hpet_assign_irq(struct hpet_dev *dev)
 {
-        unsigned int irq;
+        unsigned int irq = irq_alloc_hwirq(-1);
 
-        irq = create_irq_nr(0, -1);
         if (!irq)
                 return -EINVAL;
 
diff --git a/arch/x86/platform/uv/uv_irq.c b/arch/x86/platform/uv/uv_irq.c
index acf7752da952..b233681af4de 100644
--- a/arch/x86/platform/uv/uv_irq.c
+++ b/arch/x86/platform/uv/uv_irq.c
@@ -238,11 +238,9 @@ uv_set_irq_affinity(struct irq_data *data, const struct cpumask *mask,
 int uv_setup_irq(char *irq_name, int cpu, int mmr_blade,
                  unsigned long mmr_offset, int limit)
 {
-        int irq, ret;
+        int ret, irq = irq_alloc_hwirq(uv_blade_to_memory_nid(mmr_blade));
 
-        irq = create_irq_nr(NR_IRQS_LEGACY, uv_blade_to_memory_nid(mmr_blade));
-
-        if (irq <= 0)
+        if (!irq)
                 return -EBUSY;
 
         ret = arch_enable_uv_irq(irq_name, irq, cpu, mmr_blade, mmr_offset,
@@ -250,7 +248,7 @@ int uv_setup_irq(char *irq_name, int cpu, int mmr_blade,
         if (ret == irq)
                 uv_set_irq_2_mmr_info(irq, mmr_offset, mmr_blade);
         else
-                destroy_irq(irq);
+                irq_free_hwirq(irq);
 
         return ret;
 }
@@ -285,6 +283,6 @@ void uv_teardown_irq(unsigned int irq)
                         n = n->rb_right;
         }
         spin_unlock_irqrestore(&uv_irq_lock, irqflags);
-        destroy_irq(irq);
+        irq_free_hwirq(irq);
 }
 EXPORT_SYMBOL_GPL(uv_teardown_irq);