94 files changed, 676 insertions, 1118 deletions
diff --git a/arch/ia64/Kconfig b/arch/ia64/Kconfig
index ba22849ee3ec..38280ef4a2af 100644
--- a/arch/ia64/Kconfig
+++ b/arch/ia64/Kconfig
@@ -1,10 +1,3 @@
-#
-# For a description of the syntax of this configuration file,
-# see Documentation/kbuild/kconfig-language.txt.
-#
-mainmenu "IA-64 Linux Kernel Configuration"
 source "init/Kconfig"
 source "kernel/Kconfig.freezer"
@@ -29,6 +22,11 @@ config IA64
        select HAVE_KVM
        select HAVE_ARCH_TRACEHOOK
        select HAVE_DMA_API_DEBUG
+        select HAVE_GENERIC_HARDIRQS
+        select GENERIC_IRQ_PROBE
+        select GENERIC_PENDING_IRQ if SMP
+        select IRQ_PER_CPU
+        select GENERIC_IRQ_SHOW
        default y
        help
          The Itanium Processor Family is Intel's 64-bit successor to
@@ -53,6 +51,9 @@ config MMU
        bool
        default y
+config ARCH_DMA_ADDR_T_64BIT
+        def_bool y
 config NEED_DMA_MAP_STATE
        def_bool y
@@ -62,6 +63,9 @@ config NEED_SG_DMA_LENGTH
 config SWIOTLB
       bool
+config STACKTRACE_SUPPORT
+        def_bool y
 config GENERIC_LOCKBREAK
        def_bool n
@@ -74,10 +78,6 @@ config HUGETLB_PAGE_SIZE_VARIABLE
        depends on HUGETLB_PAGE
        default y
-config GENERIC_FIND_NEXT_BIT
-        bool
-        default y
 config GENERIC_CALIBRATE_DELAY
        bool
        default y
@@ -410,11 +410,11 @@ config PERMIT_BSP_REMOVE
        support. 
 config FORCE_CPEI_RETARGET
-        bool "Force assumption that CPEI can be re-targetted"
+        bool "Force assumption that CPEI can be re-targeted"
        depends on PERMIT_BSP_REMOVE
        default n
        ---help---
-        Say Y if you need to force the assumption that CPEI can be re-targetted to
+        Say Y if you need to force the assumption that CPEI can be re-targeted to
        any cpu in the system. This hint is available via ACPI 3.0 specifications.
        Tiger4 systems are capable of re-directing CPEI to any CPU other than BSP.
        This option it useful to enable this feature on older BIOS's as well.
@@ -679,26 +679,6 @@ source "arch/ia64/kvm/Kconfig"
 source "lib/Kconfig"
-#
-# Use the generic interrupt handling code in kernel/irq/:
-#
-config GENERIC_HARDIRQS
-        bool
-        default y
-config GENERIC_IRQ_PROBE
-        bool
-        default y
-config GENERIC_PENDING_IRQ
-        bool
-        depends on GENERIC_HARDIRQS && SMP
-        default y
-config IRQ_PER_CPU
-        bool
-        default y
 config IOMMU_HELPER
        def_bool (IA64_HP_ZX1 || IA64_HP_ZX1_SWIOTLB || IA64_GENERIC || SWIOTLB)
diff --git a/arch/ia64/configs/generic_defconfig b/arch/ia64/configs/generic_defconfig
index 3ded8fe62759..1d7bca0a396d 100644
--- a/arch/ia64/configs/generic_defconfig
+++ b/arch/ia64/configs/generic_defconfig
@@ -233,3 +233,4 @@ CONFIG_CRYPTO_PCBC=m
 CONFIG_CRYPTO_MD5=y
 # CONFIG_CRYPTO_ANSI_CPRNG is not set
 CONFIG_CRC_T10DIF=y
+CONFIG_MISC_DEVICES=y
diff --git a/arch/ia64/configs/gensparse_defconfig b/arch/ia64/configs/gensparse_defconfig
index 3a98b2dd58ac..b11fa880e4b6 100644
--- a/arch/ia64/configs/gensparse_defconfig
+++ b/arch/ia64/configs/gensparse_defconfig
@@ -208,3 +208,4 @@ CONFIG_MAGIC_SYSRQ=y
 CONFIG_DEBUG_KERNEL=y
 CONFIG_DEBUG_MUTEXES=y
 CONFIG_CRYPTO_MD5=y
+CONFIG_MISC_DEVICES=y
diff --git a/arch/ia64/hp/common/sba_iommu.c b/arch/ia64/hp/common/sba_iommu.c
index 4ce8d1358fee..80241fe03f50 100644
--- a/arch/ia64/hp/common/sba_iommu.c
+++ b/arch/ia64/hp/common/sba_iommu.c
@@ -37,6 +37,7 @@
 #include <linux/crash_dump.h>
 #include <linux/iommu-helper.h>
 #include <linux/dma-mapping.h>
+#include <linux/prefetch.h>
 #include <asm/delay.h>          /* ia64_get_itc() */
 #include <asm/io.h>
