43 files changed, 317 insertions, 283 deletions
diff --git a/arch/ia64/Kconfig b/arch/ia64/Kconfig
index 170042b420d4..6851e52ed5a2 100644
--- a/arch/ia64/Kconfig
+++ b/arch/ia64/Kconfig
@@ -89,6 +89,9 @@ config GENERIC_TIME_VSYSCALL
        bool
        default y
+config HAVE_LEGACY_PER_CPU_AREA
+        def_bool y
 config HAVE_SETUP_PER_CPU_AREA
        def_bool y
@@ -112,6 +115,10 @@ config IA64_UNCACHED_ALLOCATOR
        bool
        select GENERIC_ALLOCATOR
+config ARCH_USES_PG_UNCACHED
+        def_bool y
+        depends on IA64_UNCACHED_ALLOCATOR
 config AUDIT_ARCH
        bool
        default y
@@ -493,6 +500,10 @@ config HAVE_ARCH_NODEDATA_EXTENSION
        def_bool y
        depends on NUMA
+config ARCH_PROC_KCORE_TEXT
+        def_bool y
+        depends on PROC_KCORE
 config IA32_SUPPORT
        bool "Support for Linux/x86 binaries"
        help
diff --git a/arch/ia64/Makefile b/arch/ia64/Makefile
index 58a7e46affda..e7cbaa02cd0b 100644
--- a/arch/ia64/Makefile
+++ b/arch/ia64/Makefile
@@ -41,11 +41,6 @@ $(error Sorry, you need a newer version of the assember, one that is built from
                ftp://ftp.hpl.hp.com/pub/linux-ia64/gas-030124.tar.gz)
 endif
-ifeq ($(call cc-version),0304)
-        cflags-$(CONFIG_ITANIUM)        += -mtune=merced
-        cflags-$(CONFIG_MCKINLEY)       += -mtune=mckinley
-endif
 KBUILD_CFLAGS += $(cflags-y)
 head-y := arch/ia64/kernel/head.o arch/ia64/kernel/init_task.o
diff --git a/arch/ia64/hp/common/sba_iommu.c b/arch/ia64/hp/common/sba_iommu.c
index 8cfb001092ab..674a8374c6d9 100644
--- a/arch/ia64/hp/common/sba_iommu.c
+++ b/arch/ia64/hp/common/sba_iommu.c
@@ -2026,24 +2026,21 @@ acpi_sba_ioc_add(struct acpi_device *device)
        struct ioc *ioc;
        acpi_status status;
        u64 hpa, length;
-        struct acpi_buffer buffer;
        struct acpi_device_info *dev_info;
        status = hp_acpi_csr_space(device->handle, &hpa, &length);
        if (ACPI_FAILURE(status))
                return 1;
-        buffer.length = ACPI_ALLOCATE_LOCAL_BUFFER;
+        status = acpi_get_object_info(device->handle, &dev_info);
-        status = acpi_get_object_info(device->handle, &buffer);
        if (ACPI_FAILURE(status))
                return 1;
-        dev_info = buffer.pointer;
        /*
         * For HWP0001, only SBA appears in ACPI namespace.  It encloses the PCI
         * root bridges, and its CSR space includes the IOC function.
         */
-        if (strncmp("HWP0001", dev_info->hardware_id.value, 7) == 0) {
+        if (strncmp("HWP0001", dev_info->hardware_id.string, 7) == 0) {
                hpa += ZX1_IOC_OFFSET;
                /* zx1 based systems default to kernel page size iommu pages */
                if (!iovp_shift)
diff --git a/arch/ia64/hp/sim/simeth.c b/arch/ia64/hp/sim/simeth.c
index e4d8fde68103..7e81966ce481 100644
--- a/arch/ia64/hp/sim/simeth.c
+++ b/arch/ia64/hp/sim/simeth.c
@@ -412,7 +412,7 @@ simeth_tx(struct sk_buff *skb, struct net_device *dev)
         */
        dev_kfree_skb(skb);
-        return 0;
+        return NETDEV_TX_OK;
 }
 static inline struct sk_buff *
diff --git a/arch/ia64/ia32/sys_ia32.c b/arch/ia64/ia32/sys_ia32.c
index 16ef61a91d95..625ed8f76fce 100644
--- a/arch/ia64/ia32/sys_ia32.c
+++ b/arch/ia64/ia32/sys_ia32.c
@@ -1270,7 +1270,7 @@ putreg (struct task_struct *child, int regno, unsigned int value)
              case PT_CS:
                if (value != __USER_CS)
                        printk(KERN_ERR
-                               "ia32.putreg: attempt to to set invalid segment register %d = %x\n",
+                               "ia32.putreg: attempt to set invalid segment register %d = %x\n",
                               regno, value);
                break;
              default:
diff --git a/arch/ia64/include/asm/agp.h b/arch/ia64/include/asm/agp.h
index c11fdd8ab4d7..01d09c401c5c 100644
--- a/arch/ia64/include/asm/agp.h
+++ b/arch/ia64/include/asm/agp.h
@@ -17,10 +17,6 @@
 #define unmap_page_from_agp(page)       /* nothing */
 #define flush_agp_cache()               mb()
-/* Convert a physical address to an address suitable for the GART. */
-#define phys_to_gart(x) (x)
-#define gart_to_phys(x) (x)
 /* GATT allocation. Returns/accepts GATT kernel virtual address. */
 #define alloc_gatt_pages(order)         \
        ((char *)__get_free_pages(GFP_KERNEL, (order)))
diff --git a/arch/ia64/include/asm/bitops.h b/arch/ia64/include/asm/bitops.h
index e2ca80037335..57a2787bc9fb 100644
--- a/arch/ia64/include/asm/bitops.h
+++ b/arch/ia64/include/asm/bitops.h
@@ -286,7 +286,7 @@ __test_and_clear_bit(int nr, volatile void * addr)
 {
        __u32 *p = (__u32 *) addr + (nr >> 5);
        __u32 m = 1 << (nr & 31);
-        int oldbitset = *p & m;
+        int oldbitset = (*p & m) != 0;
        *p &= ~m;
        return oldbitset;
diff --git a/arch/ia64/include/asm/cputime.h b/arch/ia64/include/asm/cputime.h
index d20b998cb91d..7fa8a8594660 100644
--- a/arch/ia64/include/asm/cputime.h
+++ b/arch/ia64/include/asm/cputime.h
@@ -30,6 +30,7 @@ typedef u64 cputime_t;
 typedef u64 cputime64_t;
 #define cputime_zero                    ((cputime_t)0)
+#define cputime_one_jiffy               jiffies_to_cputime(1)
 #define cputime_max                     ((~((cputime_t)0) >> 1) - 1)
 #define cputime_add(__a, __b)           ((__a) +  (__b))
 #define cputime_sub(__a, __b)           ((__a) -  (__b))
diff --git a/arch/ia64/include/asm/device.h b/arch/ia64/include/asm/device.h
index 41ab85d66f33..d66d446b127c 100644
--- a/arch/ia64/include/asm/device.h
+++ b/arch/ia64/include/asm/device.h
@@ -15,4 +15,7 @@ struct dev_archdata {
 #endif
 };
+struct pdev_archdata {
+};
 #endif /* _ASM_IA64_DEVICE_H */
diff --git a/arch/ia64/include/asm/dma-mapping.h b/arch/ia64/include/asm/dma-mapping.h
index 5a61b5c2e18f..8d3c79cd81e7 100644
--- a/arch/ia64/include/asm/dma-mapping.h
+++ b/arch/ia64/include/asm/dma-mapping.h
@@ -44,7 +44,6 @@ static inline void dma_free_coherent(struct device *dev, size_t size,
 #define dma_free_noncoherent(d, s, v, h) dma_free_coherent(d, s, v, h)
 #define get_dma_ops(dev) platform_dma_get_ops(dev)
-#define flush_write_buffers()
 #include <asm-generic/dma-mapping-common.h>
@@ -69,6 +68,24 @@ dma_set_mask (struct device *dev, u64 mask)
        return 0;
 }
+static inline bool dma_capable(struct device *dev, dma_addr_t addr, size_t size)
+{
+        if (!dev->dma_mask)
+                return 0;
+        return addr + size <= *dev->dma_mask;
+}
+static inline dma_addr_t phys_to_dma(struct device *dev, phys_addr_t paddr)
+{
+        return paddr;
+}
+static inline phys_addr_t dma_to_phys(struct device *dev, dma_addr_t daddr)
+{
+        return daddr;
+}
 extern int dma_get_cache_alignment(void);
 static inline void
diff --git a/arch/ia64/include/asm/kvm_host.h b/arch/ia64/include/asm/kvm_host.h
index 5f43697aed30..d9b6325a9328 100644
--- a/arch/ia64/include/asm/kvm_host.h
+++ b/arch/ia64/include/asm/kvm_host.h
@@ -235,7 +235,8 @@ struct kvm_vm_data {
 #define KVM_REQ_PTC_G           32
 #define KVM_REQ_RESUME          33
-#define KVM_PAGES_PER_HPAGE     1
+#define KVM_NR_PAGE_SIZES       1
+#define KVM_PAGES_PER_HPAGE(x)  1
 struct kvm;
 struct kvm_vcpu;
@@ -465,7 +466,6 @@ struct kvm_arch {
        unsigned long   metaphysical_rr4;
        unsigned long   vmm_init_rr;
-        int             online_vcpus;
        int             is_sn2;
        struct kvm_ioapic *vioapic;
diff --git a/arch/ia64/include/asm/kvm_para.h b/arch/ia64/include/asm/kvm_para.h
index 0d6d8ca07b8c..1588aee781a2 100644
--- a/arch/ia64/include/asm/kvm_para.h
+++ b/arch/ia64/include/asm/kvm_para.h
@@ -19,9 +19,13 @@
 *
 */
+#ifdef __KERNEL__
 static inline unsigned int kvm_arch_para_features(void)
 {
        return 0;
 }
 #endif
+#endif
diff --git a/arch/ia64/include/asm/mca.h b/arch/ia64/include/asm/mca.h
index 44a0b53df900..c171cdf0a789 100644
--- a/arch/ia64/include/asm/mca.h
+++ b/arch/ia64/include/asm/mca.h
@@ -145,12 +145,14 @@ extern void ia64_mca_ucmc_handler(struct pt_regs *, struct ia64_sal_os_state *);
 extern void ia64_init_handler(struct pt_regs *,
                              struct switch_stack *,
                              struct ia64_sal_os_state *);
+extern void ia64_os_init_on_kdump(void);
 extern void ia64_monarch_init_handler(void);
 extern void ia64_slave_init_handler(void);
 extern void ia64_mca_cmc_vector_setup(void);
 extern int  ia64_reg_MCA_extension(int (*fn)(void *, struct ia64_sal_os_state *));
 extern void ia64_unreg_MCA_extension(void);
 extern unsigned long ia64_get_rnat(unsigned long *);
+extern void ia64_set_psr_mc(void);
 extern void ia64_mca_printk(const char * fmt, ...)
         __attribute__ ((format (printf, 1, 2)));
diff --git a/arch/ia64/include/asm/mman.h b/arch/ia64/include/asm/mman.h
index 48cf8b98a0b4..4459028e5aa8 100644
--- a/arch/ia64/include/asm/mman.h
+++ b/arch/ia64/include/asm/mman.h
@@ -8,19 +8,9 @@
 *      David Mosberger-Tang <davidm@hpl.hp.com>, Hewlett-Packard Co
 */
-#include <asm-generic/mman-common.h>
+#include <asm-generic/mman.h>
-#define MAP_GROWSDOWN   0x00100         /* stack-like segment */
+#define MAP_GROWSUP     0x0200          /* register stack-like segment */
-#define MAP_GROWSUP     0x00200         /* register stack-like segment */
-#define MAP_DENYWRITE   0x00800         /* ETXTBSY */
-#define MAP_EXECUTABLE  0x01000         /* mark it as an executable */
-#define MAP_LOCKED      0x02000         /* pages are locked */
-#define MAP_NORESERVE   0x04000         /* don't check for reservations */
-#define MAP_POPULATE    0x08000         /* populate (prefault) pagetables */
-#define MAP_NONBLOCK    0x10000         /* do not block on IO */
-#define MCL_CURRENT     1               /* lock all current mappings */
-#define MCL_FUTURE      2               /* lock all future mappings */
 #ifdef __KERNEL__
 #ifndef __ASSEMBLY__
diff --git a/arch/ia64/include/asm/pci.h b/arch/ia64/include/asm/pci.h
index fcfca56bb850..55281aabe5f2 100644
--- a/arch/ia64/include/asm/pci.h
+++ b/arch/ia64/include/asm/pci.h
@@ -17,7 +17,6 @@
 * loader.
 */
 #define pcibios_assign_all_busses()     0
-#define pcibios_scan_all_fns(a, b)      0
 #define PCIBIOS_MIN_IO          0x1000
 #define PCIBIOS_MIN_MEM         0x10000000
@@ -135,7 +134,18 @@ extern void pcibios_resource_to_bus(struct pci_dev *dev,
 extern void pcibios_bus_to_resource(struct pci_dev *dev,
                struct resource *res, struct pci_bus_region *region);
-#define pcibios_scan_all_fns(a, b)      0
+static inline struct resource *
+pcibios_select_root(struct pci_dev *pdev, struct resource *res)
+{
+        struct resource *root = NULL;
+        if (res->flags & IORESOURCE_IO)
+                root = &ioport_resource;
+        if (res->flags & IORESOURCE_MEM)
+                root = &iomem_resource;
+        return root;
+}
 #define HAVE_ARCH_PCI_GET_LEGACY_IDE_IRQ
 static inline int pci_get_legacy_ide_irq(struct pci_dev *dev, int channel)
diff --git a/arch/ia64/include/asm/pgtable.h b/arch/ia64/include/asm/pgtable.h
index 0a9cc73d35c7..8840a690d1e7 100644
--- a/arch/ia64/include/asm/pgtable.h
+++ b/arch/ia64/include/asm/pgtable.h
@@ -155,7 +155,6 @@
 #include <linux/bitops.h>
 #include <asm/cacheflush.h>
 #include <asm/mmu_context.h>
-#include <asm/processor.h>
 /*
 * Next come the mappings that determine how mmap() protection bits
diff --git a/arch/ia64/include/asm/socket.h b/arch/ia64/include/asm/socket.h
index 745421225ec6..0b0d5ff062e5 100644
--- a/arch/ia64/include/asm/socket.h
+++ b/arch/ia64/include/asm/socket.h
@@ -66,4 +66,7 @@
 #define SO_TIMESTAMPING         37
 #define SCM_TIMESTAMPING        SO_TIMESTAMPING
+#define SO_PROTOCOL             38
+#define SO_DOMAIN               39
 #endif /* _ASM_IA64_SOCKET_H */
diff --git a/arch/ia64/include/asm/topology.h b/arch/ia64/include/asm/topology.h
index 7b4c8c70b2d1..d0141fbf51d0 100644
--- a/arch/ia64/include/asm/topology.h
+++ b/arch/ia64/include/asm/topology.h
@@ -61,12 +61,13 @@ void build_cpu_to_node_map(void);
        .cache_nice_tries       = 2,                    \
        .busy_idx               = 2,                    \
        .idle_idx               = 1,                    \
-        .newidle_idx            = 2,                    \
+        .newidle_idx            = 0,                    \
-        .wake_idx               = 1,                    \
+        .wake_idx               = 0,                    \
-        .forkexec_idx           = 1,                    \
+        .forkexec_idx           = 0,                    \
        .flags                  = SD_LOAD_BALANCE       \
                                | SD_BALANCE_NEWIDLE    \
                                | SD_BALANCE_EXEC       \
+                                | SD_BALANCE_FORK       \
                                | SD_WAKE_AFFINE,       \
        .last_balance           = jiffies,              \
        .balance_interval       = 1,                    \
@@ -85,14 +86,14 @@ void build_cpu_to_node_map(void);
        .cache_nice_tries       = 2,                    \
        .busy_idx               = 3,                    \
        .idle_idx               = 2,                    \
-        .newidle_idx            = 2,                    \
+        .newidle_idx            = 0,                    \
-        .wake_idx               = 1,                    \
+        .wake_idx               = 0,                    \
-        .forkexec_idx           = 1,                    \
+        .forkexec_idx           = 0,                    \
        .flags                  = SD_LOAD_BALANCE       \
+                                | SD_BALANCE_NEWIDLE    \
                                | SD_BALANCE_EXEC       \
                                | SD_BALANCE_FORK       \
-                                | SD_SERIALIZE          \
+                                | SD_SERIALIZE,         \
-                                | SD_WAKE_BALANCE,      \
        .last_balance           = jiffies,              \
        .balance_interval       = 64,                   \
        .nr_balance_failed      = 0,                    \
diff --git a/arch/ia64/kernel/crash.c b/arch/ia64/kernel/crash.c
index f065093f8e9b..6631a9dfafdc 100644
--- a/arch/ia64/kernel/crash.c
+++ b/arch/ia64/kernel/crash.c
@@ -23,6 +23,7 @@
 int kdump_status[NR_CPUS];
 static atomic_t kdump_cpu_frozen;
 atomic_t kdump_in_progress;
+static int kdump_freeze_monarch;
 static int kdump_on_init = 1;
 static int kdump_on_fatal_mca = 1;
@@ -108,10 +109,38 @@ machine_crash_shutdown(struct pt_regs *pt)
         */
        kexec_disable_iosapic();
 #ifdef CONFIG_SMP
+        /*
+         * If kdump_on_init is set and an INIT is asserted here, kdump will
+         * be started again via INIT monarch.
+         */
+        local_irq_disable();
+        ia64_set_psr_mc();      /* mask MCA/INIT */
+        if (atomic_inc_return(&kdump_in_progress) != 1)
+                unw_init_running(kdump_cpu_freeze, NULL);
+        /*
+         * Now this cpu is ready for kdump.
+         * Stop all others by IPI or INIT.  They could receive INIT from
+         * outside and might be INIT monarch, but only thing they have to
+         * do is falling into kdump_cpu_freeze().
+         *
+         * If an INIT is asserted here:
+         * - All receivers might be slaves, since some of cpus could already
+         *   be frozen and INIT might be masked on monarch.  In this case,
+         *   all slaves will be frozen soon since kdump_in_progress will let
+         *   them into DIE_INIT_SLAVE_LEAVE.
+         * - One might be a monarch, but INIT rendezvous will fail since
+         *   at least this cpu already have INIT masked so it never join
+         *   to the rendezvous.  In this case, all slaves and monarch will
+         *   be frozen soon with no wait since the INIT rendezvous is skipped
+         *   by kdump_in_progress.
+         */
        kdump_smp_send_stop();
        /* not all cpu response to IPI, send INIT to freeze them */
-        if (kdump_wait_cpu_freeze() && kdump_on_init)   {
+        if (kdump_wait_cpu_freeze()) {
                kdump_smp_send_init();
+                /* wait again, don't go ahead if possible */
+                kdump_wait_cpu_freeze();
        }
 #endif
 }
@@ -129,17 +158,17 @@ void
 kdump_cpu_freeze(struct unw_frame_info *info, void *arg)
 {
        int cpuid;
        local_irq_disable();
        cpuid = smp_processor_id();
        crash_save_this_cpu();
        current->thread.ksp = (__u64)info->sw - 16;
+        ia64_set_psr_mc();      /* mask MCA/INIT and stop reentrance */
        atomic_inc(&kdump_cpu_frozen);
        kdump_status[cpuid] = 1;
        mb();
-#ifdef CONFIG_HOTPLUG_CPU
-        if (cpuid != 0)
-                ia64_jump_to_sal(&sal_boot_rendez_state[cpuid]);
-#endif
        for (;;)
                cpu_relax();
 }
@@ -150,6 +179,20 @@ kdump_init_notifier(struct notifier_block *self, unsigned long val, void *data)
        struct ia64_mca_notify_die *nd;
        struct die_args *args = data;
+        if (atomic_read(&kdump_in_progress)) {
+                switch (val) {
+                case DIE_INIT_MONARCH_LEAVE:
+                        if (!kdump_freeze_monarch)
+                                break;
+                        /* fall through */
+                case DIE_INIT_SLAVE_LEAVE:
+                case DIE_INIT_MONARCH_ENTER:
+                case DIE_MCA_RENDZVOUS_LEAVE:
+                        unw_init_running(kdump_cpu_freeze, NULL);
+                        break;
+                }
+        }
        if (!kdump_on_init && !kdump_on_fatal_mca)
                return NOTIFY_DONE;
@@ -162,43 +205,31 @@ kdump_init_notifier(struct notifier_block *self, unsigned long val, void *data)
        }
        if (val != DIE_INIT_MONARCH_LEAVE &&
-            val != DIE_INIT_SLAVE_LEAVE &&
            val != DIE_INIT_MONARCH_PROCESS &&
-            val != DIE_MCA_RENDZVOUS_LEAVE &&
            val != DIE_MCA_MONARCH_LEAVE)
                return NOTIFY_DONE;
        nd = (struct ia64_mca_notify_die *)args->err;
-        /* Reason code 1 means machine check rendezvous*/
-        if ((val == DIE_INIT_MONARCH_LEAVE || val == DIE_INIT_SLAVE_LEAVE
-            || val == DIE_INIT_MONARCH_PROCESS) && nd->sos->rv_rc == 1)
-                return NOTIFY_DONE;
        switch (val) {
        case DIE_INIT_MONARCH_PROCESS:
-                if (kdump_on_init) {
+                /* Reason code 1 means machine check rendezvous*/
-                        atomic_set(&kdump_in_progress, 1);
+                if (kdump_on_init && (nd->sos->rv_rc != 1)) {
-                        *(nd->monarch_cpu) = -1;
+                        if (atomic_inc_return(&kdump_in_progress) != 1)
+                                kdump_freeze_monarch = 1;
                }
                break;
        case DIE_INIT_MONARCH_LEAVE:
-                if (kdump_on_init)
+                /* Reason code 1 means machine check rendezvous*/
+                if (kdump_on_init && (nd->sos->rv_rc != 1))
                        machine_kdump_on_init();
                break;
-        case DIE_INIT_SLAVE_LEAVE:
-                if (atomic_read(&kdump_in_progress))
-                        unw_init_running(kdump_cpu_freeze, NULL);
-                break;
-        case DIE_MCA_RENDZVOUS_LEAVE:
-                if (atomic_read(&kdump_in_progress))
-                        unw_init_running(kdump_cpu_freeze, NULL);
-                break;
        case DIE_MCA_MONARCH_LEAVE:
                /* *(nd->data) indicate if MCA is recoverable */
                if (kdump_on_fatal_mca && !(*(nd->data))) {
-                        atomic_set(&kdump_in_progress, 1);
+                        if (atomic_inc_return(&kdump_in_progress) == 1)
-                        *(nd->monarch_cpu) = -1;
+                                machine_kdump_on_init();
-                        machine_kdump_on_init();
+                        /* We got fatal MCA while kdump!? No way!! */
                }
                break;
        }
diff --git a/arch/ia64/kernel/dma-mapping.c b/arch/ia64/kernel/dma-mapping.c
index 39a3cd0a4173..f2c1600da097 100644
--- a/arch/ia64/kernel/dma-mapping.c
+++ b/arch/ia64/kernel/dma-mapping.c
@@ -10,7 +10,9 @@ EXPORT_SYMBOL(dma_ops);
 static int __init dma_init(void)
 {
-       dma_debug_init(PREALLOC_DMA_DEBUG_ENTRIES);
+        dma_debug_init(PREALLOC_DMA_DEBUG_ENTRIES);
+        return 0;
 }
 fs_initcall(dma_init);
diff --git a/arch/ia64/kernel/head.S b/arch/ia64/kernel/head.S
index 23f846de62d5..1a6e44515eb4 100644
--- a/arch/ia64/kernel/head.S
+++ b/arch/ia64/kernel/head.S
@@ -167,7 +167,7 @@ RestRR:											\
        mov _tmp2=((ia64_rid(IA64_REGION_ID_KERNEL, (num<<61)) << 8) | (pgsize << 2) | vhpt);; \
        mov rr[_tmp1]=_tmp2
-        .section __special_page_section,"ax"
+        __PAGE_ALIGNED_DATA
        .global empty_zero_page
 empty_zero_page:
@@ -181,7 +181,7 @@ swapper_pg_dir:
 halt_msg:
        stringz "Halting kernel\n"
-        .section .text.head,"ax"
+        __REF
        .global start_ap
@@ -1242,7 +1242,7 @@ GLOBAL_ENTRY(ia64_jump_to_sal)
        movl r16=SAL_PSR_BITS_TO_SET;;
        mov cr.ipsr=r16
        mov cr.ifs=r0;;
-        rfi;;
+        rfi;;                   // note: this unmask MCA/INIT (psr.mc)
 1:
        /*
         * Invalidate all TLB data/inst
diff --git a/arch/ia64/kernel/ia64_ksyms.c b/arch/ia64/kernel/ia64_ksyms.c
index 2d311864e359..8ebccb589e1c 100644
--- a/arch/ia64/kernel/ia64_ksyms.c
+++ b/arch/ia64/kernel/ia64_ksyms.c
@@ -21,6 +21,7 @@ EXPORT_SYMBOL(csum_ipv6_magic);
 #include <asm/page.h>
 EXPORT_SYMBOL(clear_page);
+EXPORT_SYMBOL(copy_page);
 #ifdef CONFIG_VIRTUAL_MEM_MAP
 #include <linux/bootmem.h>
@@ -60,9 +61,6 @@ EXPORT_SYMBOL(__udivdi3);
 EXPORT_SYMBOL(__moddi3);
 EXPORT_SYMBOL(__umoddi3);
-#include <asm/page.h>
-EXPORT_SYMBOL(copy_page);
 #if defined(CONFIG_MD_RAID456) || defined(CONFIG_MD_RAID456_MODULE)
 extern void xor_ia64_2(void);
 extern void xor_ia64_3(void);
diff --git a/arch/ia64/kernel/iosapic.c b/arch/ia64/kernel/iosapic.c
index c48b03f2b61d..dab4d393908c 100644
--- a/arch/ia64/kernel/iosapic.c
+++ b/arch/ia64/kernel/iosapic.c
@@ -1072,6 +1072,10 @@ iosapic_init (unsigned long phys_addr, unsigned int gsi_base)
        }
        addr = ioremap(phys_addr, 0);
+        if (addr == NULL) {
+                spin_unlock_irqrestore(&iosapic_lock, flags);
+                return -ENOMEM;
+        }
        ver = iosapic_version(addr);
        if ((err = iosapic_check_gsi_range(gsi_base, ver))) {
                iounmap(addr);
diff --git a/arch/ia64/kernel/machine_kexec.c b/arch/ia64/kernel/machine_kexec.c
index 0823de1f6ebe..3d3aeef46947 100644
--- a/arch/ia64/kernel/machine_kexec.c
+++ b/arch/ia64/kernel/machine_kexec.c
@@ -24,6 +24,8 @@
 #include <asm/delay.h>
 #include <asm/meminit.h>
 #include <asm/processor.h>
+#include <asm/sal.h>
+#include <asm/mca.h>
 typedef NORET_TYPE void (*relocate_new_kernel_t)(
                                        unsigned long indirection_page,
@@ -85,13 +87,26 @@ static void ia64_machine_kexec(struct unw_frame_info *info, void *arg)
        void *pal_addr = efi_get_pal_addr();
        unsigned long code_addr = (unsigned long)page_address(image->control_code_page);
        int ii;
+        u64 fp, gp;
+        ia64_fptr_t *init_handler = (ia64_fptr_t *)ia64_os_init_on_kdump;
        BUG_ON(!image);
        if (image->type == KEXEC_TYPE_CRASH) {
                crash_save_this_cpu();
                current->thread.ksp = (__u64)info->sw - 16;
+                /* Register noop init handler */
+                fp = ia64_tpa(init_handler->fp);
+                gp = ia64_tpa(ia64_getreg(_IA64_REG_GP));
+                ia64_sal_set_vectors(SAL_VECTOR_OS_INIT, fp, gp, 0, fp, gp, 0);
+        } else {
+                /* Unregister init handlers of current kernel */
+                ia64_sal_set_vectors(SAL_VECTOR_OS_INIT, 0, 0, 0, 0, 0, 0);
        }
+        /* Unregister mca handler - No more recovery on current kernel */
+        ia64_sal_set_vectors(SAL_VECTOR_OS_MCA, 0, 0, 0, 0, 0, 0);
        /* Interrupts aren't acceptable while we reboot */
        local_irq_disable();
diff --git a/arch/ia64/kernel/mca.c b/arch/ia64/kernel/mca.c
index 7b30d21c5190..d2877a7bfe2e 100644
--- a/arch/ia64/kernel/mca.c
+++ b/arch/ia64/kernel/mca.c
@@ -1682,14 +1682,25 @@ ia64_init_handler(struct pt_regs *regs, struct switch_stack *sw,
        if (!sos->monarch) {
                ia64_mc_info.imi_rendez_checkin[cpu] = IA64_MCA_RENDEZ_CHECKIN_INIT;
+#ifdef CONFIG_KEXEC
+                while (monarch_cpu == -1 && !atomic_read(&kdump_in_progress))
+                        udelay(1000);
+#else
                while (monarch_cpu == -1)
-                       cpu_relax();     /* spin until monarch enters */
+                        cpu_relax();    /* spin until monarch enters */
+#endif
                NOTIFY_INIT(DIE_INIT_SLAVE_ENTER, regs, (long)&nd, 1);
                NOTIFY_INIT(DIE_INIT_SLAVE_PROCESS, regs, (long)&nd, 1);
+#ifdef CONFIG_KEXEC
+                while (monarch_cpu != -1 && !atomic_read(&kdump_in_progress))
+                        udelay(1000);
+#else
                while (monarch_cpu != -1)
-                       cpu_relax();     /* spin until monarch leaves */
+                        cpu_relax();    /* spin until monarch leaves */
+#endif
                NOTIFY_INIT(DIE_INIT_SLAVE_LEAVE, regs, (long)&nd, 1);
diff --git a/arch/ia64/kernel/mca_asm.S b/arch/ia64/kernel/mca_asm.S
index a06d46548ff9..7461d2573d41 100644
--- a/arch/ia64/kernel/mca_asm.S
+++ b/arch/ia64/kernel/mca_asm.S
@@ -40,6 +40,7 @@
        .global ia64_do_tlb_purge
        .global ia64_os_mca_dispatch
+        .global ia64_os_init_on_kdump
        .global ia64_os_init_dispatch_monarch
        .global ia64_os_init_dispatch_slave
@@ -299,6 +300,25 @@ END(ia64_os_mca_virtual_begin)
 //StartMain////////////////////////////////////////////////////////////////////
 //
+// NOP init handler for kdump.  In panic situation, we may receive INIT
+// while kernel transition.  Since we initialize registers on leave from
+// current kernel, no longer monarch/slave handlers of current kernel in
+// virtual mode are called safely.
+// We can unregister these init handlers from SAL, however then the INIT
+// will result in warmboot by SAL and we cannot retrieve the crashdump.
+// Therefore register this NOP function to SAL, to prevent entering virtual
+// mode and resulting warmboot by SAL.
+//
+ia64_os_init_on_kdump:
+        mov             r8=r0           // IA64_INIT_RESUME
+        mov             r9=r10          // SAL_GP
+        mov             r22=r17         // *minstate
+        ;;
+        mov             r10=r0          // return to same context
+        mov             b0=r12          // SAL_CHECK return address
+        br              b0
+//
 // SAL to OS entry point for INIT on all processors.  This has been defined for
 // registration purposes with SAL as a part of ia64_mca_init.  Monarch and
 // slave INIT have identical processing, except for the value of the
@@ -1073,3 +1093,30 @@ GLOBAL_ENTRY(ia64_get_rnat)
        mov ar.rsc=3
        br.ret.sptk.many rp
 END(ia64_get_rnat)
+// void ia64_set_psr_mc(void)
+//
+// Set psr.mc bit to mask MCA/INIT.
+GLOBAL_ENTRY(ia64_set_psr_mc)
+        rsm psr.i | psr.ic              // disable interrupts
+        ;;
+        srlz.d
+        ;;
+        mov r14 = psr                   // get psr{36:35,31:0}
+        movl r15 = 1f
+        ;;
+        dep r14 = -1, r14, PSR_MC, 1    // set psr.mc
+        ;;
+        dep r14 = -1, r14, PSR_IC, 1    // set psr.ic
+        ;;
+        dep r14 = -1, r14, PSR_BN, 1    // keep bank1 in use
+        ;;
+        mov cr.ipsr = r14
+        mov cr.ifs = r0
+        mov cr.iip = r15
+        ;;
+        rfi
+1:
+        br.ret.sptk.many rp
+END(ia64_set_psr_mc)
diff --git a/arch/ia64/kernel/pci-dma.c b/arch/ia64/kernel/pci-dma.c
index 05695962fe44..f6b1ff0aea76 100644
--- a/arch/ia64/kernel/pci-dma.c
+++ b/arch/ia64/kernel/pci-dma.c
@@ -69,11 +69,6 @@ iommu_dma_init(void)
 int iommu_dma_supported(struct device *dev, u64 mask)
 {
-        struct dma_map_ops *ops = platform_dma_get_ops(dev);
-        if (ops->dma_supported)
-                return ops->dma_supported(dev, mask);
        /* Copied from i386. Doesn't make much sense, because it will
           only work for pci_alloc_coherent.
           The caller just has to use GFP_DMA in this case. */
diff --git a/arch/ia64/kernel/process.c b/arch/ia64/kernel/process.c
index 5d7c0e5b9e76..9bcec9945c12 100644
--- a/arch/ia64/kernel/process.c
+++ b/arch/ia64/kernel/process.c
@@ -161,6 +161,13 @@ show_regs (struct pt_regs *regs)
                show_stack(NULL, NULL);
 }
+/* local support for deprecated console_print */
+void
+console_print(const char *s)
+{
+        printk(KERN_EMERG "%s", s);
+}
 void
 do_notify_resume_user(sigset_t *unused, struct sigscratch *scr, long in_syscall)
 {
@@ -192,6 +199,8 @@ do_notify_resume_user(sigset_t *unused, struct sigscratch *scr, long in_syscall)
        if (test_thread_flag(TIF_NOTIFY_RESUME)) {
                clear_thread_flag(TIF_NOTIFY_RESUME);
                tracehook_notify_resume(&scr->pt);
+                if (current->replacement_session_keyring)
+                        key_replace_session_keyring();
        }
        /* copy user rbs to kernel rbs */
diff --git a/arch/ia64/kernel/relocate_kernel.S b/arch/ia64/kernel/relocate_kernel.S
index 903babd22d62..32f6fc131fbe 100644
--- a/arch/ia64/kernel/relocate_kernel.S
+++ b/arch/ia64/kernel/relocate_kernel.S
@@ -52,7 +52,7 @@ GLOBAL_ENTRY(relocate_new_kernel)
        srlz.i
        ;;
        mov ar.rnat=r18
-        rfi
+        rfi                             // note: this unmask MCA/INIT (psr.mc)
        ;;
 1:
        //physical mode code begin
diff --git a/arch/ia64/kernel/setup.c b/arch/ia64/kernel/setup.c
index 1b23ec126b63..1de86c96801d 100644
--- a/arch/ia64/kernel/setup.c
+++ b/arch/ia64/kernel/setup.c
@@ -855,11 +855,17 @@ identify_cpu (struct cpuinfo_ia64 *c)
        c->unimpl_pa_mask = ~((1L<<63) | ((1L << phys_addr_size) - 1));
 }
+/*
+ * In UP configuration, setup_per_cpu_areas() is defined in
+ * include/linux/percpu.h
+ */
+#ifdef CONFIG_SMP
 void __init
 setup_per_cpu_areas (void)
 {
        /* start_kernel() requires this... */
 }
+#endif
 /*
 * Do the following calculations:
diff --git a/arch/ia64/kernel/smp.c b/arch/ia64/kernel/smp.c
index f0c521b0ba4c..93ebfea43c6c 100644
--- a/arch/ia64/kernel/smp.c
+++ b/arch/ia64/kernel/smp.c
@@ -58,7 +58,8 @@ static struct local_tlb_flush_counts {
        unsigned int count;
 } __attribute__((__aligned__(32))) local_tlb_flush_counts[NR_CPUS];
-static DEFINE_PER_CPU(unsigned short, shadow_flush_counts[NR_CPUS]) ____cacheline_aligned;
+static DEFINE_PER_CPU_SHARED_ALIGNED(unsigned short [NR_CPUS],
+                                     shadow_flush_counts);
 #define IPI_CALL_FUNC           0
 #define IPI_CPU_STOP            1
diff --git a/arch/ia64/kernel/topology.c b/arch/ia64/kernel/topology.c
index bc80dff1df7a..8f060352e129 100644
--- a/arch/ia64/kernel/topology.c
+++ b/arch/ia64/kernel/topology.c
@@ -372,6 +372,10 @@ static int __cpuinit cache_add_dev(struct sys_device * sys_dev)
        retval = kobject_init_and_add(&all_cpu_cache_info[cpu].kobj,
                                      &cache_ktype_percpu_entry, &sys_dev->kobj,
                                      "%s", "cache");
+        if (unlikely(retval < 0)) {
+                cpu_cache_sysfs_exit(cpu);
+                return retval;
+        }
        for (i = 0; i < all_cpu_cache_info[cpu].num_cache_leaves; i++) {
                this_object = LEAF_KOBJECT_PTR(cpu,i);
@@ -385,7 +389,7 @@ static int __cpuinit cache_add_dev(struct sys_device * sys_dev)
                        }
                        kobject_put(&all_cpu_cache_info[cpu].kobj);
                        cpu_cache_sysfs_exit(cpu);
-                        break;
+                        return retval;
                }
                kobject_uevent(&(this_object->kobj), KOBJ_ADD);
        }
diff --git a/arch/ia64/kernel/vmlinux.lds.S b/arch/ia64/kernel/vmlinux.lds.S
index 4a95e86b9ac2..0a0c77b2c988 100644
--- a/arch/ia64/kernel/vmlinux.lds.S
+++ b/arch/ia64/kernel/vmlinux.lds.S
@@ -24,14 +24,14 @@ PHDRS {
 }
 SECTIONS
 {
-  /* Sections to be discarded */
+  /* unwind exit sections must be discarded before the rest of the
+     sections get included. */
  /DISCARD/ : {
-        EXIT_TEXT
-        EXIT_DATA
-        *(.exitcall.exit)
        *(.IA_64.unwind.exit.text)
        *(.IA_64.unwind_info.exit.text)
-        }
+        *(.comment)
+        *(.note)
+  }
  v = PAGE_OFFSET;      /* this symbol is here to make debugging easier... */
  phys_start = _start - LOAD_OFFSET;
@@ -51,8 +51,6 @@ SECTIONS
        KPROBES_TEXT
        *(.gnu.linkonce.t*)
    }
-  .text.head : AT(ADDR(.text.head) - LOAD_OFFSET)
-        { *(.text.head) }
  .text2 : AT(ADDR(.text2) - LOAD_OFFSET)
        { *(.text2) }
 #ifdef CONFIG_SMP
@@ -66,14 +64,7 @@ SECTIONS
  NOTES :code :note             /* put .notes in text and mark in PT_NOTE  */
  code_continues : {} :code     /* switch back to regular program...  */
-  /* Exception table */
+  EXCEPTION_TABLE(16)
-  . = ALIGN(16);
-  __ex_table : AT(ADDR(__ex_table) - LOAD_OFFSET)
-        {
-          __start___ex_table = .;
-          *(__ex_table)
-          __stop___ex_table = .;
-        }
  /* MCA table */
  . = ALIGN(16);
@@ -115,38 +106,9 @@ SECTIONS
  . = ALIGN(PAGE_SIZE);
  __init_begin = .;
-  .init.text : AT(ADDR(.init.text) - LOAD_OFFSET)
-        {
-          _sinittext = .;
-          INIT_TEXT
-          _einittext = .;
-        }
-  .init.data : AT(ADDR(.init.data) - LOAD_OFFSET)
+  INIT_TEXT_SECTION(PAGE_SIZE)
-        { INIT_DATA }
+  INIT_DATA_SECTION(16)
-#ifdef CONFIG_BLK_DEV_INITRD
-  .init.ramfs : AT(ADDR(.init.ramfs) - LOAD_OFFSET)
-        {
-          __initramfs_start = .;
-          *(.init.ramfs)
-          __initramfs_end = .;
-        }
-#endif
-   . = ALIGN(16);
-  .init.setup : AT(ADDR(.init.setup) - LOAD_OFFSET)
-        {
-          __setup_start = .;
-          *(.init.setup)
-          __setup_end = .;
-        }
-  .initcall.init : AT(ADDR(.initcall.init) - LOAD_OFFSET)
-        {
-          __initcall_start = .;
-        INITCALLS
-          __initcall_end = .;
-        }
  .data.patch.vtop : AT(ADDR(.data.patch.vtop) - LOAD_OFFSET)
        {
@@ -204,24 +166,13 @@ SECTIONS
        }
 #endif
-  . = ALIGN(8);
-   __con_initcall_start = .;
-  .con_initcall.init : AT(ADDR(.con_initcall.init) - LOAD_OFFSET)
-        { *(.con_initcall.init) }
-  __con_initcall_end = .;
-  __security_initcall_start = .;
-  .security_initcall.init : AT(ADDR(.security_initcall.init) - LOAD_OFFSET)
-        { *(.security_initcall.init) }
-  __security_initcall_end = .;
  . = ALIGN(PAGE_SIZE);
  __init_end = .;
-  /* The initial task and kernel stack */
-  .data.init_task : AT(ADDR(.data.init_task) - LOAD_OFFSET)
-        { *(.data.init_task) }
  .data.page_aligned : AT(ADDR(.data.page_aligned) - LOAD_OFFSET)
-        { *(__special_page_section)
+        {
+        PAGE_ALIGNED_DATA(PAGE_SIZE)
+          . = ALIGN(PAGE_SIZE);
          __start_gate_section = .;
          *(.data.gate)
          __stop_gate_section = .;
@@ -236,12 +187,6 @@ SECTIONS
                                 * kernel data
                                 */
-  .data.read_mostly : AT(ADDR(.data.read_mostly) - LOAD_OFFSET)
-        { *(.data.read_mostly) }
-  .data.cacheline_aligned : AT(ADDR(.data.cacheline_aligned) - LOAD_OFFSET)
-        { *(.data.cacheline_aligned) }
  /* Per-cpu data: */
  . = ALIGN(PERCPU_PAGE_SIZE);
  PERCPU_VADDR(PERCPU_ADDR, :percpu)
@@ -258,6 +203,9 @@ SECTIONS
                __cpu0_per_cpu = .;
  . = . + PERCPU_PAGE_SIZE;     /* cpu0 per-cpu space */
 #endif
+                INIT_TASK_DATA(PAGE_SIZE)
+                CACHELINE_ALIGNED_DATA(SMP_CACHE_BYTES)
+                READ_MOSTLY_DATA(SMP_CACHE_BYTES)
                DATA_DATA
                *(.data1)
                *(.gnu.linkonce.d*)
@@ -274,49 +222,16 @@ SECTIONS
  .sdata : AT(ADDR(.sdata) - LOAD_OFFSET)
        { *(.sdata) *(.sdata1) *(.srdata) }
  _edata  =  .;
-  __bss_start = .;
-  .sbss : AT(ADDR(.sbss) - LOAD_OFFSET)
+  BSS_SECTION(0, 0, 0)
-        { *(.sbss) *(.scommon) }
-  .bss : AT(ADDR(.bss) - LOAD_OFFSET)
-        { *(.bss) *(COMMON) }
-  __bss_stop = .;
  _end = .;
  code : { } :code
-  /* Stabs debugging sections.  */
-  .stab 0 : { *(.stab) }
+  STABS_DEBUG
-  .stabstr 0 : { *(.stabstr) }
+  DWARF_DEBUG
-  .stab.excl 0 : { *(.stab.excl) }
-  .stab.exclstr 0 : { *(.stab.exclstr) }
+  /* Default discards */
-  .stab.index 0 : { *(.stab.index) }
+  DISCARDS
-  .stab.indexstr 0 : { *(.stab.indexstr) }
-  /* DWARF debug sections.
-     Symbols in the DWARF debugging sections are relative to the beginning
-     of the section so we begin them at 0.  */
-  /* DWARF 1 */
-  .debug          0 : { *(.debug) }
-  .line           0 : { *(.line) }
-  /* GNU DWARF 1 extensions */
-  .debug_srcinfo  0 : { *(.debug_srcinfo) }
-  .debug_sfnames  0 : { *(.debug_sfnames) }
-  /* DWARF 1.1 and DWARF 2 */
-  .debug_aranges  0 : { *(.debug_aranges) }
-  .debug_pubnames 0 : { *(.debug_pubnames) }
-  /* DWARF 2 */
-  .debug_info     0 : { *(.debug_info) }
-  .debug_abbrev   0 : { *(.debug_abbrev) }
-  .debug_line     0 : { *(.debug_line) }
-  .debug_frame    0 : { *(.debug_frame) }
-  .debug_str      0 : { *(.debug_str) }
-  .debug_loc      0 : { *(.debug_loc) }
-  .debug_macinfo  0 : { *(.debug_macinfo) }
-  /* SGI/MIPS DWARF 2 extensions */
-  .debug_weaknames 0 : { *(.debug_weaknames) }
-  .debug_funcnames 0 : { *(.debug_funcnames) }
-  .debug_typenames 0 : { *(.debug_typenames) }
-  .debug_varnames  0 : { *(.debug_varnames) }
-  /* These must appear regardless of  .  */
-  /DISCARD/ : { *(.comment) }
-  /DISCARD/ : { *(.note) }
 }
diff --git a/arch/ia64/kvm/Kconfig b/arch/ia64/kvm/Kconfig
index 64d520937874..ef3e7be29caf 100644
--- a/arch/ia64/kvm/Kconfig
+++ b/arch/ia64/kvm/Kconfig
@@ -1,12 +1,8 @@
 #
 # KVM configuration
 #
-config HAVE_KVM
-        bool
-config HAVE_KVM_IRQCHIP
+source "virt/kvm/Kconfig"
-       bool
-       default y
 menuconfig VIRTUALIZATION
        bool "Virtualization"
@@ -28,6 +24,8 @@ config KVM
        depends on PCI
        select PREEMPT_NOTIFIERS
        select ANON_INODES
+        select HAVE_KVM_IRQCHIP
+        select KVM_APIC_ARCHITECTURE
        ---help---
          Support hosting fully virtualized guest machines using hardware
          virtualization extensions.  You will need a fairly recent
@@ -49,9 +47,6 @@ config KVM_INTEL
          Provides support for KVM on Itanium 2 processors equipped with the VT
          extensions.
-config KVM_TRACE
-       bool
 source drivers/virtio/Kconfig
 endif # VIRTUALIZATION
diff --git a/arch/ia64/kvm/kvm-ia64.c b/arch/ia64/kvm/kvm-ia64.c
index 80c57b0a21c4..0ad09f05efa9 100644
--- a/arch/ia64/kvm/kvm-ia64.c
+++ b/arch/ia64/kvm/kvm-ia64.c
@@ -210,16 +210,6 @@ int kvm_dev_ioctl_check_extension(long ext)
 }
-static struct kvm_io_device *vcpu_find_mmio_dev(struct kvm_vcpu *vcpu,
-                                        gpa_t addr, int len, int is_write)
-{
-        struct kvm_io_device *dev;
-        dev = kvm_io_bus_find_dev(&vcpu->kvm->mmio_bus, addr, len, is_write);
-        return dev;
-}
 static int handle_vm_error(struct kvm_vcpu *vcpu, struct kvm_run *kvm_run)
 {
        kvm_run->exit_reason = KVM_EXIT_UNKNOWN;
@@ -231,6 +221,7 @@ static int handle_mmio(struct kvm_vcpu *vcpu, struct kvm_run *kvm_run)
 {
        struct kvm_mmio_req *p;
        struct kvm_io_device *mmio_dev;
+        int r;
        p = kvm_get_vcpu_ioreq(vcpu);
@@ -247,16 +238,13 @@ static int handle_mmio(struct kvm_vcpu *vcpu, struct kvm_run *kvm_run)
        kvm_run->exit_reason = KVM_EXIT_MMIO;
        return 0;
 mmio:
-        mmio_dev = vcpu_find_mmio_dev(vcpu, p->addr, p->size, !p->dir);
+        if (p->dir)
-        if (mmio_dev) {
+                r = kvm_io_bus_read(&vcpu->kvm->mmio_bus, p->addr,
-                if (!p->dir)
+                                    p->size, &p->data);
-                        kvm_iodevice_write(mmio_dev, p->addr, p->size,
+        else
-                                                &p->data);
+                r = kvm_io_bus_write(&vcpu->kvm->mmio_bus, p->addr,
-                else
+                                     p->size, &p->data);
-                        kvm_iodevice_read(mmio_dev, p->addr, p->size,
+        if (r)
-                                                &p->data);
-        } else
                printk(KERN_ERR"kvm: No iodevice found! addr:%lx\n", p->addr);
        p->state = STATE_IORESP_READY;
@@ -337,13 +325,12 @@ static struct kvm_vcpu *lid_to_vcpu(struct kvm *kvm, unsigned long id,
 {
        union ia64_lid lid;
        int i;
+        struct kvm_vcpu *vcpu;
-        for (i = 0; i < kvm->arch.online_vcpus; i++) {
+        kvm_for_each_vcpu(i, vcpu, kvm) {
-                if (kvm->vcpus[i]) {
+                lid.val = VCPU_LID(vcpu);
-                        lid.val = VCPU_LID(kvm->vcpus[i]);
+                if (lid.id == id && lid.eid == eid)
-                        if (lid.id == id && lid.eid == eid)
+                        return vcpu;
-                                return kvm->vcpus[i];
-                }
        }
        return NULL;
@@ -409,21 +396,21 @@ static int handle_global_purge(struct kvm_vcpu *vcpu, struct kvm_run *kvm_run)
        struct kvm *kvm = vcpu->kvm;
        struct call_data call_data;
        int i;
+        struct kvm_vcpu *vcpui;
        call_data.ptc_g_data = p->u.ptc_g_data;
-        for (i = 0; i < kvm->arch.online_vcpus; i++) {
+        kvm_for_each_vcpu(i, vcpui, kvm) {
-                if (!kvm->vcpus[i] || kvm->vcpus[i]->arch.mp_state ==
+                if (vcpui->arch.mp_state == KVM_MP_STATE_UNINITIALIZED ||
-                                                KVM_MP_STATE_UNINITIALIZED ||
+                                vcpu == vcpui)
-                                        vcpu == kvm->vcpus[i])
                        continue;
-                if (waitqueue_active(&kvm->vcpus[i]->wq))
+                if (waitqueue_active(&vcpui->wq))
-                        wake_up_interruptible(&kvm->vcpus[i]->wq);
+                        wake_up_interruptible(&vcpui->wq);
-                if (kvm->vcpus[i]->cpu != -1) {
+                if (vcpui->cpu != -1) {
-                        call_data.vcpu = kvm->vcpus[i];
+                        call_data.vcpu = vcpui;
-                        smp_call_function_single(kvm->vcpus[i]->cpu,
+                        smp_call_function_single(vcpui->cpu,
                                        vcpu_global_purge, &call_data, 1);
                } else
                        printk(KERN_WARNING"kvm: Uninit vcpu received ipi!\n");
@@ -852,8 +839,6 @@ struct  kvm *kvm_arch_create_vm(void)
        kvm_init_vm(kvm);
-        kvm->arch.online_vcpus = 0;
        return kvm;
 }
@@ -1000,10 +985,10 @@ long kvm_arch_vm_ioctl(struct file *filp,
                        goto out;
                if (irqchip_in_kernel(kvm)) {
                        __s32 status;
-                        mutex_lock(&kvm->lock);
+                        mutex_lock(&kvm->irq_lock);
                        status = kvm_set_irq(kvm, KVM_USERSPACE_IRQ_SOURCE_ID,
                                    irq_event.irq, irq_event.level);
-                        mutex_unlock(&kvm->lock);
+                        mutex_unlock(&kvm->irq_lock);
                        if (ioctl == KVM_IRQ_LINE_STATUS) {
                                irq_event.status = status;
                                if (copy_to_user(argp, &irq_event,
@@ -1216,7 +1201,7 @@ int kvm_arch_vcpu_init(struct kvm_vcpu *vcpu)
        if (IS_ERR(vmm_vcpu))
                return PTR_ERR(vmm_vcpu);
-        if (vcpu->vcpu_id == 0) {
+        if (kvm_vcpu_is_bsp(vcpu)) {
                vcpu->arch.mp_state = KVM_MP_STATE_RUNNABLE;
                /*Set entry address for first run.*/
@@ -1224,7 +1209,7 @@ int kvm_arch_vcpu_init(struct kvm_vcpu *vcpu)
                /*Initialize itc offset for vcpus*/
                itc_offset = 0UL - kvm_get_itc(vcpu);
-                for (i = 0; i < kvm->arch.online_vcpus; i++) {
+                for (i = 0; i < KVM_MAX_VCPUS; i++) {
                        v = (struct kvm_vcpu *)((char *)vcpu +
                                        sizeof(struct kvm_vcpu_data) * i);
                        v->arch.itc_offset = itc_offset;
@@ -1356,8 +1341,6 @@ struct kvm_vcpu *kvm_arch_vcpu_create(struct kvm *kvm,
                goto fail;
        }
-        kvm->arch.online_vcpus++;
        return vcpu;
 fail:
        return ERR_PTR(r);
@@ -1952,19 +1935,6 @@ int kvm_highest_pending_irq(struct kvm_vcpu *vcpu)
    return find_highest_bits((int *)&vpd->irr[0]);
 }
-int kvm_cpu_has_interrupt(struct kvm_vcpu *vcpu)
-{
-        if (kvm_highest_pending_irq(vcpu) != -1)
-                return 1;
-        return 0;
-}
-int kvm_arch_interrupt_allowed(struct kvm_vcpu *vcpu)
-{
-        /* do real check here */
-        return 1;
-}
 int kvm_cpu_has_pending_timer(struct kvm_vcpu *vcpu)
 {
        return vcpu->arch.timer_fired;
@@ -1977,7 +1947,8 @@ gfn_t unalias_gfn(struct kvm *kvm, gfn_t gfn)
 int kvm_arch_vcpu_runnable(struct kvm_vcpu *vcpu)
 {
-        return vcpu->arch.mp_state == KVM_MP_STATE_RUNNABLE;
+        return (vcpu->arch.mp_state == KVM_MP_STATE_RUNNABLE) ||
+                (kvm_highest_pending_irq(vcpu) != -1);
 }
 int kvm_arch_vcpu_ioctl_get_mpstate(struct kvm_vcpu *vcpu,
diff --git a/arch/ia64/kvm/mmio.c b/arch/ia64/kvm/mmio.c
index 21f63fffc379..9bf55afd08d0 100644
--- a/arch/ia64/kvm/mmio.c
+++ b/arch/ia64/kvm/mmio.c
@@ -247,7 +247,8 @@ void emulate_io_inst(struct kvm_vcpu *vcpu, u64 padr, u64 ma)
                vcpu_get_fpreg(vcpu, inst.M9.f2, &v);
                /* Write high word. FIXME: this is a kludge!  */
                v.u.bits[1] &= 0x3ffff;
-                mmio_access(vcpu, padr + 8, &v.u.bits[1], 8, ma, IOREQ_WRITE);
+                mmio_access(vcpu, padr + 8, (u64 *)&v.u.bits[1], 8,
+                            ma, IOREQ_WRITE);
                data = v.u.bits[0];
                size = 3;
        } else if (inst.M10.major == 7 && inst.M10.x6 == 0x3B) {
@@ -265,7 +266,8 @@ void emulate_io_inst(struct kvm_vcpu *vcpu, u64 padr, u64 ma)
                /* Write high word.FIXME: this is a kludge!  */
                v.u.bits[1] &= 0x3ffff;
-                mmio_access(vcpu, padr + 8, &v.u.bits[1], 8, ma, IOREQ_WRITE);
+                mmio_access(vcpu, padr + 8, (u64 *)&v.u.bits[1],
+                            8, ma, IOREQ_WRITE);
                data = v.u.bits[0];
                size = 3;
        } else if (inst.M10.major == 7 && inst.M10.x6 == 0x31) {
diff --git a/arch/ia64/kvm/vcpu.c b/arch/ia64/kvm/vcpu.c
index 46b02cbcc874..dce75b70cdd5 100644
--- a/arch/ia64/kvm/vcpu.c
+++ b/arch/ia64/kvm/vcpu.c
@@ -461,7 +461,7 @@ void setreg(unsigned long regnum, unsigned long val,
 u64 vcpu_get_gr(struct kvm_vcpu *vcpu, unsigned long reg)
 {
        struct kvm_pt_regs *regs = vcpu_regs(vcpu);
-        u64 val;
+        unsigned long val;
        if (!reg)
                return 0;
@@ -469,7 +469,7 @@ u64 vcpu_get_gr(struct kvm_vcpu *vcpu, unsigned long reg)
        return val;
 }
-void vcpu_set_gr(struct kvm_vcpu *vcpu, u64 reg, u64 value, int nat)
+void vcpu_set_gr(struct kvm_vcpu *vcpu, unsigned long reg, u64 value, int nat)
 {
        struct kvm_pt_regs *regs = vcpu_regs(vcpu);
        long sof = (regs->cr_ifs) & 0x7f;
@@ -830,8 +830,8 @@ static void vcpu_set_itc(struct kvm_vcpu *vcpu, u64 val)
        kvm = (struct kvm *)KVM_VM_BASE;
-        if (vcpu->vcpu_id == 0) {
+        if (kvm_vcpu_is_bsp(vcpu)) {
-                for (i = 0; i < kvm->arch.online_vcpus; i++) {
+                for (i = 0; i < atomic_read(&kvm->online_vcpus); i++) {
                        v = (struct kvm_vcpu *)((char *)vcpu +
                                        sizeof(struct kvm_vcpu_data) * i);
                        VMX(v, itc_offset) = itc_offset;
@@ -1072,7 +1072,7 @@ void kvm_ttag(struct kvm_vcpu *vcpu, INST64 inst)
        vcpu_set_gr(vcpu, inst.M46.r1, tag, 0);
 }
-int vcpu_tpa(struct kvm_vcpu *vcpu, u64 vadr, u64 *padr)
+int vcpu_tpa(struct kvm_vcpu *vcpu, u64 vadr, unsigned long *padr)
 {
        struct thash_data *data;
        union ia64_isr visr, pt_isr;
diff --git a/arch/ia64/kvm/vcpu.h b/arch/ia64/kvm/vcpu.h
index 042af92ced83..360724d3ae69 100644
--- a/arch/ia64/kvm/vcpu.h
+++ b/arch/ia64/kvm/vcpu.h
@@ -686,14 +686,15 @@ static inline int highest_inservice_irq(struct kvm_vcpu *vcpu)
        return highest_bits((int *)&(VMX(vcpu, insvc[0])));
 }
-extern void vcpu_get_fpreg(struct kvm_vcpu *vcpu, u64 reg,
+extern void vcpu_get_fpreg(struct kvm_vcpu *vcpu, unsigned long reg,
                                        struct ia64_fpreg *val);
-extern void vcpu_set_fpreg(struct kvm_vcpu *vcpu, u64 reg,
+extern void vcpu_set_fpreg(struct kvm_vcpu *vcpu, unsigned long reg,
                                        struct ia64_fpreg *val);
-extern u64 vcpu_get_gr(struct kvm_vcpu *vcpu, u64 reg);
+extern u64 vcpu_get_gr(struct kvm_vcpu *vcpu, unsigned long reg);
-extern void vcpu_set_gr(struct kvm_vcpu *vcpu, u64 reg, u64 val, int nat);
+extern void vcpu_set_gr(struct kvm_vcpu *vcpu, unsigned long reg,
-extern u64 vcpu_get_psr(struct kvm_vcpu *vcpu);
+                        u64 val, int nat);
-extern void vcpu_set_psr(struct kvm_vcpu *vcpu, u64 val);
+extern unsigned long vcpu_get_psr(struct kvm_vcpu *vcpu);
+extern void vcpu_set_psr(struct kvm_vcpu *vcpu, unsigned long val);
 extern u64 vcpu_thash(struct kvm_vcpu *vcpu, u64 vadr);
 extern void vcpu_bsw0(struct kvm_vcpu *vcpu);
 extern void thash_vhpt_insert(struct kvm_vcpu *v, u64 pte,
diff --git a/arch/ia64/lib/ip_fast_csum.S b/arch/ia64/lib/ip_fast_csum.S
index 1f86aeb2c948..620d9dc5220f 100644
--- a/arch/ia64/lib/ip_fast_csum.S
+++ b/arch/ia64/lib/ip_fast_csum.S
@@ -96,20 +96,22 @@ END(ip_fast_csum)
 GLOBAL_ENTRY(csum_ipv6_magic)
        ld4     r20=[in0],4
        ld4     r21=[in1],4
-        dep     r15=in3,in2,32,16
+        zxt4    in2=in2
        ;;
        ld4     r22=[in0],4
        ld4     r23=[in1],4
-        mux1    r15=r15,@rev
+        dep     r15=in3,in2,32,16
        ;;
        ld4     r24=[in0],4
        ld4     r25=[in1],4
-        shr.u   r15=r15,16
+        mux1    r15=r15,@rev
        add     r16=r20,r21
        add     r17=r22,r23
+        zxt4    in4=in4
        ;;
        ld4     r26=[in0],4
        ld4     r27=[in1],4
+        shr.u   r15=r15,16
        add     r18=r24,r25
        add     r8=r16,r17
        ;;
diff --git a/arch/ia64/mm/init.c b/arch/ia64/mm/init.c
index b115b3bbf04a..1857766a63c1 100644
--- a/arch/ia64/mm/init.c
+++ b/arch/ia64/mm/init.c
@@ -617,7 +617,6 @@ mem_init (void)
        long reserved_pages, codesize, datasize, initsize;
        pg_data_t *pgdat;
        int i;
-        static struct kcore_list kcore_mem, kcore_vmem, kcore_kernel;
        BUG_ON(PTRS_PER_PGD * sizeof(pgd_t) != PAGE_SIZE);
        BUG_ON(PTRS_PER_PMD * sizeof(pmd_t) != PAGE_SIZE);
@@ -639,10 +638,6 @@ mem_init (void)
        high_memory = __va(max_low_pfn * PAGE_SIZE);
-        kclist_add(&kcore_mem, __va(0), max_low_pfn * PAGE_SIZE);
-        kclist_add(&kcore_vmem, (void *)VMALLOC_START, VMALLOC_END-VMALLOC_START);
-        kclist_add(&kcore_kernel, _stext, _end - _stext);
        for_each_online_pgdat(pgdat)
                if (pgdat->bdata->node_bootmem_map)
                        totalram_pages += free_all_bootmem_node(pgdat);
@@ -655,7 +650,7 @@ mem_init (void)
        initsize =  (unsigned long) __init_end - (unsigned long) __init_begin;
        printk(KERN_INFO "Memory: %luk/%luk available (%luk code, %luk reserved, "
-               "%luk data, %luk init)\n", (unsigned long) nr_free_pages() << (PAGE_SHIFT - 10),
+               "%luk data, %luk init)\n", nr_free_pages() << (PAGE_SHIFT - 10),
               num_physpages << (PAGE_SHIFT - 10), codesize >> 10,
               reserved_pages << (PAGE_SHIFT - 10), datasize >> 10, initsize >> 10);
diff --git a/arch/ia64/sn/kernel/setup.c b/arch/ia64/sn/kernel/setup.c
index e456f062f241..ece1bf994499 100644
--- a/arch/ia64/sn/kernel/setup.c
+++ b/arch/ia64/sn/kernel/setup.c
@@ -71,7 +71,7 @@ EXPORT_SYMBOL(sn_rtc_cycles_per_second);
 DEFINE_PER_CPU(struct sn_hub_info_s, __sn_hub_info);
 EXPORT_PER_CPU_SYMBOL(__sn_hub_info);
-DEFINE_PER_CPU(short, __sn_cnodeid_to_nasid[MAX_COMPACT_NODES]);
+DEFINE_PER_CPU(short [MAX_COMPACT_NODES], __sn_cnodeid_to_nasid);
 EXPORT_PER_CPU_SYMBOL(__sn_cnodeid_to_nasid);
 DEFINE_PER_CPU(struct nodepda_s *, __sn_nodepda);
diff --git a/arch/ia64/sn/pci/pcibr/pcibr_ate.c b/arch/ia64/sn/pci/pcibr/pcibr_ate.c
index 239b3cedcf2b..5bc34eac9e01 100644
--- a/arch/ia64/sn/pci/pcibr/pcibr_ate.c
+++ b/arch/ia64/sn/pci/pcibr/pcibr_ate.c
@@ -54,6 +54,8 @@ static int find_free_ate(struct ate_resource *ate_resource, int start,
                                        break;
                                }
                        }
+                        if (i >= ate_resource->num_ate)
+                                return -1;
                } else
                        index++;        /* Try next ate */
        }
diff --git a/arch/ia64/xen/time.c b/arch/ia64/xen/time.c
index fb8332690179..dbeadb9c8e20 100644
--- a/arch/ia64/xen/time.c
+++ b/arch/ia64/xen/time.c
@@ -133,8 +133,7 @@ consider_steal_time(unsigned long new_itm)
                account_idle_ticks(blocked);
                run_local_timers();
-                if (rcu_pending(cpu))
+                rcu_check_callbacks(cpu, user_mode(get_irq_regs()));
-                        rcu_check_callbacks(cpu, user_mode(get_irq_regs()));
                scheduler_tick();
                run_posix_cpu_timers(p);