Merge branch 'x86/core' into perfcounters/core

Conflicts:
	arch/x86/Kconfig
	arch/x86/kernel/apic.c
	arch/x86/kernel/setup_percpu.c

20 files changed, 239 insertions, 144 deletions

diff --git a/drivers/acpi/acpica/tbxface.c b/drivers/acpi/acpica/tbxface.c
index c3e841f3cde..ab0aff3c7d6 100644
--- a/drivers/acpi/acpica/tbxface.c
+++ b/drivers/acpi/acpica/tbxface.c
@@ -365,7 +365,7 @@ ACPI_EXPORT_SYMBOL(acpi_unload_table_id)
 
 /*******************************************************************************
  *
- * FUNCTION:    acpi_get_table
+ * FUNCTION:    acpi_get_table_with_size
  *
  * PARAMETERS:  Signature           - ACPI signature of needed table
  *              Instance            - Which instance (for SSDTs)
@@ -377,8 +377,9 @@ ACPI_EXPORT_SYMBOL(acpi_unload_table_id)
  *
  *****************************************************************************/
 acpi_status
-acpi_get_table(char *signature,
-               u32 instance, struct acpi_table_header **out_table)
+acpi_get_table_with_size(char *signature,
+               u32 instance, struct acpi_table_header **out_table,
+               acpi_size *tbl_size)
 {
        u32 i;
        u32 j;
@@ -408,6 +409,7 @@ acpi_get_table(char *signature,
                     acpi_tb_verify_table(&acpi_gbl_root_table_list.tables[i]);
                 if (ACPI_SUCCESS(status)) {
                         *out_table = acpi_gbl_root_table_list.tables[i].pointer;
+                        *tbl_size = acpi_gbl_root_table_list.tables[i].length;
                 }
 
                 if (!acpi_gbl_permanent_mmap) {
@@ -420,6 +422,15 @@ acpi_get_table(char *signature,
         return (AE_NOT_FOUND);
 }
 
+acpi_status
+acpi_get_table(char *signature,
+               u32 instance, struct acpi_table_header **out_table)
+{
+        acpi_size tbl_size;
+
+        return acpi_get_table_with_size(signature,
+                       instance, out_table, &tbl_size);
+}
 ACPI_EXPORT_SYMBOL(acpi_get_table)
 
 /*******************************************************************************
diff --git a/drivers/acpi/osl.c b/drivers/acpi/osl.c
index b3193ec0a2e..d1dd5160daa 100644
--- a/drivers/acpi/osl.c
+++ b/drivers/acpi/osl.c
@@ -274,12 +274,19 @@ EXPORT_SYMBOL_GPL(acpi_os_map_memory);
 
 void acpi_os_unmap_memory(void __iomem * virt, acpi_size size)
 {
-        if (acpi_gbl_permanent_mmap) {
+        if (acpi_gbl_permanent_mmap)
                 iounmap(virt);
-        }
+        else
+                __acpi_unmap_table(virt, size);
 }
 EXPORT_SYMBOL_GPL(acpi_os_unmap_memory);
 
+void early_acpi_os_unmap_memory(void __iomem * virt, acpi_size size)
+{
+        if (!acpi_gbl_permanent_mmap)
+                __acpi_unmap_table(virt, size);
+}
+
 #ifdef ACPI_FUTURE_USAGE
 acpi_status
 acpi_os_get_physical_address(void *virt, acpi_physical_address * phys)
diff --git a/drivers/acpi/tables.c b/drivers/acpi/tables.c
index a8852952fac..fec1ae36d43 100644
--- a/drivers/acpi/tables.c
+++ b/drivers/acpi/tables.c
@@ -181,14 +181,15 @@ acpi_table_parse_entries(char *id,
         struct acpi_subtable_header *entry;
         unsigned int count = 0;
         unsigned long table_end;
+        acpi_size tbl_size;
 
         if (!handler)
                 return -EINVAL;
 
         if (strncmp(id, ACPI_SIG_MADT, 4) == 0)
-                acpi_get_table(id, acpi_apic_instance, &table_header);
+                acpi_get_table_with_size(id, acpi_apic_instance, &table_header, &tbl_size);
         else
-                acpi_get_table(id, 0, &table_header);
+                acpi_get_table_with_size(id, 0, &table_header, &tbl_size);
 
         if (!table_header) {
                 printk(KERN_WARNING PREFIX "%4.4s not present\n", id);
@@ -206,8 +207,10 @@ acpi_table_parse_entries(char *id,
                table_end) {
                 if (entry->type == entry_id
                     && (!max_entries || count++ < max_entries))
-                        if (handler(entry, table_end))
+                        if (handler(entry, table_end)) {
+                                early_acpi_os_unmap_memory((char *)table_header, tbl_size);
                                 return -EINVAL;
+                        }
 
                 entry = (struct acpi_subtable_header *)
                     ((unsigned long)entry + entry->length);
@@ -217,6 +220,7 @@ acpi_table_parse_entries(char *id,
                        "%i found\n", id, entry_id, count - max_entries, count);
         }
 
+        early_acpi_os_unmap_memory((char *)table_header, tbl_size);
         return count;
 }
 
@@ -241,17 +245,19 @@ acpi_table_parse_madt(enum acpi_madt_type id,
 int __init acpi_table_parse(char *id, acpi_table_handler handler)
 {
         struct acpi_table_header *table = NULL;
+        acpi_size tbl_size;
 
         if (!handler)
                 return -EINVAL;
 
         if (strncmp(id, ACPI_SIG_MADT, 4) == 0)
-                acpi_get_table(id, acpi_apic_instance, &table);
+                acpi_get_table_with_size(id, acpi_apic_instance, &table, &tbl_size);
         else
-                acpi_get_table(id, 0, &table);
+                acpi_get_table_with_size(id, 0, &table, &tbl_size);
 
         if (table) {
                 handler(table);
+                early_acpi_os_unmap_memory(table, tbl_size);
                 return 0;
         } else
                 return 1;
@@ -265,8 +271,9 @@ int __init acpi_table_parse(char *id, acpi_table_handler handler)
 static void __init check_multiple_madt(void)
 {
         struct acpi_table_header *table = NULL;
+        acpi_size tbl_size;
 
-        acpi_get_table(ACPI_SIG_MADT, 2, &table);
+        acpi_get_table_with_size(ACPI_SIG_MADT, 2, &table, &tbl_size);
         if (table) {
                 printk(KERN_WARNING PREFIX
                        "BIOS bug: multiple APIC/MADT found,"
@@ -275,6 +282,7 @@ static void __init check_multiple_madt(void)
                        "If \"acpi_apic_instance=%d\" works better, "
                        "notify linux-acpi@vger.kernel.org\n",
                        acpi_apic_instance ? 0 : 2);
+                early_acpi_os_unmap_memory(table, tbl_size);
 
         } else
                 acpi_apic_instance = 0;
diff --git a/drivers/clocksource/acpi_pm.c b/drivers/clocksource/acpi_pm.c
index e1129fad96d..ee19b6e8fcb 100644
--- a/drivers/clocksource/acpi_pm.c
+++ b/drivers/clocksource/acpi_pm.c
@@ -143,7 +143,7 @@ DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_SERVERWORKS, PCI_DEVICE_ID_SERVERWORKS_LE,
 #endif
 
 #ifndef CONFIG_X86_64
-#include "mach_timer.h"
+#include <asm/mach_timer.h>
 #define PMTMR_EXPECTED_RATE \
   ((CALIBRATE_LATCH * (PMTMR_TICKS_PER_SEC >> 10)) / (CLOCK_TICK_RATE>>10))
 /*
diff --git a/drivers/clocksource/cyclone.c b/drivers/clocksource/cyclone.c
index 1bde303b970..8615059a872 100644
--- a/drivers/clocksource/cyclone.c
+++ b/drivers/clocksource/cyclone.c
@@ -7,7 +7,7 @@
 #include <asm/pgtable.h>
 #include <asm/io.h>
 
-#include "mach_timer.h"
+#include <asm/mach_timer.h>
 
 #define CYCLONE_CBAR_ADDR       0xFEB00CD0      /* base address ptr */
 #define CYCLONE_PMCC_OFFSET     0x51A0          /* offset to control register */
diff --git a/drivers/eisa/Kconfig b/drivers/eisa/Kconfig
index c0646576cf4..2705284f622 100644
--- a/drivers/eisa/Kconfig
+++ b/drivers/eisa/Kconfig
@@ -3,7 +3,7 @@
 #
 config EISA_VLB_PRIMING
         bool "Vesa Local Bus priming"
-        depends on X86_PC && EISA
+        depends on X86 && EISA
         default n
         ---help---
           Activate this option if your system contains a Vesa Local
@@ -24,11 +24,11 @@ config EISA_PCI_EISA
           When in doubt, say Y.
 
 # Using EISA_VIRTUAL_ROOT on something other than an Alpha or
-# an X86_PC may lead to crashes...
+# an X86 may lead to crashes...
 
 config EISA_VIRTUAL_ROOT
         bool "EISA virtual root device"
-        depends on EISA && (ALPHA || X86_PC)
+        depends on EISA && (ALPHA || X86)
         default y
         ---help---
           Activate this option if your system only have EISA bus
diff --git a/drivers/firmware/iscsi_ibft.c b/drivers/firmware/iscsi_ibft.c
index 3ab3e4a41d6..7b7ddc2d51c 100644
--- a/drivers/firmware/iscsi_ibft.c
+++ b/drivers/firmware/iscsi_ibft.c
@@ -938,8 +938,8 @@ static int __init ibft_init(void)
                 return -ENOMEM;
 
         if (ibft_addr) {
-                printk(KERN_INFO "iBFT detected at 0x%lx.\n",
-                       virt_to_phys((void *)ibft_addr));
+                printk(KERN_INFO "iBFT detected at 0x%llx.\n",
+                       (u64)virt_to_phys((void *)ibft_addr));
 
                 rc = ibft_check_device();
                 if (rc)
diff --git a/drivers/gpu/drm/drm_proc.c b/drivers/gpu/drm/drm_proc.c
index 8df849f6683..b756f043a5f 100644
--- a/drivers/gpu/drm/drm_proc.c
+++ b/drivers/gpu/drm/drm_proc.c
@@ -678,9 +678,9 @@ static int drm__vma_info(char *buf, char **start, off_t offset, int request,
         *start = &buf[offset];
         *eof = 0;
 
-        DRM_PROC_PRINT("vma use count: %d, high_memory = %p, 0x%08lx\n",
+        DRM_PROC_PRINT("vma use count: %d, high_memory = %p, 0x%llx\n",
                        atomic_read(&dev->vma_count),
-                       high_memory, virt_to_phys(high_memory));
+                       high_memory, (u64)virt_to_phys(high_memory));
         list_for_each_entry(pt, &dev->vmalist, head) {
                 if (!(vma = pt->vma))
                         continue;
diff --git a/drivers/input/keyboard/Kconfig b/drivers/input/keyboard/Kconfig
index 35561689ff3..ea2638b4198 100644
--- a/drivers/input/keyboard/Kconfig
+++ b/drivers/input/keyboard/Kconfig
@@ -13,11 +13,11 @@ menuconfig INPUT_KEYBOARD
 if INPUT_KEYBOARD
 
 config KEYBOARD_ATKBD
-        tristate "AT keyboard" if EMBEDDED || !X86_PC
+        tristate "AT keyboard" if EMBEDDED || !X86
         default y
         select SERIO
         select SERIO_LIBPS2
-        select SERIO_I8042 if X86_PC
+        select SERIO_I8042 if X86
         select SERIO_GSCPS2 if GSC
         help
           Say Y here if you want to use a standard AT or PS/2 keyboard. Usually
diff --git a/drivers/input/mouse/Kconfig b/drivers/input/mouse/Kconfig
index 093c8c1bca7..9bef935ef19 100644
--- a/drivers/input/mouse/Kconfig
+++ b/drivers/input/mouse/Kconfig
@@ -17,7 +17,7 @@ config MOUSE_PS2
         default y
         select SERIO
         select SERIO_LIBPS2
-        select SERIO_I8042 if X86_PC
+        select SERIO_I8042 if X86
         select SERIO_GSCPS2 if GSC
         help
           Say Y here if you have a PS/2 mouse connected to your system. This
diff --git a/drivers/misc/sgi-gru/gru.h b/drivers/misc/sgi-gru/gru.h
index 1b5f579df15..f93f03a9e6e 100644
--- a/drivers/misc/sgi-gru/gru.h
+++ b/drivers/misc/sgi-gru/gru.h
@@ -19,8 +19,6 @@
 #ifndef __GRU_H__
 #define __GRU_H__
 
-#include <asm/uv/uv.h>
-
 /*
  * GRU architectural definitions
  */
diff --git a/drivers/misc/sgi-gru/grufile.c b/drivers/misc/sgi-gru/grufile.c
index 65098380639..c67e4e8bd62 100644
--- a/drivers/misc/sgi-gru/grufile.c
+++ b/drivers/misc/sgi-gru/grufile.c
@@ -36,23 +36,11 @@
 #include <linux/interrupt.h>
 #include <linux/proc_fs.h>
 #include <linux/uaccess.h>
+#include <asm/uv/uv.h>
 #include "gru.h"
 #include "grulib.h"
 #include "grutables.h"
 
-#if defined CONFIG_X86_64
-#include <asm/genapic.h>
-#include <asm/irq.h>
-#define IS_UV()         is_uv_system()
-#elif defined CONFIG_IA64
-#include <asm/system.h>
-#include <asm/sn/simulator.h>
-/* temp support for running on hardware simulator */
-#define IS_UV()         IS_MEDUSA() || ia64_platform_is("uv")
-#else
-#define IS_UV()         0
-#endif
-
 #include <asm/uv/uv_hub.h>
 #include <asm/uv/uv_mmrs.h>
 
@@ -381,7 +369,7 @@ static int __init gru_init(void)
         char id[10];
         void *gru_start_vaddr;
 
-        if (!IS_UV())
+        if (!is_uv_system())
                 return 0;
 
 #if defined CONFIG_IA64
@@ -451,7 +439,7 @@ static void __exit gru_exit(void)
         int order = get_order(sizeof(struct gru_state) *
                               GRU_CHIPLETS_PER_BLADE);
 
-        if (!IS_UV())
+        if (!is_uv_system())
                 return;
 
         for (i = 0; i < GRU_CHIPLETS_PER_BLADE; i++)
diff --git a/drivers/misc/sgi-xp/xp.h b/drivers/misc/sgi-xp/xp.h
index 069ad3a1c2a..2275126cb33 100644
--- a/drivers/misc/sgi-xp/xp.h
+++ b/drivers/misc/sgi-xp/xp.h
@@ -15,21 +15,19 @@
 
 #include <linux/mutex.h>
 
+#if defined CONFIG_X86_UV || defined CONFIG_IA64_SGI_UV
 #include <asm/uv/uv.h>
+#define is_uv()         is_uv_system()
+#endif
+
+#ifndef is_uv
+#define is_uv()         0
+#endif
 
-#ifdef CONFIG_IA64
+#if defined CONFIG_IA64
 #include <asm/system.h>
 #include <asm/sn/arch.h>        /* defines is_shub1() and is_shub2() */
 #define is_shub()       ia64_platform_is("sn2")
-#ifdef CONFIG_IA64_SGI_UV
-#define is_uv()         ia64_platform_is("uv")
-#else
-#define is_uv()         0
-#endif
-#endif
-#ifdef CONFIG_X86_64
-#include <asm/genapic.h>
-#define is_uv()         is_uv_system()
 #endif
 
 #ifndef is_shub1
@@ -44,10 +42,6 @@
 #define is_shub()       0
 #endif
 
-#ifndef is_uv
-#define is_uv()         0
-#endif
-
 #ifdef USE_DBUG_ON
 #define DBUG_ON(condition)      BUG_ON(condition)
 #else
diff --git a/drivers/mtd/nand/Kconfig b/drivers/mtd/nand/Kconfig
index 8b12e6e109d..2ff88791ceb 100644
--- a/drivers/mtd/nand/Kconfig
+++ b/drivers/mtd/nand/Kconfig
@@ -273,7 +273,7 @@ config MTD_NAND_CAFE
 
 config MTD_NAND_CS553X
         tristate "NAND support for CS5535/CS5536 (AMD Geode companion chip)"
-        depends on X86_32 && (X86_PC || X86_GENERICARCH)
+        depends on X86_32
         help
           The CS553x companion chips for the AMD Geode processor
           include NAND flash controllers with built-in hardware ECC
diff --git a/drivers/net/ne3210.c b/drivers/net/ne3210.c
index fac43fd6fc8..6a843f7350a 100644
--- a/drivers/net/ne3210.c
+++ b/drivers/net/ne3210.c
@@ -150,7 +150,8 @@ static int __init ne3210_eisa_probe (struct device *device)
                 if (phys_mem < virt_to_phys(high_memory)) {
                         printk(KERN_CRIT "ne3210.c: Card RAM overlaps with normal memory!!!\n");
                         printk(KERN_CRIT "ne3210.c: Use EISA SCU to set card memory below 1MB,\n");
-                        printk(KERN_CRIT "ne3210.c: or to an address above 0x%lx.\n", virt_to_phys(high_memory));
+                        printk(KERN_CRIT "ne3210.c: or to an address above 0x%llx.\n",
+                                (u64)virt_to_phys(high_memory));
                         printk(KERN_CRIT "ne3210.c: Driver NOT installed.\n");
                         retval = -EINVAL;
                         goto out3;
diff --git a/drivers/net/sfc/falcon.c b/drivers/net/sfc/falcon.c
index d5378e60fcd..064307c2277 100644
--- a/drivers/net/sfc/falcon.c
+++ b/drivers/net/sfc/falcon.c
@@ -338,10 +338,10 @@ static int falcon_alloc_special_buffer(struct efx_nic *efx,
         nic_data->next_buffer_table += buffer->entries;
 
         EFX_LOG(efx, "allocating special buffers %d-%d at %llx+%x "
-                "(virt %p phys %lx)\n", buffer->index,
+                "(virt %p phys %llx)\n", buffer->index,
                 buffer->index + buffer->entries - 1,
-                (unsigned long long)buffer->dma_addr, len,
-                buffer->addr, virt_to_phys(buffer->addr));
+                (u64)buffer->dma_addr, len,
+                buffer->addr, (u64)virt_to_phys(buffer->addr));
 
         return 0;
 }
@@ -353,10 +353,10 @@ static void falcon_free_special_buffer(struct efx_nic *efx,
                 return;
 
         EFX_LOG(efx, "deallocating special buffers %d-%d at %llx+%x "
-                "(virt %p phys %lx)\n", buffer->index,
+                "(virt %p phys %llx)\n", buffer->index,
                 buffer->index + buffer->entries - 1,
-                (unsigned long long)buffer->dma_addr, buffer->len,
-                buffer->addr, virt_to_phys(buffer->addr));
+                (u64)buffer->dma_addr, buffer->len,
+                buffer->addr, (u64)virt_to_phys(buffer->addr));
 
         pci_free_consistent(efx->pci_dev, buffer->len, buffer->addr,
                             buffer->dma_addr);
@@ -2343,10 +2343,10 @@ int falcon_probe_port(struct efx_nic *efx)
                                  FALCON_MAC_STATS_SIZE);
         if (rc)
                 return rc;
-        EFX_LOG(efx, "stats buffer at %llx (virt %p phys %lx)\n",
-                (unsigned long long)efx->stats_buffer.dma_addr,
+        EFX_LOG(efx, "stats buffer at %llx (virt %p phys %llx)\n",
+                (u64)efx->stats_buffer.dma_addr,
                 efx->stats_buffer.addr,
-                virt_to_phys(efx->stats_buffer.addr));
+                (u64)virt_to_phys(efx->stats_buffer.addr));
 
         return 0;
 }
@@ -2921,9 +2921,9 @@ int falcon_probe_nic(struct efx_nic *efx)
                 goto fail4;
         BUG_ON(efx->irq_status.dma_addr & 0x0f);
 
-        EFX_LOG(efx, "INT_KER at %llx (virt %p phys %lx)\n",
-                (unsigned long long)efx->irq_status.dma_addr,
-                efx->irq_status.addr, virt_to_phys(efx->irq_status.addr));
+        EFX_LOG(efx, "INT_KER at %llx (virt %p phys %llx)\n",
+                (u64)efx->irq_status.dma_addr,
+                efx->irq_status.addr, (u64)virt_to_phys(efx->irq_status.addr));
 
         falcon_probe_spi_devices(efx);
 
diff --git a/drivers/net/wireless/arlan-main.c b/drivers/net/wireless/arlan-main.c
index bfca15da6f0..14c11656e82 100644
--- a/drivers/net/wireless/arlan-main.c
+++ b/drivers/net/wireless/arlan-main.c
@@ -1082,8 +1082,8 @@ static int __init arlan_probe_here(struct net_device *dev,
         if (arlan_check_fingerprint(memaddr))
                 return -ENODEV;
 
-        printk(KERN_NOTICE "%s: Arlan found at %x, \n ", dev->name, 
-               (int) virt_to_phys((void*)memaddr));
+        printk(KERN_NOTICE "%s: Arlan found at %llx, \n ", dev->name, 
+               (u64) virt_to_phys((void*)memaddr));
 
         ap->card = (void *) memaddr;
         dev->mem_start = memaddr;
diff --git a/drivers/pci/dmar.c b/drivers/pci/dmar.c
index f5a662a50ac..519f5f91e76 100644
--- a/drivers/pci/dmar.c
+++ b/drivers/pci/dmar.c
@@ -42,6 +42,7 @@
 LIST_HEAD(dmar_drhd_units);
 
 static struct acpi_table_header * __initdata dmar_tbl;
+static acpi_size dmar_tbl_size;
 
 static void __init dmar_register_drhd_unit(struct dmar_drhd_unit *drhd)
 {
@@ -288,8 +289,9 @@ static int __init dmar_table_detect(void)
         acpi_status status = AE_OK;
 
         /* if we could find DMAR table, then there are DMAR devices */
-        status = acpi_get_table(ACPI_SIG_DMAR, 0,
-                                (struct acpi_table_header **)&dmar_tbl);
+        status = acpi_get_table_with_size(ACPI_SIG_DMAR, 0,
+                                (struct acpi_table_header **)&dmar_tbl,
+                                &dmar_tbl_size);
 
         if (ACPI_SUCCESS(status) && !dmar_tbl) {
                 printk (KERN_WARNING PREFIX "Unable to map DMAR\n");
@@ -481,6 +483,7 @@ void __init detect_intel_iommu(void)
                         iommu_detected = 1;
 #endif
         }
+        early_acpi_os_unmap_memory(dmar_tbl, dmar_tbl_size);
         dmar_tbl = NULL;
 }
 
diff --git a/drivers/watchdog/rdc321x_wdt.c b/drivers/watchdog/rdc321x_wdt.c
index bf92802f2bb..36e221beedc 100644
--- a/drivers/watchdog/rdc321x_wdt.c
+++ b/drivers/watchdog/rdc321x_wdt.c
@@ -37,7 +37,7 @@
 #include <linux/io.h>
 #include <linux/uaccess.h>
 
-#include <asm/mach-rdc321x/rdc321x_defs.h>
+#include <asm/rdc321x_defs.h>
 
 #define RDC_WDT_MASK    0x80000000 /* Mask */
 #define RDC_WDT_EN      0x00800000 /* Enable bit */
diff --git a/drivers/xen/events.c b/drivers/xen/events.c
index 3141e149d59..30963af5dba 100644
--- a/drivers/xen/events.c
+++ b/drivers/xen/events.c
@@ -30,6 +30,7 @@
 
 #include <asm/ptrace.h>
 #include <asm/irq.h>
+#include <asm/idle.h>
 #include <asm/sync_bitops.h>
 #include <asm/xen/hypercall.h>
 #include <asm/xen/hypervisor.h>
@@ -51,27 +52,43 @@ static DEFINE_PER_CPU(int, virq_to_irq[NR_VIRQS]) = {[0 ... NR_VIRQS-1] = -1};
 /* IRQ <-> IPI mapping */
 static DEFINE_PER_CPU(int, ipi_to_irq[XEN_NR_IPIS]) = {[0 ... XEN_NR_IPIS-1] = -1};
 
-/* Packed IRQ information: binding type, sub-type index, and event channel. */
-struct packed_irq
-{
-        unsigned short evtchn;
-        unsigned char index;
-        unsigned char type;
-};
-
-static struct packed_irq irq_info[NR_IRQS];
-
-/* Binding types. */
-enum {
-        IRQT_UNBOUND,
+/* Interrupt types. */
+enum xen_irq_type {
+        IRQT_UNBOUND = 0,
         IRQT_PIRQ,
         IRQT_VIRQ,
         IRQT_IPI,
         IRQT_EVTCHN
 };
 
-/* Convenient shorthand for packed representation of an unbound IRQ. */
-#define IRQ_UNBOUND     mk_irq_info(IRQT_UNBOUND, 0, 0)
+/*
+ * Packed IRQ information:
+ * type - enum xen_irq_type
+ * event channel - irq->event channel mapping
+ * cpu - cpu this event channel is bound to
+ * index - type-specific information:
+ *    PIRQ - vector, with MSB being "needs EIO"
+ *    VIRQ - virq number
+ *    IPI - IPI vector
+ *    EVTCHN -
+ */
+struct irq_info
+{
+        enum xen_irq_type type; /* type */
+        unsigned short evtchn;  /* event channel */
+        unsigned short cpu;     /* cpu bound */
+
+        union {
+                unsigned short virq;
+                enum ipi_vector ipi;
+                struct {
+                        unsigned short gsi;
+                        unsigned short vector;
+                } pirq;
+        } u;
+};
+
+static struct irq_info irq_info[NR_IRQS];
 
 static int evtchn_to_irq[NR_EVENT_CHANNELS] = {
         [0 ... NR_EVENT_CHANNELS-1] = -1
@@ -84,10 +101,6 @@ static inline unsigned long *cpu_evtchn_mask(int cpu)
 {
         return cpu_evtchn_mask_p[cpu].bits;
 }
-static u8 cpu_evtchn[NR_EVENT_CHANNELS];
-
-/* Reference counts for bindings to IRQs. */
-static int irq_bindcount[NR_IRQS];
 
 /* Xen will never allocate port zero for any purpose. */
 #define VALID_EVTCHN(chn)       ((chn) != 0)
@@ -95,27 +108,108 @@ static int irq_bindcount[NR_IRQS];
 static struct irq_chip xen_dynamic_chip;
 
 /* Constructor for packed IRQ information. */
-static inline struct packed_irq mk_irq_info(u32 type, u32 index, u32 evtchn)
+static struct irq_info mk_unbound_info(void)
+{
+        return (struct irq_info) { .type = IRQT_UNBOUND };
+}
+
+static struct irq_info mk_evtchn_info(unsigned short evtchn)
+{
+        return (struct irq_info) { .type = IRQT_EVTCHN, .evtchn = evtchn,
+                        .cpu = 0 };
+}
+
+static struct irq_info mk_ipi_info(unsigned short evtchn, enum ipi_vector ipi)
+{
+        return (struct irq_info) { .type = IRQT_IPI, .evtchn = evtchn,
+                        .cpu = 0, .u.ipi = ipi };
+}
+
+static struct irq_info mk_virq_info(unsigned short evtchn, unsigned short virq)
 {
-        return (struct packed_irq) { evtchn, index, type };
+        return (struct irq_info) { .type = IRQT_VIRQ, .evtchn = evtchn,
+                        .cpu = 0, .u.virq = virq };
+}
+
+static struct irq_info mk_pirq_info(unsigned short evtchn,
+                                    unsigned short gsi, unsigned short vector)
+{
+        return (struct irq_info) { .type = IRQT_PIRQ, .evtchn = evtchn,
+                        .cpu = 0, .u.pirq = { .gsi = gsi, .vector = vector } };
 }
 
 /*
  * Accessors for packed IRQ information.
  */
-static inline unsigned int evtchn_from_irq(int irq)
+static struct irq_info *info_for_irq(unsigned irq)
 {
-        return irq_info[irq].evtchn;
+        return &irq_info[irq];
 }
 
-static inline unsigned int index_from_irq(int irq)
+static unsigned int evtchn_from_irq(unsigned irq)
 {
-        return irq_info[irq].index;
+        return info_for_irq(irq)->evtchn;
 }
 
-static inline unsigned int type_from_irq(int irq)
+static enum ipi_vector ipi_from_irq(unsigned irq)
 {
-        return irq_info[irq].type;
+        struct irq_info *info = info_for_irq(irq);
+
+        BUG_ON(info == NULL);
+        BUG_ON(info->type != IRQT_IPI);
+
+        return info->u.ipi;
+}
+
+static unsigned virq_from_irq(unsigned irq)
+{
+        struct irq_info *info = info_for_irq(irq);
+
+        BUG_ON(info == NULL);
+        BUG_ON(info->type != IRQT_VIRQ);
+
+        return info->u.virq;
+}
+
+static unsigned gsi_from_irq(unsigned irq)
+{
+        struct irq_info *info = info_for_irq(irq);
+
+        BUG_ON(info == NULL);
+        BUG_ON(info->type != IRQT_PIRQ);
+
+        return info->u.pirq.gsi;
+}
+
+static unsigned vector_from_irq(unsigned irq)
+{
+        struct irq_info *info = info_for_irq(irq);
+
+        BUG_ON(info == NULL);
+        BUG_ON(info->type != IRQT_PIRQ);
+
+        return info->u.pirq.vector;
+}
+
+static enum xen_irq_type type_from_irq(unsigned irq)
+{
+        return info_for_irq(irq)->type;
+}
+
+static unsigned cpu_from_irq(unsigned irq)
+{
+        return info_for_irq(irq)->cpu;
+}
+
+static unsigned int cpu_from_evtchn(unsigned int evtchn)
+{
+        int irq = evtchn_to_irq[evtchn];
+        unsigned ret = 0;
+
+        if (irq != -1)
+                ret = cpu_from_irq(irq);
+
+        return ret;
 }
 
 static inline unsigned long active_evtchns(unsigned int cpu,
@@ -136,10 +230,10 @@ static void bind_evtchn_to_cpu(unsigned int chn, unsigned int cpu)
         cpumask_copy(irq_to_desc(irq)->affinity, cpumask_of(cpu));
 #endif
 
-        __clear_bit(chn, cpu_evtchn_mask(cpu_evtchn[chn]));
+        __clear_bit(chn, cpu_evtchn_mask(cpu_from_irq(irq)));
         __set_bit(chn, cpu_evtchn_mask(cpu));
 
-        cpu_evtchn[chn] = cpu;
+        irq_info[irq].cpu = cpu;
 }
 
 static void init_evtchn_cpu_bindings(void)
@@ -154,15 +248,9 @@ static void init_evtchn_cpu_bindings(void)
         }
 #endif
 
-        memset(cpu_evtchn, 0, sizeof(cpu_evtchn));
         memset(cpu_evtchn_mask(0), ~0, sizeof(cpu_evtchn_mask(0)));
 }
 
-static inline unsigned int cpu_from_evtchn(unsigned int evtchn)
-{
-        return cpu_evtchn[evtchn];
-}
-
 static inline void clear_evtchn(int port)
 {
         struct shared_info *s = HYPERVISOR_shared_info;
@@ -240,9 +328,8 @@ static int find_unbound_irq(void)
         int irq;
         struct irq_desc *desc;
 
-        /* Only allocate from dynirq range */
         for (irq = 0; irq < nr_irqs; irq++)
-                if (irq_bindcount[irq] == 0)
+                if (irq_info[irq].type == IRQT_UNBOUND)
                         break;
 
         if (irq == nr_irqs)
@@ -252,6 +339,8 @@ static int find_unbound_irq(void)
         if (WARN_ON(desc == NULL))
                 return -1;
 
+        dynamic_irq_init(irq);
+
         return irq;
 }
 
@@ -266,16 +355,13 @@ int bind_evtchn_to_irq(unsigned int evtchn)
         if (irq == -1) {
                 irq = find_unbound_irq();
 
-                dynamic_irq_init(irq);
                 set_irq_chip_and_handler_name(irq, &xen_dynamic_chip,
                                               handle_level_irq, "event");
 
                 evtchn_to_irq[evtchn] = irq;
-                irq_info[irq] = mk_irq_info(IRQT_EVTCHN, 0, evtchn);
+                irq_info[irq] = mk_evtchn_info(evtchn);
         }
 
-        irq_bindcount[irq]++;
-
         spin_unlock(&irq_mapping_update_lock);
 
         return irq;
@@ -290,12 +376,12 @@ static int bind_ipi_to_irq(unsigned int ipi, unsigned int cpu)
         spin_lock(&irq_mapping_update_lock);
 
         irq = per_cpu(ipi_to_irq, cpu)[ipi];
+
         if (irq == -1) {
                 irq = find_unbound_irq();
                 if (irq < 0)
                         goto out;
 
-                dynamic_irq_init(irq);
                 set_irq_chip_and_handler_name(irq, &xen_dynamic_chip,
                                               handle_level_irq, "ipi");
 
@@ -306,15 +392,12 @@ static int bind_ipi_to_irq(unsigned int ipi, unsigned int cpu)
                 evtchn = bind_ipi.port;
 
                 evtchn_to_irq[evtchn] = irq;
-                irq_info[irq] = mk_irq_info(IRQT_IPI, ipi, evtchn);
-
+                irq_info[irq] = mk_ipi_info(evtchn, ipi);
                 per_cpu(ipi_to_irq, cpu)[ipi] = irq;
 
                 bind_evtchn_to_cpu(evtchn, cpu);
         }
 
-        irq_bindcount[irq]++;
-
  out:
         spin_unlock(&irq_mapping_update_lock);
         return irq;
@@ -340,20 +423,17 @@ static int bind_virq_to_irq(unsigned int virq, unsigned int cpu)
 
                 irq = find_unbound_irq();
 
-                dynamic_irq_init(irq);
                 set_irq_chip_and_handler_name(irq, &xen_dynamic_chip,
                                               handle_level_irq, "virq");
 
                 evtchn_to_irq[evtchn] = irq;
-                irq_info[irq] = mk_irq_info(IRQT_VIRQ, virq, evtchn);
+                irq_info[irq] = mk_virq_info(evtchn, virq);
 
                 per_cpu(virq_to_irq, cpu)[virq] = irq;
 
                 bind_evtchn_to_cpu(evtchn, cpu);
         }
 
-        irq_bindcount[irq]++;
-
         spin_unlock(&irq_mapping_update_lock);
 
         return irq;
@@ -366,7 +446,7 @@ static void unbind_from_irq(unsigned int irq)
 
         spin_lock(&irq_mapping_update_lock);
 
-        if ((--irq_bindcount[irq] == 0) && VALID_EVTCHN(evtchn)) {
+        if (VALID_EVTCHN(evtchn)) {
                 close.port = evtchn;
                 if (HYPERVISOR_event_channel_op(EVTCHNOP_close, &close) != 0)
                         BUG();
@@ -374,11 +454,11 @@ static void unbind_from_irq(unsigned int irq)
                 switch (type_from_irq(irq)) {
                 case IRQT_VIRQ:
                         per_cpu(virq_to_irq, cpu_from_evtchn(evtchn))
-                                [index_from_irq(irq)] = -1;
+                                [virq_from_irq(irq)] = -1;
                         break;
                 case IRQT_IPI:
                         per_cpu(ipi_to_irq, cpu_from_evtchn(evtchn))
-                                [index_from_irq(irq)] = -1;
+                                [ipi_from_irq(irq)] = -1;
                         break;
                 default:
                         break;
@@ -388,7 +468,7 @@ static void unbind_from_irq(unsigned int irq)
                 bind_evtchn_to_cpu(evtchn, 0);
 
                 evtchn_to_irq[evtchn] = -1;
-                irq_info[irq] = IRQ_UNBOUND;
+                irq_info[irq] = mk_unbound_info();
 
                 dynamic_irq_cleanup(irq);
         }
@@ -506,8 +586,8 @@ irqreturn_t xen_debug_interrupt(int irq, void *dev_id)
         for(i = 0; i < NR_EVENT_CHANNELS; i++) {
                 if (sync_test_bit(i, sh->evtchn_pending)) {
                         printk("  %d: event %d -> irq %d\n",
-                                cpu_evtchn[i], i,
-                                evtchn_to_irq[i]);
+                               cpu_from_evtchn(i), i,
+                               evtchn_to_irq[i]);
                 }
         }
 
@@ -516,7 +596,6 @@ irqreturn_t xen_debug_interrupt(int irq, void *dev_id)
         return IRQ_HANDLED;
 }
 
-
 /*
  * Search the CPUs pending events bitmasks.  For each one found, map
  * the event number to an irq, and feed it into do_IRQ() for
@@ -529,11 +608,15 @@ irqreturn_t xen_debug_interrupt(int irq, void *dev_id)
 void xen_evtchn_do_upcall(struct pt_regs *regs)
 {
         int cpu = get_cpu();
+        struct pt_regs *old_regs = set_irq_regs(regs);
         struct shared_info *s = HYPERVISOR_shared_info;
         struct vcpu_info *vcpu_info = __get_cpu_var(xen_vcpu);
         static DEFINE_PER_CPU(unsigned, nesting_count);
         unsigned count;
 
+        exit_idle();
+        irq_enter();
+
         do {
                 unsigned long pending_words;
 
@@ -558,7 +641,7 @@ void xen_evtchn_do_upcall(struct pt_regs *regs)
                                 int irq = evtchn_to_irq[port];
 
                                 if (irq != -1)
-                                        xen_do_IRQ(irq, regs);
+                                        handle_irq(irq, regs);
                         }
                 }
 
@@ -569,12 +652,17 @@ void xen_evtchn_do_upcall(struct pt_regs *regs)
         } while(count != 1);
 
 out:
+        irq_exit();
+        set_irq_regs(old_regs);
+
         put_cpu();
 }
 
 /* Rebind a new event channel to an existing irq. */
 void rebind_evtchn_irq(int evtchn, int irq)
 {
+        struct irq_info *info = info_for_irq(irq);
+
         /* Make sure the irq is masked, since the new event channel
            will also be masked. */
         disable_irq(irq);
@@ -584,11 +672,11 @@ void rebind_evtchn_irq(int evtchn, int irq)
         /* After resume the irq<->evtchn mappings are all cleared out */
         BUG_ON(evtchn_to_irq[evtchn] != -1);
         /* Expect irq to have been bound before,
-           so the bindcount should be non-0 */
-        BUG_ON(irq_bindcount[irq] == 0);
+           so there should be a proper type */
+        BUG_ON(info->type == IRQT_UNBOUND);
 
         evtchn_to_irq[evtchn] = irq;
-        irq_info[irq] = mk_irq_info(IRQT_EVTCHN, 0, evtchn);
+        irq_info[irq] = mk_evtchn_info(evtchn);
 
         spin_unlock(&irq_mapping_update_lock);
 
@@ -698,8 +786,7 @@ static void restore_cpu_virqs(unsigned int cpu)
                 if ((irq = per_cpu(virq_to_irq, cpu)[virq]) == -1)
                         continue;
 
-                BUG_ON(irq_info[irq].type != IRQT_VIRQ);
-                BUG_ON(irq_info[irq].index != virq);
+                BUG_ON(virq_from_irq(irq) != virq);
 
                 /* Get a new binding from Xen. */
                 bind_virq.virq = virq;
@@ -711,7 +798,7 @@ static void restore_cpu_virqs(unsigned int cpu)
 
                 /* Record the new mapping. */
                 evtchn_to_irq[evtchn] = irq;
-                irq_info[irq] = mk_irq_info(IRQT_VIRQ, virq, evtchn);
+                irq_info[irq] = mk_virq_info(evtchn, virq);
                 bind_evtchn_to_cpu(evtchn, cpu);
 
                 /* Ready for use. */
@@ -728,8 +815,7 @@ static void restore_cpu_ipis(unsigned int cpu)
                 if ((irq = per_cpu(ipi_to_irq, cpu)[ipi]) == -1)
                         continue;
 
-                BUG_ON(irq_info[irq].type != IRQT_IPI);
-                BUG_ON(irq_info[irq].index != ipi);
+                BUG_ON(ipi_from_irq(irq) != ipi);
 
                 /* Get a new binding from Xen. */
                 bind_ipi.vcpu = cpu;
@@ -740,7 +826,7 @@ static void restore_cpu_ipis(unsigned int cpu)
 
                 /* Record the new mapping. */
                 evtchn_to_irq[evtchn] = irq;
-                irq_info[irq] = mk_irq_info(IRQT_IPI, ipi, evtchn);
+                irq_info[irq] = mk_ipi_info(evtchn, ipi);
                 bind_evtchn_to_cpu(evtchn, cpu);
 
                 /* Ready for use. */
@@ -820,8 +906,11 @@ void xen_irq_resume(void)
 
 static struct irq_chip xen_dynamic_chip __read_mostly = {
         .name           = "xen-dyn",
+
+        .disable        = disable_dynirq,
         .mask           = disable_dynirq,
         .unmask         = enable_dynirq,
+
         .ack            = ack_dynirq,
         .set_affinity   = set_affinity_irq,
         .retrigger      = retrigger_dynirq,
@@ -841,9 +930,5 @@ void __init xen_init_IRQ(void)
         for (i = 0; i < NR_EVENT_CHANNELS; i++)
                 mask_evtchn(i);
 
-        /* Dynamic IRQ space is currently unbound. Zero the refcnts. */
-        for (i = 0; i < nr_irqs; i++)
-                irq_bindcount[i] = 0;
-
         irq_ctx_init(smp_processor_id());
 }