@@ -1063,7 +1064,7 @@ static void sba_unmap_page(struct device *dev, dma_addr_t iova, size_t size,
                /*
                ** Address does not fall w/in IOVA, must be bypassing
                */
-                DBG_BYPASS("sba_unmap_single_atttrs() bypass addr: 0x%lx\n",
+                DBG_BYPASS("sba_unmap_single_attrs() bypass addr: 0x%lx\n",
                           iova);
 #ifdef ENABLE_MARK_CLEAN
diff --git a/arch/ia64/hp/sim/hpsim_irq.c b/arch/ia64/hp/sim/hpsim_irq.c
index b272261d77cc..4bd9a63260ee 100644
--- a/arch/ia64/hp/sim/hpsim_irq.c
+++ b/arch/ia64/hp/sim/hpsim_irq.c
@@ -11,42 +11,41 @@
 #include <linux/irq.h>
 static unsigned int
-hpsim_irq_startup (unsigned int irq)
+hpsim_irq_startup(struct irq_data *data)
 {
        return 0;
 }
 static void
-hpsim_irq_noop (unsigned int irq)
+hpsim_irq_noop(struct irq_data *data)
 {
 }
 static int
-hpsim_set_affinity_noop(unsigned int a, const struct cpumask *b)
+hpsim_set_affinity_noop(struct irq_data *d, const struct cpumask *b, bool f)
 {
        return 0;
 }
 static struct irq_chip irq_type_hp_sim = {
-        .name =         "hpsim",
+        .name =                 "hpsim",
-        .startup =      hpsim_irq_startup,
+        .irq_startup =          hpsim_irq_startup,
-        .shutdown =     hpsim_irq_noop,
+        .irq_shutdown =         hpsim_irq_noop,
-        .enable =       hpsim_irq_noop,
+        .irq_enable =           hpsim_irq_noop,
-        .disable =      hpsim_irq_noop,
+        .irq_disable =          hpsim_irq_noop,
-        .ack =          hpsim_irq_noop,
+        .irq_ack =              hpsim_irq_noop,
-        .end =          hpsim_irq_noop,
+        .irq_set_affinity =     hpsim_set_affinity_noop,
-        .set_affinity = hpsim_set_affinity_noop,
 };
 void __init
 hpsim_irq_init (void)
 {
-        struct irq_desc *idesc;
        int i;
-        for (i = 0; i < NR_IRQS; ++i) {
+        for_each_active_irq(i) {
-                idesc = irq_desc + i;
+                struct irq_chip *chip = irq_get_chip(i);
-                if (idesc->chip == &no_irq_chip)
-                        idesc->chip = &irq_type_hp_sim;
+                if (chip == &no_irq_chip)
+                        irq_set_chip(i, &irq_type_hp_sim);
        }
 }
diff --git a/arch/ia64/hp/sim/simscsi.c b/arch/ia64/hp/sim/simscsi.c
index 3a078ad3aa44..331de723c676 100644
--- a/arch/ia64/hp/sim/simscsi.c
+++ b/arch/ia64/hp/sim/simscsi.c
@@ -202,7 +202,7 @@ simscsi_readwrite10 (struct scsi_cmnd *sc, int mode)
 }
 static int
-simscsi_queuecommand (struct scsi_cmnd *sc, void (*done)(struct scsi_cmnd *))
+simscsi_queuecommand_lck (struct scsi_cmnd *sc, void (*done)(struct scsi_cmnd *))
 {
        unsigned int target_id = sc->device->id;
        char fname[MAX_ROOT_LEN+16];
@@ -326,6 +326,8 @@ simscsi_queuecommand (struct scsi_cmnd *sc, void (*done)(struct scsi_cmnd *))
        return 0;
 }
+static DEF_SCSI_QCMD(simscsi_queuecommand)
 static int
 simscsi_host_reset (struct scsi_cmnd *sc)
 {
diff --git a/arch/ia64/hp/sim/simserial.c b/arch/ia64/hp/sim/simserial.c
index 1e8d71ad93ef..bff0824cf8a4 100644
--- a/arch/ia64/hp/sim/simserial.c
+++ b/arch/ia64/hp/sim/simserial.c
@@ -390,12 +390,11 @@ static void rs_unthrottle(struct tty_struct * tty)
 }
-static int rs_ioctl(struct tty_struct *tty, struct file * file,
+static int rs_ioctl(struct tty_struct *tty, unsigned int cmd, unsigned long arg)
-                    unsigned int cmd, unsigned long arg)
 {
        if ((cmd != TIOCGSERIAL) && (cmd != TIOCSSERIAL) &&
            (cmd != TIOCSERCONFIG) && (cmd != TIOCSERGSTRUCT) &&
-            (cmd != TIOCMIWAIT) && (cmd != TIOCGICOUNT)) {
+            (cmd != TIOCMIWAIT)) {
                if (tty->flags & (1 << TTY_IO_ERROR))
                    return -EIO;
        }
@@ -433,16 +432,6 @@ static int rs_ioctl(struct tty_struct *tty, struct file * file,
                case TIOCMIWAIT:
                        printk(KERN_INFO "rs_ioctl: TIOCMIWAIT: called\n");
                        return 0;
-                /*
-                 * Get counter of input serial line interrupts (DCD,RI,DSR,CTS)
-                 * Return: write counters to the user passed counter struct
-                 * NB: both 1->0 and 0->1 transitions are counted except for
-                 *     RI where only 0->1 is counted.
-                 */
-                case TIOCGICOUNT:
-                        printk(KERN_INFO "rs_ioctl: TIOCGICOUNT called\n");
-                        return 0;
                case TIOCSERGWILD:
                case TIOCSERSWILD:
                        /* "setserial -W" is called in Debian boot */
diff --git a/arch/ia64/include/asm/acpi.h b/arch/ia64/include/asm/acpi.h
index 837dc82a013e..a06dfb13d518 100644
--- a/arch/ia64/include/asm/acpi.h
+++ b/arch/ia64/include/asm/acpi.h
@@ -128,9 +128,9 @@ static inline const char *acpi_get_sysname (void)
 int acpi_request_vector (u32 int_type);
 int acpi_gsi_to_irq (u32 gsi, unsigned int *irq);
-/* routines for saving/restoring kernel state */
+/* Low-level suspend routine. */
-extern int acpi_save_state_mem(void);
+extern int acpi_suspend_lowlevel(void);
-extern void acpi_restore_state_mem(void);
 extern unsigned long acpi_wakeup_address;
 /*
diff --git a/arch/ia64/include/asm/bitops.h b/arch/ia64/include/asm/bitops.h
index 9da3df6f1a52..b76f7e009218 100644
--- a/arch/ia64/include/asm/bitops.h
+++ b/arch/ia64/include/asm/bitops.h
@@ -456,12 +456,11 @@ static __inline__ unsigned long __arch_hweight64(unsigned long x)
 #ifdef __KERNEL__
-#include <asm-generic/bitops/ext2-non-atomic.h>
+#include <asm-generic/bitops/le.h>
 #define ext2_set_bit_atomic(l,n,a)      test_and_set_bit(n,a)
 #define ext2_clear_bit_atomic(l,n,a)    test_and_clear_bit(n,a)
-#include <asm-generic/bitops/minix.h>
 #include <asm-generic/bitops/sched.h>
 #endif /* __KERNEL__ */
diff --git a/arch/ia64/include/asm/compat.h b/arch/ia64/include/asm/compat.h
deleted file mode 100644
index 9301a2821615..000000000000
--- a/arch/ia64/include/asm/compat.h
+++ /dev/null
@@ -1,208 +0,0 @@
-#ifndef _ASM_IA64_COMPAT_H
-#define _ASM_IA64_COMPAT_H
-/*
- * Architecture specific compatibility types
- */
-#include <linux/types.h>
-#define COMPAT_USER_HZ          100
-#define COMPAT_UTS_MACHINE      "i686\0\0\0"
-typedef u32             compat_size_t;
-typedef s32             compat_ssize_t;
-typedef s32             compat_time_t;
-typedef s32             compat_clock_t;
-typedef s32             compat_key_t;
-typedef s32             compat_pid_t;
-typedef u16             __compat_uid_t;
-typedef u16             __compat_gid_t;
-typedef u32             __compat_uid32_t;
-typedef u32             __compat_gid32_t;
-typedef u16             compat_mode_t;
-typedef u32             compat_ino_t;
-typedef u16             compat_dev_t;
-typedef s32             compat_off_t;
-typedef s64             compat_loff_t;
-typedef u16             compat_nlink_t;
-typedef u16             compat_ipc_pid_t;
-typedef s32             compat_daddr_t;
-typedef u32             compat_caddr_t;
-typedef __kernel_fsid_t compat_fsid_t;
-typedef s32             compat_timer_t;
-typedef s32             compat_int_t;
-typedef s32             compat_long_t;
-typedef s64 __attribute__((aligned(4))) compat_s64;
-typedef u32             compat_uint_t;
-typedef u32             compat_ulong_t;
-typedef u64 __attribute__((aligned(4))) compat_u64;
-struct compat_timespec {
-        compat_time_t   tv_sec;
-        s32             tv_nsec;
-};
-struct compat_timeval {
-        compat_time_t   tv_sec;
-        s32             tv_usec;
-};
-struct compat_stat {
-        compat_dev_t    st_dev;
-        u16             __pad1;
-        compat_ino_t    st_ino;
-        compat_mode_t   st_mode;
-        compat_nlink_t  st_nlink;
-        __compat_uid_t  st_uid;
-        __compat_gid_t  st_gid;
-        compat_dev_t    st_rdev;
-        u16             __pad2;
-        u32             st_size;
-        u32             st_blksize;
-        u32             st_blocks;
-        u32             st_atime;
-        u32             st_atime_nsec;
-        u32             st_mtime;
-        u32             st_mtime_nsec;
-        u32             st_ctime;
-        u32             st_ctime_nsec;
-        u32             __unused4;
-        u32             __unused5;
-};
-struct compat_flock {
-        short           l_type;
-        short           l_whence;
-        compat_off_t    l_start;
-        compat_off_t    l_len;
-        compat_pid_t    l_pid;
-};
-#define F_GETLK64       12
-#define F_SETLK64       13
-#define F_SETLKW64      14
-/*
- * IA32 uses 4 byte alignment for 64 bit quantities,
- * so we need to pack this structure.
- */
-struct compat_flock64 {
-        short           l_type;
-        short           l_whence;
-        compat_loff_t   l_start;
-        compat_loff_t   l_len;
-        compat_pid_t    l_pid;
-} __attribute__((packed));
-struct compat_statfs {
-        int             f_type;
-        int             f_bsize;
-        int             f_blocks;
-        int             f_bfree;
-        int             f_bavail;
-        int             f_files;
-        int             f_ffree;
-        compat_fsid_t   f_fsid;
-        int             f_namelen;      /* SunOS ignores this field. */
-        int             f_frsize;
-        int             f_spare[5];
-};
-#define COMPAT_RLIM_OLD_INFINITY       0x7fffffff
-#define COMPAT_RLIM_INFINITY           0xffffffff
-typedef u32             compat_old_sigset_t;    /* at least 32 bits */
-#define _COMPAT_NSIG            64
-#define _COMPAT_NSIG_BPW        32
-typedef u32             compat_sigset_word;
-#define COMPAT_OFF_T_MAX        0x7fffffff
-#define COMPAT_LOFF_T_MAX       0x7fffffffffffffffL
-struct compat_ipc64_perm {
-        compat_key_t key;
-        __compat_uid32_t uid;
-        __compat_gid32_t gid;
-        __compat_uid32_t cuid;
-        __compat_gid32_t cgid;
-        unsigned short mode;
-        unsigned short __pad1;
-        unsigned short seq;
-        unsigned short __pad2;
-        compat_ulong_t unused1;
-        compat_ulong_t unused2;
-};
-struct compat_semid64_ds {
-        struct compat_ipc64_perm sem_perm;
-        compat_time_t  sem_otime;
-        compat_ulong_t __unused1;
-        compat_time_t  sem_ctime;
-        compat_ulong_t __unused2;
-        compat_ulong_t sem_nsems;
-        compat_ulong_t __unused3;
-        compat_ulong_t __unused4;
-};
-struct compat_msqid64_ds {
-        struct compat_ipc64_perm msg_perm;
-        compat_time_t  msg_stime;
-        compat_ulong_t __unused1;
-        compat_time_t  msg_rtime;
-        compat_ulong_t __unused2;
-        compat_time_t  msg_ctime;
-        compat_ulong_t __unused3;
-        compat_ulong_t msg_cbytes;
-        compat_ulong_t msg_qnum;
-        compat_ulong_t msg_qbytes;
-        compat_pid_t   msg_lspid;
-        compat_pid_t   msg_lrpid;
-        compat_ulong_t __unused4;
-        compat_ulong_t __unused5;
-};
-struct compat_shmid64_ds {
-        struct compat_ipc64_perm shm_perm;
-        compat_size_t  shm_segsz;
-        compat_time_t  shm_atime;
-        compat_ulong_t __unused1;
-        compat_time_t  shm_dtime;
-        compat_ulong_t __unused2;
-        compat_time_t  shm_ctime;
-        compat_ulong_t __unused3;
-        compat_pid_t   shm_cpid;
-        compat_pid_t   shm_lpid;
-        compat_ulong_t shm_nattch;
-        compat_ulong_t __unused4;
-        compat_ulong_t __unused5;
-};
-/*
- * A pointer passed in from user mode. This should not be used for syscall parameters,
- * just declare them as pointers because the syscall entry code will have appropriately
- * converted them already.
- */
-typedef u32             compat_uptr_t;
-static inline void __user *
-compat_ptr (compat_uptr_t uptr)
-{
-        return (void __user *) (unsigned long) uptr;
-}
-static inline compat_uptr_t
-ptr_to_compat(void __user *uptr)
-{
-        return (u32)(unsigned long)uptr;
-}
-static __inline__ void __user *
-arch_compat_alloc_user_space (long len)
-{
-        struct pt_regs *regs = task_pt_regs(current);
-        return (void __user *) (((regs->r12 & 0xffffffff) & -16) - len);
-}
-#endif /* _ASM_IA64_COMPAT_H */
diff --git a/arch/ia64/include/asm/cputime.h b/arch/ia64/include/asm/cputime.h
index 7fa8a8594660..6073b187528a 100644
--- a/arch/ia64/include/asm/cputime.h
+++ b/arch/ia64/include/asm/cputime.h
@@ -56,10 +56,10 @@ typedef u64 cputime64_t;
 #define jiffies64_to_cputime64(__jif)   ((__jif) * (NSEC_PER_SEC / HZ))
 /*
- * Convert cputime <-> milliseconds
+ * Convert cputime <-> microseconds
 */
-#define cputime_to_msecs(__ct)          ((__ct) / NSEC_PER_MSEC)
+#define cputime_to_usecs(__ct)          ((__ct) / NSEC_PER_USEC)
-#define msecs_to_cputime(__msecs)       ((__msecs) * NSEC_PER_MSEC)
+#define usecs_to_cputime(__usecs)       ((__usecs) * NSEC_PER_USEC)
 /*
 * Convert cputime <-> seconds
diff --git a/arch/ia64/include/asm/dma-mapping.h b/arch/ia64/include/asm/dma-mapping.h
index a2e7368a0150..4336d080b241 100644
--- a/arch/ia64/include/asm/dma-mapping.h
+++ b/arch/ia64/include/asm/dma-mapping.h
@@ -12,6 +12,8 @@
 #define ARCH_HAS_DMA_GET_REQUIRED_MASK
+#define DMA_ERROR_CODE 0
 extern struct dma_map_ops *dma_ops;
 extern struct ia64_machine_vector ia64_mv;
 extern void set_iommu_machvec(void);
diff --git a/arch/ia64/include/asm/futex.h b/arch/ia64/include/asm/futex.h
index c7f0f062239c..8428525ddb22 100644
--- a/arch/ia64/include/asm/futex.h
+++ b/arch/ia64/include/asm/futex.h
@@ -46,7 +46,7 @@ do {									\
 } while (0)
 static inline int
-futex_atomic_op_inuser (int encoded_op, int __user *uaddr)
+futex_atomic_op_inuser (int encoded_op, u32 __user *uaddr)
 {
        int op = (encoded_op >> 28) & 7;
        int cmp = (encoded_op >> 24) & 15;
@@ -56,7 +56,7 @@ futex_atomic_op_inuser (int encoded_op, int __user *uaddr)
        if (encoded_op & (FUTEX_OP_OPARG_SHIFT << 28))
                oparg = 1 << oparg;
-        if (! access_ok (VERIFY_WRITE, uaddr, sizeof(int)))
+        if (! access_ok (VERIFY_WRITE, uaddr, sizeof(u32)))
                return -EFAULT;
        pagefault_disable();
@@ -100,23 +100,26 @@ futex_atomic_op_inuser (int encoded_op, int __user *uaddr)
 }
 static inline int
-futex_atomic_cmpxchg_inatomic(int __user *uaddr, int oldval, int newval)
+futex_atomic_cmpxchg_inatomic(u32 *uval, u32 __user *uaddr,
+                              u32 oldval, u32 newval)
 {
-        if (!access_ok(VERIFY_WRITE, uaddr, sizeof(int)))
+        if (!access_ok(VERIFY_WRITE, uaddr, sizeof(u32)))
                return -EFAULT;
        {
-                register unsigned long r8 __asm ("r8");
+                register unsigned long r8 __asm ("r8") = 0;
+                unsigned long prev;
                __asm__ __volatile__(
                        "       mf;;                                    \n"
                        "       mov ar.ccv=%3;;                         \n"
                        "[1:]   cmpxchg4.acq %0=[%1],%2,ar.ccv          \n"
                        "       .xdata4 \"__ex_table\", 1b-., 2f-.      \n"
                        "[2:]"
-                        : "=r" (r8)
+                        : "=r" (prev)
                        : "r" (uaddr), "r" (newval),
                          "rO" ((long) (unsigned) oldval)
                        : "memory");
+                *uval = prev;
                return r8;
        }
 }
diff --git a/arch/ia64/include/asm/hardirq.h b/arch/ia64/include/asm/hardirq.h
index d514cd9edb49..8fb7d33a661f 100644
--- a/arch/ia64/include/asm/hardirq.h
+++ b/arch/ia64/include/asm/hardirq.h
@@ -6,12 +6,6 @@
 *      David Mosberger-Tang <davidm@hpl.hp.com>
 */
-#include <linux/threads.h>
-#include <linux/irq.h>
-#include <asm/processor.h>
 /*
 * No irq_cpustat_t for IA-64.  The data is held in the per-CPU data structure.
 */
@@ -20,6 +14,11 @@
 #define local_softirq_pending()         (local_cpu_data->softirq_pending)
+#include <linux/threads.h>
+#include <linux/irq.h>
+#include <asm/processor.h>
 extern void __iomem *ipi_base_addr;
 void ack_bad_irq(unsigned int irq);
diff --git a/arch/ia64/include/asm/hw_irq.h b/arch/ia64/include/asm/hw_irq.h
index bf2e37493e04..a681d02cb324 100644
--- a/arch/ia64/include/asm/hw_irq.h
+++ b/arch/ia64/include/asm/hw_irq.h
@@ -151,9 +151,6 @@ static inline void ia64_native_resend_irq(unsigned int vector)
 /*
 * Default implementations for the irq-descriptor API:
 */
-extern struct irq_desc irq_desc[NR_IRQS];
 #ifndef CONFIG_IA64_GENERIC
 static inline ia64_vector __ia64_irq_to_vector(int irq)
 {
diff --git a/arch/ia64/include/asm/io.h b/arch/ia64/include/asm/io.h
index cc8335eb3110..e5a6c3530c6c 100644
--- a/arch/ia64/include/asm/io.h
+++ b/arch/ia64/include/asm/io.h
@@ -426,6 +426,11 @@ extern void __iomem * ioremap_nocache (unsigned long offset, unsigned long size)
 extern void iounmap (volatile void __iomem *addr);
 extern void __iomem * early_ioremap (unsigned long phys_addr, unsigned long size);
 extern void early_iounmap (volatile void __iomem *addr, unsigned long size);
+static inline void __iomem * ioremap_cache (unsigned long phys_addr, unsigned long size)
+{
+        return ioremap(phys_addr, size);
+}
 /*
 * String version of IO memory access ops:
diff --git a/arch/ia64/include/asm/ioctls.h b/arch/ia64/include/asm/ioctls.h
index b79c385114ef..f3aab5512e98 100644
--- a/arch/ia64/include/asm/ioctls.h
+++ b/arch/ia64/include/asm/ioctls.h
@@ -1,93 +1,6 @@
 #ifndef _ASM_IA64_IOCTLS_H
 #define _ASM_IA64_IOCTLS_H
-/*
+#include <asm-generic/ioctls.h>
- * Based on <asm-i386/ioctls.h>
- *
- * Modified 1998, 1999, 2002
- *      David Mosberger-Tang <davidm@hpl.hp.com>, Hewlett-Packard Co
- */
-#include <asm/ioctl.h>
-/* 0x54 is just a magic number to make these relatively unique ('T') */
-#define TCGETS          0x5401
-#define TCSETS          0x5402  /* Clashes with SNDCTL_TMR_START sound ioctl */
-#define TCSETSW         0x5403
-#define TCSETSF         0x5404
-#define TCGETA          0x5405
-#define TCSETA          0x5406
-#define TCSETAW         0x5407
-#define TCSETAF         0x5408
-#define TCSBRK          0x5409
-#define TCXONC          0x540A
-#define TCFLSH          0x540B
-#define TIOCEXCL        0x540C
-#define TIOCNXCL        0x540D
-#define TIOCSCTTY       0x540E
-#define TIOCGPGRP       0x540F
-#define TIOCSPGRP       0x5410
-#define TIOCOUTQ        0x5411
-#define TIOCSTI         0x5412
-#define TIOCGWINSZ      0x5413
-#define TIOCSWINSZ      0x5414
-#define TIOCMGET        0x5415
-#define TIOCMBIS        0x5416
-#define TIOCMBIC        0x5417
-#define TIOCMSET        0x5418
-#define TIOCGSOFTCAR    0x5419
-#define TIOCSSOFTCAR    0x541A
-#define FIONREAD        0x541B
-#define TIOCINQ         FIONREAD
-#define TIOCLINUX       0x541C
-#define TIOCCONS        0x541D
-#define TIOCGSERIAL     0x541E
-#define TIOCSSERIAL     0x541F
-#define TIOCPKT         0x5420
-#define FIONBIO         0x5421
-#define TIOCNOTTY       0x5422
-#define TIOCSETD        0x5423
-#define TIOCGETD        0x5424
-#define TCSBRKP         0x5425  /* Needed for POSIX tcsendbreak() */
-#define TIOCSBRK        0x5427  /* BSD compatibility */
-#define TIOCCBRK        0x5428  /* BSD compatibility */
-#define TIOCGSID        0x5429  /* Return the session ID of FD */
-#define TCGETS2         _IOR('T',0x2A, struct termios2)
-#define TCSETS2         _IOW('T',0x2B, struct termios2)
-#define TCSETSW2        _IOW('T',0x2C, struct termios2)
-#define TCSETSF2        _IOW('T',0x2D, struct termios2)
-#define TIOCGPTN        _IOR('T',0x30, unsigned int) /* Get Pty Number (of pty-mux device) */
-#define TIOCSPTLCK      _IOW('T',0x31, int)  /* Lock/unlock Pty */
-#define TIOCSIG         _IOW('T',0x36, int)  /* Generate signal on Pty slave */
-#define FIONCLEX        0x5450  /* these numbers need to be adjusted. */
-#define FIOCLEX         0x5451
-#define FIOASYNC        0x5452
-#define TIOCSERCONFIG   0x5453
-#define TIOCSERGWILD    0x5454
-#define TIOCSERSWILD    0x5455
-#define TIOCGLCKTRMIOS  0x5456
-#define TIOCSLCKTRMIOS  0x5457
-#define TIOCSERGSTRUCT  0x5458 /* For debugging only */
-#define TIOCSERGETLSR   0x5459 /* Get line status register */
-#define TIOCSERGETMULTI 0x545A /* Get multiport config  */
-#define TIOCSERSETMULTI 0x545B /* Set multiport config */
-#define TIOCMIWAIT      0x545C  /* wait for a change on serial input line(s) */
-#define TIOCGICOUNT     0x545D  /* read serial port inline interrupt counts */
-#define FIOQSIZE        0x5460
-/* Used for packet mode */
-#define TIOCPKT_DATA             0
-#define TIOCPKT_FLUSHREAD        1
-#define TIOCPKT_FLUSHWRITE       2
-#define TIOCPKT_STOP             4
-#define TIOCPKT_START            8
-#define TIOCPKT_NOSTOP          16
-#define TIOCPKT_DOSTOP          32
-#define TIOCPKT_IOCTL           64
-#define TIOCSER_TEMT    0x01    /* Transmitter physically empty */
 #endif /* _ASM_IA64_IOCTLS_H */
diff --git a/arch/ia64/include/asm/iommu_table.h b/arch/ia64/include/asm/iommu_table.h
new file mode 100644
index 000000000000..92c8d36ae5ae
--- /dev/null
+++ b/arch/ia64/include/asm/iommu_table.h
@@ -0,0 +1,6 @@
+#ifndef _ASM_IA64_IOMMU_TABLE_H
+#define _ASM_IA64_IOMMU_TABLE_H
+#define IOMMU_INIT_POST(_detect)
+#endif /* _ASM_IA64_IOMMU_TABLE_H */
diff --git a/arch/ia64/include/asm/irqflags.h b/arch/ia64/include/asm/irqflags.h
new file mode 100644
index 000000000000..f82d6be2ecd2
--- /dev/null
+++ b/arch/ia64/include/asm/irqflags.h
@@ -0,0 +1,94 @@
+/*
+ * IRQ flags defines.
+ *
+ * Copyright (C) 1998-2003 Hewlett-Packard Co
+ *      David Mosberger-Tang <davidm@hpl.hp.com>
+ * Copyright (C) 1999 Asit Mallick <asit.k.mallick@intel.com>
+ * Copyright (C) 1999 Don Dugger <don.dugger@intel.com>
+ */
+#ifndef _ASM_IA64_IRQFLAGS_H
+#define _ASM_IA64_IRQFLAGS_H
+#ifdef CONFIG_IA64_DEBUG_IRQ
+extern unsigned long last_cli_ip;
+static inline void arch_maybe_save_ip(unsigned long flags)
+{
+        if (flags & IA64_PSR_I)
+                last_cli_ip = ia64_getreg(_IA64_REG_IP);
+}
+#else
+#define arch_maybe_save_ip(flags) do {} while (0)
+#endif
+/*
+ * - clearing psr.i is implicitly serialized (visible by next insn)
+ * - setting psr.i requires data serialization
+ * - we need a stop-bit before reading PSR because we sometimes
+ *   write a floating-point register right before reading the PSR
+ *   and that writes to PSR.mfl
+ */
+static inline unsigned long arch_local_save_flags(void)
+{
+        ia64_stop();
+#ifdef CONFIG_PARAVIRT
+        return ia64_get_psr_i();
+#else
+        return ia64_getreg(_IA64_REG_PSR);
+#endif
+}
+static inline unsigned long arch_local_irq_save(void)
+{
+        unsigned long flags = arch_local_save_flags();
+        ia64_stop();
+        ia64_rsm(IA64_PSR_I);
+        arch_maybe_save_ip(flags);
+        return flags;
+}
+static inline void arch_local_irq_disable(void)
+{
+#ifdef CONFIG_IA64_DEBUG_IRQ
+        arch_local_irq_save();
+#else
+        ia64_stop();
+        ia64_rsm(IA64_PSR_I);
+#endif
+}
+static inline void arch_local_irq_enable(void)
+{
+        ia64_stop();
+        ia64_ssm(IA64_PSR_I);
+        ia64_srlz_d();
+}
+static inline void arch_local_irq_restore(unsigned long flags)
+{
+#ifdef CONFIG_IA64_DEBUG_IRQ
+        unsigned long old_psr = arch_local_save_flags();
+#endif
+        ia64_intrin_local_irq_restore(flags & IA64_PSR_I);
+        arch_maybe_save_ip(old_psr & ~flags);
+}
+static inline bool arch_irqs_disabled_flags(unsigned long flags)
+{
+        return (flags & IA64_PSR_I) == 0;
+}
+static inline bool arch_irqs_disabled(void)
+{
+        return arch_irqs_disabled_flags(arch_local_save_flags());
+}
+static inline void arch_safe_halt(void)
+{
+        ia64_pal_halt_light();  /* PAL_HALT_LIGHT */
+}
+#endif /* _ASM_IA64_IRQFLAGS_H */
diff --git a/arch/ia64/include/asm/kvm_host.h b/arch/ia64/include/asm/kvm_host.h
index 2f229e5de498..2689ee54a1c9 100644
--- a/arch/ia64/include/asm/kvm_host.h
+++ b/arch/ia64/include/asm/kvm_host.h
@@ -590,6 +590,10 @@ int kvm_emulate_halt(struct kvm_vcpu *vcpu);
 int kvm_pal_emul(struct kvm_vcpu *vcpu, struct kvm_run *kvm_run);
 void kvm_sal_emul(struct kvm_vcpu *vcpu);
+#define __KVM_HAVE_ARCH_VM_ALLOC 1
+struct kvm *kvm_arch_alloc_vm(void);
+void kvm_arch_free_vm(struct kvm *kvm);
 #endif /* __ASSEMBLY__*/
 #endif
diff --git a/arch/ia64/include/asm/page.h b/arch/ia64/include/asm/page.h
index 41b6d31110fd..961a16f43e6b 100644
--- a/arch/ia64/include/asm/page.h
+++ b/arch/ia64/include/asm/page.h
@@ -189,6 +189,7 @@ get_order (unsigned long size)
 # define pgprot_val(x)  ((x).pgprot)
 # define __pte(x)       ((pte_t) { (x) } )
+# define __pmd(x)       ((pmd_t) { (x) } )
 # define __pgprot(x)    ((pgprot_t) { (x) } )
 #else /* !STRICT_MM_TYPECHECKS */
diff --git a/arch/ia64/include/asm/pal.h b/arch/ia64/include/asm/pal.h
index 6a292505b396..2e69284df8e7 100644
--- a/arch/ia64/include/asm/pal.h
+++ b/arch/ia64/include/asm/pal.h
@@ -1669,7 +1669,7 @@ typedef union pal_vp_info_u {
 } pal_vp_info_u_t;
 /*
- * Returns infomation about virtual processor features
+ * Returns information about virtual processor features
 */
 static inline s64
 ia64_pal_vp_info (u64 feature_set, u64 vp_buffer, u64 *vp_info, u64 *vmm_id)
diff --git a/arch/ia64/include/asm/perfmon.h b/arch/ia64/include/asm/perfmon.h
index 7f3333dd00e4..d551183fee90 100644
--- a/arch/ia64/include/asm/perfmon.h
+++ b/arch/ia64/include/asm/perfmon.h
@@ -7,7 +7,7 @@
 #define _ASM_IA64_PERFMON_H
 /*
- * perfmon comamnds supported on all CPU models
+ * perfmon commands supported on all CPU models
 */
 #define PFM_WRITE_PMCS          0x01
 #define PFM_WRITE_PMDS          0x02
diff --git a/arch/ia64/include/asm/perfmon_default_smpl.h b/arch/ia64/include/asm/perfmon_default_smpl.h
index 74724b24c2b7..a2d560c67230 100644
--- a/arch/ia64/include/asm/perfmon_default_smpl.h
+++ b/arch/ia64/include/asm/perfmon_default_smpl.h
@@ -67,8 +67,8 @@ typedef struct {
        unsigned long   ip;                     /* where did the overflow interrupt happened  */
        unsigned long   tstamp;                 /* ar.itc when entering perfmon intr. handler */
-        unsigned short  cpu;                    /* cpu on which the overflow occured */
+        unsigned short  cpu;                    /* cpu on which the overflow occurred */
-        unsigned short  set;                    /* event set active when overflow ocurred   */
+        unsigned short  set;                    /* event set active when overflow occurred   */
        int             tgid;                   /* thread group id (for NPTL, this is getpid()) */
 } pfm_default_smpl_entry_t;
diff --git a/arch/ia64/include/asm/pgtable.h b/arch/ia64/include/asm/pgtable.h
index c3286f42e501..1a97af31ef17 100644
--- a/arch/ia64/include/asm/pgtable.h
+++ b/arch/ia64/include/asm/pgtable.h
@@ -406,9 +406,7 @@ pgd_offset (const struct mm_struct *mm, unsigned long address)
 #define pte_index(addr)         (((addr) >> PAGE_SHIFT) & (PTRS_PER_PTE - 1))
 #define pte_offset_kernel(dir,addr)     ((pte_t *) pmd_page_vaddr(*(dir)) + pte_index(addr))
 #define pte_offset_map(dir,addr)        pte_offset_kernel(dir, addr)
-#define pte_offset_map_nested(dir,addr) pte_offset_map(dir, addr)
 #define pte_unmap(pte)                  do { } while (0)
-#define pte_unmap_nested(pte)           do { } while (0)
 /* atomic versions of the some PTE manipulations: */
diff --git a/arch/ia64/include/asm/processor.h b/arch/ia64/include/asm/processor.h
index 348e44d08ce3..03afe7970748 100644
--- a/arch/ia64/include/asm/processor.h
+++ b/arch/ia64/include/asm/processor.h
@@ -717,8 +717,9 @@ prefetchw (const void *x)
 #define spin_lock_prefetch(x)   prefetchw(x)
 extern unsigned long boot_option_idle_override;
-extern unsigned long idle_halt;
-extern unsigned long idle_nomwait;
+enum idle_boot_override {IDLE_NO_OVERRIDE=0, IDLE_HALT, IDLE_FORCE_MWAIT,
+                         IDLE_NOMWAIT, IDLE_POLL};
 #endif /* !__ASSEMBLY__ */
diff --git a/arch/ia64/include/asm/rwsem.h b/arch/ia64/include/asm/rwsem.h
index 215d5454c7d3..3027e7516d85 100644
--- a/arch/ia64/include/asm/rwsem.h
+++ b/arch/ia64/include/asm/rwsem.h
@@ -25,20 +25,8 @@
 #error "Please don't include <asm/rwsem.h> directly, use <linux/rwsem.h> instead."
 #endif
-#include <linux/list.h>
-#include <linux/spinlock.h>
 #include <asm/intrinsics.h>
-/*
- * the semaphore definition
- */
-struct rw_semaphore {
-        signed long             count;
-        spinlock_t              wait_lock;
-        struct list_head        wait_list;
-};
 #define RWSEM_UNLOCKED_VALUE            __IA64_UL_CONST(0x0000000000000000)
 #define RWSEM_ACTIVE_BIAS               (1L)
 #define RWSEM_ACTIVE_MASK               (0xffffffffL)
@@ -46,26 +34,6 @@ struct rw_semaphore {
 #define RWSEM_ACTIVE_READ_BIAS          RWSEM_ACTIVE_BIAS
 #define RWSEM_ACTIVE_WRITE_BIAS         (RWSEM_WAITING_BIAS + RWSEM_ACTIVE_BIAS)
-#define __RWSEM_INITIALIZER(name) \
-        { RWSEM_UNLOCKED_VALUE, __SPIN_LOCK_UNLOCKED((name).wait_lock), \
-          LIST_HEAD_INIT((name).wait_list) }
-#define DECLARE_RWSEM(name) \
-        struct rw_semaphore name = __RWSEM_INITIALIZER(name)
-extern struct rw_semaphore *rwsem_down_read_failed(struct rw_semaphore *sem);
-extern struct rw_semaphore *rwsem_down_write_failed(struct rw_semaphore *sem);
-extern struct rw_semaphore *rwsem_wake(struct rw_semaphore *sem);
-extern struct rw_semaphore *rwsem_downgrade_wake(struct rw_semaphore *sem);
-static inline void
-init_rwsem (struct rw_semaphore *sem)
-{
-        sem->count = RWSEM_UNLOCKED_VALUE;
-        spin_lock_init(&sem->wait_lock);
-        INIT_LIST_HEAD(&sem->wait_list);
-}
 /*
 * lock for reading
 */
@@ -174,9 +142,4 @@ __downgrade_write (struct rw_semaphore *sem)
 #define rwsem_atomic_add(delta, sem)    atomic64_add(delta, (atomic64_t *)(&(sem)->count))
 #define rwsem_atomic_update(delta, sem) atomic64_add_return(delta, (atomic64_t *)(&(sem)->count))
-static inline int rwsem_is_locked(struct rw_semaphore *sem)
-{
-        return (sem->count != 0);
-}
 #endif /* _ASM_IA64_RWSEM_H */
diff --git a/arch/ia64/include/asm/siginfo.h b/arch/ia64/include/asm/siginfo.h
index 118d42979003..c8fcaa2ac48f 100644
--- a/arch/ia64/include/asm/siginfo.h
+++ b/arch/ia64/include/asm/siginfo.h
@@ -62,6 +62,7 @@ typedef struct siginfo {
                        int _imm;               /* immediate value for "break" */
                        unsigned int _flags;    /* see below */
                        unsigned long _isr;     /* isr */
+                        short _addr_lsb;        /* lsb of faulting address */
                } _sigfault;
                /* SIGPOLL */
diff --git a/arch/ia64/include/asm/sn/bte.h b/arch/ia64/include/asm/sn/bte.h
index 96798d2da7c2..cc6c4dbf53af 100644
--- a/arch/ia64/include/asm/sn/bte.h
+++ b/arch/ia64/include/asm/sn/bte.h
@@ -216,7 +216,7 @@ extern void bte_error_handler(unsigned long);
        bte_copy(0, dest, len, ((mode) | BTE_ZERO_FILL), notification)
 /*
- * The following is the prefered way of calling bte_unaligned_copy
+ * The following is the preferred way of calling bte_unaligned_copy
 * If the copy is fully cache line aligned, then bte_copy is
 * used instead.  Since bte_copy is inlined, this saves a call
 * stack.  NOTE: bte_copy is called synchronously and does block
diff --git a/arch/ia64/include/asm/sn/shub_mmr.h b/arch/ia64/include/asm/sn/shub_mmr.h
index 7de1d1d4b71a..a84d870f4294 100644
--- a/arch/ia64/include/asm/sn/shub_mmr.h
+++ b/arch/ia64/include/asm/sn/shub_mmr.h
@@ -459,7 +459,7 @@
 /* ==================================================================== */
 /* Some MMRs are functionally identical (or close enough) on both SHUB1 */
 /* and SHUB2 that it makes sense to define a geberic name for the MMR.  */
-/* It is acceptible to use (for example) SH_IPI_INT to reference the    */
+/* It is acceptable to use (for example) SH_IPI_INT to reference the    */
 /* the IPI MMR. The value of SH_IPI_INT is determined at runtime based  */
 /* on the type of the SHUB. Do not use these #defines in performance    */
 /* critical code  or loops - there is a small performance penalty.      */
diff --git a/arch/ia64/include/asm/sn/shubio.h b/arch/ia64/include/asm/sn/shubio.h
index 6052422a22b3..ecb8a49476b6 100644
--- a/arch/ia64/include/asm/sn/shubio.h
+++ b/arch/ia64/include/asm/sn/shubio.h
@@ -1383,7 +1383,7 @@ typedef union ii_ibcr_u {
 * response is capture in IXSM and IXSS, and IXSS[VALID] is set. The    *
 * errant header is thereby captured, and no further spurious read      *
 * respones are captured until IXSS[VALID] is cleared by setting the    *
- * appropriate bit in IECLR.Everytime a spurious read response is       *
+ * appropriate bit in IECLR. Every time a spurious read response is     *
 * detected, the SPUR_RD bit of the PRB corresponding to the incoming   *
 * message's SIDN field is set. This always happens, regarless of       *
 * whether a header is captured. The programmer should check            *
@@ -2738,7 +2738,7 @@ typedef union ii_ippr_u {
 /************************************************************************
 *                                                                      *
 * The following defines which were not formed into structures are      *
- * probably indentical to another register, and the name of the         *
+ * probably identical to another register, and the name of the          *
 * register is provided against each of these registers. This           *
 * information needs to be checked carefully                            *
 *                                                                      *
diff --git a/arch/ia64/include/asm/system.h b/arch/ia64/include/asm/system.h
index 9f342a574ce8..6cca30705d50 100644
--- a/arch/ia64/include/asm/system.h
+++ b/arch/ia64/include/asm/system.h
@@ -107,87 +107,11 @@ extern struct ia64_boot_param {
 */
 #define set_mb(var, value)      do { (var) = (value); mb(); } while (0)
-#define safe_halt()         ia64_pal_halt_light()    /* PAL_HALT_LIGHT */
 /*
 * The group barrier in front of the rsm & ssm are necessary to ensure
 * that none of the previous instructions in the same group are
 * affected by the rsm/ssm.
 */
-/* For spinlocks etc */
-/*
- * - clearing psr.i is implicitly serialized (visible by next insn)
- * - setting psr.i requires data serialization
- * - we need a stop-bit before reading PSR because we sometimes
- *   write a floating-point register right before reading the PSR
- *   and that writes to PSR.mfl
- */
-#ifdef CONFIG_PARAVIRT
-#define __local_save_flags()    ia64_get_psr_i()
-#else
-#define __local_save_flags()    ia64_getreg(_IA64_REG_PSR)
-#endif
-#define __local_irq_save(x)                     \
-do {                                            \
-        ia64_stop();                            \
-        (x) = __local_save_flags();             \
-        ia64_stop();                            \
-        ia64_rsm(IA64_PSR_I);                   \
-} while (0)
-#define __local_irq_disable()                   \
-do {                                            \
-        ia64_stop();                            \
-        ia64_rsm(IA64_PSR_I);                   \
-} while (0)
-#define __local_irq_restore(x)  ia64_intrin_local_irq_restore((x) & IA64_PSR_I)
-#ifdef CONFIG_IA64_DEBUG_IRQ
-  extern unsigned long last_cli_ip;
-# define __save_ip()            last_cli_ip = ia64_getreg(_IA64_REG_IP)
-# define local_irq_save(x)                                      \
-do {                                                            \
-        unsigned long __psr;                                    \
-                                                                \
-        __local_irq_save(__psr);                                \
-        if (__psr & IA64_PSR_I)                                 \
-                __save_ip();                                    \
-        (x) = __psr;                                            \
-} while (0)
-# define local_irq_disable()    do { unsigned long __x; local_irq_save(__x); } while (0)
-# define local_irq_restore(x)                                   \
-do {                                                            \
-        unsigned long __old_psr, __psr = (x);                   \
-                                                                \
-        local_save_flags(__old_psr);                            \
-        __local_irq_restore(__psr);                             \
-        if ((__old_psr & IA64_PSR_I) && !(__psr & IA64_PSR_I))  \
-                __save_ip();                                    \
-} while (0)
-#else /* !CONFIG_IA64_DEBUG_IRQ */
-# define local_irq_save(x)      __local_irq_save(x)
-# define local_irq_disable()    __local_irq_disable()
-# define local_irq_restore(x)   __local_irq_restore(x)
-#endif /* !CONFIG_IA64_DEBUG_IRQ */
-#define local_irq_enable()      ({ ia64_stop(); ia64_ssm(IA64_PSR_I); ia64_srlz_d(); })
-#define local_save_flags(flags) ({ ia64_stop(); (flags) = __local_save_flags(); })
-#define irqs_disabled()                         \
-({                                              \
-        unsigned long __ia64_id_flags;          \
-        local_save_flags(__ia64_id_flags);      \
-        (__ia64_id_flags & IA64_PSR_I) == 0;    \
-})
 #ifdef __KERNEL__
@@ -272,10 +196,6 @@ void cpu_idle_wait(void);
 void default_idle(void);
-#ifdef CONFIG_VIRT_CPU_ACCOUNTING
-extern void account_system_vtime(struct task_struct *);
-#endif
 #endif /* __KERNEL__ */
 #endif /* __ASSEMBLY__ */
diff --git a/arch/ia64/include/asm/thread_info.h b/arch/ia64/include/asm/thread_info.h
index b6a5ba2aca34..ff0cc84e7bcc 100644
--- a/arch/ia64/include/asm/thread_info.h
+++ b/arch/ia64/include/asm/thread_info.h
@@ -59,11 +59,12 @@ struct thread_info {
 #ifndef ASM_OFFSETS_C
 /* how to get the thread information struct from C */
 #define current_thread_info()   ((struct thread_info *) ((char *) current + IA64_TASK_SIZE))
-#define alloc_thread_info(tsk)  ((struct thread_info *) ((char *) (tsk) + IA64_TASK_SIZE))
+#define alloc_thread_info_node(tsk, node)       \
+                ((struct thread_info *) ((char *) (tsk) + IA64_TASK_SIZE))
 #define task_thread_info(tsk)   ((struct thread_info *) ((char *) (tsk) + IA64_TASK_SIZE))
 #else
 #define current_thread_info()   ((struct thread_info *) 0)
-#define alloc_thread_info(tsk)  ((struct thread_info *) 0)
+#define alloc_thread_info_node(tsk, node)       ((struct thread_info *) 0)
 #define task_thread_info(tsk)   ((struct thread_info *) 0)
 #endif
 #define free_thread_info(ti)    /* nothing */
@@ -84,7 +85,14 @@ struct thread_info {
 #define end_of_stack(p) (unsigned long *)((void *)(p) + IA64_RBS_OFFSET)
 #define __HAVE_ARCH_TASK_STRUCT_ALLOCATOR
-#define alloc_task_struct()     ((struct task_struct *)__get_free_pages(GFP_KERNEL | __GFP_COMP, KERNEL_STACK_SIZE_ORDER))
+#define alloc_task_struct_node(node)                                            \
+({                                                                              \
+        struct page *page = alloc_pages_node(node, GFP_KERNEL | __GFP_COMP,     \
+                                             KERNEL_STACK_SIZE_ORDER);          \
+        struct task_struct *ret = page ? page_address(page) : NULL;             \
+                                                                                \
+        ret;                                                                    \
+})
 #define free_task_struct(tsk)   free_pages((unsigned long) (tsk), KERNEL_STACK_SIZE_ORDER)
 #endif /* !__ASSEMBLY */
diff --git a/arch/ia64/include/asm/tlb.h b/arch/ia64/include/asm/tlb.h
index 23cce999eb1c..c3ffe3e54edc 100644
--- a/arch/ia64/include/asm/tlb.h
+++ b/arch/ia64/include/asm/tlb.h
@@ -47,21 +47,27 @@
 #include <asm/machvec.h>
 #ifdef CONFIG_SMP
-# define FREE_PTE_NR            2048
 # define tlb_fast_mode(tlb)     ((tlb)->nr == ~0U)
 #else
-# define FREE_PTE_NR            0
 # define tlb_fast_mode(tlb)     (1)
 #endif
+/*
+ * If we can't allocate a page to make a big batch of page pointers
+ * to work on, then just handle a few from the on-stack structure.
+ */
+#define IA64_GATHER_BUNDLE      8
 struct mmu_gather {
        struct mm_struct        *mm;
        unsigned int            nr;             /* == ~0U => fast mode */
+        unsigned int            max;
        unsigned char           fullmm;         /* non-zero means full mm flush */
        unsigned char           need_flush;     /* really unmapped some PTEs? */
        unsigned long           start_addr;
        unsigned long           end_addr;
-        struct page             *pages[FREE_PTE_NR];
+        struct page             **pages;
+        struct page             *local[IA64_GATHER_BUNDLE];
 };
 struct ia64_tr_entry {
@@ -90,9 +96,6 @@ extern struct ia64_tr_entry *ia64_idtrs[NR_CPUS];
 #define RR_RID_MASK     0x00000000ffffff00L
 #define RR_TO_RID(val)  ((val >> 8) & 0xffffff)
-/* Users of the generic TLB shootdown code must declare this storage space. */
-DECLARE_PER_CPU(struct mmu_gather, mmu_gathers);
 /*
 * Flush the TLB for address range START to END and, if not in fast mode, release the
 * freed pages that where gathered up to this point.
@@ -147,15 +150,23 @@ ia64_tlb_flush_mmu (struct mmu_gather *tlb, unsigned long start, unsigned long e
        }
 }
-/*
+static inline void __tlb_alloc_page(struct mmu_gather *tlb)
- * Return a pointer to an initialized struct mmu_gather.
- */
-static inline struct mmu_gather *
-tlb_gather_mmu (struct mm_struct *mm, unsigned int full_mm_flush)
 {
-        struct mmu_gather *tlb = &get_cpu_var(mmu_gathers);
+        unsigned long addr = __get_free_pages(GFP_NOWAIT | __GFP_NOWARN, 0);
+        if (addr) {
+                tlb->pages = (void *)addr;
+                tlb->max = PAGE_SIZE / sizeof(void *);
+        }
+}
+static inline void
+tlb_gather_mmu(struct mmu_gather *tlb, struct mm_struct *mm, unsigned int full_mm_flush)
+{
        tlb->mm = mm;
+        tlb->max = ARRAY_SIZE(tlb->local);
+        tlb->pages = tlb->local;
        /*
         * Use fast mode if only 1 CPU is online.
         *
@@ -172,7 +183,6 @@ tlb_gather_mmu (struct mm_struct *mm, unsigned int full_mm_flush)
        tlb->nr = (num_online_cpus() == 1) ? ~0U : 0;
        tlb->fullmm = full_mm_flush;
        tlb->start_addr = ~0UL;
-        return tlb;
 }
 /*
@@ -180,7 +190,7 @@ tlb_gather_mmu (struct mm_struct *mm, unsigned int full_mm_flush)
 * collected.
 */
 static inline void
-tlb_finish_mmu (struct mmu_gather *tlb, unsigned long start, unsigned long end)
+tlb_finish_mmu(struct mmu_gather *tlb, unsigned long start, unsigned long end)
 {
        /*
         * Note: tlb->nr may be 0 at this point, so we can't rely on tlb->start_addr and
@@ -191,7 +201,8 @@ tlb_finish_mmu (struct mmu_gather *tlb, unsigned long start, unsigned long end)
        /* keep the page table cache within bounds */
        check_pgt_cache();
-        put_cpu_var(mmu_gathers);
+        if (tlb->pages != tlb->local)
+                free_pages((unsigned long)tlb->pages, 0);
 }
 /*
@@ -199,18 +210,33 @@ tlb_finish_mmu (struct mmu_gather *tlb, unsigned long start, unsigned long end)
 * must be delayed until after the TLB has been flushed (see comments at the beginning of
 * this file).
 */
-static inline void
+static inline int __tlb_remove_page(struct mmu_gather *tlb, struct page *page)
-tlb_remove_page (struct mmu_gather *tlb, struct page *page)
 {
        tlb->need_flush = 1;
        if (tlb_fast_mode(tlb)) {
                free_page_and_swap_cache(page);
-                return;
+                return 1; /* avoid calling tlb_flush_mmu */
        }
+        if (!tlb->nr && tlb->pages == tlb->local)
+                __tlb_alloc_page(tlb);
        tlb->pages[tlb->nr++] = page;
-        if (tlb->nr >= FREE_PTE_NR)
+        VM_BUG_ON(tlb->nr > tlb->max);
-                ia64_tlb_flush_mmu(tlb, tlb->start_addr, tlb->end_addr);
+        return tlb->max - tlb->nr;
+}
+static inline void tlb_flush_mmu(struct mmu_gather *tlb)
+{
+        ia64_tlb_flush_mmu(tlb, tlb->start_addr, tlb->end_addr);
+}
+static inline void tlb_remove_page(struct mmu_gather *tlb, struct page *page)
+{
+        if (!__tlb_remove_page(tlb, page))
+                tlb_flush_mmu(tlb);
 }
 /*
diff --git a/arch/ia64/include/asm/types.h b/arch/ia64/include/asm/types.h
index 93773fd37be0..82b3939d2718 100644
--- a/arch/ia64/include/asm/types.h
+++ b/arch/ia64/include/asm/types.h
@@ -40,9 +40,6 @@ struct fnptr {
        unsigned long gp;
 };
-/* DMA addresses are 64-bits wide, in general.  */
-typedef u64 dma_addr_t;
 # endif /* __KERNEL__ */
 #endif /* !__ASSEMBLY__ */
diff --git a/arch/ia64/include/asm/unistd.h b/arch/ia64/include/asm/unistd.h
index 954d398a54b4..7c928da35b17 100644
--- a/arch/ia64/include/asm/unistd.h
+++ b/arch/ia64/include/asm/unistd.h
@@ -315,11 +315,17 @@
 #define __NR_fanotify_init              1323
 #define __NR_fanotify_mark              1324
 #define __NR_prlimit64                  1325
+#define __NR_name_to_handle_at          1326
+#define __NR_open_by_handle_at          1327
+#define __NR_clock_adjtime              1328
+#define __NR_syncfs                     1329
+#define __NR_setns                      1330
+#define __NR_sendmmsg                   1331
 #ifdef __KERNEL__
-#define NR_syscalls                     302 /* length of syscall table */
+#define NR_syscalls                     308 /* length of syscall table */
 /*
 * The following defines stop scripts/checksyscalls.sh from complaining about
diff --git a/arch/ia64/include/asm/xen/hypercall.h b/arch/ia64/include/asm/xen/hypercall.h
index 96fc62366aa4..ed28bcd5bb85 100644
--- a/arch/ia64/include/asm/xen/hypercall.h
+++ b/arch/ia64/include/asm/xen/hypercall.h
@@ -107,7 +107,7 @@ extern unsigned long __hypercall(unsigned long a1, unsigned long a2,
 static inline int
 xencomm_arch_hypercall_sched_op(int cmd, struct xencomm_handle *arg)
 {
-        return _hypercall2(int, sched_op_new, cmd, arg);
+        return _hypercall2(int, sched_op, cmd, arg);
 }
 static inline long
diff --git a/arch/ia64/kernel/Makefile b/arch/ia64/kernel/Makefile
index db10b1e378b0..395c2f216dd8 100644
--- a/arch/ia64/kernel/Makefile
+++ b/arch/ia64/kernel/Makefile
@@ -34,6 +34,7 @@ obj-$(CONFIG_AUDIT)		+= audit.o
 obj-$(CONFIG_PCI_MSI)           += msi_ia64.o
 mca_recovery-y                  += mca_drv.o mca_drv_asm.o
 obj-$(CONFIG_IA64_MC_ERR_INJECT)+= err_inject.o
+obj-$(CONFIG_STACKTRACE)        += stacktrace.o
 obj-$(CONFIG_PARAVIRT)          += paravirt.o paravirtentry.o \
                                   paravirt_patch.o
diff --git a/arch/ia64/kernel/acpi.c b/arch/ia64/kernel/acpi.c
index c6c90f39f4d9..3be485a300b1 100644
--- a/arch/ia64/kernel/acpi.c
+++ b/arch/ia64/kernel/acpi.c
@@ -477,6 +477,12 @@ acpi_numa_processor_affinity_init(struct acpi_srat_cpu_affinity *pa)
        if (!(pa->flags & ACPI_SRAT_CPU_ENABLED))
                return;
+        if (srat_num_cpus >= ARRAY_SIZE(node_cpuid)) {
+                printk_once(KERN_WARNING
+                            "node_cpuid[%ld] is too small, may not be able to use all cpus\n",
+                            ARRAY_SIZE(node_cpuid));
+                return;
+        }
        pxm = get_processor_proximity_domain(pa);
        /* record this node in proximity bitmap */
@@ -797,7 +803,7 @@ int acpi_isa_irq_to_gsi(unsigned isa_irq, u32 *gsi)
 *  ACPI based hotplug CPU support
 */
 #ifdef CONFIG_ACPI_HOTPLUG_CPU
-static
+static __cpuinit
 int acpi_map_cpu2node(acpi_handle handle, int cpu, int physid)
 {
 #ifdef CONFIG_ACPI_NUMA
@@ -872,7 +878,7 @@ __init void prefill_possible_map(void)
                set_cpu_possible(i, true);
 }
-int acpi_map_lsapic(acpi_handle handle, int *pcpu)
+static int __cpuinit _acpi_map_lsapic(acpi_handle handle, int *pcpu)
 {
        struct acpi_buffer buffer = { ACPI_ALLOCATE_BUFFER, NULL };
        union acpi_object *obj;
@@ -923,6 +929,11 @@ int acpi_map_lsapic(acpi_handle handle, int *pcpu)
        return (0);
 }
+/* wrapper to silence section mismatch warning */
+int __ref acpi_map_lsapic(acpi_handle handle, int *pcpu)
+{
+        return _acpi_map_lsapic(handle, pcpu);
+}
 EXPORT_SYMBOL(acpi_map_lsapic);
 int acpi_unmap_lsapic(int cpu)
@@ -1028,18 +1039,8 @@ int acpi_unregister_ioapic(acpi_handle handle, u32 gsi_base)
 EXPORT_SYMBOL(acpi_unregister_ioapic);
 /*
- * acpi_save_state_mem() - save kernel state
+ * acpi_suspend_lowlevel() - save kernel state and suspend.
 *
 * TBD when when IA64 starts to support suspend...
 */
-int acpi_save_state_mem(void) { return 0; } 
+int acpi_suspend_lowlevel(void) { return 0; }
-/*
- * acpi_restore_state()
- */
-void acpi_restore_state_mem(void) {}
-/*
- * do_suspend_lowlevel()
- */
-void do_suspend_lowlevel(void) {}
diff --git a/arch/ia64/kernel/cpufreq/acpi-cpufreq.c b/arch/ia64/kernel/cpufreq/acpi-cpufreq.c
index 22f61526a8e1..f09b174244d5 100644
--- a/arch/ia64/kernel/cpufreq/acpi-cpufreq.c
+++ b/arch/ia64/kernel/cpufreq/acpi-cpufreq.c
@@ -23,8 +23,6 @@
 #include <linux/acpi.h>
 #include <acpi/processor.h>
-#define dprintk(msg...) cpufreq_debug_printk(CPUFREQ_DEBUG_DRIVER, "acpi-cpufreq", msg)
 MODULE_AUTHOR("Venkatesh Pallipadi");
 MODULE_DESCRIPTION("ACPI Processor P-States Driver");
 MODULE_LICENSE("GPL");
@@ -47,12 +45,12 @@ processor_set_pstate (
 {
        s64 retval;
-        dprintk("processor_set_pstate\n");
+        pr_debug("processor_set_pstate\n");
        retval = ia64_pal_set_pstate((u64)value);
        if (retval) {
-                dprintk("Failed to set freq to 0x%x, with error 0x%lx\n",
+                pr_debug("Failed to set freq to 0x%x, with error 0x%lx\n",
                        value, retval);
                return -ENODEV;
        }
@@ -67,14 +65,14 @@ processor_get_pstate (
        u64     pstate_index = 0;
        s64     retval;
-        dprintk("processor_get_pstate\n");
+        pr_debug("processor_get_pstate\n");
        retval = ia64_pal_get_pstate(&pstate_index,
                                     PAL_GET_PSTATE_TYPE_INSTANT);
        *value = (u32) pstate_index;
        if (retval)
-                dprintk("Failed to get current freq with "
+                pr_debug("Failed to get current freq with "
                        "error 0x%lx, idx 0x%x\n", retval, *value);
        return (int)retval;
@@ -90,7 +88,7 @@ extract_clock (
 {
        unsigned long i;
-        dprintk("extract_clock\n");
+        pr_debug("extract_clock\n");
        for (i = 0; i < data->acpi_data.state_count; i++) {
                if (value == data->acpi_data.states[i].status)
@@ -110,7 +108,7 @@ processor_get_freq (
        cpumask_t               saved_mask;
        unsigned long           clock_freq;
-        dprintk("processor_get_freq\n");
+        pr_debug("processor_get_freq\n");
        saved_mask = current->cpus_allowed;
        set_cpus_allowed_ptr(current, cpumask_of(cpu));
@@ -148,7 +146,7 @@ processor_set_freq (
        cpumask_t               saved_mask;
        int                     retval;
-        dprintk("processor_set_freq\n");
+        pr_debug("processor_set_freq\n");
        saved_mask = current->cpus_allowed;
        set_cpus_allowed_ptr(current, cpumask_of(cpu));
@@ -159,16 +157,16 @@ processor_set_freq (
        if (state == data->acpi_data.state) {
                if (unlikely(data->resume)) {
-                        dprintk("Called after resume, resetting to P%d\n", state);
+                        pr_debug("Called after resume, resetting to P%d\n", state);
                        data->resume = 0;
                } else {
-                        dprintk("Already at target state (P%d)\n", state);
+                        pr_debug("Already at target state (P%d)\n", state);
                        retval = 0;
                        goto migrate_end;
                }
        }
-        dprintk("Transitioning from P%d to P%d\n",
+        pr_debug("Transitioning from P%d to P%d\n",
                data->acpi_data.state, state);
        /* cpufreq frequency struct */
@@ -186,7 +184,7 @@ processor_set_freq (
        value = (u32) data->acpi_data.states[state].control;
-        dprintk("Transitioning to state: 0x%08x\n", value);
+        pr_debug("Transitioning to state: 0x%08x\n", value);
        ret = processor_set_pstate(value);
        if (ret) {
@@ -219,7 +217,7 @@ acpi_cpufreq_get (
 {
        struct cpufreq_acpi_io *data = acpi_io_data[cpu];
-        dprintk("acpi_cpufreq_get\n");
+        pr_debug("acpi_cpufreq_get\n");
        return processor_get_freq(data, cpu);
 }
@@ -235,7 +233,7 @@ acpi_cpufreq_target (
        unsigned int next_state = 0;
        unsigned int result = 0;
-        dprintk("acpi_cpufreq_setpolicy\n");
+        pr_debug("acpi_cpufreq_setpolicy\n");
        result = cpufreq_frequency_table_target(policy,
                        data->freq_table, target_freq, relation, &next_state);
@@ -255,7 +253,7 @@ acpi_cpufreq_verify (
        unsigned int result = 0;
        struct cpufreq_acpi_io *data = acpi_io_data[policy->cpu];
-        dprintk("acpi_cpufreq_verify\n");
+        pr_debug("acpi_cpufreq_verify\n");
        result = cpufreq_frequency_table_verify(policy,
                        data->freq_table);
@@ -273,7 +271,7 @@ acpi_cpufreq_cpu_init (
        struct cpufreq_acpi_io  *data;
        unsigned int            result = 0;
-        dprintk("acpi_cpufreq_cpu_init\n");
+        pr_debug("acpi_cpufreq_cpu_init\n");
        data = kzalloc(sizeof(struct cpufreq_acpi_io), GFP_KERNEL);
        if (!data)
@@ -288,7 +286,7 @@ acpi_cpufreq_cpu_init (
        /* capability check */
        if (data->acpi_data.state_count <= 1) {
-                dprintk("No P-States\n");
+                pr_debug("No P-States\n");
                result = -ENODEV;
                goto err_unreg;
        }
@@ -297,7 +295,7 @@ acpi_cpufreq_cpu_init (
                                        ACPI_ADR_SPACE_FIXED_HARDWARE) ||
            (data->acpi_data.status_register.space_id !=
                                        ACPI_ADR_SPACE_FIXED_HARDWARE)) {
-                dprintk("Unsupported address space [%d, %d]\n",
+                pr_debug("Unsupported address space [%d, %d]\n",
                        (u32) (data->acpi_data.control_register.space_id),
                        (u32) (data->acpi_data.status_register.space_id));
                result = -ENODEV;
@@ -348,7 +346,7 @@ acpi_cpufreq_cpu_init (
               "activated.\n", cpu);
        for (i = 0; i < data->acpi_data.state_count; i++)
-                dprintk("     %cP%d: %d MHz, %d mW, %d uS, %d uS, 0x%x 0x%x\n",
+                pr_debug("     %cP%d: %d MHz, %d mW, %d uS, %d uS, 0x%x 0x%x\n",
                        (i == data->acpi_data.state?'*':' '), i,
                        (u32) data->acpi_data.states[i].core_frequency,
                        (u32) data->acpi_data.states[i].power,
@@ -383,7 +381,7 @@ acpi_cpufreq_cpu_exit (
 {
        struct cpufreq_acpi_io *data = acpi_io_data[policy->cpu];
-        dprintk("acpi_cpufreq_cpu_exit\n");
+        pr_debug("acpi_cpufreq_cpu_exit\n");
        if (data) {
                cpufreq_frequency_table_put_attr(policy->cpu);
@@ -418,7 +416,7 @@ static struct cpufreq_driver acpi_cpufreq_driver = {
 static int __init
 acpi_cpufreq_init (void)
 {
-        dprintk("acpi_cpufreq_init\n");
+        pr_debug("acpi_cpufreq_init\n");
        return cpufreq_register_driver(&acpi_cpufreq_driver);
 }
@@ -427,7 +425,7 @@ acpi_cpufreq_init (void)
 static void __exit
 acpi_cpufreq_exit (void)
 {
-        dprintk("acpi_cpufreq_exit\n");
+        pr_debug("acpi_cpufreq_exit\n");
        cpufreq_unregister_driver(&acpi_cpufreq_driver);
        return;
diff --git a/arch/ia64/kernel/crash_dump.c b/arch/ia64/kernel/crash_dump.c
index 23e91290e41f..c8c9298666fb 100644
--- a/arch/ia64/kernel/crash_dump.c
+++ b/arch/ia64/kernel/crash_dump.c
@@ -13,9 +13,6 @@
 #include <asm/page.h>
 #include <asm/uaccess.h>
-/* Stores the physical address of elf header of crash image. */
-unsigned long long elfcorehdr_addr = ELFCORE_ADDR_MAX;
 /**
 * copy_oldmem_page - copy one page from "oldmem"
 * @pfn: page frame number to be copied
diff --git a/arch/ia64/kernel/cyclone.c b/arch/ia64/kernel/cyclone.c
index 71e35864d2e2..f64097b5118a 100644
--- a/arch/ia64/kernel/cyclone.c
+++ b/arch/ia64/kernel/cyclone.c
@@ -31,8 +31,6 @@ static struct clocksource clocksource_cyclone = {
        .rating         = 300,
        .read           = read_cyclone,
        .mask           = (1LL << 40) - 1,
-        .mult           = 0, /*to be caluclated*/
-        .shift          = 16,
        .flags          = CLOCK_SOURCE_IS_CONTINUOUS,
 };
@@ -59,13 +57,13 @@ int __init init_cyclone_clock(void)
                return -ENODEV;
        }
        base = readq(reg);
+        iounmap(reg);
        if(!base){
                printk(KERN_ERR "Summit chipset: Could not find valid CBAR"
                                " value.\n");
                use_cyclone = 0;
                return -ENODEV;
        }
-        iounmap(reg);
        /* setup PMCC */
        offset = (base + CYCLONE_PMCC_OFFSET);
@@ -118,9 +116,7 @@ int __init init_cyclone_clock(void)
        /* initialize last tick */
        cyclone_mc = cyclone_timer;
        clocksource_cyclone.fsys_mmio = cyclone_timer;
-        clocksource_cyclone.mult = clocksource_hz2mult(CYCLONE_TIMER_FREQ,
+        clocksource_register_hz(&clocksource_cyclone, CYCLONE_TIMER_FREQ);
-                                                clocksource_cyclone.shift);
-        clocksource_register(&clocksource_cyclone);
        return 0;
 }
diff --git a/arch/ia64/kernel/efi.c b/arch/ia64/kernel/efi.c
index a0f001928502..6fc03aff046c 100644
--- a/arch/ia64/kernel/efi.c
+++ b/arch/ia64/kernel/efi.c
@@ -23,6 +23,7 @@
 */
 #include <linux/module.h>
 #include <linux/bootmem.h>
+#include <linux/crash_dump.h>
 #include <linux/kernel.h>
 #include <linux/init.h>
 #include <linux/types.h>
diff --git a/arch/ia64/kernel/entry.S b/arch/ia64/kernel/entry.S
index 244704a174de..97dd2abdeb1a 100644
--- a/arch/ia64/kernel/entry.S
+++ b/arch/ia64/kernel/entry.S
@@ -1771,6 +1771,12 @@ sys_call_table:
        data8 sys_fanotify_init
        data8 sys_fanotify_mark
        data8 sys_prlimit64                     // 1325
+        data8 sys_name_to_handle_at
+        data8 sys_open_by_handle_at
+        data8 sys_clock_adjtime
+        data8 sys_syncfs
+        data8 sys_setns                         // 1330
+        data8 sys_sendmmsg
        .org sys_call_table + 8*NR_syscalls     // guard against failures to increase NR_syscalls
 #endif /* __IA64_ASM_PARAVIRTUALIZED_NATIVE */
diff --git a/arch/ia64/kernel/iosapic.c b/arch/ia64/kernel/iosapic.c
index 7ded76658d2d..b0f9afebb146 100644
--- a/arch/ia64/kernel/iosapic.c
+++ b/arch/ia64/kernel/iosapic.c
@@ -108,10 +108,6 @@
 #define DBG(fmt...)
 #endif
-#define NR_PREALLOCATE_RTE_ENTRIES \
-        (PAGE_SIZE / sizeof(struct iosapic_rte_info))
-#define RTE_PREALLOCATED        (1)
 static DEFINE_SPINLOCK(iosapic_lock);
 /*
@@ -136,7 +132,6 @@ struct iosapic_rte_info {
        struct list_head rte_list;      /* RTEs sharing the same vector */
        char            rte_index;      /* IOSAPIC RTE index */
        int             refcnt;         /* reference counter */
-        unsigned int    flags;          /* flags */
        struct iosapic  *iosapic;
 } ____cacheline_aligned;
@@ -155,9 +150,6 @@ static struct iosapic_intr_info {
 static unsigned char pcat_compat __devinitdata; /* 8259 compatibility flag */
-static int iosapic_kmalloc_ok;
-static LIST_HEAD(free_rte_list);
 static inline void
 iosapic_write(struct iosapic *iosapic, unsigned int reg, u32 val)
 {
@@ -265,7 +257,7 @@ set_rte (unsigned int gsi, unsigned int irq, unsigned int dest, int mask)
 }
 static void
-nop (unsigned int irq)
+nop (struct irq_data *data)
 {
        /* do nothing... */
 }
@@ -295,8 +287,9 @@ kexec_disable_iosapic(void)
 #endif
 static void
-mask_irq (unsigned int irq)
+mask_irq (struct irq_data *data)
 {
+        unsigned int irq = data->irq;
        u32 low32;
        int rte_index;
        struct iosapic_rte_info *rte;
@@ -313,8 +306,9 @@ mask_irq (unsigned int irq)
 }
 static void
-unmask_irq (unsigned int irq)
+unmask_irq (struct irq_data *data)
 {
+        unsigned int irq = data->irq;
        u32 low32;
        int rte_index;
        struct iosapic_rte_info *rte;
@@ -331,9 +325,11 @@ unmask_irq (unsigned int irq)
 static int
-iosapic_set_affinity(unsigned int irq, const struct cpumask *mask)
+iosapic_set_affinity(struct irq_data *data, const struct cpumask *mask,
+                     bool force)
 {
 #ifdef CONFIG_SMP
+        unsigned int irq = data->irq;
        u32 high32, low32;
        int cpu, dest, rte_index;
        int redir = (irq & IA64_IRQ_REDIRECTED) ? 1 : 0;
@@ -387,31 +383,33 @@ iosapic_set_affinity(unsigned int irq, const struct cpumask *mask)
 */
 static unsigned int
-iosapic_startup_level_irq (unsigned int irq)
+iosapic_startup_level_irq (struct irq_data *data)
 {
-        unmask_irq(irq);
+        unmask_irq(data);
        return 0;
 }
 static void
-iosapic_end_level_irq (unsigned int irq)
+iosapic_unmask_level_irq (struct irq_data *data)
 {
+        unsigned int irq = data->irq;
        ia64_vector vec = irq_to_vector(irq);
        struct iosapic_rte_info *rte;
        int do_unmask_irq = 0;
        irq_complete_move(irq);
-        if (unlikely(irq_desc[irq].status & IRQ_MOVE_PENDING)) {
+        if (unlikely(irqd_is_setaffinity_pending(data))) {
                do_unmask_irq = 1;
-                mask_irq(irq);
+                mask_irq(data);
-        }
+        } else
+                unmask_irq(data);
        list_for_each_entry(rte, &iosapic_intr_info[irq].rtes, rte_list)
                iosapic_eoi(rte->iosapic->addr, vec);
        if (unlikely(do_unmask_irq)) {
-                move_masked_irq(irq);
+                irq_move_masked_irq(data);
-                unmask_irq(irq);
+                unmask_irq(data);
        }
 }
@@ -421,16 +419,15 @@ iosapic_end_level_irq (unsigned int irq)
 #define iosapic_ack_level_irq           nop
 static struct irq_chip irq_type_iosapic_level = {
-        .name =         "IO-SAPIC-level",
+        .name =                 "IO-SAPIC-level",
-        .startup =      iosapic_startup_level_irq,
+        .irq_startup =          iosapic_startup_level_irq,
-        .shutdown =     iosapic_shutdown_level_irq,
+        .irq_shutdown =         iosapic_shutdown_level_irq,
-        .enable =       iosapic_enable_level_irq,
+        .irq_enable =           iosapic_enable_level_irq,
-        .disable =      iosapic_disable_level_irq,
+        .irq_disable =          iosapic_disable_level_irq,
-        .ack =          iosapic_ack_level_irq,
+        .irq_ack =              iosapic_ack_level_irq,
-        .end =          iosapic_end_level_irq,
+        .irq_mask =             mask_irq,
-        .mask =         mask_irq,
+        .irq_unmask =           iosapic_unmask_level_irq,
-        .unmask =       unmask_irq,
+        .irq_set_affinity =     iosapic_set_affinity
-        .set_affinity = iosapic_set_affinity
 };
 /*
@@ -438,9 +435,9 @@ static struct irq_chip irq_type_iosapic_level = {
 */
 static unsigned int
-iosapic_startup_edge_irq (unsigned int irq)
+iosapic_startup_edge_irq (struct irq_data *data)
 {
-        unmask_irq(irq);
+        unmask_irq(data);
        /*
         * IOSAPIC simply drops interrupts pended while the
         * corresponding pin was masked, so we can't know if an
@@ -450,37 +447,25 @@ iosapic_startup_edge_irq (unsigned int irq)
 }
 static void
-iosapic_ack_edge_irq (unsigned int irq)
+iosapic_ack_edge_irq (struct irq_data *data)
 {
-        struct irq_desc *idesc = irq_desc + irq;
+        irq_complete_move(data->irq);
+        irq_move_irq(data);
-        irq_complete_move(irq);
-        move_native_irq(irq);
-        /*
-         * Once we have recorded IRQ_PENDING already, we can mask the
-         * interrupt for real. This prevents IRQ storms from unhandled
-         * devices.
-         */
-        if ((idesc->status & (IRQ_PENDING|IRQ_DISABLED)) ==
-            (IRQ_PENDING|IRQ_DISABLED))
-                mask_irq(irq);
 }
 #define iosapic_enable_edge_irq         unmask_irq
 #define iosapic_disable_edge_irq        nop
-#define iosapic_end_edge_irq            nop
 static struct irq_chip irq_type_iosapic_edge = {
-        .name =         "IO-SAPIC-edge",
+        .name =                 "IO-SAPIC-edge",
-        .startup =      iosapic_startup_edge_irq,
+        .irq_startup =          iosapic_startup_edge_irq,
-        .shutdown =     iosapic_disable_edge_irq,
+        .irq_shutdown =         iosapic_disable_edge_irq,
-        .enable =       iosapic_enable_edge_irq,
+        .irq_enable =           iosapic_enable_edge_irq,
-        .disable =      iosapic_disable_edge_irq,
+        .irq_disable =          iosapic_disable_edge_irq,
-        .ack =          iosapic_ack_edge_irq,
+        .irq_ack =              iosapic_ack_edge_irq,
-        .end =          iosapic_end_edge_irq,
+        .irq_mask =             mask_irq,
-        .mask =         mask_irq,
+        .irq_unmask =           unmask_irq,
-        .unmask =       unmask_irq,
+        .irq_set_affinity =     iosapic_set_affinity
-        .set_affinity = iosapic_set_affinity
 };
 static unsigned int
@@ -552,37 +537,6 @@ iosapic_reassign_vector (int irq)
        }
 }
-static struct iosapic_rte_info * __init_refok iosapic_alloc_rte (void)
-{
-        int i;
-        struct iosapic_rte_info *rte;
-        int preallocated = 0;
-        if (!iosapic_kmalloc_ok && list_empty(&free_rte_list)) {
-                rte = alloc_bootmem(sizeof(struct iosapic_rte_info) *
-                                    NR_PREALLOCATE_RTE_ENTRIES);
-                for (i = 0; i < NR_PREALLOCATE_RTE_ENTRIES; i++, rte++)
-                        list_add(&rte->rte_list, &free_rte_list);
-        }
-        if (!list_empty(&free_rte_list)) {
-                rte = list_entry(free_rte_list.next, struct iosapic_rte_info,
-                                 rte_list);
-                list_del(&rte->rte_list);
-                preallocated++;
-        } else {
-                rte = kmalloc(sizeof(struct iosapic_rte_info), GFP_ATOMIC);
-                if (!rte)
-                        return NULL;
-        }
-        memset(rte, 0, sizeof(struct iosapic_rte_info));
-        if (preallocated)
-                rte->flags |= RTE_PREALLOCATED;
-        return rte;
-}
 static inline int irq_is_shared (int irq)
 {
        return (iosapic_intr_info[irq].count > 1);
@@ -601,8 +555,7 @@ static int
 register_intr (unsigned int gsi, int irq, unsigned char delivery,
               unsigned long polarity, unsigned long trigger)
 {
-        struct irq_desc *idesc;
+        struct irq_chip *chip, *irq_type;
-        struct irq_chip *irq_type;
        int index;
        struct iosapic_rte_info *rte;
@@ -615,7 +568,7 @@ register_intr (unsigned int gsi, int irq, unsigned char delivery,
        rte = find_rte(irq, gsi);
        if (!rte) {
-                rte = iosapic_alloc_rte();
+                rte = kzalloc(sizeof (*rte), GFP_ATOMIC);
                if (!rte) {
                        printk(KERN_WARNING "%s: cannot allocate memory\n",
                               __func__);
@@ -649,15 +602,18 @@ register_intr (unsigned int gsi, int irq, unsigned char delivery,
        irq_type = iosapic_get_irq_chip(trigger);
-        idesc = irq_desc + irq;
+        chip = irq_get_chip(irq);
-        if (irq_type != NULL && idesc->chip != irq_type) {
+        if (irq_type != NULL && chip != irq_type) {
-                if (idesc->chip != &no_irq_chip)
+                if (chip != &no_irq_chip)
                        printk(KERN_WARNING
                               "%s: changing vector %d from %s to %s\n",
                               __func__, irq_to_vector(irq),
-                               idesc->chip->name, irq_type->name);
+                               chip->name, irq_type->name);
-                idesc->chip = irq_type;
+                chip = irq_type;
        }
+        __irq_set_chip_handler_name_locked(irq, chip, trigger == IOSAPIC_EDGE ?
+                                           handle_edge_irq : handle_level_irq,
+                                           NULL);
        return 0;
 }
@@ -767,6 +723,7 @@ iosapic_register_intr (unsigned int gsi,
        struct iosapic_rte_info *rte;
        u32 low32;
        unsigned char dmode;
+        struct irq_desc *desc;
        /*
         * If this GSI has already been registered (i.e., it's a
@@ -794,12 +751,13 @@ iosapic_register_intr (unsigned int gsi,
                        goto unlock_iosapic_lock;
        }
-        raw_spin_lock(&irq_desc[irq].lock);
+        desc = irq_to_desc(irq);
+        raw_spin_lock(&desc->lock);
        dest = get_target_cpu(gsi, irq);
        dmode = choose_dmode();
        err = register_intr(gsi, irq, dmode, polarity, trigger);
        if (err < 0) {
-                raw_spin_unlock(&irq_desc[irq].lock);
+                raw_spin_unlock(&desc->lock);
                irq = err;
                goto unlock_iosapic_lock;
        }
@@ -818,7 +776,7 @@ iosapic_register_intr (unsigned int gsi,
               (polarity == IOSAPIC_POL_HIGH ? "high" : "low"),
               cpu_logical_id(dest), dest, irq_to_vector(irq));
-        raw_spin_unlock(&irq_desc[irq].lock);
+        raw_spin_unlock(&desc->lock);
 unlock_iosapic_lock:
        spin_unlock_irqrestore(&iosapic_lock, flags);
        return irq;
@@ -829,7 +787,6 @@ iosapic_unregister_intr (unsigned int gsi)
 {
        unsigned long flags;
        int irq, index;
-        struct irq_desc *idesc;
        u32 low32;
        unsigned long trigger, polarity;
        unsigned int dest;
@@ -859,7 +816,6 @@ iosapic_unregister_intr (unsigned int gsi)
        if (--rte->refcnt > 0)
                goto out;
-        idesc = irq_desc + irq;
        rte->refcnt = NO_REF_RTE;
        /* Mask the interrupt */
@@ -883,7 +839,7 @@ iosapic_unregister_intr (unsigned int gsi)
        if (iosapic_intr_info[irq].count == 0) {
 #ifdef CONFIG_SMP
                /* Clear affinity */
-                cpumask_setall(idesc->affinity);
+                cpumask_setall(irq_get_irq_data(irq)->affinity);
 #endif
                /* Clear the interrupt information */
                iosapic_intr_info[irq].dest = 0;
@@ -1161,10 +1117,3 @@ map_iosapic_to_node(unsigned int gsi_base, int node)
        return;
 }
 #endif
-static int __init iosapic_enable_kmalloc (void)
-{
-        iosapic_kmalloc_ok = 1;
-        return 0;
-}
-core_initcall (iosapic_enable_kmalloc);
diff --git a/arch/ia64/kernel/irq.c b/arch/ia64/kernel/irq.c
index 94ee9d067cbd..ad69606613eb 100644
--- a/arch/ia64/kernel/irq.c
+++ b/arch/ia64/kernel/irq.c
@@ -53,47 +53,9 @@ atomic_t irq_err_count;
 /*
 * /proc/interrupts printing:
 */
+int arch_show_interrupts(struct seq_file *p, int prec)
-int show_interrupts(struct seq_file *p, void *v)
 {
-        int i = *(loff_t *) v, j;
+        seq_printf(p, "ERR: %10u\n", atomic_read(&irq_err_count));
-        struct irqaction * action;
-        unsigned long flags;
-        if (i == 0) {
-                char cpuname[16];
-                seq_printf(p, "     ");
-                for_each_online_cpu(j) {
-                        snprintf(cpuname, 10, "CPU%d", j);
-                        seq_printf(p, "%10s ", cpuname);
-                }
-                seq_putc(p, '\n');
-        }
-        if (i < NR_IRQS) {
-                raw_spin_lock_irqsave(&irq_desc[i].lock, flags);
-                action = irq_desc[i].action;
-                if (!action)
-                        goto skip;
-                seq_printf(p, "%3d: ",i);
-#ifndef CONFIG_SMP
-                seq_printf(p, "%10u ", kstat_irqs(i));
-#else
-                for_each_online_cpu(j) {
-                        seq_printf(p, "%10u ", kstat_irqs_cpu(i, j));
-                }
-#endif
-                seq_printf(p, " %14s", irq_desc[i].chip->name);
-                seq_printf(p, "  %s", action->name);
-                for (action=action->next; action; action = action->next)
-                        seq_printf(p, ", %s", action->name);
-                seq_putc(p, '\n');
-skip:
-                raw_spin_unlock_irqrestore(&irq_desc[i].lock, flags);
-        } else if (i == NR_IRQS)
-                seq_printf(p, "ERR: %10u\n", atomic_read(&irq_err_count));
        return 0;
 }
@@ -103,7 +65,7 @@ static char irq_redir [NR_IRQS]; // = { [0 ... NR_IRQS-1] = 1 };
 void set_irq_affinity_info (unsigned int irq, int hwid, int redir)
 {
        if (irq < NR_IRQS) {
-                cpumask_copy(irq_desc[irq].affinity,
+                cpumask_copy(irq_get_irq_data(irq)->affinity,
                             cpumask_of(cpu_logical_id(hwid)));
                irq_redir[irq] = (char) (redir & 0xff);
        }
@@ -130,13 +92,14 @@ unsigned int vectors_in_migration[NR_IRQS];
 */
 static void migrate_irqs(void)
 {
-        struct irq_desc *desc;
        int             irq, new_cpu;
        for (irq=0; irq < NR_IRQS; irq++) {
-                desc = irq_desc + irq;
+                struct irq_desc *desc = irq_to_desc(irq);
+                struct irq_data *data = irq_desc_get_irq_data(desc);
+                struct irq_chip *chip = irq_data_get_irq_chip(data);
-                if (desc->status == IRQ_DISABLED)
+                if (irqd_irq_disabled(data))
                        continue;
                /*
@@ -145,10 +108,10 @@ static void migrate_irqs(void)
                 * tell CPU not to respond to these local intr sources.
                 * such as ITV,CPEI,MCA etc.
                 */
-                if (desc->status == IRQ_PER_CPU)
+                if (irqd_is_per_cpu(data))
                        continue;
-                if (cpumask_any_and(irq_desc[irq].affinity, cpu_online_mask)
+                if (cpumask_any_and(data->affinity, cpu_online_mask)
                    >= nr_cpu_ids) {
                        /*
                         * Save it for phase 2 processing
@@ -160,16 +123,16 @@ static void migrate_irqs(void)
                        /*
                         * Al three are essential, currently WARN_ON.. maybe panic?
                         */
-                        if (desc->chip && desc->chip->disable &&
+                        if (chip && chip->irq_disable &&
-                                desc->chip->enable && desc->chip->set_affinity) {
+                                chip->irq_enable && chip->irq_set_affinity) {
-                                desc->chip->disable(irq);
+                                chip->irq_disable(data);
-                                desc->chip->set_affinity(irq,
+                                chip->irq_set_affinity(data,
-                                                         cpumask_of(new_cpu));
+                                                       cpumask_of(new_cpu), false);
-                                desc->chip->enable(irq);
+                                chip->irq_enable(data);
                        } else {
-                                WARN_ON((!(desc->chip) || !(desc->chip->disable) ||
+                                WARN_ON((!chip || !chip->irq_disable ||
-                                                !(desc->chip->enable) ||
+                                         !chip->irq_enable ||
-                                                !(desc->chip->set_affinity)));
+                                         !chip->irq_set_affinity));
                        }
                }
        }
diff --git a/arch/ia64/kernel/irq_ia64.c b/arch/ia64/kernel/irq_ia64.c
index f14c35f9b03a..782c3a357f24 100644
--- a/arch/ia64/kernel/irq_ia64.c
+++ b/arch/ia64/kernel/irq_ia64.c
@@ -30,6 +30,8 @@
 #include <linux/bitops.h>
 #include <linux/irq.h>
 #include <linux/ratelimit.h>
+#include <linux/acpi.h>
+#include <linux/sched.h>
 #include <asm/delay.h>
 #include <asm/intrinsics.h>
@@ -342,7 +344,7 @@ static irqreturn_t smp_irq_move_cleanup_interrupt(int irq, void *dev_id)
                if (irq < 0)
                        continue;
-                desc = irq_desc + irq;
+                desc = irq_to_desc(irq);
                cfg = irq_cfg + irq;
                raw_spin_lock(&desc->lock);
                if (!cfg->move_cleanup_count)
@@ -495,6 +497,7 @@ ia64_handle_irq (ia64_vector vector, struct pt_regs *regs)
                        smp_local_flush_tlb();
                        kstat_incr_irqs_this_cpu(irq, desc);
                } else if (unlikely(IS_RESCHEDULE(vector))) {
+                        scheduler_ipi();
                        kstat_incr_irqs_this_cpu(irq, desc);
                } else {
                        ia64_setreg(_IA64_REG_CR_TPR, vector);
@@ -625,16 +628,15 @@ static struct irqaction tlb_irqaction = {
 void
 ia64_native_register_percpu_irq (ia64_vector vec, struct irqaction *action)
 {
-        struct irq_desc *desc;
        unsigned int irq;
        irq = vec;
        BUG_ON(bind_irq_vector(irq, vec, CPU_MASK_ALL));
-        desc = irq_desc + irq;
+        irq_set_status_flags(irq, IRQ_PER_CPU);
-        desc->status |= IRQ_PER_CPU;
+        irq_set_chip(irq, &irq_type_ia64_lsapic);
-        desc->chip = &irq_type_ia64_lsapic;
        if (action)
                setup_irq(irq, action);
+        irq_set_handler(irq, handle_percpu_irq);
 }
 void __init
@@ -650,6 +652,9 @@ ia64_native_register_ipi(void)
 void __init
 init_IRQ (void)
 {
+#ifdef CONFIG_ACPI
+        acpi_boot_init();
+#endif
        ia64_register_ipi();
        register_percpu_irq(IA64_SPURIOUS_INT_VECTOR, NULL);
 #ifdef CONFIG_SMP
diff --git a/arch/ia64/kernel/irq_lsapic.c b/arch/ia64/kernel/irq_lsapic.c
index fc1549d4564d..1b3a776e5161 100644
--- a/arch/ia64/kernel/irq_lsapic.c
+++ b/arch/ia64/kernel/irq_lsapic.c
@@ -15,31 +15,30 @@
 #include <linux/irq.h>
 static unsigned int
-lsapic_noop_startup (unsigned int irq)
+lsapic_noop_startup (struct irq_data *data)
 {
        return 0;
 }
 static void
-lsapic_noop (unsigned int irq)
+lsapic_noop (struct irq_data *data)
 {
        /* nothing to do... */
 }
-static int lsapic_retrigger(unsigned int irq)
+static int lsapic_retrigger(struct irq_data *data)
 {
-        ia64_resend_irq(irq);
+        ia64_resend_irq(data->irq);
        return 1;
 }
 struct irq_chip irq_type_ia64_lsapic = {
-        .name =         "LSAPIC",
+        .name =                 "LSAPIC",
-        .startup =      lsapic_noop_startup,
+        .irq_startup =          lsapic_noop_startup,
-        .shutdown =     lsapic_noop,
+        .irq_shutdown =         lsapic_noop,
-        .enable =       lsapic_noop,
+        .irq_enable =           lsapic_noop,
-        .disable =      lsapic_noop,
+        .irq_disable =          lsapic_noop,
-        .ack =          lsapic_noop,
+        .irq_ack =              lsapic_noop,
-        .end =          lsapic_noop,
+        .irq_retrigger =        lsapic_retrigger,
-        .retrigger =    lsapic_retrigger,
 };
diff --git a/arch/ia64/kernel/mca.c b/arch/ia64/kernel/mca.c
index a0220dc5ff42..84fb405eee87 100644
--- a/arch/ia64/kernel/mca.c
+++ b/arch/ia64/kernel/mca.c
@@ -582,6 +582,8 @@ out:
        /* Get the CPE error record and log it */
        ia64_mca_log_sal_error_record(SAL_INFO_TYPE_CPE);
+        local_irq_disable();
        return IRQ_HANDLED;
 }
@@ -1859,7 +1861,8 @@ ia64_mca_cpu_init(void *cpu_data)
                        data = mca_bootmem();
                        first_time = 0;
                } else
-                        data = __get_free_pages(GFP_KERNEL, get_order(sz));
+                        data = (void *)__get_free_pages(GFP_KERNEL,
+                                                        get_order(sz));
                if (!data)
                        panic("Could not allocate MCA memory for cpu %d\n",
                                        cpu);
@@ -2055,25 +2058,6 @@ ia64_mca_init(void)
        IA64_MCA_DEBUG("%s: registered OS INIT handler with SAL\n", __func__);
-        /*
-         *  Configure the CMCI/P vector and handler. Interrupts for CMC are
-         *  per-processor, so AP CMC interrupts are setup in smp_callin() (smpboot.c).
-         */
-        register_percpu_irq(IA64_CMC_VECTOR, &cmci_irqaction);
-        register_percpu_irq(IA64_CMCP_VECTOR, &cmcp_irqaction);
-        ia64_mca_cmc_vector_setup();       /* Setup vector on BSP */
-        /* Setup the MCA rendezvous interrupt vector */
-        register_percpu_irq(IA64_MCA_RENDEZ_VECTOR, &mca_rdzv_irqaction);
-        /* Setup the MCA wakeup interrupt vector */
-        register_percpu_irq(IA64_MCA_WAKEUP_VECTOR, &mca_wkup_irqaction);
-#ifdef CONFIG_ACPI
-        /* Setup the CPEI/P handler */
-        register_percpu_irq(IA64_CPEP_VECTOR, &mca_cpep_irqaction);
-#endif
        /* Initialize the areas set aside by the OS to buffer the
         * platform/processor error states for MCA/INIT/CMC
         * handling.
@@ -2103,6 +2087,25 @@ ia64_mca_late_init(void)
        if (!mca_init)
                return 0;
+        /*
+         *  Configure the CMCI/P vector and handler. Interrupts for CMC are
+         *  per-processor, so AP CMC interrupts are setup in smp_callin() (smpboot.c).
+         */
+        register_percpu_irq(IA64_CMC_VECTOR, &cmci_irqaction);
+        register_percpu_irq(IA64_CMCP_VECTOR, &cmcp_irqaction);
+        ia64_mca_cmc_vector_setup();       /* Setup vector on BSP */
+        /* Setup the MCA rendezvous interrupt vector */
+        register_percpu_irq(IA64_MCA_RENDEZ_VECTOR, &mca_rdzv_irqaction);
+        /* Setup the MCA wakeup interrupt vector */
+        register_percpu_irq(IA64_MCA_WAKEUP_VECTOR, &mca_wkup_irqaction);
+#ifdef CONFIG_ACPI
+        /* Setup the CPEI/P handler */
+        register_percpu_irq(IA64_CPEP_VECTOR, &mca_cpep_irqaction);
+#endif
        register_hotcpu_notifier(&mca_cpu_notifier);
        /* Setup the CMCI/P vector and handler */
@@ -2122,7 +2125,6 @@ ia64_mca_late_init(void)
        cpe_poll_timer.function = ia64_mca_cpe_poll;
        {
-                struct irq_desc *desc;
                unsigned int irq;
                if (cpe_vector >= 0) {
@@ -2130,8 +2132,7 @@ ia64_mca_late_init(void)
                        irq = local_vector_to_irq(cpe_vector);
                        if (irq > 0) {
                                cpe_poll_enabled = 0;
-                                desc = irq_desc + irq;
+                                irq_set_status_flags(irq, IRQ_PER_CPU);
-                                desc->status |= IRQ_PER_CPU;
                                setup_irq(irq, &mca_cpe_irqaction);
                                ia64_cpe_irq = irq;
                                ia64_mca_register_cpev(cpe_vector);
diff --git a/arch/ia64/kernel/msi_ia64.c b/arch/ia64/kernel/msi_ia64.c
index 4a746ea838ff..009df5434a7a 100644
--- a/arch/ia64/kernel/msi_ia64.c
+++ b/arch/ia64/kernel/msi_ia64.c
@@ -12,12 +12,13 @@
 static struct irq_chip  ia64_msi_chip;
 #ifdef CONFIG_SMP
-static int ia64_set_msi_irq_affinity(unsigned int irq,
+static int ia64_set_msi_irq_affinity(struct irq_data *idata,
-                                      const cpumask_t *cpu_mask)
+                                     const cpumask_t *cpu_mask, bool force)
 {
        struct msi_msg msg;
        u32 addr, data;
        int cpu = first_cpu(*cpu_mask);
+        unsigned int irq = idata->irq;
        if (!cpu_online(cpu))
                return -1;
@@ -38,7 +39,7 @@ static int ia64_set_msi_irq_affinity(unsigned int irq,
        msg.data = data;
        write_msi_msg(irq, &msg);
-        cpumask_copy(irq_desc[irq].affinity, cpumask_of(cpu));
+        cpumask_copy(idata->affinity, cpumask_of(cpu));
        return 0;
 }
@@ -55,7 +56,7 @@ int ia64_setup_msi_irq(struct pci_dev *pdev, struct msi_desc *desc)
        if (irq < 0)
                return irq;
-        set_irq_msi(irq, desc);
+        irq_set_msi_desc(irq, desc);
        cpus_and(mask, irq_to_domain(irq), cpu_online_map);
        dest_phys_id = cpu_physical_id(first_cpu(mask));
        vector = irq_to_vector(irq);
@@ -74,7 +75,7 @@ int ia64_setup_msi_irq(struct pci_dev *pdev, struct msi_desc *desc)
                MSI_DATA_VECTOR(vector);
        write_msi_msg(irq, &msg);
-        set_irq_chip_and_handler(irq, &ia64_msi_chip, handle_edge_irq);
+        irq_set_chip_and_handler(irq, &ia64_msi_chip, handle_edge_irq);
        return 0;
 }
@@ -84,16 +85,16 @@ void ia64_teardown_msi_irq(unsigned int irq)
        destroy_irq(irq);
 }
-static void ia64_ack_msi_irq(unsigned int irq)
+static void ia64_ack_msi_irq(struct irq_data *data)
 {
-        irq_complete_move(irq);
+        irq_complete_move(data->irq);
-        move_native_irq(irq);
+        irq_move_irq(data);
        ia64_eoi();
 }
-static int ia64_msi_retrigger_irq(unsigned int irq)
+static int ia64_msi_retrigger_irq(struct irq_data *data)
 {
-        unsigned int vector = irq_to_vector(irq);
+        unsigned int vector = irq_to_vector(data->irq);
        ia64_resend_irq(vector);
        return 1;
@@ -103,14 +104,14 @@ static int ia64_msi_retrigger_irq(unsigned int irq)
 * Generic ops used on most IA64 platforms.
 */
 static struct irq_chip ia64_msi_chip = {
-        .name           = "PCI-MSI",
+        .name                   = "PCI-MSI",
-        .mask           = mask_msi_irq,
+        .irq_mask               = mask_msi_irq,
-        .unmask         = unmask_msi_irq,
+        .irq_unmask             = unmask_msi_irq,
-        .ack            = ia64_ack_msi_irq,
+        .irq_ack                = ia64_ack_msi_irq,
 #ifdef CONFIG_SMP
-        .set_affinity   = ia64_set_msi_irq_affinity,
+        .irq_set_affinity       = ia64_set_msi_irq_affinity,
 #endif
-        .retrigger      = ia64_msi_retrigger_irq,
+        .irq_retrigger          = ia64_msi_retrigger_irq,
 };
@@ -132,8 +133,10 @@ void arch_teardown_msi_irq(unsigned int irq)
 #ifdef CONFIG_DMAR
 #ifdef CONFIG_SMP
-static int dmar_msi_set_affinity(unsigned int irq, const struct cpumask *mask)
+static int dmar_msi_set_affinity(struct irq_data *data,
+                                 const struct cpumask *mask, bool force)
 {
+        unsigned int irq = data->irq;
        struct irq_cfg *cfg = irq_cfg + irq;
        struct msi_msg msg;
        int cpu = cpumask_first(mask);
@@ -152,7 +155,7 @@ static int dmar_msi_set_affinity(unsigned int irq, const struct cpumask *mask)
        msg.address_lo |= MSI_ADDR_DEST_ID_CPU(cpu_physical_id(cpu));
        dmar_msi_write(irq, &msg);
-        cpumask_copy(irq_desc[irq].affinity, mask);
+        cpumask_copy(data->affinity, mask);
        return 0;
 }
@@ -160,13 +163,13 @@ static int dmar_msi_set_affinity(unsigned int irq, const struct cpumask *mask)
 static struct irq_chip dmar_msi_type = {
        .name = "DMAR_MSI",
-        .unmask = dmar_msi_unmask,
+        .irq_unmask = dmar_msi_unmask,
-        .mask = dmar_msi_mask,
+        .irq_mask = dmar_msi_mask,
-        .ack = ia64_ack_msi_irq,
+        .irq_ack = ia64_ack_msi_irq,
 #ifdef CONFIG_SMP
-        .set_affinity = dmar_msi_set_affinity,
+        .irq_set_affinity = dmar_msi_set_affinity,
 #endif
-        .retrigger = ia64_msi_retrigger_irq,
+        .irq_retrigger = ia64_msi_retrigger_irq,
 };
 static int
@@ -203,8 +206,8 @@ int arch_setup_dmar_msi(unsigned int irq)
        if (ret < 0)
                return ret;
        dmar_msi_write(irq, &msg);
-        set_irq_chip_and_handler_name(irq, &dmar_msi_type, handle_edge_irq,
+        irq_set_chip_and_handler_name(irq, &dmar_msi_type, handle_edge_irq,
-                "edge");
+                                      "edge");
        return 0;
 }
 #endif /* CONFIG_DMAR */
diff --git a/arch/ia64/kernel/palinfo.c b/arch/ia64/kernel/palinfo.c
index fdf6f9d013e5..77597e5ea60a 100644
--- a/arch/ia64/kernel/palinfo.c
+++ b/arch/ia64/kernel/palinfo.c
@@ -434,7 +434,7 @@ register_info(char *page)
        unsigned long phys_stacked;
        pal_hints_u_t hints;
        unsigned long iregs, dregs;
-        char *info_type[]={
+        static const char * const info_type[] = {
                "Implemented AR(s)",
                "AR(s) with read side-effects",
                "Implemented CR(s)",
diff --git a/arch/ia64/kernel/perfmon.c b/arch/ia64/kernel/perfmon.c
index cce050e85c73..89accc626b86 100644
--- a/arch/ia64/kernel/perfmon.c
+++ b/arch/ia64/kernel/perfmon.c
@@ -617,17 +617,19 @@ pfm_get_unmapped_area(struct file *file, unsigned long addr, unsigned long len,
        return get_unmapped_area(file, addr, len, pgoff, flags);
 }
+/* forward declaration */
+static const struct dentry_operations pfmfs_dentry_operations;
-static int
+static struct dentry *
-pfmfs_get_sb(struct file_system_type *fs_type, int flags, const char *dev_name, void *data,
+pfmfs_mount(struct file_system_type *fs_type, int flags, const char *dev_name, void *data)
-             struct vfsmount *mnt)
 {
-        return get_sb_pseudo(fs_type, "pfm:", NULL, PFMFS_MAGIC, mnt);
+        return mount_pseudo(fs_type, "pfm:", NULL, &pfmfs_dentry_operations,
+                        PFMFS_MAGIC);
 }
 static struct file_system_type pfm_fs_type = {
        .name     = "pfmfs",
-        .get_sb   = pfmfs_get_sb,
+        .mount    = pfmfs_mount,
        .kill_sb  = kill_anon_super,
 };
@@ -830,10 +832,9 @@ pfm_rvmalloc(unsigned long size)
        unsigned long addr;
        size = PAGE_ALIGN(size);
-        mem  = vmalloc(size);
+        mem  = vzalloc(size);
        if (mem) {
                //printk("perfmon: CPU%d pfm_rvmalloc(%ld)=%p\n", smp_processor_id(), size, mem);
-                memset(mem, 0, size);
                addr = (unsigned long)mem;
                while (size > 0) {
                        pfm_reserve_page(addr);
@@ -1543,7 +1544,7 @@ pfm_exit_smpl_buffer(pfm_buffer_fmt_t *fmt)
 * any operations on the root directory. However, we need a non-trivial
 * d_name - pfm: will go nicely and kill the special-casing in procfs.
 */
-static struct vfsmount *pfmfs_mnt;
+static struct vfsmount *pfmfs_mnt __read_mostly;
 static int __init
 init_pfm_fs(void)
@@ -1573,7 +1574,7 @@ pfm_read(struct file *filp, char __user *buf, size_t size, loff_t *ppos)
                return -EINVAL;
        }
-        ctx = (pfm_context_t *)filp->private_data;
+        ctx = filp->private_data;
        if (ctx == NULL) {
                printk(KERN_ERR "perfmon: pfm_read: NULL ctx [%d]\n", task_pid_nr(current));
                return -EINVAL;
@@ -1673,7 +1674,7 @@ pfm_poll(struct file *filp, poll_table * wait)
                return 0;
        }
-        ctx = (pfm_context_t *)filp->private_data;
+        ctx = filp->private_data;
        if (ctx == NULL) {
                printk(KERN_ERR "perfmon: pfm_poll: NULL ctx [%d]\n", task_pid_nr(current));
                return 0;
@@ -1733,7 +1734,7 @@ pfm_fasync(int fd, struct file *filp, int on)
                return -EBADF;
        }
-        ctx = (pfm_context_t *)filp->private_data;
+        ctx = filp->private_data;
        if (ctx == NULL) {
                printk(KERN_ERR "perfmon: pfm_fasync NULL ctx [%d]\n", task_pid_nr(current));
                return -EBADF;
@@ -1841,7 +1842,7 @@ pfm_flush(struct file *filp, fl_owner_t id)
                return -EBADF;
        }
-        ctx = (pfm_context_t *)filp->private_data;
+        ctx = filp->private_data;
        if (ctx == NULL) {
                printk(KERN_ERR "perfmon: pfm_flush: NULL ctx [%d]\n", task_pid_nr(current));
                return -EBADF;
@@ -1984,7 +1985,7 @@ pfm_close(struct inode *inode, struct file *filp)
                return -EBADF;
        }
        
-        ctx = (pfm_context_t *)filp->private_data;
+        ctx = filp->private_data;
        if (ctx == NULL) {
                printk(KERN_ERR "perfmon: pfm_close: NULL ctx [%d]\n", task_pid_nr(current));
                return -EBADF;
@@ -2186,7 +2187,7 @@ static const struct file_operations pfm_file_ops = {
 };
 static int
-pfmfs_delete_dentry(struct dentry *dentry)
+pfmfs_delete_dentry(const struct dentry *dentry)
 {
        return 1;
 }
@@ -2234,7 +2235,6 @@ pfm_alloc_file(pfm_context_t *ctx)
        }
        path.mnt = mntget(pfmfs_mnt);
-        path.dentry->d_op = &pfmfs_dentry_operations;
        d_add(path.dentry, inode);
        file = alloc_file(&path, FMODE_READ, &pfm_file_ops);
@@ -4907,7 +4907,7 @@ restart_args:
                goto error_args;
        }
-        ctx = (pfm_context_t *)file->private_data;
+        ctx = file->private_data;
        if (unlikely(ctx == NULL)) {
                DPRINT(("no context for fd %d\n", fd));
                goto error_args;
diff --git a/arch/ia64/kernel/perfmon_default_smpl.c b/arch/ia64/kernel/perfmon_default_smpl.c
index 5f637bbfcccd..30c644ea44c9 100644
--- a/arch/ia64/kernel/perfmon_default_smpl.c
+++ b/arch/ia64/kernel/perfmon_default_smpl.c
@@ -150,7 +150,7 @@ default_handler(struct task_struct *task, void *buf, pfm_ovfl_arg_t *arg, struct
         * current = task running at the time of the overflow.
         *
         * per-task mode:
-         *      - this is ususally the task being monitored.
+         *      - this is usually the task being monitored.
         *        Under certain conditions, it might be a different task
         *
         * system-wide:
diff --git a/arch/ia64/kernel/process.c b/arch/ia64/kernel/process.c
index 16f1c7b04c69..6d33c5cc94f0 100644
--- a/arch/ia64/kernel/process.c
+++ b/arch/ia64/kernel/process.c
@@ -53,12 +53,8 @@
 void (*ia64_mark_idle)(int);
-unsigned long boot_option_idle_override = 0;
+unsigned long boot_option_idle_override = IDLE_NO_OVERRIDE;
 EXPORT_SYMBOL(boot_option_idle_override);
-unsigned long idle_halt;
-EXPORT_SYMBOL(idle_halt);
-unsigned long idle_nomwait;
-EXPORT_SYMBOL(idle_nomwait);
 void (*pm_idle) (void);
 EXPORT_SYMBOL(pm_idle);
 void (*pm_power_off) (void);
diff --git a/arch/ia64/kernel/ptrace.c b/arch/ia64/kernel/ptrace.c
index 7c7909f9bc93..8848f43d819e 100644
--- a/arch/ia64/kernel/ptrace.c
+++ b/arch/ia64/kernel/ptrace.c
@@ -1177,7 +1177,8 @@ ptrace_disable (struct task_struct *child)
 }
 long
-arch_ptrace (struct task_struct *child, long request, long addr, long data)
+arch_ptrace (struct task_struct *child, long request,
+             unsigned long addr, unsigned long data)
 {
        switch (request) {
        case PTRACE_PEEKTEXT:
diff --git a/arch/ia64/kernel/salinfo.c b/arch/ia64/kernel/salinfo.c
index aa8b5fa1a8de..79802e540e53 100644
--- a/arch/ia64/kernel/salinfo.c
+++ b/arch/ia64/kernel/salinfo.c
@@ -354,6 +354,7 @@ retry:
 static const struct file_operations salinfo_event_fops = {
        .open  = salinfo_event_open,
        .read  = salinfo_event_read,
+        .llseek = noop_llseek,
 };
 static int
@@ -571,6 +572,7 @@ static const struct file_operations salinfo_data_fops = {
        .release = salinfo_log_release,
        .read    = salinfo_log_read,
        .write   = salinfo_log_write,
+        .llseek  = default_llseek,
 };
 static int __cpuinit
@@ -642,7 +644,7 @@ salinfo_init(void)
        for (i = 0; i < ARRAY_SIZE(salinfo_log_name); i++) {
                data = salinfo_data + i;
                data->type = i;
-                init_MUTEX(&data->mutex);
+                sema_init(&data->mutex, 1);
                dir = proc_mkdir(salinfo_log_name[i], salinfo_dir);
                if (!dir)
                        continue;
diff --git a/arch/ia64/kernel/setup.c b/arch/ia64/kernel/setup.c
index 8fb958abf8d0..5e2c72498c51 100644
--- a/arch/ia64/kernel/setup.c
+++ b/arch/ia64/kernel/setup.c
@@ -479,25 +479,7 @@ static __init int setup_nomca(char *s)
 }
 early_param("nomca", setup_nomca);
-/*
- * Note: elfcorehdr_addr is not just limited to vmcore. It is also used by
- * is_kdump_kernel() to determine if we are booting after a panic. Hence
- * ifdef it under CONFIG_CRASH_DUMP and not CONFIG_PROC_VMCORE.
- */
 #ifdef CONFIG_CRASH_DUMP
-/* elfcorehdr= specifies the location of elf core header
- * stored by the crashed kernel.
- */
-static int __init parse_elfcorehdr(char *arg)
-{
-        if (!arg)
-                return -EINVAL;
-        elfcorehdr_addr = memparse(arg, &arg);
-        return 0;
-}
-early_param("elfcorehdr", parse_elfcorehdr);
 int __init reserve_elfcorehdr(u64 *start, u64 *end)
 {
        u64 length;
@@ -594,10 +576,6 @@ setup_arch (char **cmdline_p)
        cpu_init();     /* initialize the bootstrap CPU */
        mmu_context_init();     /* initialize context_id bitmap */
-#ifdef CONFIG_ACPI
-        acpi_boot_init();
-#endif
        paravirt_banner();
        paravirt_arch_setup_console(cmdline_p);
diff --git a/arch/ia64/kernel/smp.c b/arch/ia64/kernel/smp.c
index dabeefe21134..be450a3e9871 100644
--- a/arch/ia64/kernel/smp.c
+++ b/arch/ia64/kernel/smp.c
@@ -293,6 +293,7 @@ smp_flush_tlb_all (void)
 void
 smp_flush_tlb_mm (struct mm_struct *mm)
 {
+        cpumask_var_t cpus;
        preempt_disable();
        /* this happens for the common case of a single-threaded fork():  */
        if (likely(mm == current->active_mm && atomic_read(&mm->mm_users) == 1))
@@ -301,9 +302,15 @@ smp_flush_tlb_mm (struct mm_struct *mm)
                preempt_enable();
                return;
        }
+        if (!alloc_cpumask_var(&cpus, GFP_ATOMIC)) {
-        smp_call_function_many(mm_cpumask(mm),
+                smp_call_function((void (*)(void *))local_finish_flush_tlb_mm,
-                (void (*)(void *))local_finish_flush_tlb_mm, mm, 1);
+                        mm, 1);
+        } else {
+                cpumask_copy(cpus, mm_cpumask(mm));
+                smp_call_function_many(cpus,
+                        (void (*)(void *))local_finish_flush_tlb_mm, mm, 1);
+                free_cpumask_var(cpus);
+        }
        local_irq_disable();
        local_finish_flush_tlb_mm(mm);
        local_irq_enable();
diff --git a/arch/ia64/kernel/smpboot.c b/arch/ia64/kernel/smpboot.c
index d003b502a432..14ec641003da 100644
--- a/arch/ia64/kernel/smpboot.c
+++ b/arch/ia64/kernel/smpboot.c
@@ -677,7 +677,7 @@ extern void fixup_irqs(void);
 int migrate_platform_irqs(unsigned int cpu)
 {
        int new_cpei_cpu;
-        struct irq_desc *desc = NULL;
+        struct irq_data *data = NULL;
        const struct cpumask *mask;
        int             retval = 0;
@@ -693,20 +693,20 @@ int migrate_platform_irqs(unsigned int cpu)
                        new_cpei_cpu = any_online_cpu(cpu_online_map);
                        mask = cpumask_of(new_cpei_cpu);
                        set_cpei_target_cpu(new_cpei_cpu);
-                        desc = irq_desc + ia64_cpe_irq;
+                        data = irq_get_irq_data(ia64_cpe_irq);
                        /*
                         * Switch for now, immediately, we need to do fake intr
                         * as other interrupts, but need to study CPEI behaviour with
                         * polling before making changes.
                         */
-                        if (desc) {
+                        if (data && data->chip) {
-                                desc->chip->disable(ia64_cpe_irq);
+                                data->chip->irq_disable(data);
-                                desc->chip->set_affinity(ia64_cpe_irq, mask);
+                                data->chip->irq_set_affinity(data, mask, false);
-                                desc->chip->enable(ia64_cpe_irq);
+                                data->chip->irq_enable(data);
-                                printk ("Re-targetting CPEI to cpu %d\n", new_cpei_cpu);
+                                printk ("Re-targeting CPEI to cpu %d\n", new_cpei_cpu);
                        }
                }
-                if (!desc) {
+                if (!data) {
                        printk ("Unable to retarget CPEI, offline cpu [%d] failed\n", cpu);
                        retval = -EBUSY;
                }
diff --git a/arch/ia64/kernel/stacktrace.c b/arch/ia64/kernel/stacktrace.c
new file mode 100644
index 000000000000..5af2783a87f4
--- /dev/null
+++ b/arch/ia64/kernel/stacktrace.c
@@ -0,0 +1,39 @@
+/*
+ * arch/ia64/kernel/stacktrace.c
+ *
+ * Stack trace management functions
+ *
+ */
+#include <linux/sched.h>
+#include <linux/stacktrace.h>
+#include <linux/module.h>
+static void
+ia64_do_save_stack(struct unw_frame_info *info, void *arg)
+{
+        struct stack_trace *trace = arg;
+        unsigned long ip;
+        int skip = trace->skip;
+        trace->nr_entries = 0;
+        do {
+                unw_get_ip(info, &ip);
+                if (ip == 0)
+                        break;
+                if (skip == 0) {
+                        trace->entries[trace->nr_entries++] = ip;
+                        if (trace->nr_entries == trace->max_entries)
+                                break;
+                } else
+                        skip--;
+        } while (unw_unwind(info) >= 0);
+}
+/*
+ * Save stack-backtrace addresses into a stack_trace buffer.
+ */
+void save_stack_trace(struct stack_trace *trace)
+{
+        unw_init_running(ia64_do_save_stack, trace);
+}
+EXPORT_SYMBOL(save_stack_trace);
diff --git a/arch/ia64/kernel/time.c b/arch/ia64/kernel/time.c
index ed6f22eb5b12..85118dfe9bb5 100644
--- a/arch/ia64/kernel/time.c
+++ b/arch/ia64/kernel/time.c
@@ -36,7 +36,7 @@
 static cycle_t itc_get_cycles(struct clocksource *cs);
 struct fsyscall_gtod_data_t fsyscall_gtod_data = {
-        .lock = SEQLOCK_UNLOCKED,
+        .lock = __SEQLOCK_UNLOCKED(fsyscall_gtod_data.lock),
 };
 struct itc_jitter_data_t itc_jitter_data;
@@ -73,8 +73,6 @@ static struct clocksource clocksource_itc = {
        .rating         = 350,
        .read           = itc_get_cycles,
        .mask           = CLOCKSOURCE_MASK(64),
-        .mult           = 0, /*to be calculated*/
-        .shift          = 16,
        .flags          = CLOCK_SOURCE_IS_CONTINUOUS,
 #ifdef CONFIG_PARAVIRT
        .resume         = paravirt_clocksource_resume,
@@ -168,7 +166,7 @@ timer_interrupt (int irq, void *dev_id)
 {
        unsigned long new_itm;
-        if (unlikely(cpu_is_offline(smp_processor_id()))) {
+        if (cpu_is_offline(smp_processor_id())) {
                return IRQ_HANDLED;
        }
@@ -190,19 +188,10 @@ timer_interrupt (int irq, void *dev_id)
                new_itm += local_cpu_data->itm_delta;
-                if (smp_processor_id() == time_keeper_id) {
+                if (smp_processor_id() == time_keeper_id)
-                        /*
+                        xtime_update(1);
-                         * Here we are in the timer irq handler. We have irqs locally
-                         * disabled, but we don't know if the timer_bh is running on
+                local_cpu_data->itm_next = new_itm;
-                         * another CPU. We need to avoid to SMP race by acquiring the
-                         * xtime_lock.
-                         */
-                        write_seqlock(&xtime_lock);
-                        do_timer(1);
-                        local_cpu_data->itm_next = new_itm;
-                        write_sequnlock(&xtime_lock);
-                } else
-                        local_cpu_data->itm_next = new_itm;
                if (time_after(new_itm, ia64_get_itc()))
                        break;
@@ -222,7 +211,7 @@ skip_process_time_accounting:
                 * comfort, we increase the safety margin by
                 * intentionally dropping the next tick(s).  We do NOT
                 * update itm.next because that would force us to call
-                 * do_timer() which in turn would let our clock run
+                 * xtime_update() which in turn would let our clock run
                 * too fast (with the potentially devastating effect
                 * of losing monotony of time).
                 */
@@ -374,11 +363,8 @@ ia64_init_itm (void)
        ia64_cpu_local_tick();
        if (!itc_clocksource) {
-                /* Sort out mult/shift values: */
+                clocksource_register_hz(&clocksource_itc,
-                clocksource_itc.mult =
+                                                local_cpu_data->itc_freq);
-                        clocksource_hz2mult(local_cpu_data->itc_freq,
-                                                clocksource_itc.shift);
-                clocksource_register(&clocksource_itc);
                itc_clocksource = &clocksource_itc;
        }
 }
diff --git a/arch/ia64/kernel/topology.c b/arch/ia64/kernel/topology.c
index 0baa1bbb65fe..0e0e0cc9e392 100644
--- a/arch/ia64/kernel/topology.c
+++ b/arch/ia64/kernel/topology.c
@@ -43,7 +43,7 @@ int __ref arch_register_cpu(int num)
 {
 #ifdef CONFIG_ACPI
        /*
-         * If CPEI can be re-targetted or if this is not
+         * If CPEI can be re-targeted or if this is not
         * CPEI target, then it is hotpluggable
         */
        if (can_cpei_retarget() || !is_cpu_cpei_target(num))
diff --git a/arch/ia64/kernel/unwind.c b/arch/ia64/kernel/unwind.c
index b6c0e63a0bf6..fed6afa2e8a9 100644
--- a/arch/ia64/kernel/unwind.c
+++ b/arch/ia64/kernel/unwind.c
@@ -1204,10 +1204,10 @@ desc_spill_sprel_p (unsigned char qp, unw_word t, unsigned char abreg, unw_word
 static inline unw_hash_index_t
 hash (unsigned long ip)
 {
-#       define hashmagic        0x9e3779b97f4a7c16UL    /* based on (sqrt(5)/2-1)*2^64 */
+        /* magic number = ((sqrt(5)-1)/2)*2^64 */
+        static const unsigned long hashmagic = 0x9e3779b97f4a7c16UL;
-        return (ip >> 4)*hashmagic >> (64 - UNW_LOG_HASH_SIZE);
+        return (ip >> 4) * hashmagic >> (64 - UNW_LOG_HASH_SIZE);
-#undef hashmagic
 }
 static inline long
@@ -1531,7 +1531,7 @@ build_script (struct unw_frame_info *info)
        struct unw_labeled_state *ls, *next;
        unsigned long ip = info->ip;
        struct unw_state_record sr;
-        struct unw_table *table;
+        struct unw_table *table, *prev;
        struct unw_reg_info *r;
        struct unw_insn insn;
        u8 *dp, *desc_end;
@@ -1560,11 +1560,26 @@ build_script (struct unw_frame_info *info)
        STAT(parse_start = ia64_get_itc());
+        prev = NULL;
        for (table = unw.tables; table; table = table->next) {
                if (ip >= table->start && ip < table->end) {
+                        /*
+                         * Leave the kernel unwind table at the very front,
+                         * lest moving it breaks some assumption elsewhere.
+                         * Otherwise, move the matching table to the second
+                         * position in the list so that traversals can benefit
+                         * from commonality in backtrace paths.
+                         */
+                        if (prev && prev != unw.tables) {
+                                /* unw is safe - we're already spinlocked */
+                                prev->next = table->next;
+                                table->next = unw.tables->next;
+                                unw.tables->next = table;
+                        }
                        e = lookup(table, ip - table->segment_base);
                        break;
                }
+                prev = table;
        }
        if (!e) {
                /* no info, return default unwinder (leaf proc, no mem stack, no saved regs)  */
diff --git a/arch/ia64/kernel/vmlinux.lds.S b/arch/ia64/kernel/vmlinux.lds.S
index 5a4d044dcb1c..53c0ba004e9e 100644
--- a/arch/ia64/kernel/vmlinux.lds.S
+++ b/arch/ia64/kernel/vmlinux.lds.S
@@ -198,7 +198,7 @@ SECTIONS {
        /* Per-cpu data: */
        . = ALIGN(PERCPU_PAGE_SIZE);
-        PERCPU_VADDR(PERCPU_ADDR, :percpu)
+        PERCPU_VADDR(SMP_CACHE_BYTES, PERCPU_ADDR, :percpu)
        __phys_per_cpu_start = __per_cpu_load;
        /*
         * ensure percpu data fits
@@ -209,6 +209,7 @@ SECTIONS {
        data : {
        } :data
        .data : AT(ADDR(.data) - LOAD_OFFSET) {
+                _sdata  =  .;
                INIT_TASK_DATA(PAGE_SIZE)
                CACHELINE_ALIGNED_DATA(SMP_CACHE_BYTES)
                READ_MOSTLY_DATA(SMP_CACHE_BYTES)
diff --git a/arch/ia64/kvm/Makefile b/arch/ia64/kvm/Makefile
index 1089b3e918ac..db3d7c5d1071 100644
--- a/arch/ia64/kvm/Makefile
+++ b/arch/ia64/kvm/Makefile
@@ -45,8 +45,8 @@ FORCE : $(obj)/$(offsets-file)
 # Makefile for Kernel-based Virtual Machine module
 #
-EXTRA_CFLAGS += -Ivirt/kvm -Iarch/ia64/kvm/
+ccflags-y := -Ivirt/kvm -Iarch/ia64/kvm/
-EXTRA_AFLAGS += -Ivirt/kvm -Iarch/ia64/kvm/
+asflags-y := -Ivirt/kvm -Iarch/ia64/kvm/
 common-objs = $(addprefix ../../../virt/kvm/, kvm_main.o ioapic.o \
                coalesced_mmio.o irq_comm.o assigned-dev.o)
diff --git a/arch/ia64/kvm/kvm-ia64.c b/arch/ia64/kvm/kvm-ia64.c
index f56a6316e134..8213efe1998c 100644
--- a/arch/ia64/kvm/kvm-ia64.c
+++ b/arch/ia64/kvm/kvm-ia64.c
@@ -662,6 +662,7 @@ again:
                goto vcpu_run_fail;
        srcu_read_unlock(&vcpu->kvm->srcu, idx);
+        vcpu->mode = IN_GUEST_MODE;
        kvm_guest_enter();
        /*
@@ -683,6 +684,7 @@ again:
         */
        barrier();
        kvm_guest_exit();
+        vcpu->mode = OUTSIDE_GUEST_MODE;
        preempt_enable();
        idx = srcu_read_lock(&vcpu->kvm->srcu);
@@ -749,7 +751,7 @@ out:
        return r;
 }
-static struct kvm *kvm_alloc_kvm(void)
+struct kvm *kvm_arch_alloc_vm(void)
 {
        struct kvm *kvm;
@@ -760,7 +762,7 @@ static struct kvm *kvm_alloc_kvm(void)
        vm_base = __get_free_pages(GFP_KERNEL, get_order(KVM_VM_DATA_SIZE));
        if (!vm_base)
-                return ERR_PTR(-ENOMEM);
+                return NULL;
        memset((void *)vm_base, 0, KVM_VM_DATA_SIZE);
        kvm = (struct kvm *)(vm_base +
@@ -806,10 +808,12 @@ static void kvm_build_io_pmt(struct kvm *kvm)
 #define GUEST_PHYSICAL_RR4      0x2739
 #define VMM_INIT_RR             0x1660
-static void kvm_init_vm(struct kvm *kvm)
+int kvm_arch_init_vm(struct kvm *kvm)
 {
        BUG_ON(!kvm);
+        kvm->arch.is_sn2 = ia64_platform_is("sn2");
        kvm->arch.metaphysical_rr0 = GUEST_PHYSICAL_RR0;
        kvm->arch.metaphysical_rr4 = GUEST_PHYSICAL_RR4;
        kvm->arch.vmm_init_rr = VMM_INIT_RR;
@@ -823,21 +827,8 @@ static void kvm_init_vm(struct kvm *kvm)
        /* Reserve bit 0 of irq_sources_bitmap for userspace irq source */
        set_bit(KVM_USERSPACE_IRQ_SOURCE_ID, &kvm->arch.irq_sources_bitmap);
-}
-struct  kvm *kvm_arch_create_vm(void)
-{
-        struct kvm *kvm = kvm_alloc_kvm();
-        if (IS_ERR(kvm))
-                return ERR_PTR(-ENOMEM);
-        kvm->arch.is_sn2 = ia64_platform_is("sn2");
-        kvm_init_vm(kvm);
-        return kvm;
+        return 0;
 }
 static int kvm_vm_ioctl_get_irqchip(struct kvm *kvm,
@@ -962,7 +953,9 @@ long kvm_arch_vm_ioctl(struct file *filp,
                        goto out;
                r = kvm_setup_default_irq_routing(kvm);
                if (r) {
+                        mutex_lock(&kvm->slots_lock);
                        kvm_ioapic_destroy(kvm);
+                        mutex_unlock(&kvm->slots_lock);
                        goto out;
                }
                break;
@@ -1357,7 +1350,7 @@ int kvm_arch_vcpu_ioctl_set_guest_debug(struct kvm_vcpu *vcpu,
        return -EINVAL;
 }
-static void free_kvm(struct kvm *kvm)
+void kvm_arch_free_vm(struct kvm *kvm)
 {
        unsigned long vm_base = kvm->arch.vm_base;
@@ -1399,9 +1392,6 @@ void kvm_arch_destroy_vm(struct kvm *kvm)
 #endif
        kfree(kvm->arch.vioapic);
        kvm_release_vm_pages(kvm);
-        kvm_free_physmem(kvm);
-        cleanup_srcu_struct(&kvm->srcu);
-        free_kvm(kvm);
 }
 void kvm_arch_vcpu_put(struct kvm_vcpu *vcpu)
diff --git a/arch/ia64/kvm/lapic.h b/arch/ia64/kvm/lapic.h
index ee541cebcd78..c5f92a926a9a 100644
--- a/arch/ia64/kvm/lapic.h
+++ b/arch/ia64/kvm/lapic.h
@@ -25,5 +25,6 @@ int kvm_apic_match_dest(struct kvm_vcpu *vcpu, struct kvm_lapic *source,
 int kvm_apic_compare_prio(struct kvm_vcpu *vcpu1, struct kvm_vcpu *vcpu2);
 int kvm_apic_set_irq(struct kvm_vcpu *vcpu, struct kvm_lapic_irq *irq);
 #define kvm_apic_present(x) (true)
+#define kvm_lapic_enabled(x) (true)
 #endif
diff --git a/arch/ia64/kvm/mmio.c b/arch/ia64/kvm/mmio.c
index fb8f9f59a1ed..f1e17d3d6cd9 100644
--- a/arch/ia64/kvm/mmio.c
+++ b/arch/ia64/kvm/mmio.c
@@ -130,7 +130,7 @@ static void mmio_access(struct kvm_vcpu *vcpu, u64 src_pa, u64 *dest,
        local_irq_save(psr);
-        /*Intercept the acces for PIB range*/
+        /*Intercept the access for PIB range*/
        if (iot == GPFN_PIB) {
                if (!dir)
                        lsapic_write(vcpu, src_pa, s, *dest);
diff --git a/arch/ia64/kvm/process.c b/arch/ia64/kvm/process.c
index bb862fb224f2..b0398740b48d 100644
--- a/arch/ia64/kvm/process.c
+++ b/arch/ia64/kvm/process.c
@@ -987,7 +987,7 @@ static void vmm_sanity_check(struct kvm_vcpu *vcpu)
 static void kvm_do_resume_op(struct kvm_vcpu *vcpu)
 {
-        vmm_sanity_check(vcpu); /*Guarantee vcpu runing on healthy vmm!*/
+        vmm_sanity_check(vcpu); /*Guarantee vcpu running on healthy vmm!*/
        if (test_and_clear_bit(KVM_REQ_RESUME, &vcpu->requests)) {
                vcpu_do_resume(vcpu);
diff --git a/arch/ia64/kvm/vti.h b/arch/ia64/kvm/vti.h
index f6c5617e16af..b214b5b0432d 100644
--- a/arch/ia64/kvm/vti.h
+++ b/arch/ia64/kvm/vti.h
@@ -83,13 +83,13 @@
 union vac {
        unsigned long value;
        struct {
-                int a_int:1;
+                unsigned int a_int:1;
-                int a_from_int_cr:1;
+                unsigned int a_from_int_cr:1;
-                int a_to_int_cr:1;
+                unsigned int a_to_int_cr:1;
-                int a_from_psr:1;
+                unsigned int a_from_psr:1;
-                int a_from_cpuid:1;
+                unsigned int a_from_cpuid:1;
-                int a_cover:1;
+                unsigned int a_cover:1;
-                int a_bsw:1;
+                unsigned int a_bsw:1;
                long reserved:57;
        };
 };
@@ -97,12 +97,12 @@ union vac {
 union vdc {
        unsigned long value;
        struct {
-                int d_vmsw:1;
+                unsigned int d_vmsw:1;
-                int d_extint:1;
+                unsigned int d_extint:1;
-                int d_ibr_dbr:1;
+                unsigned int d_ibr_dbr:1;
-                int d_pmc:1;
+                unsigned int d_pmc:1;
-                int d_to_pmd:1;
+                unsigned int d_to_pmd:1;
-                int d_itm:1;
+                unsigned int d_itm:1;
                long reserved:58;
        };
 };
diff --git a/arch/ia64/lib/do_csum.S b/arch/ia64/lib/do_csum.S
index 6bec2fc9f5b2..1a431a5cf86f 100644
--- a/arch/ia64/lib/do_csum.S
+++ b/arch/ia64/lib/do_csum.S
@@ -201,7 +201,7 @@ GLOBAL_ENTRY(do_csum)
        ;;
 (p6)    adds result1[0]=1,result1[0]
 (p9)    br.cond.sptk .do_csum_exit      // if (count == 1) exit
-        // Fall through to caluculate the checksum, feeding result1[0] as
+        // Fall through to calculate the checksum, feeding result1[0] as
        // the initial value in result1[0].
        //
        // Calculate the checksum loading two 8-byte words per loop.
diff --git a/arch/ia64/mm/contig.c b/arch/ia64/mm/contig.c
index 54bf54059811..f114a3b14c6a 100644
--- a/arch/ia64/mm/contig.c
+++ b/arch/ia64/mm/contig.c
@@ -36,7 +36,7 @@ static unsigned long max_gap;
 * Shows a simple page count of reserved and used pages in the system.
 * For discontig machines, it does this on a per-pgdat basis.
 */
-void show_mem(void)
+void show_mem(unsigned int filter)
 {
        int i, total_reserved = 0;
        int total_shared = 0, total_cached = 0;
@@ -44,13 +44,16 @@ void show_mem(void)
        pg_data_t *pgdat;
        printk(KERN_INFO "Mem-info:\n");
-        show_free_areas();
+        show_free_areas(filter);
        printk(KERN_INFO "Node memory in pages:\n");
        for_each_online_pgdat(pgdat) {
                unsigned long present;
                unsigned long flags;
                int shared = 0, cached = 0, reserved = 0;
+                int nid = pgdat->node_id;
+                if (skip_free_areas_node(filter, nid))
+                        continue;
                pgdat_resize_lock(pgdat, &flags);
                present = pgdat->node_present_pages;
                for(i = 0; i < pgdat->node_spanned_pages; i++) {
@@ -64,8 +67,7 @@ void show_mem(void)
                                if (max_gap < LARGE_GAP)
                                        continue;
 #endif
-                                i = vmemmap_find_next_valid_pfn(pgdat->node_id,
+                                i = vmemmap_find_next_valid_pfn(nid, i) - 1;
-                                         i) - 1;
                                continue;
                        }
                        if (PageReserved(page))
@@ -81,7 +83,7 @@ void show_mem(void)
                total_cached += cached;
                total_shared += shared;
                printk(KERN_INFO "Node %4d:  RAM: %11ld, rsvd: %8d, "
-                       "shrd: %10d, swpd: %10d\n", pgdat->node_id,
+                       "shrd: %10d, swpd: %10d\n", nid,
                       present, reserved, shared, cached);
        }
        printk(KERN_INFO "%ld pages of RAM\n", total_present);
diff --git a/arch/ia64/mm/discontig.c b/arch/ia64/mm/discontig.c
index 61620323bb60..c641333cd997 100644
--- a/arch/ia64/mm/discontig.c
+++ b/arch/ia64/mm/discontig.c
@@ -614,7 +614,7 @@ void __cpuinit *per_cpu_init(void)
 * Shows a simple page count of reserved and used pages in the system.
 * For discontig machines, it does this on a per-pgdat basis.
 */
-void show_mem(void)
+void show_mem(unsigned int filter)
 {
        int i, total_reserved = 0;
        int total_shared = 0, total_cached = 0;
@@ -622,13 +622,16 @@ void show_mem(void)
        pg_data_t *pgdat;
        printk(KERN_INFO "Mem-info:\n");
-        show_free_areas();
+        show_free_areas(filter);
        printk(KERN_INFO "Node memory in pages:\n");
        for_each_online_pgdat(pgdat) {
                unsigned long present;
                unsigned long flags;
                int shared = 0, cached = 0, reserved = 0;
+                int nid = pgdat->node_id;
+                if (skip_free_areas_node(filter, nid))
+                        continue;
                pgdat_resize_lock(pgdat, &flags);
                present = pgdat->node_present_pages;
                for(i = 0; i < pgdat->node_spanned_pages; i++) {
@@ -638,8 +641,7 @@ void show_mem(void)
                        if (pfn_valid(pgdat->node_start_pfn + i))
                                page = pfn_to_page(pgdat->node_start_pfn + i);
                        else {
-                                i = vmemmap_find_next_valid_pfn(pgdat->node_id,
+                                i = vmemmap_find_next_valid_pfn(nid, i) - 1;
-                                         i) - 1;
                                continue;
                        }
                        if (PageReserved(page))
@@ -655,7 +657,7 @@ void show_mem(void)
                total_cached += cached;
                total_shared += shared;
                printk(KERN_INFO "Node %4d:  RAM: %11ld, rsvd: %8d, "
-                       "shrd: %10d, swpd: %10d\n", pgdat->node_id,
+                       "shrd: %10d, swpd: %10d\n", nid,
                       present, reserved, shared, cached);
        }
        printk(KERN_INFO "%ld pages of RAM\n", total_present);
diff --git a/arch/ia64/mm/fault.c b/arch/ia64/mm/fault.c
index 0799fea4c588..20b359376128 100644
--- a/arch/ia64/mm/fault.c
+++ b/arch/ia64/mm/fault.c
@@ -10,6 +10,7 @@
 #include <linux/interrupt.h>
 #include <linux/kprobes.h>
 #include <linux/kdebug.h>
+#include <linux/prefetch.h>
 #include <asm/pgtable.h>
 #include <asm/processor.h>
diff --git a/arch/ia64/mm/hugetlbpage.c b/arch/ia64/mm/hugetlbpage.c
index 1841ee7e65f9..5ca674b74737 100644
--- a/arch/ia64/mm/hugetlbpage.c
+++ b/arch/ia64/mm/hugetlbpage.c
@@ -38,7 +38,7 @@ huge_pte_alloc(struct mm_struct *mm, unsigned long addr, unsigned long sz)
        if (pud) {
                pmd = pmd_alloc(mm, pud, taddr);
                if (pmd)
-                        pte = pte_alloc_map(mm, pmd, taddr);
+                        pte = pte_alloc_map(mm, NULL, pmd, taddr);
        }
        return pte;
 }
diff --git a/arch/ia64/mm/init.c b/arch/ia64/mm/init.c
index ed41759efcac..00cb0e26c64e 100644
--- a/arch/ia64/mm/init.c
+++ b/arch/ia64/mm/init.c
@@ -36,8 +36,6 @@
 #include <asm/mca.h>
 #include <asm/paravirt.h>
-DEFINE_PER_CPU(struct mmu_gather, mmu_gathers);
 extern void ia64_tlb_init (void);
 unsigned long MAX_DMA_ADDRESS = PAGE_OFFSET + 0x100000000UL;
diff --git a/arch/ia64/oprofile/backtrace.c b/arch/ia64/oprofile/backtrace.c
index 5cdd7e4a597c..f7b798993cea 100644
--- a/arch/ia64/oprofile/backtrace.c
+++ b/arch/ia64/oprofile/backtrace.c
@@ -29,7 +29,7 @@ typedef struct
        unsigned int depth;
        struct pt_regs *regs;
        struct unw_frame_info frame;
-        u64 *prev_pfs_loc;      /* state for WAR for old spinlock ool code */
+        unsigned long *prev_pfs_loc;    /* state for WAR for old spinlock ool code */
 } ia64_backtrace_t;
 /* Returns non-zero if the PC is in the Interrupt Vector Table */
diff --git a/arch/ia64/sn/kernel/Makefile b/arch/ia64/sn/kernel/Makefile
index 0591038735af..d27df1d45da7 100644
--- a/arch/ia64/sn/kernel/Makefile
+++ b/arch/ia64/sn/kernel/Makefile
@@ -7,7 +7,7 @@
 # Copyright (C) 1999,2001-2006,2008 Silicon Graphics, Inc.  All Rights Reserved.
 #
-EXTRA_CFLAGS += -Iarch/ia64/sn/include
+ccflags-y := -Iarch/ia64/sn/include
 obj-y                           += setup.o bte.o bte_error.o irq.o mca.o idle.o \
                                   huberror.o io_acpi_init.o io_common.o \
diff --git a/arch/ia64/sn/kernel/irq.c b/arch/ia64/sn/kernel/irq.c
index 13c15d968098..81a1f4e6bcd8 100644
--- a/arch/ia64/sn/kernel/irq.c
+++ b/arch/ia64/sn/kernel/irq.c
@@ -23,11 +23,9 @@
 #include <asm/sn/sn_sal.h>
 #include <asm/sn/sn_feature_sets.h>
-static void force_interrupt(int irq);
 static void register_intr_pda(struct sn_irq_info *sn_irq_info);
 static void unregister_intr_pda(struct sn_irq_info *sn_irq_info);
-int sn_force_interrupt_flag = 1;
 extern int sn_ioif_inited;
 struct list_head **sn_irq_lh;
 static DEFINE_SPINLOCK(sn_irq_info_lock); /* non-IRQ lock */
@@ -78,62 +76,40 @@ u64 sn_intr_redirect(nasid_t local_nasid, int local_widget,
        return ret_stuff.status;
 }
-static unsigned int sn_startup_irq(unsigned int irq)
+static unsigned int sn_startup_irq(struct irq_data *data)
 {
        return 0;
 }
-static void sn_shutdown_irq(unsigned int irq)
+static void sn_shutdown_irq(struct irq_data *data)
 {
 }
 extern void ia64_mca_register_cpev(int);
-static void sn_disable_irq(unsigned int irq)
+static void sn_disable_irq(struct irq_data *data)
 {
-        if (irq == local_vector_to_irq(IA64_CPE_VECTOR))
+        if (data->irq == local_vector_to_irq(IA64_CPE_VECTOR))
                ia64_mca_register_cpev(0);
 }
-static void sn_enable_irq(unsigned int irq)
+static void sn_enable_irq(struct irq_data *data)
 {
-        if (irq == local_vector_to_irq(IA64_CPE_VECTOR))
+        if (data->irq == local_vector_to_irq(IA64_CPE_VECTOR))
-                ia64_mca_register_cpev(irq);
+                ia64_mca_register_cpev(data->irq);
 }
-static void sn_ack_irq(unsigned int irq)
+static void sn_ack_irq(struct irq_data *data)
 {
        u64 event_occurred, mask;
+        unsigned int irq = data->irq & 0xff;
-        irq = irq & 0xff;
        event_occurred = HUB_L((u64*)LOCAL_MMR_ADDR(SH_EVENT_OCCURRED));
        mask = event_occurred & SH_ALL_INT_MASK;
        HUB_S((u64*)LOCAL_MMR_ADDR(SH_EVENT_OCCURRED_ALIAS), mask);
        __set_bit(irq, (volatile void *)pda->sn_in_service_ivecs);
-        move_native_irq(irq);
+        irq_move_irq(data);
-}
-static void sn_end_irq(unsigned int irq)
-{
-        int ivec;
-        u64 event_occurred;
-        ivec = irq & 0xff;
-        if (ivec == SGI_UART_VECTOR) {
-                event_occurred = HUB_L((u64*)LOCAL_MMR_ADDR (SH_EVENT_OCCURRED));
-                /* If the UART bit is set here, we may have received an
-                 * interrupt from the UART that the driver missed.  To
-                 * make sure, we IPI ourselves to force us to look again.
-                 */
-                if (event_occurred & SH_EVENT_OCCURRED_UART_INT_MASK) {
-                        platform_send_ipi(smp_processor_id(), SGI_UART_VECTOR,
-                                          IA64_IPI_DM_INT, 0);
-                }
-        }
-        __clear_bit(ivec, (volatile void *)pda->sn_in_service_ivecs);
-        if (sn_force_interrupt_flag)
-                force_interrupt(irq);
 }
 static void sn_irq_info_free(struct rcu_head *head);
@@ -228,9 +204,11 @@ finish_up:
        return new_irq_info;
 }
-static int sn_set_affinity_irq(unsigned int irq, const struct cpumask *mask)
+static int sn_set_affinity_irq(struct irq_data *data,
+                               const struct cpumask *mask, bool force)
 {
        struct sn_irq_info *sn_irq_info, *sn_irq_info_safe;
+        unsigned int irq = data->irq;
        nasid_t nasid;
        int slice;
@@ -249,7 +227,7 @@ void sn_set_err_irq_affinity(unsigned int irq)
 {
        /*
         * On systems which support CPU disabling (SHub2), all error interrupts
-         * are targetted at the boot CPU.
+         * are targeted at the boot CPU.
         */
        if (is_shub2() && sn_prom_feature_available(PRF_CPU_DISABLE_SUPPORT))
                set_irq_affinity_info(irq, cpu_physical_id(0), 0);
@@ -259,26 +237,25 @@ void sn_set_err_irq_affinity(unsigned int irq) { }
 #endif
 static void
-sn_mask_irq(unsigned int irq)
+sn_mask_irq(struct irq_data *data)
 {
 }
 static void
-sn_unmask_irq(unsigned int irq)
+sn_unmask_irq(struct irq_data *data)
 {
 }
 struct irq_chip irq_type_sn = {
-        .name           = "SN hub",
+        .name                   = "SN hub",
-        .startup        = sn_startup_irq,
+        .irq_startup            = sn_startup_irq,
-        .shutdown       = sn_shutdown_irq,
+        .irq_shutdown           = sn_shutdown_irq,
-        .enable         = sn_enable_irq,
+        .irq_enable             = sn_enable_irq,
-        .disable        = sn_disable_irq,
+        .irq_disable            = sn_disable_irq,
-        .ack            = sn_ack_irq,
+        .irq_ack                = sn_ack_irq,
-        .end            = sn_end_irq,
+        .irq_mask               = sn_mask_irq,
-        .mask           = sn_mask_irq,
+        .irq_unmask             = sn_unmask_irq,
-        .unmask         = sn_unmask_irq,
+        .irq_set_affinity       = sn_set_affinity_irq
-        .set_affinity   = sn_set_affinity_irq
 };
 ia64_vector sn_irq_to_vector(int irq)
@@ -296,15 +273,13 @@ unsigned int sn_local_vector_to_irq(u8 vector)
 void sn_irq_init(void)
 {
        int i;
-        struct irq_desc *base_desc = irq_desc;
        ia64_first_device_vector = IA64_SN2_FIRST_DEVICE_VECTOR;
        ia64_last_device_vector = IA64_SN2_LAST_DEVICE_VECTOR;
        for (i = 0; i < NR_IRQS; i++) {
-                if (base_desc[i].chip == &no_irq_chip) {
+                if (irq_get_chip(i) == &no_irq_chip)
-                        base_desc[i].chip = &irq_type_sn;
+                        irq_set_chip(i, &irq_type_sn);
-                }
        }
 }
@@ -378,7 +353,6 @@ void sn_irq_fixup(struct pci_dev *pci_dev, struct sn_irq_info *sn_irq_info)
        int cpu = nasid_slice_to_cpuid(nasid, slice);
 #ifdef CONFIG_SMP
        int cpuphys;
-        struct irq_desc *desc;
 #endif
        pci_dev_get(pci_dev);
@@ -395,12 +369,11 @@ void sn_irq_fixup(struct pci_dev *pci_dev, struct sn_irq_info *sn_irq_info)
 #ifdef CONFIG_SMP
        cpuphys = cpu_physical_id(cpu);
        set_irq_affinity_info(sn_irq_info->irq_irq, cpuphys, 0);
-        desc = irq_to_desc(sn_irq_info->irq_irq);
        /*
         * Affinity was set by the PROM, prevent it from
         * being reset by the request_irq() path.
         */
-        desc->status |= IRQ_AFFINITY_SET;
+        irqd_mark_affinity_was_set(irq_get_irq_data(sn_irq_info->irq_irq));
 #endif
 }
@@ -439,25 +412,11 @@ sn_call_force_intr_provider(struct sn_irq_info *sn_irq_info)
        pci_provider = sn_pci_provider[sn_irq_info->irq_bridge_type];
        /* Don't force an interrupt if the irq has been disabled */
-        if (!(irq_desc[sn_irq_info->irq_irq].status & IRQ_DISABLED) &&
+        if (!irqd_irq_disabled(irq_get_irq_data(sn_irq_info->irq_irq)) &&
            pci_provider && pci_provider->force_interrupt)
                (*pci_provider->force_interrupt)(sn_irq_info);
 }
-static void force_interrupt(int irq)
-{
-        struct sn_irq_info *sn_irq_info;
-        if (!sn_ioif_inited)
-                return;
-        rcu_read_lock();
-        list_for_each_entry_rcu(sn_irq_info, sn_irq_lh[irq], list)
-                sn_call_force_intr_provider(sn_irq_info);
-        rcu_read_unlock();
-}
 /*
 * Check for lost interrupts.  If the PIC int_status reg. says that
 * an interrupt has been sent, but not handled, and the interrupt
@@ -476,7 +435,7 @@ static void sn_check_intr(int irq, struct sn_irq_info *sn_irq_info)
        /*
         * Bridge types attached to TIO (anything but PIC) do not need this WAR
         * since they do not target Shub II interrupt registers.  If that
-         * ever changes, this check needs to accomodate.
+         * ever changes, this check needs to accommodate.
         */
        if (sn_irq_info->irq_bridge_type != PCIIO_ASIC_TYPE_PIC)
                return;
diff --git a/arch/ia64/sn/kernel/msi_sn.c b/arch/ia64/sn/kernel/msi_sn.c
index 0c72dd463831..2b98b9e088de 100644
--- a/arch/ia64/sn/kernel/msi_sn.c
+++ b/arch/ia64/sn/kernel/msi_sn.c
@@ -144,16 +144,16 @@ int sn_setup_msi_irq(struct pci_dev *pdev, struct msi_desc *entry)
         */
        msg.data = 0x100 + irq;
-        set_irq_msi(irq, entry);
+        irq_set_msi_desc(irq, entry);
        write_msi_msg(irq, &msg);
-        set_irq_chip_and_handler(irq, &sn_msi_chip, handle_edge_irq);
+        irq_set_chip_and_handler(irq, &sn_msi_chip, handle_edge_irq);
        return 0;
 }
 #ifdef CONFIG_SMP
-static int sn_set_msi_irq_affinity(unsigned int irq,
+static int sn_set_msi_irq_affinity(struct irq_data *data,
-                                    const struct cpumask *cpu_mask)
+                                   const struct cpumask *cpu_mask, bool force)
 {
        struct msi_msg msg;
        int slice;
@@ -164,7 +164,7 @@ static int sn_set_msi_irq_affinity(unsigned int irq,
        struct sn_irq_info *sn_irq_info;
        struct sn_irq_info *new_irq_info;
        struct sn_pcibus_provider *provider;
-        unsigned int cpu;
+        unsigned int cpu, irq = data->irq;
        cpu = cpumask_first(cpu_mask);
        sn_irq_info = sn_msi_info[irq].sn_irq_info;
@@ -206,33 +206,33 @@ static int sn_set_msi_irq_affinity(unsigned int irq,
        msg.address_lo = (u32)(bus_addr & 0x00000000ffffffff);
        write_msi_msg(irq, &msg);
-        cpumask_copy(irq_desc[irq].affinity, cpu_mask);
+        cpumask_copy(data->affinity, cpu_mask);
        return 0;
 }
 #endif /* CONFIG_SMP */
-static void sn_ack_msi_irq(unsigned int irq)
+static void sn_ack_msi_irq(struct irq_data *data)
 {
-        move_native_irq(irq);
+        irq_move_irq(data);
        ia64_eoi();
 }
-static int sn_msi_retrigger_irq(unsigned int irq)
+static int sn_msi_retrigger_irq(struct irq_data *data)
 {
-        unsigned int vector = irq;
+        unsigned int vector = data->irq;
        ia64_resend_irq(vector);
        return 1;
 }
 static struct irq_chip sn_msi_chip = {
-        .name           = "PCI-MSI",
+        .name                   = "PCI-MSI",
-        .mask           = mask_msi_irq,
+        .irq_mask               = mask_msi_irq,
-        .unmask         = unmask_msi_irq,
+        .irq_unmask             = unmask_msi_irq,
-        .ack            = sn_ack_msi_irq,
+        .irq_ack                = sn_ack_msi_irq,
 #ifdef CONFIG_SMP
-        .set_affinity   = sn_set_msi_irq_affinity,
+        .irq_set_affinity       = sn_set_msi_irq_affinity,
 #endif
-        .retrigger      = sn_msi_retrigger_irq,
+        .irq_retrigger          = sn_msi_retrigger_irq,
 };
diff --git a/arch/ia64/sn/kernel/setup.c b/arch/ia64/sn/kernel/setup.c
index dbc4cbecb5ed..77db0b514fa4 100644
--- a/arch/ia64/sn/kernel/setup.c
+++ b/arch/ia64/sn/kernel/setup.c
@@ -592,7 +592,7 @@ void __cpuinit sn_cpu_init(void)
        /*
         * Don't check status. The SAL call is not supported on all PROMs
         * but a failure is harmless.
-         * Architechtuallly, cpu_init is always called twice on cpu 0. We
+         * Architecturally, cpu_init is always called twice on cpu 0. We
         * should set cpu_number on cpu 0 once.
         */
        if (cpuid == 0) {
diff --git a/arch/ia64/sn/kernel/sn2/Makefile b/arch/ia64/sn/kernel/sn2/Makefile
index 08e6565dc908..3d09108d4277 100644
--- a/arch/ia64/sn/kernel/sn2/Makefile
+++ b/arch/ia64/sn/kernel/sn2/Makefile
@@ -9,7 +9,7 @@
 # sn2 specific kernel files
 #
-EXTRA_CFLAGS += -Iarch/ia64/sn/include
+ccflags-y := -Iarch/ia64/sn/include
 obj-y += cache.o io.o ptc_deadlock.o sn2_smp.o sn_proc_fs.o \
         prominfo_proc.o timer.o timer_interrupt.o sn_hwperf.o
diff --git a/arch/ia64/sn/kernel/sn2/sn_hwperf.c b/arch/ia64/sn/kernel/sn2/sn_hwperf.c
index fa1eceed0d23..30862c0358cd 100644
--- a/arch/ia64/sn/kernel/sn2/sn_hwperf.c
+++ b/arch/ia64/sn/kernel/sn2/sn_hwperf.c
@@ -860,6 +860,7 @@ error:
 static const struct file_operations sn_hwperf_fops = {
        .unlocked_ioctl = sn_hwperf_ioctl,
+        .llseek = noop_llseek,
 };
 static struct miscdevice sn_hwperf_dev = {
diff --git a/arch/ia64/sn/kernel/sn2/sn_proc_fs.c b/arch/ia64/sn/kernel/sn2/sn_proc_fs.c
index c76d8dc3aea3..7aab87f48060 100644
--- a/arch/ia64/sn/kernel/sn2/sn_proc_fs.c
+++ b/arch/ia64/sn/kernel/sn2/sn_proc_fs.c
@@ -45,38 +45,6 @@ static int licenseID_open(struct inode *inode, struct file *file)
        return single_open(file, licenseID_show, NULL);
 }
-/*
- * Enable forced interrupt by default.
- * When set, the sn interrupt handler writes the force interrupt register on
- * the bridge chip.  The hardware will then send an interrupt message if the
- * interrupt line is active.  This mimics a level sensitive interrupt.
- */
-extern int sn_force_interrupt_flag;
-static int sn_force_interrupt_show(struct seq_file *s, void *p)
-{
-        seq_printf(s, "Force interrupt is %s\n",
-                sn_force_interrupt_flag ? "enabled" : "disabled");
-        return 0;
-}
-static ssize_t sn_force_interrupt_write_proc(struct file *file,
-                const char __user *buffer, size_t count, loff_t *data)
-{
-        char val;
-        if (copy_from_user(&val, buffer, 1))
-                return -EFAULT;
-        sn_force_interrupt_flag = (val == '0') ? 0 : 1;
-        return count;
-}
-static int sn_force_interrupt_open(struct inode *inode, struct file *file)
-{
-        return single_open(file, sn_force_interrupt_show, NULL);
-}
 static int coherence_id_show(struct seq_file *s, void *p)
 {
        seq_printf(s, "%d\n", partition_coherence_id());
@@ -114,14 +82,6 @@ static const struct file_operations proc_license_id_fops = {
        .release        = single_release,
 };
-static const struct file_operations proc_sn_force_intr_fops = {
-        .open           = sn_force_interrupt_open,
-        .read           = seq_read,
-        .write          = sn_force_interrupt_write_proc,
-        .llseek         = seq_lseek,
-        .release        = single_release,
-};
 static const struct file_operations proc_coherence_id_fops = {
        .open           = coherence_id_open,
        .read           = seq_read,
@@ -149,8 +109,6 @@ void register_sn_procfs(void)
        proc_create("system_serial_number", 0444, sgi_proc_dir,
                    &proc_system_sn_fops);
        proc_create("licenseID", 0444, sgi_proc_dir, &proc_license_id_fops);
-        proc_create("sn_force_interrupt", 0644, sgi_proc_dir,
-                    &proc_sn_force_intr_fops);
        proc_create("coherence_id", 0444, sgi_proc_dir,
                    &proc_coherence_id_fops);
        proc_create("sn_topology", 0444, sgi_proc_dir, &proc_sn_topo_fops);
diff --git a/arch/ia64/sn/kernel/sn2/timer.c b/arch/ia64/sn/kernel/sn2/timer.c
index 21d6f09e3447..c34efda122e1 100644
--- a/arch/ia64/sn/kernel/sn2/timer.c
+++ b/arch/ia64/sn/kernel/sn2/timer.c
@@ -33,8 +33,6 @@ static struct clocksource clocksource_sn2 = {
        .rating         = 450,
        .read           = read_sn2,
        .mask           = (1LL << 55) - 1,
-        .mult           = 0,
-        .shift          = 10,
        .flags          = CLOCK_SOURCE_IS_CONTINUOUS,
 };
@@ -57,9 +55,7 @@ ia64_sn_udelay (unsigned long usecs)
 void __init sn_timer_init(void)
 {
        clocksource_sn2.fsys_mmio = RTC_COUNTER_ADDR;
-        clocksource_sn2.mult = clocksource_hz2mult(sn_rtc_cycles_per_second,
+        clocksource_register_hz(&clocksource_sn2, sn_rtc_cycles_per_second);
-                                                        clocksource_sn2.shift);
-        clocksource_register(&clocksource_sn2);
        ia64_udelay = &ia64_sn_udelay;
 }
diff --git a/arch/ia64/sn/pci/Makefile b/arch/ia64/sn/pci/Makefile
index ad4ef34dfe26..df2a90145426 100644
--- a/arch/ia64/sn/pci/Makefile
+++ b/arch/ia64/sn/pci/Makefile
@@ -7,6 +7,6 @@
 #
 # Makefile for the sn pci general routines.
-EXTRA_CFLAGS += -Iarch/ia64/sn/include
+ccflags-y := -Iarch/ia64/sn/include
 obj-y := pci_dma.o tioca_provider.o tioce_provider.o pcibr/
diff --git a/arch/ia64/sn/pci/pcibr/Makefile b/arch/ia64/sn/pci/pcibr/Makefile
index 01192d3247dd..396bcae36309 100644
--- a/arch/ia64/sn/pci/pcibr/Makefile
+++ b/arch/ia64/sn/pci/pcibr/Makefile
@@ -7,7 +7,7 @@
 #
 # Makefile for the sn2 io routines.
-EXTRA_CFLAGS += -Iarch/ia64/sn/include
+ccflags-y := -Iarch/ia64/sn/include
 obj-y                           +=  pcibr_dma.o pcibr_reg.o \
                                    pcibr_ate.o pcibr_provider.o
diff --git a/arch/ia64/sn/pci/pcibr/pcibr_dma.c b/arch/ia64/sn/pci/pcibr/pcibr_dma.c
index c659ad5613a0..33def666a664 100644
--- a/arch/ia64/sn/pci/pcibr/pcibr_dma.c
+++ b/arch/ia64/sn/pci/pcibr/pcibr_dma.c
@@ -227,7 +227,7 @@ pcibr_dma_unmap(struct pci_dev *hwdev, dma_addr_t dma_handle, int direction)
 * after doing the read.  For PIC this routine then forces a fake interrupt
 * on another line, which is logically associated with the slot that the PIO
 * is addressed to.  It then spins while watching the memory location that
- * the interrupt is targetted to.  When the interrupt response arrives, we 
+ * the interrupt is targeted to.  When the interrupt response arrives, we 
 * are sure that the DMA has landed in memory and it is safe for the driver
 * to proceed.  For TIOCP use the Device(x) Write Request Buffer Flush 
 * Bridge register since it ensures the data has entered the coherence domain,
diff --git a/arch/ia64/sn/pci/tioca_provider.c b/arch/ia64/sn/pci/tioca_provider.c
index 4d4536e3b6f3..9c271be9919a 100644
--- a/arch/ia64/sn/pci/tioca_provider.c
+++ b/arch/ia64/sn/pci/tioca_provider.c
@@ -509,7 +509,7 @@ tioca_dma_unmap(struct pci_dev *pdev, dma_addr_t bus_addr, int dir)
 * use the GART mapped mode.
 */
 static u64
-tioca_dma_map(struct pci_dev *pdev, u64 paddr, size_t byte_count, int dma_flags)
+tioca_dma_map(struct pci_dev *pdev, unsigned long paddr, size_t byte_count, int dma_flags)
 {
        u64 mapaddr;
diff --git a/arch/ia64/uv/kernel/Makefile b/arch/ia64/uv/kernel/Makefile
index 8d92b4684d8e..124e441d383d 100644
--- a/arch/ia64/uv/kernel/Makefile
+++ b/arch/ia64/uv/kernel/Makefile
@@ -7,7 +7,7 @@
 # Copyright (C) 2008 Silicon Graphics, Inc.  All Rights Reserved.
 #
-EXTRA_CFLAGS += -Iarch/ia64/sn/include
+ccflags-y := -Iarch/ia64/sn/include
 obj-y                           += setup.o
 obj-$(CONFIG_IA64_GENERIC)      += machvec.o
diff --git a/arch/ia64/xen/irq_xen.c b/arch/ia64/xen/irq_xen.c
index a3fb7cf9ae1d..b279e142c633 100644
--- a/arch/ia64/xen/irq_xen.c
+++ b/arch/ia64/xen/irq_xen.c
@@ -92,6 +92,8 @@ static unsigned short saved_irq_cnt;
 static int xen_slab_ready;
 #ifdef CONFIG_SMP
+#include <linux/sched.h>
 /* Dummy stub. Though we may check XEN_RESCHEDULE_VECTOR before __do_IRQ,
 * it ends up to issue several memory accesses upon percpu data and
 * thus adds unnecessary traffic to other paths.
@@ -99,7 +101,13 @@ static int xen_slab_ready;
 static irqreturn_t
 xen_dummy_handler(int irq, void *dev_id)
 {
+        return IRQ_HANDLED;
+}
+static irqreturn_t
+xen_resched_handler(int irq, void *dev_id)
+{
+        scheduler_ipi();
        return IRQ_HANDLED;
 }
@@ -110,7 +118,7 @@ static struct irqaction xen_ipi_irqaction = {
 };
 static struct irqaction xen_resched_irqaction = {
-        .handler =      xen_dummy_handler,
+        .handler =      xen_resched_handler,
        .flags =        IRQF_DISABLED,
        .name =         "resched"
 };
@@ -138,7 +146,6 @@ static void
 __xen_register_percpu_irq(unsigned int cpu, unsigned int vec,
                        struct irqaction *action, int save)
 {
-        struct irq_desc *desc;
        int irq = 0;
        if (xen_slab_ready) {
@@ -223,8 +230,7 @@ __xen_register_percpu_irq(unsigned int cpu, unsigned int vec,
                         * mark the interrupt for migrations and trigger it
                         * on cpu hotplug.
                         */
-                        desc = irq_desc + irq;
+                        irq_set_status_flags(irq, IRQ_PER_CPU);
-                        desc->status |= IRQ_PER_CPU;
                }
        }
diff --git a/arch/ia64/xen/suspend.c b/arch/ia64/xen/suspend.c
index fd66b048c6fa..419c8620945a 100644
--- a/arch/ia64/xen/suspend.c
+++ b/arch/ia64/xen/suspend.c
@@ -37,19 +37,14 @@ xen_mm_unpin_all(void)
        /* nothing */
 }
-void xen_pre_device_suspend(void)
-{
-        /* nothing */
-}
 void
-xen_pre_suspend()
+xen_arch_pre_suspend()
 {
        /* nothing */
 }
 void
-xen_post_suspend(int suspend_cancelled)
+xen_arch_post_suspend(int suspend_cancelled)
 {
        if (suspend_cancelled)
                return;
diff --git a/arch/ia64/xen/time.c b/arch/ia64/xen/time.c
index c1c544513e8d..1f8244a78bee 100644
--- a/arch/ia64/xen/time.c
+++ b/arch/ia64/xen/time.c
@@ -139,14 +139,11 @@ consider_steal_time(unsigned long new_itm)
                run_posix_cpu_timers(p);
                delta_itm += local_cpu_data->itm_delta * (stolen + blocked);
-                if (cpu == time_keeper_id) {
+                if (cpu == time_keeper_id)
-                        write_seqlock(&xtime_lock);
+                        xtime_update(stolen + blocked);
-                        do_timer(stolen + blocked);
-                        local_cpu_data->itm_next = delta_itm + new_itm;
+                local_cpu_data->itm_next = delta_itm + new_itm;
-                        write_sequnlock(&xtime_lock);
-                } else {
-                        local_cpu_data->itm_next = delta_itm + new_itm;
-                }
                per_cpu(xen_stolen_time, cpu) += NS_PER_TICK * stolen;
                per_cpu(xen_blocked_time, cpu) += NS_PER_TICK * blocked;
        }
diff --git a/arch/ia64/xen/xen_pv_ops.c b/arch/ia64/xen/xen_pv_ops.c
index 8adc6a14272a..3e8d350fdf39 100644
--- a/arch/ia64/xen/xen_pv_ops.c
+++ b/arch/ia64/xen/xen_pv_ops.c
@@ -1136,7 +1136,6 @@ __initconst = {
 static void __init
 xen_patch_branch(unsigned long tag, unsigned long type)
 {
-        const unsigned long nelem =
+        __paravirt_patch_apply_branch(tag, type, xen_branch_target,
-                sizeof(xen_branch_target) / sizeof(xen_branch_target[0]);
+                                        ARRAY_SIZE(xen_branch_target));
-        __paravirt_patch_apply_branch(tag, type, xen_branch_target, nelem);
 }