Merge branch 'for-2.6.26' of master.kernel.org:/pub/scm/linux/kernel/git/jwboyer/powerpc-4xx into merge

319 files changed, 7933 insertions, 7478 deletions

diff --git a/arch/Kconfig b/arch/Kconfig
index 694c9af520bb..3ea332b009e5 100644
--- a/arch/Kconfig
+++ b/arch/Kconfig
@@ -36,3 +36,6 @@ config HAVE_KPROBES
 
 config HAVE_KRETPROBES
         def_bool n
+
+config HAVE_DMA_ATTRS
+        def_bool n
diff --git a/arch/alpha/kernel/asm-offsets.c b/arch/alpha/kernel/asm-offsets.c
index 6c56c754a0b5..4b18cd94d59d 100644
--- a/arch/alpha/kernel/asm-offsets.c
+++ b/arch/alpha/kernel/asm-offsets.c
@@ -8,13 +8,9 @@
 #include <linux/stddef.h>
 #include <linux/sched.h>
 #include <linux/ptrace.h>
+#include <linux/kbuild.h>
 #include <asm/io.h>
 
-#define DEFINE(sym, val) \
-        asm volatile("\n->" #sym " %0 " #val : : "i" (val))
-
-#define BLANK() asm volatile("\n->" : : )
-
 void foo(void)
 {
         DEFINE(TI_TASK, offsetof(struct thread_info, task));
diff --git a/arch/alpha/kernel/osf_sys.c b/arch/alpha/kernel/osf_sys.c
index 9fee37e2596f..32ca1b927307 100644
--- a/arch/alpha/kernel/osf_sys.c
+++ b/arch/alpha/kernel/osf_sys.c
@@ -981,27 +981,18 @@ asmlinkage int
 osf_select(int n, fd_set __user *inp, fd_set __user *outp, fd_set __user *exp,
            struct timeval32 __user *tvp)
 {
-        fd_set_bits fds;
-        char *bits;
-        size_t size;
-        long timeout;
-        int ret = -EINVAL;
-        struct fdtable *fdt;
-        int max_fds;
-
-        timeout = MAX_SCHEDULE_TIMEOUT;
+        s64 timeout = MAX_SCHEDULE_TIMEOUT;
         if (tvp) {
                 time_t sec, usec;
 
                 if (!access_ok(VERIFY_READ, tvp, sizeof(*tvp))
                     || __get_user(sec, &tvp->tv_sec)
                     || __get_user(usec, &tvp->tv_usec)) {
-                        ret = -EFAULT;
-                        goto out_nofds;
+                        return -EFAULT;
                 }
 
                 if (sec < 0 || usec < 0)
-                        goto out_nofds;
+                        return -EINVAL;
 
                 if ((unsigned long) sec < MAX_SELECT_SECONDS) {
                         timeout = (usec + 1000000/HZ - 1) / (1000000/HZ);
@@ -1009,60 +1000,8 @@ osf_select(int n, fd_set __user *inp, fd_set __user *outp, fd_set __user *exp,
                 }
         }
 
-        rcu_read_lock();
-        fdt = files_fdtable(current->files);
-        max_fds = fdt->max_fds;
-        rcu_read_unlock();
-        if (n < 0 || n > max_fds)
-                goto out_nofds;
-
-        /*
-         * We need 6 bitmaps (in/out/ex for both incoming and outgoing),
-         * since we used fdset we need to allocate memory in units of
-         * long-words. 
-         */
-        ret = -ENOMEM;
-        size = FDS_BYTES(n);
-        bits = kmalloc(6 * size, GFP_KERNEL);
-        if (!bits)
-                goto out_nofds;
-        fds.in      = (unsigned long *)  bits;
-        fds.out     = (unsigned long *) (bits +   size);
-        fds.ex      = (unsigned long *) (bits + 2*size);
-        fds.res_in  = (unsigned long *) (bits + 3*size);
-        fds.res_out = (unsigned long *) (bits + 4*size);
-        fds.res_ex  = (unsigned long *) (bits + 5*size);
-
-        if ((ret = get_fd_set(n, inp->fds_bits, fds.in)) ||
-            (ret = get_fd_set(n, outp->fds_bits, fds.out)) ||
-            (ret = get_fd_set(n, exp->fds_bits, fds.ex)))
-                goto out;
-        zero_fd_set(n, fds.res_in);
-        zero_fd_set(n, fds.res_out);
-        zero_fd_set(n, fds.res_ex);
-
-        ret = do_select(n, &fds, &timeout);
-
         /* OSF does not copy back the remaining time.  */
-
-        if (ret < 0)
-                goto out;
-        if (!ret) {
-                ret = -ERESTARTNOHAND;
-                if (signal_pending(current))
-                        goto out;
-                ret = 0;
-        }
-
-        if (set_fd_set(n, inp->fds_bits, fds.res_in) ||
-            set_fd_set(n, outp->fds_bits, fds.res_out) ||
-            set_fd_set(n, exp->fds_bits, fds.res_ex))
-                ret = -EFAULT;
-
- out:
-        kfree(bits);
- out_nofds:
-        return ret;
+        return core_sys_select(n, inp, outp, exp, &timeout);
 }
 
 struct rusage32 {
diff --git a/arch/alpha/kernel/pci.c b/arch/alpha/kernel/pci.c
index baf57563b14c..36ab22a7ea12 100644
--- a/arch/alpha/kernel/pci.c
+++ b/arch/alpha/kernel/pci.c
@@ -514,8 +514,8 @@ sys_pciconfig_iobase(long which, unsigned long bus, unsigned long dfn)
 
 void __iomem *pci_iomap(struct pci_dev *dev, int bar, unsigned long maxlen)
 {
-        unsigned long start = pci_resource_start(dev, bar);
-        unsigned long len = pci_resource_len(dev, bar);
+        resource_size_t start = pci_resource_start(dev, bar);
+        resource_size_t len = pci_resource_len(dev, bar);
         unsigned long flags = pci_resource_flags(dev, bar);
 
         if (!len || !start)
diff --git a/arch/arm/configs/am200epdkit_defconfig b/arch/arm/configs/am200epdkit_defconfig
index dc030cfe5009..5e68420f4680 100644
--- a/arch/arm/configs/am200epdkit_defconfig
+++ b/arch/arm/configs/am200epdkit_defconfig
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.25-rc3
-# Sun Mar  9 06:33:33 2008
+# Linux kernel version: 2.6.25
+# Sun Apr 20 00:29:49 2008
 #
 CONFIG_ARM=y
 CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -51,7 +51,8 @@ CONFIG_FAIR_GROUP_SCHED=y
 # CONFIG_RT_GROUP_SCHED is not set
 CONFIG_USER_SCHED=y
 # CONFIG_CGROUP_SCHED is not set
-# CONFIG_SYSFS_DEPRECATED is not set
+CONFIG_SYSFS_DEPRECATED=y
+CONFIG_SYSFS_DEPRECATED_V2=y
 # CONFIG_RELAY is not set
 # CONFIG_NAMESPACES is not set
 # CONFIG_BLK_DEV_INITRD is not set
@@ -85,6 +86,7 @@ CONFIG_SLAB=y
 CONFIG_HAVE_OPROFILE=y
 # CONFIG_KPROBES is not set
 CONFIG_HAVE_KPROBES=y
+CONFIG_HAVE_KRETPROBES=y
 CONFIG_PROC_PAGE_MONITOR=y
 CONFIG_SLABINFO=y
 CONFIG_RT_MUTEXES=y
@@ -115,7 +117,6 @@ CONFIG_IOSCHED_NOOP=y
 CONFIG_DEFAULT_NOOP=y
 CONFIG_DEFAULT_IOSCHED="noop"
 CONFIG_CLASSIC_RCU=y
-# CONFIG_PREEMPT_RCU is not set
 
 #
 # System Type
@@ -320,8 +321,6 @@ CONFIG_TCP_CONG_CUBIC=y
 CONFIG_DEFAULT_TCP_CONG="cubic"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IPV6 is not set
-# CONFIG_INET6_XFRM_TUNNEL is not set
-# CONFIG_INET6_TUNNEL is not set
 # CONFIG_NETWORK_SECMARK is not set
 # CONFIG_NETFILTER is not set
 # CONFIG_IP_DCCP is not set
@@ -383,7 +382,6 @@ CONFIG_IEEE80211=m
 CONFIG_IEEE80211_CRYPT_WEP=m
 # CONFIG_IEEE80211_CRYPT_CCMP is not set
 # CONFIG_IEEE80211_CRYPT_TKIP is not set
-# CONFIG_IEEE80211_SOFTMAC is not set
 # CONFIG_RFKILL is not set
 # CONFIG_NET_9P is not set
 
@@ -503,7 +501,7 @@ CONFIG_IDE_MAX_HWIFS=2
 CONFIG_BLK_DEV_IDE=m
 
 #
-# Please see Documentation/ide.txt for help/info on IDE drives
+# Please see Documentation/ide/ide.txt for help/info on IDE drives
 #
 # CONFIG_BLK_DEV_IDE_SATA is not set
 CONFIG_BLK_DEV_IDEDISK=m
@@ -518,10 +516,9 @@ CONFIG_IDE_PROC_FS=y
 #
 # IDE chipset support/bugfixes
 #
-CONFIG_IDE_GENERIC=m
 # CONFIG_BLK_DEV_PLATFORM is not set
 # CONFIG_BLK_DEV_IDEDMA is not set
-CONFIG_IDE_ARCH_OBSOLETE_INIT=y
+# CONFIG_BLK_DEV_HD_ONLY is not set
 # CONFIG_BLK_DEV_HD is not set
 
 #
@@ -562,6 +559,7 @@ CONFIG_NETDEV_10000=y
 #
 # CONFIG_WLAN_PRE80211 is not set
 # CONFIG_WLAN_80211 is not set
+# CONFIG_IWLWIFI_LEDS is not set
 # CONFIG_NET_PCMCIA is not set
 # CONFIG_WAN is not set
 # CONFIG_PPP is not set
@@ -707,6 +705,8 @@ CONFIG_SSB_POSSIBLE=y
 #
 # CONFIG_MFD_SM501 is not set
 # CONFIG_MFD_ASIC3 is not set
+# CONFIG_HTC_EGPIO is not set
+# CONFIG_HTC_PASIC3 is not set
 
 #
 # Multimedia devices
@@ -745,6 +745,7 @@ CONFIG_FB_TILEBLITTING=y
 CONFIG_FB_PXA=y
 CONFIG_FB_PXA_PARAMETERS=y
 CONFIG_FB_MBX=m
+# CONFIG_FB_METRONOME is not set
 CONFIG_FB_VIRTUAL=m
 # CONFIG_BACKLIGHT_LCD_SUPPORT is not set
 
@@ -891,7 +892,6 @@ CONFIG_RTC_LIB=y
 # CONFIG_JFS_FS is not set
 # CONFIG_FS_POSIX_ACL is not set
 # CONFIG_XFS_FS is not set
-# CONFIG_GFS2_FS is not set
 # CONFIG_OCFS2_FS is not set
 # CONFIG_DNOTIFY is not set
 CONFIG_INOTIFY=y
diff --git a/arch/arm/kernel/asm-offsets.c b/arch/arm/kernel/asm-offsets.c
index 0a0d2479274b..4a881258bb17 100644
--- a/arch/arm/kernel/asm-offsets.c
+++ b/arch/arm/kernel/asm-offsets.c
@@ -16,6 +16,7 @@
 #include <asm/thread_info.h>
 #include <asm/memory.h>
 #include <asm/procinfo.h>
+#include <linux/kbuild.h>
 
 /*
  * Make sure that the compiler and target are compatible.
@@ -35,13 +36,6 @@
 #error    Known good compilers: 3.3
 #endif
 
-/* Use marker if you need to separate the values later */
-
-#define DEFINE(sym, val) \
-        asm volatile("\n->" #sym " %0 " #val : : "i" (val))
-
-#define BLANK() asm volatile("\n->" : : )
-
 int main(void)
 {
   DEFINE(TSK_ACTIVE_MM,         offsetof(struct task_struct, active_mm));
diff --git a/arch/arm/kernel/atags.c b/arch/arm/kernel/atags.c
index e2e934c38080..64c420805e6f 100644
--- a/arch/arm/kernel/atags.c
+++ b/arch/arm/kernel/atags.c
@@ -35,7 +35,7 @@ create_proc_entries(void)
 {
         struct proc_dir_entry* tags_entry;
 
-        tags_entry = create_proc_read_entry("atags", 0400, &proc_root, read_buffer, &tags_buffer);
+        tags_entry = create_proc_read_entry("atags", 0400, NULL, read_buffer, &tags_buffer);
         if (!tags_entry)
                 return -ENOMEM;
 
diff --git a/arch/arm/kernel/ecard.c b/arch/arm/kernel/ecard.c
index f56d48c451ea..a53c0aba5c14 100644
--- a/arch/arm/kernel/ecard.c
+++ b/arch/arm/kernel/ecard.c
@@ -37,6 +37,7 @@
 #include <linux/mm.h>
 #include <linux/slab.h>
 #include <linux/proc_fs.h>
+#include <linux/seq_file.h>
 #include <linux/device.h>
 #include <linux/init.h>
 #include <linux/mutex.h>
@@ -723,17 +724,14 @@ unsigned int __ecard_address(ecard_t *ec, card_type_t type, card_speed_t speed)
         return address;
 }
 
-static int ecard_prints(char *buffer, ecard_t *ec)
+static int ecard_prints(struct seq_file *m, ecard_t *ec)
 {
-        char *start = buffer;
-
-        buffer += sprintf(buffer, "  %d: %s ", ec->slot_no,
-                          ec->easi ? "EASI" : "    ");
+        seq_printf(m, "  %d: %s ", ec->slot_no, ec->easi ? "EASI" : "    ");
 
         if (ec->cid.id == 0) {
                 struct in_chunk_dir incd;
 
-                buffer += sprintf(buffer, "[%04X:%04X] ",
+                seq_printf(m, "[%04X:%04X] ",
                         ec->cid.manufacturer, ec->cid.product);
 
                 if (!ec->card_desc && ec->cid.cd &&
@@ -744,43 +742,43 @@ static int ecard_prints(char *buffer, ecard_t *ec)
                                 strcpy((char *)ec->card_desc, incd.d.string);
                 }
 
-                buffer += sprintf(buffer, "%s\n", ec->card_desc ? ec->card_desc : "*unknown*");
+                seq_printf(m, "%s\n", ec->card_desc ? ec->card_desc : "*unknown*");
         } else
-                buffer += sprintf(buffer, "Simple card %d\n", ec->cid.id);
+                seq_printf(m, "Simple card %d\n", ec->cid.id);
 
-        return buffer - start;
+        return 0;
 }
 
-static int get_ecard_dev_info(char *buf, char **start, off_t pos, int count)
+static int ecard_devices_proc_show(struct seq_file *m, void *v)
 {
         ecard_t *ec = cards;
-        off_t at = 0;
-        int len, cnt;
-
-        cnt = 0;
-        while (ec && count > cnt) {
-                len = ecard_prints(buf, ec);
-                at += len;
-                if (at >= pos) {
-                        if (!*start) {
-                                *start = buf + (pos - (at - len));
-                                cnt = at - pos;
-                        } else
-                                cnt += len;
-                        buf += len;
-                }
+
+        while (ec) {
+                ecard_prints(m, ec);
                 ec = ec->next;
         }
-        return (count > cnt) ? cnt : count;
+        return 0;
 }
 
+static int ecard_devices_proc_open(struct inode *inode, struct file *file)
+{
+        return single_open(file, ecard_devices_proc_show, NULL);
+}
+
+static const struct file_operations bus_ecard_proc_fops = {
+        .owner          = THIS_MODULE,
+        .open           = ecard_devices_proc_open,
+        .read           = seq_read,
+        .llseek         = seq_lseek,
+        .release        = single_release,
+};
+
 static struct proc_dir_entry *proc_bus_ecard_dir = NULL;
 
 static void ecard_proc_init(void)
 {
-        proc_bus_ecard_dir = proc_mkdir("ecard", proc_bus);
-        create_proc_info_entry("devices", 0, proc_bus_ecard_dir,
-                get_ecard_dev_info);
+        proc_bus_ecard_dir = proc_mkdir("bus/ecard", NULL);
+        proc_create("devices", 0, proc_bus_ecard_dir, &bus_ecard_proc_fops);
 }
 
 #define ec_set_resource(ec,nr,st,sz)                            \
diff --git a/arch/arm/kernel/kprobes-decode.c b/arch/arm/kernel/kprobes-decode.c
index d51bc8b60557..b4565bb133c1 100644
--- a/arch/arm/kernel/kprobes-decode.c
+++ b/arch/arm/kernel/kprobes-decode.c
@@ -1176,7 +1176,7 @@ space_cccc_001x(kprobe_opcode_t insn, struct arch_specific_insn *asi)
          * *S (bit 20) updates condition codes
          * ADC/SBC/RSC reads the C flag
          */
-        insn &= 0xfff00ff0;     /* Rn = r0, Rd = r0 */
+        insn &= 0xfff00fff;     /* Rn = r0, Rd = r0 */
         asi->insn[0] = insn;
         asi->insn_handler = (insn & (1 << 20)) ?  /* S-bit */
                         emulate_alu_imm_rwflags : emulate_alu_imm_rflags;
diff --git a/arch/arm/kernel/kprobes.c b/arch/arm/kernel/kprobes.c
index 13e371aad879..5593dd207216 100644
--- a/arch/arm/kernel/kprobes.c
+++ b/arch/arm/kernel/kprobes.c
@@ -66,7 +66,7 @@ int __kprobes arch_prepare_kprobe(struct kprobe *p)
                         return -ENOMEM;
                 for (is = 0; is < MAX_INSN_SIZE; ++is)
                         p->ainsn.insn[is] = tmp_insn[is];
-                flush_insns(&p->ainsn.insn, MAX_INSN_SIZE);
+                flush_insns(p->ainsn.insn, MAX_INSN_SIZE);
                 break;
 
         case INSN_GOOD_NO_SLOT: /* instruction doesn't need insn slot */
diff --git a/arch/arm/kernel/sys_arm.c b/arch/arm/kernel/sys_arm.c
index 9bd1870d980e..0128687ba0f7 100644
--- a/arch/arm/kernel/sys_arm.c
+++ b/arch/arm/kernel/sys_arm.c
@@ -34,23 +34,6 @@ extern unsigned long do_mremap(unsigned long addr, unsigned long old_len,
                                unsigned long new_len, unsigned long flags,
                                unsigned long new_addr);
 
-/*
- * sys_pipe() is the normal C calling standard for creating
- * a pipe. It's not the way unix traditionally does this, though.
- */
-asmlinkage int sys_pipe(unsigned long __user *fildes)
-{
-        int fd[2];
-        int error;
-
-        error = do_pipe(fd);
-        if (!error) {
-                if (copy_to_user(fildes, fd, 2*sizeof(int)))
-                        error = -EFAULT;
-        }
-        return error;
-}
-
 /* common code for old and new mmaps */
 inline long do_mmap2(
         unsigned long addr, unsigned long len,
diff --git a/arch/arm/mach-at91/at91cap9_devices.c b/arch/arm/mach-at91/at91cap9_devices.c
index f1a80d74a4b6..be526746e01e 100644
--- a/arch/arm/mach-at91/at91cap9_devices.c
+++ b/arch/arm/mach-at91/at91cap9_devices.c
@@ -246,7 +246,7 @@ void __init at91_add_device_mmc(short mmc_id, struct at91_mmc_data *data)
                 }
 
                 mmc0_data = *data;
-                at91_clock_associate("mci0_clk", &at91cap9_mmc1_device.dev, "mci_clk");
+                at91_clock_associate("mci0_clk", &at91cap9_mmc0_device.dev, "mci_clk");
                 platform_device_register(&at91cap9_mmc0_device);
         } else {                        /* MCI1 */
                 /* CLK */
diff --git a/arch/arm/mach-at91/at91sam9263_devices.c b/arch/arm/mach-at91/at91sam9263_devices.c
index b6454c525962..719667e25c98 100644
--- a/arch/arm/mach-at91/at91sam9263_devices.c
+++ b/arch/arm/mach-at91/at91sam9263_devices.c
@@ -308,7 +308,7 @@ void __init at91_add_device_mmc(short mmc_id, struct at91_mmc_data *data)
                 }
 
                 mmc0_data = *data;
-                at91_clock_associate("mci0_clk", &at91sam9263_mmc1_device.dev, "mci_clk");
+                at91_clock_associate("mci0_clk", &at91sam9263_mmc0_device.dev, "mci_clk");
                 platform_device_register(&at91sam9263_mmc0_device);
         } else {                        /* MCI1 */
                 /* CLK */
diff --git a/arch/arm/mach-at91/board-csb337.c b/arch/arm/mach-at91/board-csb337.c
index 26fea4dcc3a0..81f1ebb4e964 100644
--- a/arch/arm/mach-at91/board-csb337.c
+++ b/arch/arm/mach-at91/board-csb337.c
@@ -79,8 +79,7 @@ static struct at91_udc_data __initdata csb337_udc_data = {
 
 static struct i2c_board_info __initdata csb337_i2c_devices[] = {
         {
-                I2C_BOARD_INFO("rtc-ds1307", 0x68),
-                .type   = "ds1307",
+                I2C_BOARD_INFO("ds1307", 0x68),
         },
 };
 
diff --git a/arch/arm/mach-at91/board-dk.c b/arch/arm/mach-at91/board-dk.c
index 0a897efeba8e..c1a813c7169b 100644
--- a/arch/arm/mach-at91/board-dk.c
+++ b/arch/arm/mach-at91/board-dk.c
@@ -132,8 +132,7 @@ static struct i2c_board_info __initdata dk_i2c_devices[] = {
                 I2C_BOARD_INFO("x9429", 0x28),
         },
         {
-                I2C_BOARD_INFO("at24c", 0x50),
-                .type   = "24c1024",
+                I2C_BOARD_INFO("24c1024", 0x50),
         }
 };
 
diff --git a/arch/arm/mach-at91/board-eb9200.c b/arch/arm/mach-at91/board-eb9200.c
index b7b79bb9d6c4..af1a1d8ecc30 100644
--- a/arch/arm/mach-at91/board-eb9200.c
+++ b/arch/arm/mach-at91/board-eb9200.c
@@ -93,8 +93,7 @@ static struct at91_mmc_data __initdata eb9200_mmc_data = {
 
 static struct i2c_board_info __initdata eb9200_i2c_devices[] = {
         {
-                I2C_BOARD_INFO("at24c", 0x50),
-                .type   = "24c512",
+                I2C_BOARD_INFO("24c512", 0x50),
         },
 };
 
diff --git a/arch/arm/mach-at91/pm.c b/arch/arm/mach-at91/pm.c
index 39733b6992aa..aa863c157708 100644
--- a/arch/arm/mach-at91/pm.c
+++ b/arch/arm/mach-at91/pm.c
@@ -61,6 +61,15 @@ static inline void sdram_selfrefresh_enable(void)
 #else
 #include <asm/arch/at91sam9_sdramc.h>
 
+#ifdef CONFIG_ARCH_AT91SAM9263
+/*
+ * FIXME either or both the SDRAM controllers (EB0, EB1) might be in use;
+ * handle those cases both here and in the Suspend-To-RAM support.
+ */
+#define AT91_SDRAMC     AT91_SDRAMC0
+#warning Assuming EB1 SDRAM controller is *NOT* used
+#endif
+
 static u32 saved_lpr;
 
 static inline void sdram_selfrefresh_enable(void)
@@ -75,11 +84,6 @@ static inline void sdram_selfrefresh_enable(void)
 
 #define sdram_selfrefresh_disable()     at91_sys_write(AT91_SDRAMC_LPR, saved_lpr)
 
-/*
- * FIXME: The AT91SAM9263 has a second EBI controller which may have
- *        additional SDRAM.  pm_slowclock.S will require a similar fix.
- */
-
 #endif
 
 
diff --git a/arch/arm/mach-davinci/clock.c b/arch/arm/mach-davinci/clock.c
index 4143828a9684..c6b94f60e0b2 100644
--- a/arch/arm/mach-davinci/clock.c
+++ b/arch/arm/mach-davinci/clock.c
@@ -311,11 +311,7 @@ static const struct file_operations proc_davinci_ck_operations = {
 
 static int __init davinci_ck_proc_init(void)
 {
-        struct proc_dir_entry *entry;
-
-        entry = create_proc_entry("davinci_clocks", 0, NULL);
-        if (entry)
-                entry->proc_fops = &proc_davinci_ck_operations;
+        proc_create("davinci_clocks", 0, NULL, &proc_davinci_ck_operations);
         return 0;
 
 }
diff --git a/arch/arm/mach-iop32x/em7210.c b/arch/arm/mach-iop32x/em7210.c
index c947152f9a3c..4877597c8758 100644
--- a/arch/arm/mach-iop32x/em7210.c
+++ b/arch/arm/mach-iop32x/em7210.c
@@ -50,8 +50,7 @@ static struct sys_timer em7210_timer = {
  */
 static struct i2c_board_info __initdata em7210_i2c_devices[] = {
         {
-                I2C_BOARD_INFO("rtc-rs5c372", 0x32),
-                .type = "rs5c372a",
+                I2C_BOARD_INFO("rs5c372a", 0x32),
         },
 };
 
diff --git a/arch/arm/mach-iop32x/glantank.c b/arch/arm/mach-iop32x/glantank.c
index d2a7b04f1cb0..d4fca75ce542 100644
--- a/arch/arm/mach-iop32x/glantank.c
+++ b/arch/arm/mach-iop32x/glantank.c
@@ -176,12 +176,10 @@ static struct f75375s_platform_data glantank_f75375s = {
 
 static struct i2c_board_info __initdata glantank_i2c_devices[] = {
         {
-                I2C_BOARD_INFO("rtc-rs5c372", 0x32),
-                .type = "rs5c372a",
+                I2C_BOARD_INFO("rs5c372a", 0x32),
         },
         {
                 I2C_BOARD_INFO("f75375", 0x2e),
-                .type = "f75375",
                 .platform_data = &glantank_f75375s,
         },
 };
diff --git a/arch/arm/mach-iop32x/n2100.c b/arch/arm/mach-iop32x/n2100.c
index bc91d6e66bc4..2741063bf361 100644
--- a/arch/arm/mach-iop32x/n2100.c
+++ b/arch/arm/mach-iop32x/n2100.c
@@ -208,12 +208,10 @@ static struct f75375s_platform_data n2100_f75375s = {
 
 static struct i2c_board_info __initdata n2100_i2c_devices[] = {
         {
-                I2C_BOARD_INFO("rtc-rs5c372", 0x32),
-                .type = "rs5c372b",
+                I2C_BOARD_INFO("rs5c372b", 0x32),
         },
         {
                 I2C_BOARD_INFO("f75375", 0x2e),
-                .type = "f75375",
                 .platform_data = &n2100_f75375s,
         },
 };
diff --git a/arch/arm/mach-ixp4xx/dsmg600-setup.c b/arch/arm/mach-ixp4xx/dsmg600-setup.c
index 8cb07437a807..a51bfa6978b6 100644
--- a/arch/arm/mach-ixp4xx/dsmg600-setup.c
+++ b/arch/arm/mach-ixp4xx/dsmg600-setup.c
@@ -65,7 +65,7 @@ static struct platform_device dsmg600_i2c_gpio = {
 
 static struct i2c_board_info __initdata dsmg600_i2c_board_info [] = {
         {
-                I2C_BOARD_INFO("rtc-pcf8563", 0x51),
+                I2C_BOARD_INFO("pcf8563", 0x51),
         },
 };
 
diff --git a/arch/arm/mach-ixp4xx/ixp4xx_npe.c b/arch/arm/mach-ixp4xx/ixp4xx_npe.c
index 83c137ec582c..63a23fa4aab4 100644
--- a/arch/arm/mach-ixp4xx/ixp4xx_npe.c
+++ b/arch/arm/mach-ixp4xx/ixp4xx_npe.c
@@ -448,7 +448,9 @@ int npe_send_message(struct npe *npe, const void *msg, const char *what)
                 return -ETIMEDOUT;
         }
 
+#if DEBUG_MSG > 1
         debug_msg(npe, "Sending a message took %i cycles\n", cycles);
+#endif
         return 0;
 }
 
@@ -484,7 +486,9 @@ int npe_recv_message(struct npe *npe, void *msg, const char *what)
                 return -ETIMEDOUT;
         }
 
+#if DEBUG_MSG > 1
         debug_msg(npe, "Receiving a message took %i cycles\n", cycles);
+#endif
         return 0;
 }
 
diff --git a/arch/arm/mach-ixp4xx/ixp4xx_qmgr.c b/arch/arm/mach-ixp4xx/ixp4xx_qmgr.c
index e83301325301..fab94eaecee7 100644
--- a/arch/arm/mach-ixp4xx/ixp4xx_qmgr.c
+++ b/arch/arm/mach-ixp4xx/ixp4xx_qmgr.c
@@ -184,6 +184,8 @@ void qmgr_release_queue(unsigned int queue)
         case 3: mask[0] = 0xFF; break;
         }
 
+        mask[1] = mask[2] = mask[3] = 0;
+
         while (addr--)
                 shift_mask(mask);
 
diff --git a/arch/arm/mach-ixp4xx/nas100d-setup.c b/arch/arm/mach-ixp4xx/nas100d-setup.c
index 159e1c4f1eda..84b5e62a9c0a 100644
--- a/arch/arm/mach-ixp4xx/nas100d-setup.c
+++ b/arch/arm/mach-ixp4xx/nas100d-setup.c
@@ -54,7 +54,7 @@ static struct platform_device nas100d_flash = {
 
 static struct i2c_board_info __initdata nas100d_i2c_board_info [] = {
         {
-                I2C_BOARD_INFO("rtc-pcf8563", 0x51),
+                I2C_BOARD_INFO("pcf8563", 0x51),
         },
 };
 
diff --git a/arch/arm/mach-ixp4xx/nslu2-setup.c b/arch/arm/mach-ixp4xx/nslu2-setup.c
index d9a182895a0f..a48a6655b887 100644
--- a/arch/arm/mach-ixp4xx/nslu2-setup.c
+++ b/arch/arm/mach-ixp4xx/nslu2-setup.c
@@ -57,7 +57,7 @@ static struct i2c_gpio_platform_data nslu2_i2c_gpio_data = {
 
 static struct i2c_board_info __initdata nslu2_i2c_board_info [] = {
         {
-                I2C_BOARD_INFO("rtc-x1205", 0x6f),
+                I2C_BOARD_INFO("x1205", 0x6f),
         },
 };
 
diff --git a/arch/arm/mach-omap1/board-h2.c b/arch/arm/mach-omap1/board-h2.c
index 507987720015..4b444fdaafea 100644
--- a/arch/arm/mach-omap1/board-h2.c
+++ b/arch/arm/mach-omap1/board-h2.c
@@ -351,11 +351,9 @@ static void __init h2_init_smc91x(void)
 static struct i2c_board_info __initdata h2_i2c_board_info[] = {
         {
                 I2C_BOARD_INFO("tps65010", 0x48),
-                .type           = "tps65010",
                 .irq            = OMAP_GPIO_IRQ(58),
         }, {
                 I2C_BOARD_INFO("isp1301_omap", 0x2d),
-                .type           = "isp1301_omap",
                 .irq            = OMAP_GPIO_IRQ(2),
         },
 };
diff --git a/arch/arm/mach-omap1/board-h3.c b/arch/arm/mach-omap1/board-h3.c
index c3ef1ee5f77b..7fbaa8d648cd 100644
--- a/arch/arm/mach-omap1/board-h3.c
+++ b/arch/arm/mach-omap1/board-h3.c
@@ -473,8 +473,7 @@ static struct omap_board_config_kernel h3_config[] __initdata = {
 
 static struct i2c_board_info __initdata h3_i2c_board_info[] = {
        {
-               I2C_BOARD_INFO("tps65010", 0x48),
-               .type           = "tps65013",
+                I2C_BOARD_INFO("tps65013", 0x48),
                /* .irq         = OMAP_GPIO_IRQ(??), */
        },
 };
diff --git a/arch/arm/mach-omap1/board-osk.c b/arch/arm/mach-omap1/board-osk.c
index 4f9baba7d893..a66505f58b15 100644
--- a/arch/arm/mach-omap1/board-osk.c
+++ b/arch/arm/mach-omap1/board-osk.c
@@ -254,7 +254,6 @@ static struct tps65010_board tps_board = {
 static struct i2c_board_info __initdata osk_i2c_board_info[] = {
         {
                 I2C_BOARD_INFO("tps65010", 0x48),
-                .type           = "tps65010",
                 .irq            = OMAP_GPIO_IRQ(OMAP_MPUIO(1)),
                 .platform_data  = &tps_board,
 
diff --git a/arch/arm/mach-orion5x/addr-map.c b/arch/arm/mach-orion5x/addr-map.c
index 6b179371e0a2..9608503d67f5 100644
--- a/arch/arm/mach-orion5x/addr-map.c
+++ b/arch/arm/mach-orion5x/addr-map.c
@@ -19,14 +19,14 @@
 
 /*
  * The Orion has fully programable address map. There's a separate address
- * map for each of the device _master_ interfaces, e.g. CPU, PCI, PCIE, USB,
+ * map for each of the device _master_ interfaces, e.g. CPU, PCI, PCIe, USB,
  * Gigabit Ethernet, DMA/XOR engines, etc. Each interface has its own
  * address decode windows that allow it to access any of the Orion resources.
  *
  * CPU address decoding --
  * Linux assumes that it is the boot loader that already setup the access to
  * DDR and internal registers.
- * Setup access to PCI and PCI-E IO/MEM space is issued by this file.
+ * Setup access to PCI and PCIe IO/MEM space is issued by this file.
  * Setup access to various devices located on the device bus interface (e.g.
  * flashes, RTC, etc) should be issued by machine-setup.c according to
  * specific board population (by using orion5x_setup_*_win()).
diff --git a/arch/arm/mach-orion5x/common.c b/arch/arm/mach-orion5x/common.c
index 439c7784af02..968deb58be01 100644
--- a/arch/arm/mach-orion5x/common.c
+++ b/arch/arm/mach-orion5x/common.c
@@ -132,7 +132,7 @@ static struct platform_device orion5x_uart = {
 static struct resource orion5x_ehci0_resources[] = {
         {
                 .start  = ORION5X_USB0_PHYS_BASE,
-                .end    = ORION5X_USB0_PHYS_BASE + SZ_4K,
+                .end    = ORION5X_USB0_PHYS_BASE + SZ_4K - 1,
                 .flags  = IORESOURCE_MEM,
         },
         {
@@ -145,7 +145,7 @@ static struct resource orion5x_ehci0_resources[] = {
 static struct resource orion5x_ehci1_resources[] = {
         {
                 .start  = ORION5X_USB1_PHYS_BASE,
-                .end    = ORION5X_USB1_PHYS_BASE + SZ_4K,
+                .end    = ORION5X_USB1_PHYS_BASE + SZ_4K - 1,
                 .flags  = IORESOURCE_MEM,
         },
         {
@@ -317,7 +317,7 @@ struct sys_timer orion5x_timer = {
  ****************************************************************************/
 
 /*
- * Identify device ID and rev from PCIE configuration header space '0'.
+ * Identify device ID and rev from PCIe configuration header space '0'.
  */
 static void __init orion5x_id(u32 *dev, u32 *rev, char **dev_name)
 {
diff --git a/arch/arm/mach-orion5x/common.h b/arch/arm/mach-orion5x/common.h
index f4c4c9a72a7c..14adf8d1a54a 100644
--- a/arch/arm/mach-orion5x/common.h
+++ b/arch/arm/mach-orion5x/common.h
@@ -33,10 +33,9 @@ struct pci_sys_data;
 struct pci_bus;
 
 void orion5x_pcie_id(u32 *dev, u32 *rev);
-int orion5x_pcie_local_bus_nr(void);
-int orion5x_pci_local_bus_nr(void);
 int orion5x_pci_sys_setup(int nr, struct pci_sys_data *sys);
 struct pci_bus *orion5x_pci_sys_scan_bus(int nr, struct pci_sys_data *sys);
+int orion5x_pci_map_irq(struct pci_dev *dev, u8 slot, u8 pin);
 
 /*
  * Valid GPIO pins according to MPP setup, used by machine-setup.
diff --git a/arch/arm/mach-orion5x/db88f5281-setup.c b/arch/arm/mach-orion5x/db88f5281-setup.c
index 872aed372327..44c64342dacb 100644
--- a/arch/arm/mach-orion5x/db88f5281-setup.c
+++ b/arch/arm/mach-orion5x/db88f5281-setup.c
@@ -241,14 +241,17 @@ void __init db88f5281_pci_preinit(void)
 
 static int __init db88f5281_pci_map_irq(struct pci_dev *dev, u8 slot, u8 pin)
 {
+        int irq;
+
         /*
-         * PCIE IRQ is connected internally (not GPIO)
+         * Check for devices with hard-wired IRQs.
          */
-        if (dev->bus->number == orion5x_pcie_local_bus_nr())
-                return IRQ_ORION5X_PCIE0_INT;
+        irq = orion5x_pci_map_irq(dev, slot, pin);
+        if (irq != -1)
+                return irq;
 
         /*
-         * PCI IRQs are connected via GPIOs
+         * PCI IRQs are connected via GPIOs.
          */
         switch (slot - DB88F5281_PCI_SLOT0_OFFS) {
         case 0:
@@ -292,9 +295,7 @@ static struct mv643xx_eth_platform_data db88f5281_eth_data = {
  * RTC DS1339 on I2C bus
  ****************************************************************************/
 static struct i2c_board_info __initdata db88f5281_i2c_rtc = {
-        .driver_name    = "rtc-ds1307",
-        .type           = "ds1339",
-        .addr           = 0x68,
+        I2C_BOARD_INFO("ds1339", 0x68),
 };
 
 /*****************************************************************************
diff --git a/arch/arm/mach-orion5x/dns323-setup.c b/arch/arm/mach-orion5x/dns323-setup.c
index d67790ef236e..f9430f5ca9a8 100644
--- a/arch/arm/mach-orion5x/dns323-setup.c
+++ b/arch/arm/mach-orion5x/dns323-setup.c
@@ -43,11 +43,16 @@
 
 static int __init dns323_pci_map_irq(struct pci_dev *dev, u8 slot, u8 pin)
 {
-        /* PCI-E */
-        if (dev->bus->number == orion5x_pcie_local_bus_nr())
-                return IRQ_ORION5X_PCIE0_INT;
+        int irq;
 
-        pr_err("%s: requested mapping for unknown bus\n", __func__);
+        /*
+         * Check for devices with hard-wired IRQs.
+         */
+        irq = orion5x_pci_map_irq(dev, slot, pin);
+        if (irq != -1)
+                return irq;
+
+        pr_err("%s: requested mapping for unknown device\n", __func__);
 
         return -1;
 }
@@ -220,19 +225,16 @@ static struct platform_device *dns323_plat_devices[] __initdata = {
 static struct i2c_board_info __initdata dns323_i2c_devices[] = {
         {
                 I2C_BOARD_INFO("g760a", 0x3e),
-                .type = "g760a",
         },
 #if 0
         /* this entry requires the new-style driver model lm75 driver,
          * for the meantime "insmod lm75.ko force_lm75=0,0x48" is needed */
         {
-                I2C_BOARD_INFO("lm75", 0x48),
-                .type = "g751",
+                I2C_BOARD_INFO("g751", 0x48),
         },
 #endif
         {
-                I2C_BOARD_INFO("rtc-m41t80", 0x68),
-                .type = "m41t80",
+                I2C_BOARD_INFO("m41t80", 0x68),
         }
 };
 
@@ -253,9 +255,9 @@ static void __init dns323_init(void)
          */
         orion5x_setup_dev_boot_win(DNS323_NOR_BOOT_BASE, DNS323_NOR_BOOT_SIZE);
 
-        /* DNS-323 has a Marvell 88X7042 SATA controller attached via PCIE
+        /* DNS-323 has a Marvell 88X7042 SATA controller attached via PCIe
          *
-         * Open a special address decode windows for the PCIE WA.
+         * Open a special address decode windows for the PCIe WA.
          */
         orion5x_setup_pcie_wa_win(ORION5X_PCIE_WA_PHYS_BASE,
                                 ORION5X_PCIE_WA_SIZE);
diff --git a/arch/arm/mach-orion5x/kurobox_pro-setup.c b/arch/arm/mach-orion5x/kurobox_pro-setup.c
index 91413455beba..88410862feef 100644
--- a/arch/arm/mach-orion5x/kurobox_pro-setup.c
+++ b/arch/arm/mach-orion5x/kurobox_pro-setup.c
@@ -120,13 +120,19 @@ static struct platform_device kurobox_pro_nor_flash = {
 
 static int __init kurobox_pro_pci_map_irq(struct pci_dev *dev, u8 slot, u8 pin)
 {
+        int irq;
+
+        /*
+         * Check for devices with hard-wired IRQs.
+         */
+        irq = orion5x_pci_map_irq(dev, slot, pin);
+        if (irq != -1)
+                return irq;
+
         /*
          * PCI isn't used on the Kuro
          */
-        if (dev->bus->number == orion5x_pcie_local_bus_nr())
-                return IRQ_ORION5X_PCIE0_INT;
-        else
-                printk(KERN_ERR "kurobox_pro_pci_map_irq failed, unknown bus\n");
+        printk(KERN_ERR "kurobox_pro_pci_map_irq failed, unknown bus\n");
 
         return -1;
 }
@@ -162,9 +168,7 @@ static struct mv643xx_eth_platform_data kurobox_pro_eth_data = {
  * RTC 5C372a on I2C bus
  ****************************************************************************/
 static struct i2c_board_info __initdata kurobox_pro_i2c_rtc = {
-       .driver_name    = "rtc-rs5c372",
-       .type           = "rs5c372a",
-       .addr           = 0x32,
+        I2C_BOARD_INFO("rs5c372a", 0x32),
 };
 
 /*****************************************************************************
@@ -193,7 +197,7 @@ static void __init kurobox_pro_init(void)
         orion5x_setup_dev0_win(KUROBOX_PRO_NAND_BASE, KUROBOX_PRO_NAND_SIZE);
 
         /*
-         * Open a special address decode windows for the PCIE WA.
+         * Open a special address decode windows for the PCIe WA.
          */
         orion5x_setup_pcie_wa_win(ORION5X_PCIE_WA_PHYS_BASE,
                                 ORION5X_PCIE_WA_SIZE);
diff --git a/arch/arm/mach-orion5x/pci.c b/arch/arm/mach-orion5x/pci.c
index fdf99fca85b3..9d5d39fa19c3 100644
--- a/arch/arm/mach-orion5x/pci.c
+++ b/arch/arm/mach-orion5x/pci.c
@@ -41,11 +41,6 @@ void __init orion5x_pcie_id(u32 *dev, u32 *rev)
         *rev = orion_pcie_rev(PCIE_BASE);
 }
 
-int __init orion5x_pcie_local_bus_nr(void)
-{
-        return orion_pcie_get_local_bus_nr(PCIE_BASE);
-}
-
 static int pcie_valid_config(int bus, int dev)
 {
         /*
@@ -269,7 +264,7 @@ static int __init pcie_setup(struct pci_sys_data *sys)
  */
 static DEFINE_SPINLOCK(orion5x_pci_lock);
 
-int orion5x_pci_local_bus_nr(void)
+static int orion5x_pci_local_bus_nr(void)
 {
         u32 conf = orion5x_read(PCI_P2P_CONF);
         return((conf & PCI_P2P_BUS_MASK) >> PCI_P2P_BUS_OFFS);
@@ -557,3 +552,16 @@ struct pci_bus __init *orion5x_pci_sys_scan_bus(int nr, struct pci_sys_data *sys
 
         return bus;
 }
+
+int __init orion5x_pci_map_irq(struct pci_dev *dev, u8 slot, u8 pin)
+{
+        int bus = dev->bus->number;
+
+        /*
+         * PCIe endpoint?
+         */
+        if (bus < orion5x_pci_local_bus_nr())
+                return IRQ_ORION5X_PCIE0_INT;
+
+        return -1;
+}
diff --git a/arch/arm/mach-orion5x/rd88f5182-setup.c b/arch/arm/mach-orion5x/rd88f5182-setup.c
index 37e8b2dc3ed5..81abc1003aae 100644
--- a/arch/arm/mach-orion5x/rd88f5182-setup.c
+++ b/arch/arm/mach-orion5x/rd88f5182-setup.c
@@ -172,11 +172,14 @@ void __init rd88f5182_pci_preinit(void)
 
 static int __init rd88f5182_pci_map_irq(struct pci_dev *dev, u8 slot, u8 pin)
 {
+        int irq;
+
         /*
-         * PCI-E isn't used on the RD2
+         * Check for devices with hard-wired IRQs.
          */
-        if (dev->bus->number == orion5x_pcie_local_bus_nr())
-                return IRQ_ORION5X_PCIE0_INT;
+        irq = orion5x_pci_map_irq(dev, slot, pin);
+        if (irq != -1)
+                return irq;
 
         /*
          * PCI IRQs are connected via GPIOs
@@ -224,9 +227,7 @@ static struct mv643xx_eth_platform_data rd88f5182_eth_data = {
  * RTC DS1338 on I2C bus
  ****************************************************************************/
 static struct i2c_board_info __initdata rd88f5182_i2c_rtc = {
-        .driver_name    = "rtc-ds1307",
-        .type           = "ds1338",
-        .addr           = 0x68,
+        I2C_BOARD_INFO("ds1338", 0x68),
 };
 
 /*****************************************************************************
@@ -259,7 +260,7 @@ static void __init rd88f5182_init(void)
         orion5x_setup_dev1_win(RD88F5182_NOR_BASE, RD88F5182_NOR_SIZE);
 
         /*
-         * Open a special address decode windows for the PCIE WA.
+         * Open a special address decode windows for the PCIe WA.
          */
         orion5x_setup_pcie_wa_win(ORION5X_PCIE_WA_PHYS_BASE,
                                 ORION5X_PCIE_WA_SIZE);
diff --git a/arch/arm/mach-orion5x/ts209-setup.c b/arch/arm/mach-orion5x/ts209-setup.c
index fd43863a86f6..9afb41ee6e07 100644
--- a/arch/arm/mach-orion5x/ts209-setup.c
+++ b/arch/arm/mach-orion5x/ts209-setup.c
@@ -141,14 +141,17 @@ void __init qnap_ts209_pci_preinit(void)
 
 static int __init qnap_ts209_pci_map_irq(struct pci_dev *dev, u8 slot, u8 pin)
 {
+        int irq;
+
         /*
-         * PCIE IRQ is connected internally (not GPIO)
+         * Check for devices with hard-wired IRQs.
          */
-        if (dev->bus->number == orion5x_pcie_local_bus_nr())
-                return IRQ_ORION5X_PCIE0_INT;
+        irq = orion5x_pci_map_irq(dev, slot, pin);
+        if (irq != -1)
+                return irq;
 
         /*
-         * PCI IRQs are connected via GPIOs
+         * PCI IRQs are connected via GPIOs.
          */
         switch (slot - QNAP_TS209_PCI_SLOT0_OFFS) {
         case 0:
@@ -276,8 +279,7 @@ static void __init ts209_find_mac_addr(void)
 #define TS209_RTC_GPIO  3
 
 static struct i2c_board_info __initdata qnap_ts209_i2c_rtc = {
-       .driver_name = "rtc-s35390a",
-       .addr        = 0x30,
+        I2C_BOARD_INFO("s35390a", 0x30),
        .irq         = 0,
 };
 
@@ -373,7 +375,7 @@ static void __init qnap_ts209_init(void)
                             QNAP_TS209_NOR_BOOT_SIZE);
 
         /*
-         * Open a special address decode windows for the PCIE WA.
+         * Open a special address decode windows for the PCIe WA.
          */
         orion5x_setup_pcie_wa_win(ORION5X_PCIE_WA_PHYS_BASE,
                                 ORION5X_PCIE_WA_SIZE);
diff --git a/arch/arm/mach-pxa/Makefile b/arch/arm/mach-pxa/Makefile
index 7cdcb459ea9d..6a830853aa6a 100644
--- a/arch/arm/mach-pxa/Makefile
+++ b/arch/arm/mach-pxa/Makefile
@@ -5,9 +5,9 @@
 # Common support (must be linked before board specific support)
 obj-y                           += clock.o devices.o generic.o irq.o dma.o \
                                    time.o gpio.o
-obj-$(CONFIG_PXA25x)            += pxa25x.o mfp-pxa2xx.o
-obj-$(CONFIG_PXA27x)            += pxa27x.o mfp-pxa2xx.o
-obj-$(CONFIG_PXA3xx)            += pxa3xx.o mfp-pxa3xx.o smemc.o
+obj-$(CONFIG_PXA25x)            += mfp-pxa2xx.o pxa25x.o
+obj-$(CONFIG_PXA27x)            += mfp-pxa2xx.o pxa27x.o
+obj-$(CONFIG_PXA3xx)            += mfp-pxa3xx.o pxa3xx.o smemc.o
 obj-$(CONFIG_CPU_PXA300)        += pxa300.o
 obj-$(CONFIG_CPU_PXA320)        += pxa320.o
 
diff --git a/arch/arm/mach-pxa/generic.c b/arch/arm/mach-pxa/generic.c
index 331f29b2d0cd..44617938f3f1 100644
--- a/arch/arm/mach-pxa/generic.c
+++ b/arch/arm/mach-pxa/generic.c
@@ -90,11 +90,6 @@ static struct map_desc standard_io_desc[] __initdata = {
                 .pfn            = __phys_to_pfn(0x40000000),
                 .length         = 0x02000000,
                 .type           = MT_DEVICE
-        }, {    /* LCD */
-                .virtual        =  0xf4000000,
-                .pfn            = __phys_to_pfn(0x44000000),
-                .length         = 0x00100000,
-                .type           = MT_DEVICE
         }, {    /* Mem Ctl */
                 .virtual        =  0xf6000000,
                 .pfn            = __phys_to_pfn(0x48000000),
diff --git a/arch/arm/mach-pxa/gumstix.c b/arch/arm/mach-pxa/gumstix.c
index f01d18544133..bdf239754037 100644
--- a/arch/arm/mach-pxa/gumstix.c
+++ b/arch/arm/mach-pxa/gumstix.c
@@ -40,6 +40,7 @@
 
 #include <asm/arch/pxa-regs.h>
 #include <asm/arch/pxa2xx-regs.h>
+#include <asm/arch/pxa2xx-gpio.h>
 
 #include "generic.h"
 
diff --git a/arch/arm/mach-pxa/littleton.c b/arch/arm/mach-pxa/littleton.c
index 03396063b561..530654474bb2 100644
--- a/arch/arm/mach-pxa/littleton.c
+++ b/arch/arm/mach-pxa/littleton.c
@@ -301,8 +301,7 @@ static struct pxafb_mode_info tpo_tdo24mtea1_modes[] = {
 static struct pxafb_mach_info littleton_lcd_info = {
         .modes                  = tpo_tdo24mtea1_modes,
         .num_modes              = 2,
-        .lccr0                  = LCCR0_Act,
-        .lccr3                  = LCCR3_HSP | LCCR3_VSP,
+        .lcd_conn               = LCD_COLOR_TFT_16BPP,
         .pxafb_lcd_power        = littleton_lcd_power,
 };
 
diff --git a/arch/arm/mach-pxa/lubbock.c b/arch/arm/mach-pxa/lubbock.c
index ca209c443f34..0993f4d1a0bc 100644
--- a/arch/arm/mach-pxa/lubbock.c
+++ b/arch/arm/mach-pxa/lubbock.c
@@ -395,8 +395,8 @@ static struct pxafb_mach_info sharp_lm8v31 = {
         .num_modes      = 1,
         .cmap_inverse   = 0,
         .cmap_static    = 0,
-        .lccr0          = LCCR0_SDS,
-        .lccr3          = LCCR3_PCP | LCCR3_Acb(255),
+        .lcd_conn       = LCD_COLOR_DSTN_16BPP | LCD_PCLK_EDGE_FALL |
+                          LCD_AC_BIAS_FREQ(255);
 };
 
 #define MMC_POLL_RATE           msecs_to_jiffies(1000)
diff --git a/arch/arm/mach-pxa/magician.c b/arch/arm/mach-pxa/magician.c
index d70be75bd199..badba064dc04 100644
--- a/arch/arm/mach-pxa/magician.c
+++ b/arch/arm/mach-pxa/magician.c
@@ -114,6 +114,14 @@ static unsigned long magician_pin_config[] = {
         GPIO82_CIF_DD_5,
         GPIO84_CIF_FV,
         GPIO85_CIF_LV,
+
+        /* Magician specific input GPIOs */
+        GPIO9_GPIO,     /* unknown */
+        GPIO10_GPIO,    /* GSM_IRQ */
+        GPIO13_GPIO,    /* CPLD_IRQ */
+        GPIO107_GPIO,   /* DS1WM_IRQ */
+        GPIO108_GPIO,   /* GSM_READY */
+        GPIO115_GPIO,   /* nPEN_IRQ */
 };
 
 /*
@@ -438,7 +446,7 @@ static struct pasic3_led pasic3_leds[] = {
 
 static struct platform_device pasic3;
 
-static struct pasic3_leds_machinfo __devinit pasic3_leds_info = {
+static struct pasic3_leds_machinfo pasic3_leds_info = {
         .num_leds   = ARRAY_SIZE(pasic3_leds),
         .power_gpio = EGPIO_MAGICIAN_LED_POWER,
         .leds       = pasic3_leds,
@@ -543,9 +551,28 @@ static struct platform_device power_supply = {
 static int magician_mci_init(struct device *dev,
                                 irq_handler_t detect_irq, void *data)
 {
-        return request_irq(IRQ_MAGICIAN_SD, detect_irq,
+        int err;
+
+        err = request_irq(IRQ_MAGICIAN_SD, detect_irq,
                                 IRQF_DISABLED | IRQF_SAMPLE_RANDOM,
                                 "MMC card detect", data);
+        if (err)
+                goto err_request_irq;
+        err = gpio_request(EGPIO_MAGICIAN_SD_POWER, "SD_POWER");
+        if (err)
+                goto err_request_power;
+        err = gpio_request(EGPIO_MAGICIAN_nSD_READONLY, "nSD_READONLY");
+        if (err)
+                goto err_request_readonly;
+
+        return 0;
+
+err_request_readonly:
+        gpio_free(EGPIO_MAGICIAN_SD_POWER);
+err_request_power:
+        free_irq(IRQ_MAGICIAN_SD, data);
+err_request_irq:
+        return err;
 }
 
 static void magician_mci_setpower(struct device *dev, unsigned int vdd)
@@ -562,6 +589,8 @@ static int magician_mci_get_ro(struct device *dev)
 
 static void magician_mci_exit(struct device *dev, void *data)
 {
+        gpio_free(EGPIO_MAGICIAN_nSD_READONLY);
+        gpio_free(EGPIO_MAGICIAN_SD_POWER);
         free_irq(IRQ_MAGICIAN_SD, data);
 }
 
@@ -643,28 +672,42 @@ static void __init magician_init(void)
 {
         void __iomem *cpld;
         int lcd_select;
+        int err;
+
+        gpio_request(GPIO13_MAGICIAN_CPLD_IRQ, "CPLD_IRQ");
+        gpio_request(GPIO107_MAGICIAN_DS1WM_IRQ, "DS1WM_IRQ");
 
         pxa2xx_mfp_config(ARRAY_AND_SIZE(magician_pin_config));
 
         platform_add_devices(devices, ARRAY_SIZE(devices));
+
+        err = gpio_request(GPIO83_MAGICIAN_nIR_EN, "nIR_EN");
+        if (!err) {
+                gpio_direction_output(GPIO83_MAGICIAN_nIR_EN, 1);
+                pxa_set_ficp_info(&magician_ficp_info);
+        }
         pxa_set_i2c_info(NULL);
         pxa_set_mci_info(&magician_mci_info);
         pxa_set_ohci_info(&magician_ohci_info);
-        pxa_set_ficp_info(&magician_ficp_info);
 
         /* Check LCD type we have */
         cpld = ioremap_nocache(PXA_CS3_PHYS, 0x1000);
         if (cpld) {
                 u8 board_id = __raw_readb(cpld+0x14);
+                iounmap(cpld);
                 system_rev = board_id & 0x7;
                 lcd_select = board_id & 0x8;
-                iounmap(cpld);
                 pr_info("LCD type: %s\n", lcd_select ? "Samsung" : "Toppoly");
-                if (lcd_select && (system_rev < 3))
-                        pxa_gpio_mode(GPIO75_MAGICIAN_SAMSUNG_POWER_MD);
-                pxa_gpio_mode(GPIO104_MAGICIAN_LCD_POWER_1_MD);
-                pxa_gpio_mode(GPIO105_MAGICIAN_LCD_POWER_2_MD);
-                pxa_gpio_mode(GPIO106_MAGICIAN_LCD_POWER_3_MD);
+                if (lcd_select && (system_rev < 3)) {
+                        gpio_request(GPIO75_MAGICIAN_SAMSUNG_POWER, "SAMSUNG_POWER");
+                        gpio_direction_output(GPIO75_MAGICIAN_SAMSUNG_POWER, 0);
+                }
+                gpio_request(GPIO104_MAGICIAN_LCD_POWER_1, "LCD_POWER_1");
+                gpio_request(GPIO105_MAGICIAN_LCD_POWER_2, "LCD_POWER_2");
+                gpio_request(GPIO106_MAGICIAN_LCD_POWER_3, "LCD_POWER_3");
+                gpio_direction_output(GPIO104_MAGICIAN_LCD_POWER_1, 0);
+                gpio_direction_output(GPIO105_MAGICIAN_LCD_POWER_2, 0);
+                gpio_direction_output(GPIO106_MAGICIAN_LCD_POWER_3, 0);
                 set_pxa_fb_info(lcd_select ? &samsung_info : &toppoly_info);
         } else
                 pr_err("LCD detection: CPLD mapping failed\n");
diff --git a/arch/arm/mach-pxa/mainstone.c b/arch/arm/mach-pxa/mainstone.c
index 18d47cfa2a18..7399fb34da4e 100644
--- a/arch/arm/mach-pxa/mainstone.c
+++ b/arch/arm/mach-pxa/mainstone.c
@@ -434,8 +434,7 @@ static struct pxafb_mode_info toshiba_ltm035a776c_mode = {
 
 static struct pxafb_mach_info mainstone_pxafb_info = {
         .num_modes              = 1,
-        .lccr0                  = LCCR0_Act,
-        .lccr3                  = LCCR3_PCP,
+        .lcd_conn               = LCD_COLOR_TFT_16BPP | LCD_PCLK_EDGE_FALL,
 };
 
 static int mainstone_mci_init(struct device *dev, irq_handler_t mstone_detect_int, void *data)
diff --git a/arch/arm/mach-pxa/pcm990-baseboard.c b/arch/arm/mach-pxa/pcm990-baseboard.c
index e6be9d0aeccf..49d951db0f3d 100644
--- a/arch/arm/mach-pxa/pcm990-baseboard.c
+++ b/arch/arm/mach-pxa/pcm990-baseboard.c
@@ -320,16 +320,13 @@ static struct soc_camera_link iclink[] = {
 static struct i2c_board_info __initdata pcm990_i2c_devices[] = {
         {
                 /* Must initialize before the camera(s) */
-                I2C_BOARD_INFO("pca953x", 0x41),
-                .type = "pca9536",
+                I2C_BOARD_INFO("pca9536", 0x41),
                 .platform_data = &pca9536_data,
         }, {
                 I2C_BOARD_INFO("mt9v022", 0x48),
-                .type = "mt9v022",
                 .platform_data = &iclink[0], /* With extender */
         }, {
                 I2C_BOARD_INFO("mt9m001", 0x5d),
-                .type = "mt9m001",
                 .platform_data = &iclink[0], /* With extender */
         },
 };
diff --git a/arch/arm/mach-pxa/pm.c b/arch/arm/mach-pxa/pm.c
index 039194cbe477..ec1bbf333a3a 100644
--- a/arch/arm/mach-pxa/pm.c
+++ b/arch/arm/mach-pxa/pm.c
@@ -46,8 +46,8 @@ int pxa_pm_enter(suspend_state_t state)
                         sleep_save_checksum += sleep_save[i];
         }
 
-        /* Clear sleep reset status */
-        RCSR = RCSR_SMR;
+        /* Clear reset status */
+        RCSR = RCSR_HWR | RCSR_WDR | RCSR_SMR | RCSR_GPR;
 
         /* *** go zzz *** */
         pxa_cpu_pm_fns->enter(state);
diff --git a/arch/arm/mach-pxa/pxa3xx.c b/arch/arm/mach-pxa/pxa3xx.c
index dde355e88fa1..b6a6f5fcc77a 100644
--- a/arch/arm/mach-pxa/pxa3xx.c
+++ b/arch/arm/mach-pxa/pxa3xx.c
@@ -486,6 +486,8 @@ static int pxa3xx_set_wake(unsigned int irq, unsigned int on)
         case IRQ_MMC3:
                 mask = ADXER_MFP_GEN12;
                 break;
+        default:
+                return -EINVAL;
         }
 
         local_irq_save(flags);
diff --git a/arch/arm/mach-pxa/zylonite.c b/arch/arm/mach-pxa/zylonite.c
index dbb546216be1..4a0028087ea6 100644
--- a/arch/arm/mach-pxa/zylonite.c
+++ b/arch/arm/mach-pxa/zylonite.c
@@ -97,8 +97,7 @@ static struct pxafb_mode_info toshiba_ltm04c380k_mode = {
 
 static struct pxafb_mach_info zylonite_toshiba_lcd_info = {
         .num_modes              = 1,
-        .lccr0                  = LCCR0_Act,
-        .lccr3                  = LCCR3_PCP,
+        .lcd_conn               = LCD_COLOR_TFT_16BPP | LCD_PCLK_EDGE_FALL,
         .pxafb_backlight_power  = zylonite_backlight_power,
 };
 
@@ -134,8 +133,7 @@ static struct pxafb_mode_info sharp_ls037_modes[] = {
 static struct pxafb_mach_info zylonite_sharp_lcd_info = {
         .modes                  = sharp_ls037_modes,
         .num_modes              = 2,
-        .lccr0                  = LCCR0_Act,
-        .lccr3                  = LCCR3_PCP | LCCR3_HSP | LCCR3_VSP,
+        .lcd_conn               = LCD_COLOR_TFT_16BPP | LCD_PCLK_EDGE_FALL,
         .pxafb_backlight_power  = zylonite_backlight_power,
 };
 
diff --git a/arch/arm/mm/Kconfig b/arch/arm/mm/Kconfig
index 1b8229d9c9d5..33ed048502a3 100644
--- a/arch/arm/mm/Kconfig
+++ b/arch/arm/mm/Kconfig
@@ -372,7 +372,7 @@ config CPU_FEROCEON
         select CPU_PABRT_NOIFAR
         select CPU_CACHE_VIVT
         select CPU_CP15_MMU
-        select CPU_COPY_V4WB if MMU
+        select CPU_COPY_FEROCEON if MMU
         select CPU_TLB_V4WBI if MMU
 
 config CPU_FEROCEON_OLD_ID
@@ -523,6 +523,9 @@ config CPU_COPY_V4WT
 config CPU_COPY_V4WB
         bool
 
+config CPU_COPY_FEROCEON
+        bool
+
 config CPU_COPY_V6
         bool
 
@@ -658,7 +661,7 @@ config CPU_DCACHE_SIZE
 
 config CPU_DCACHE_WRITETHROUGH
         bool "Force write through D-cache"
-        depends on (CPU_ARM740T || CPU_ARM920T || CPU_ARM922T || CPU_ARM925T || CPU_ARM926T || CPU_ARM940T || CPU_ARM946E || CPU_ARM1020 || CPU_FEROCEON) && !CPU_DCACHE_DISABLE
+        depends on (CPU_ARM740T || CPU_ARM920T || CPU_ARM922T || CPU_ARM925T || CPU_ARM926T || CPU_ARM940T || CPU_ARM946E || CPU_ARM1020) && !CPU_DCACHE_DISABLE
         default y if CPU_ARM925T
         help
           Say Y here to use the data cache in writethrough mode. Unless you
diff --git a/arch/arm/mm/Makefile b/arch/arm/mm/Makefile
index 44536a0b995a..32b2d2d213a6 100644
--- a/arch/arm/mm/Makefile
+++ b/arch/arm/mm/Makefile
@@ -36,6 +36,7 @@ obj-$(CONFIG_CPU_CACHE_V7)	+= cache-v7.o
 obj-$(CONFIG_CPU_COPY_V3)       += copypage-v3.o
 obj-$(CONFIG_CPU_COPY_V4WT)     += copypage-v4wt.o
 obj-$(CONFIG_CPU_COPY_V4WB)     += copypage-v4wb.o
+obj-$(CONFIG_CPU_COPY_FEROCEON) += copypage-feroceon.o
 obj-$(CONFIG_CPU_COPY_V6)       += copypage-v6.o context.o
 obj-$(CONFIG_CPU_SA1100)        += copypage-v4mc.o
 obj-$(CONFIG_CPU_XSCALE)        += copypage-xscale.o
diff --git a/arch/arm/mm/copypage-feroceon.S b/arch/arm/mm/copypage-feroceon.S
new file mode 100644
index 000000000000..7eb0d320d240
--- /dev/null
+++ b/arch/arm/mm/copypage-feroceon.S
@@ -0,0 +1,95 @@
+/*
+ *  linux/arch/arm/lib/copypage-feroceon.S
+ *
+ *  Copyright (C) 2008 Marvell Semiconductors
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ *
+ * This handles copy_user_page and clear_user_page on Feroceon
+ * more optimally than the generic implementations.
+ */
+#include <linux/linkage.h>
+#include <linux/init.h>
+#include <asm/asm-offsets.h>
+
+        .text
+        .align  5
+
+ENTRY(feroceon_copy_user_page)
+        stmfd   sp!, {r4-r9, lr}
+        mov     ip, #PAGE_SZ
+1:      mov     lr, r1
+        ldmia   r1!, {r2 - r9}
+        pld     [lr, #32]
+        pld     [lr, #64]
+        pld     [lr, #96]
+        pld     [lr, #128]
+        pld     [lr, #160]
+        pld     [lr, #192]
+        pld     [lr, #224]
+        stmia   r0, {r2 - r9}
+        ldmia   r1!, {r2 - r9}
+        mcr     p15, 0, r0, c7, c14, 1          @ clean and invalidate D line
+        add     r0, r0, #32
+        stmia   r0, {r2 - r9}
+        ldmia   r1!, {r2 - r9}
+        mcr     p15, 0, r0, c7, c14, 1          @ clean and invalidate D line
+        add     r0, r0, #32
+        stmia   r0, {r2 - r9}
+        ldmia   r1!, {r2 - r9}
+        mcr     p15, 0, r0, c7, c14, 1          @ clean and invalidate D line
+        add     r0, r0, #32
+        stmia   r0, {r2 - r9}
+        ldmia   r1!, {r2 - r9}
+        mcr     p15, 0, r0, c7, c14, 1          @ clean and invalidate D line
+        add     r0, r0, #32
+        stmia   r0, {r2 - r9}
+        ldmia   r1!, {r2 - r9}
+        mcr     p15, 0, r0, c7, c14, 1          @ clean and invalidate D line
+        add     r0, r0, #32
+        stmia   r0, {r2 - r9}
+        ldmia   r1!, {r2 - r9}
+        mcr     p15, 0, r0, c7, c14, 1          @ clean and invalidate D line
+        add     r0, r0, #32
+        stmia   r0, {r2 - r9}
+        ldmia   r1!, {r2 - r9}
+        mcr     p15, 0, r0, c7, c14, 1          @ clean and invalidate D line
+        add     r0, r0, #32
+        stmia   r0, {r2 - r9}
+        subs    ip, ip, #(32 * 8)
+        mcr     p15, 0, r0, c7, c14, 1          @ clean and invalidate D line
+        add     r0, r0, #32
+        bne     1b
+        mcr     p15, 0, ip, c7, c10, 4          @ drain WB
+        ldmfd   sp!, {r4-r9, pc}
+
+        .align  5
+
+ENTRY(feroceon_clear_user_page)
+        stmfd   sp!, {r4-r7, lr}
+        mov     r1, #PAGE_SZ/32
+        mov     r2, #0
+        mov     r3, #0
+        mov     r4, #0
+        mov     r5, #0
+        mov     r6, #0
+        mov     r7, #0
+        mov     ip, #0
+        mov     lr, #0
+1:      stmia   r0, {r2-r7, ip, lr}
+        subs    r1, r1, #1
+        mcr     p15, 0, r0, c7, c14, 1          @ clean and invalidate D line
+        add     r0, r0, #32
+        bne     1b
+        mcr     p15, 0, r1, c7, c10, 4          @ drain WB
+        ldmfd   sp!, {r4-r7, pc}
+
+        __INITDATA
+
+        .type   feroceon_user_fns, #object
+ENTRY(feroceon_user_fns)
+        .long   feroceon_clear_user_page
+        .long   feroceon_copy_user_page
+        .size   feroceon_user_fns, . - feroceon_user_fns
diff --git a/arch/arm/mm/iomap.c b/arch/arm/mm/iomap.c
index 62066f3020c8..7429f8c01015 100644
--- a/arch/arm/mm/iomap.c
+++ b/arch/arm/mm/iomap.c
@@ -26,8 +26,8 @@ EXPORT_SYMBOL(ioport_unmap);
 #ifdef CONFIG_PCI
 void __iomem *pci_iomap(struct pci_dev *dev, int bar, unsigned long maxlen)
 {
-        unsigned long start = pci_resource_start(dev, bar);
-        unsigned long len   = pci_resource_len(dev, bar);
+        resource_size_t start = pci_resource_start(dev, bar);
+        resource_size_t len   = pci_resource_len(dev, bar);
         unsigned long flags = pci_resource_flags(dev, bar);
 
         if (!len || !start)
diff --git a/arch/arm/mm/mmu.c b/arch/arm/mm/mmu.c
index d41a75ed3dce..2d6d682c206a 100644
--- a/arch/arm/mm/mmu.c
+++ b/arch/arm/mm/mmu.c
@@ -35,6 +35,7 @@ extern pgd_t swapper_pg_dir[PTRS_PER_PGD];
  * zero-initialized data and COW.
  */
 struct page *empty_zero_page;
+EXPORT_SYMBOL(empty_zero_page);
 
 /*
  * The pmd table for the upper-most set of pages.
diff --git a/arch/arm/mm/proc-feroceon.S b/arch/arm/mm/proc-feroceon.S
index 90e7594e29b1..a02c1712b52d 100644
--- a/arch/arm/mm/proc-feroceon.S
+++ b/arch/arm/mm/proc-feroceon.S
@@ -93,7 +93,7 @@ ENTRY(cpu_feroceon_reset)
  *
  * Called with IRQs disabled
  */
-        .align  10
+        .align  5
 ENTRY(cpu_feroceon_do_idle)
         mov     r0, #0
         mcr     p15, 0, r0, c7, c10, 4          @ Drain write buffer
@@ -106,6 +106,7 @@ ENTRY(cpu_feroceon_do_idle)
  *      Clean and invalidate all cache entries in a particular
  *      address space.
  */
+        .align  5
 ENTRY(feroceon_flush_user_cache_all)
         /* FALLTHROUGH */
 
@@ -118,12 +119,8 @@ ENTRY(feroceon_flush_kern_cache_all)
         mov     r2, #VM_EXEC
         mov     ip, #0
 __flush_whole_cache:
-#ifdef CONFIG_CPU_DCACHE_WRITETHROUGH
-        mcr     p15, 0, ip, c7, c6, 0           @ invalidate D cache
-#else
 1:      mrc     p15, 0, r15, c7, c14, 3         @ test,clean,invalidate
         bne     1b
-#endif
         tst     r2, #VM_EXEC
         mcrne   p15, 0, ip, c7, c5, 0           @ invalidate I cache
         mcrne   p15, 0, ip, c7, c10, 4          @ drain WB
@@ -139,27 +136,19 @@ __flush_whole_cache:
  *      - end   - end address (exclusive)
  *      - flags - vm_flags describing address space
  */
+        .align  5
 ENTRY(feroceon_flush_user_cache_range)
         mov     ip, #0
         sub     r3, r1, r0                      @ calculate total size
         cmp     r3, #CACHE_DLIMIT
         bgt     __flush_whole_cache
 1:      tst     r2, #VM_EXEC
-#ifdef CONFIG_CPU_DCACHE_WRITETHROUGH
-        mcr     p15, 0, r0, c7, c6, 1           @ invalidate D entry
-        mcrne   p15, 0, r0, c7, c5, 1           @ invalidate I entry
-        add     r0, r0, #CACHE_DLINESIZE
-        mcr     p15, 0, r0, c7, c6, 1           @ invalidate D entry
-        mcrne   p15, 0, r0, c7, c5, 1           @ invalidate I entry
-        add     r0, r0, #CACHE_DLINESIZE
-#else
         mcr     p15, 0, r0, c7, c14, 1          @ clean and invalidate D entry
         mcrne   p15, 0, r0, c7, c5, 1           @ invalidate I entry
         add     r0, r0, #CACHE_DLINESIZE
         mcr     p15, 0, r0, c7, c14, 1          @ clean and invalidate D entry
         mcrne   p15, 0, r0, c7, c5, 1           @ invalidate I entry
         add     r0, r0, #CACHE_DLINESIZE
-#endif
         cmp     r0, r1
         blo     1b
         tst     r2, #VM_EXEC
@@ -176,6 +165,7 @@ ENTRY(feroceon_flush_user_cache_range)
  *      - start - virtual start address
  *      - end   - virtual end address
  */
+        .align  5
 ENTRY(feroceon_coherent_kern_range)
         /* FALLTHROUGH */
 
@@ -207,6 +197,7 @@ ENTRY(feroceon_coherent_user_range)
  *
  *      - addr  - page aligned address
  */
+        .align  5
 ENTRY(feroceon_flush_kern_dcache_page)
         add     r1, r0, #PAGE_SZ
 1:      mcr     p15, 0, r0, c7, c14, 1          @ clean+invalidate D entry
@@ -231,13 +222,12 @@ ENTRY(feroceon_flush_kern_dcache_page)
  *
  * (same as v4wb)
  */
+        .align  5
 ENTRY(feroceon_dma_inv_range)
-#ifndef CONFIG_CPU_DCACHE_WRITETHROUGH
         tst     r0, #CACHE_DLINESIZE - 1
         mcrne   p15, 0, r0, c7, c10, 1          @ clean D entry
         tst     r1, #CACHE_DLINESIZE - 1
         mcrne   p15, 0, r1, c7, c10, 1          @ clean D entry
-#endif
         bic     r0, r0, #CACHE_DLINESIZE - 1
 1:      mcr     p15, 0, r0, c7, c6, 1           @ invalidate D entry
         add     r0, r0, #CACHE_DLINESIZE
@@ -256,14 +246,13 @@ ENTRY(feroceon_dma_inv_range)
  *
  * (same as v4wb)
  */
+        .align  5
 ENTRY(feroceon_dma_clean_range)
-#ifndef CONFIG_CPU_DCACHE_WRITETHROUGH
         bic     r0, r0, #CACHE_DLINESIZE - 1
 1:      mcr     p15, 0, r0, c7, c10, 1          @ clean D entry
         add     r0, r0, #CACHE_DLINESIZE
         cmp     r0, r1
         blo     1b
-#endif
         mcr     p15, 0, r0, c7, c10, 4          @ drain WB
         mov     pc, lr
 
@@ -275,14 +264,10 @@ ENTRY(feroceon_dma_clean_range)
  *      - start - virtual start address
  *      - end   - virtual end address
  */
+        .align  5
 ENTRY(feroceon_dma_flush_range)
         bic     r0, r0, #CACHE_DLINESIZE - 1
-1:
-#ifndef CONFIG_CPU_DCACHE_WRITETHROUGH
-        mcr     p15, 0, r0, c7, c14, 1          @ clean+invalidate D entry
-#else
-        mcr     p15, 0, r0, c7, c10, 1          @ clean D entry
-#endif
+1:      mcr     p15, 0, r0, c7, c14, 1          @ clean+invalidate D entry
         add     r0, r0, #CACHE_DLINESIZE
         cmp     r0, r1
         blo     1b
@@ -300,13 +285,12 @@ ENTRY(feroceon_cache_fns)
         .long   feroceon_dma_clean_range
         .long   feroceon_dma_flush_range
 
+        .align  5
 ENTRY(cpu_feroceon_dcache_clean_area)
-#ifndef CONFIG_CPU_DCACHE_WRITETHROUGH
 1:      mcr     p15, 0, r0, c7, c10, 1          @ clean D entry
         add     r0, r0, #CACHE_DLINESIZE
         subs    r1, r1, #CACHE_DLINESIZE
         bhi     1b
-#endif
         mcr     p15, 0, r0, c7, c10, 4          @ drain WB
         mov     pc, lr
 
@@ -323,13 +307,9 @@ ENTRY(cpu_feroceon_dcache_clean_area)
 ENTRY(cpu_feroceon_switch_mm)
 #ifdef CONFIG_MMU
         mov     ip, #0
-#ifdef CONFIG_CPU_DCACHE_WRITETHROUGH
-        mcr     p15, 0, ip, c7, c6, 0           @ invalidate D cache
-#else
 @ && 'Clean & Invalidate whole DCache'
 1:      mrc     p15, 0, r15, c7, c14, 3         @ test,clean,invalidate
         bne     1b
-#endif
         mcr     p15, 0, ip, c7, c5, 0           @ invalidate I cache
         mcr     p15, 0, ip, c7, c10, 4          @ drain WB
         mcr     p15, 0, r0, c2, c0, 0           @ load page table pointer
@@ -362,16 +342,9 @@ ENTRY(cpu_feroceon_set_pte_ext)
         tst     r1, #L_PTE_PRESENT | L_PTE_YOUNG        @ Present and Young?
         movne   r2, #0
 
-#ifdef CONFIG_CPU_DCACHE_WRITETHROUGH
-        eor     r3, r2, #0x0a                   @ C & small page?
-        tst     r3, #0x0b
-        biceq   r2, r2, #4
-#endif
         str     r2, [r0]                        @ hardware version
         mov     r0, r0
-#ifndef CONFIG_CPU_DCACHE_WRITETHROUGH
         mcr     p15, 0, r0, c7, c10, 1          @ clean D entry
-#endif
         mcr     p15, 0, r0, c7, c10, 4          @ drain WB
 #endif
         mov     pc, lr
@@ -387,20 +360,11 @@ __feroceon_setup:
         mcr     p15, 0, r0, c8, c7              @ invalidate I,D TLBs on v4
 #endif
 
-
-#ifdef CONFIG_CPU_DCACHE_WRITETHROUGH
-        mov     r0, #4                          @ disable write-back on caches explicitly
-        mcr     p15, 7, r0, c15, c0, 0
-#endif
-
         adr     r5, feroceon_crval
         ldmia   r5, {r5, r6}
         mrc     p15, 0, r0, c1, c0              @ get control register v4
         bic     r0, r0, r5
         orr     r0, r0, r6
-#ifdef CONFIG_CPU_CACHE_ROUND_ROBIN
-        orr     r0, r0, #0x4000                 @ .1.. .... .... ....
-#endif
         mov     pc, lr
         .size   __feroceon_setup, . - __feroceon_setup
 
@@ -476,7 +440,7 @@ __feroceon_old_id_proc_info:
         .long   cpu_feroceon_name
         .long   feroceon_processor_functions
         .long   v4wbi_tlb_fns
-        .long   v4wb_user_fns
+        .long   feroceon_user_fns
         .long   feroceon_cache_fns
         .size   __feroceon_old_id_proc_info, . - __feroceon_old_id_proc_info
 #endif
@@ -502,6 +466,6 @@ __feroceon_proc_info:
         .long   cpu_feroceon_name
         .long   feroceon_processor_functions
         .long   v4wbi_tlb_fns
-        .long   v4wb_user_fns
+        .long   feroceon_user_fns
         .long   feroceon_cache_fns
         .size   __feroceon_proc_info, . - __feroceon_proc_info
diff --git a/arch/arm/oprofile/op_model_mpcore.c b/arch/arm/oprofile/op_model_mpcore.c
index 75bae067922d..74fae6045650 100644
--- a/arch/arm/oprofile/op_model_mpcore.c
+++ b/arch/arm/oprofile/op_model_mpcore.c
@@ -51,7 +51,7 @@
 /*
  * MPCore SCU event monitor support
  */
-#define SCU_EVENTMONITORS_VA_BASE __io_address(REALVIEW_MPCORE_SCU_BASE + 0x10)
+#define SCU_EVENTMONITORS_VA_BASE __io_address(REALVIEW_EB11MP_SCU_BASE + 0x10)
 
 /*
  * Bitmask of used SCU counters
@@ -80,7 +80,7 @@ static irqreturn_t scu_em_interrupt(int irq, void *arg)
         struct eventmonitor __iomem *emc = SCU_EVENTMONITORS_VA_BASE;
         unsigned int cnt;
 
-        cnt = irq - IRQ_PMU_SCU0;
+        cnt = irq - IRQ_EB11MP_PMU_SCU0;
         oprofile_add_sample(get_irq_regs(), SCU_COUNTER(cnt));
         scu_reset_counter(emc, cnt);
 
@@ -119,10 +119,10 @@ static int scu_start(void)
          */
         for (i = 0; i < NUM_SCU_COUNTERS; i++) {
                 if (scu_em_used & (1 << i)) {
-                        ret = request_irq(IRQ_PMU_SCU0 + i, scu_em_interrupt, IRQF_DISABLED, "SCU PMU", NULL);
+                        ret = request_irq(IRQ_EB11MP_PMU_SCU0 + i, scu_em_interrupt, IRQF_DISABLED, "SCU PMU", NULL);
                         if (ret) {
                                 printk(KERN_ERR "oprofile: unable to request IRQ%u for SCU Event Monitor\n",
-                                       IRQ_PMU_SCU0 + i);
+                                       IRQ_EB11MP_PMU_SCU0 + i);
                                 goto err_free_scu;
                         }
                 }
@@ -153,7 +153,7 @@ static int scu_start(void)
 
  err_free_scu:
         while (i--)
-                free_irq(IRQ_PMU_SCU0 + i, NULL);
+                free_irq(IRQ_EB11MP_PMU_SCU0 + i, NULL);
         return ret;
 }
 
@@ -175,7 +175,7 @@ static void scu_stop(void)
         for (i = 0; i < NUM_SCU_COUNTERS; i++) {
                 if (scu_em_used & (1 << i)) {
                         scu_reset_counter(emc, i);
-                        free_irq(IRQ_PMU_SCU0 + i, NULL);
+                        free_irq(IRQ_EB11MP_PMU_SCU0 + i, NULL);
                 }
         }
 }
@@ -225,10 +225,10 @@ static int em_setup_ctrs(void)
 }
 
 static int arm11_irqs[] = {
-        [0]     = IRQ_PMU_CPU0,
-        [1]     = IRQ_PMU_CPU1,
-        [2]     = IRQ_PMU_CPU2,
-        [3]     = IRQ_PMU_CPU3
+        [0]     = IRQ_EB11MP_PMU_CPU0,
+        [1]     = IRQ_EB11MP_PMU_CPU1,
+        [2]     = IRQ_EB11MP_PMU_CPU2,
+        [3]     = IRQ_EB11MP_PMU_CPU3
 };
 
 static int em_start(void)
@@ -273,22 +273,22 @@ static int em_setup(void)
         /*
          * Send SCU PMU interrupts to the "owner" CPU.
          */
-        em_route_irq(IRQ_PMU_SCU0, 0);
-        em_route_irq(IRQ_PMU_SCU1, 0);
-        em_route_irq(IRQ_PMU_SCU2, 1);
-        em_route_irq(IRQ_PMU_SCU3, 1);
-        em_route_irq(IRQ_PMU_SCU4, 2);
-        em_route_irq(IRQ_PMU_SCU5, 2);
-        em_route_irq(IRQ_PMU_SCU6, 3);
-        em_route_irq(IRQ_PMU_SCU7, 3);
+        em_route_irq(IRQ_EB11MP_PMU_SCU0, 0);
+        em_route_irq(IRQ_EB11MP_PMU_SCU1, 0);
+        em_route_irq(IRQ_EB11MP_PMU_SCU2, 1);
+        em_route_irq(IRQ_EB11MP_PMU_SCU3, 1);
+        em_route_irq(IRQ_EB11MP_PMU_SCU4, 2);
+        em_route_irq(IRQ_EB11MP_PMU_SCU5, 2);
+        em_route_irq(IRQ_EB11MP_PMU_SCU6, 3);
+        em_route_irq(IRQ_EB11MP_PMU_SCU7, 3);
 
         /*
          * Send CP15 PMU interrupts to the owner CPU.
          */
-        em_route_irq(IRQ_PMU_CPU0, 0);
-        em_route_irq(IRQ_PMU_CPU1, 1);
-        em_route_irq(IRQ_PMU_CPU2, 2);
-        em_route_irq(IRQ_PMU_CPU3, 3);
+        em_route_irq(IRQ_EB11MP_PMU_CPU0, 0);
+        em_route_irq(IRQ_EB11MP_PMU_CPU1, 1);
+        em_route_irq(IRQ_EB11MP_PMU_CPU2, 2);
+        em_route_irq(IRQ_EB11MP_PMU_CPU3, 3);
 
         return 0;
 }
diff --git a/arch/avr32/kernel/asm-offsets.c b/arch/avr32/kernel/asm-offsets.c
index 078cd33f467b..e4796c67a831 100644
--- a/arch/avr32/kernel/asm-offsets.c
+++ b/arch/avr32/kernel/asm-offsets.c
@@ -5,14 +5,7 @@
  */
 
 #include <linux/thread_info.h>
-
-#define DEFINE(sym, val) \
-        asm volatile("\n->" #sym " %0 " #val : : "i" (val))
-
-#define BLANK() asm volatile("\n->" : : )
-
-#define OFFSET(sym, str, mem) \
-        DEFINE(sym, offsetof(struct str, mem));
+#include <linux/kbuild.h>
 
 void foo(void)
 {
diff --git a/arch/avr32/kernel/sys_avr32.c b/arch/avr32/kernel/sys_avr32.c
index 8deb6003ee62..8e8911e55c8f 100644
--- a/arch/avr32/kernel/sys_avr32.c
+++ b/arch/avr32/kernel/sys_avr32.c
@@ -14,19 +14,6 @@
 #include <asm/mman.h>
 #include <asm/uaccess.h>
 
-asmlinkage int sys_pipe(unsigned long __user *filedes)
-{
-        int fd[2];
-        int error;
-
-        error = do_pipe(fd);
-        if (!error) {
-                if (copy_to_user(filedes, fd, sizeof(fd)))
-                        error = -EFAULT;
-        }
-        return error;
-}
-
 asmlinkage long sys_mmap2(unsigned long addr, unsigned long len,
                           unsigned long prot, unsigned long flags,
                           unsigned long fd, off_t offset)
diff --git a/arch/avr32/mm/tlb.c b/arch/avr32/mm/tlb.c
index b835257a8fa3..cd12edbea9f2 100644
--- a/arch/avr32/mm/tlb.c
+++ b/arch/avr32/mm/tlb.c
@@ -369,11 +369,7 @@ static const struct file_operations proc_tlb_operations = {
 
 static int __init proctlb_init(void)
 {
-        struct proc_dir_entry *entry;
-
-        entry = create_proc_entry("tlb", 0, NULL);
-        if (entry)
-                entry->proc_fops = &proc_tlb_operations;
+        proc_create("tlb", 0, NULL, &proc_tlb_operations);
         return 0;
 }
 late_initcall(proctlb_init);
diff --git a/arch/blackfin/kernel/asm-offsets.c b/arch/blackfin/kernel/asm-offsets.c
index b56b2741cdea..721f15f3cebf 100644
--- a/arch/blackfin/kernel/asm-offsets.c
+++ b/arch/blackfin/kernel/asm-offsets.c
@@ -34,8 +34,7 @@
 #include <linux/hardirq.h>
 #include <linux/irq.h>
 #include <linux/thread_info.h>
-
-#define DEFINE(sym, val) asm volatile("\n->" #sym " %0 " #val : : "i" (val))
+#include <linux/kbuild.h>
 
 int main(void)
 {
diff --git a/arch/blackfin/kernel/signal.c b/arch/blackfin/kernel/signal.c
index d1fa24401dc6..cb9d883d493c 100644
--- a/arch/blackfin/kernel/signal.c
+++ b/arch/blackfin/kernel/signal.c
@@ -212,7 +212,7 @@ setup_rt_frame(int sig, struct k_sigaction *ka, siginfo_t * info,
 
         /* Set up registers for signal handler */
         wrusp((unsigned long)frame);
-        if (get_personality & FDPIC_FUNCPTRS) {
+        if (current->personality & FDPIC_FUNCPTRS) {
                 struct fdpic_func_descriptor __user *funcptr =
                         (struct fdpic_func_descriptor *) ka->sa.sa_handler;
                 __get_user(regs->pc, &funcptr->text);
diff --git a/arch/blackfin/kernel/sys_bfin.c b/arch/blackfin/kernel/sys_bfin.c
index efb7b25a2633..fce49d7cf001 100644
--- a/arch/blackfin/kernel/sys_bfin.c
+++ b/arch/blackfin/kernel/sys_bfin.c
@@ -45,23 +45,6 @@
 #include <asm/cacheflush.h>
 #include <asm/dma.h>
 
-/*
- * sys_pipe() is the normal C calling standard for creating
- * a pipe. It's not the way unix traditionally does this, though.
- */
-asmlinkage int sys_pipe(unsigned long __user *fildes)
-{
-        int fd[2];
-        int error;
-
-        error = do_pipe(fd);
-        if (!error) {
-                if (copy_to_user(fildes, fd, 2 * sizeof(int)))
-                        error = -EFAULT;
-        }
-        return error;
-}
-
 /* common code for old and new mmaps */
 static inline long
 do_mmap2(unsigned long addr, unsigned long len,
diff --git a/arch/blackfin/mach-bf533/boards/stamp.c b/arch/blackfin/mach-bf533/boards/stamp.c
index fddce32901a2..024f418ae543 100644
--- a/arch/blackfin/mach-bf533/boards/stamp.c
+++ b/arch/blackfin/mach-bf533/boards/stamp.c
@@ -499,20 +499,17 @@ static struct i2c_board_info __initdata bfin_i2c_board_info[] = {
 #if defined(CONFIG_JOYSTICK_AD7142) || defined(CONFIG_JOYSTICK_AD7142_MODULE)
         {
                 I2C_BOARD_INFO("ad7142_joystick", 0x2C),
-                .type = "ad7142_joystick",
                 .irq = 39,
         },
 #endif
 #if defined(CONFIG_TWI_LCD) || defined(CONFIG_TWI_LCD_MODULE)
         {
                 I2C_BOARD_INFO("pcf8574_lcd", 0x22),
-                .type = "pcf8574_lcd",
         },
 #endif
 #if defined(CONFIG_TWI_KEYPAD) || defined(CONFIG_TWI_KEYPAD_MODULE)
         {
                 I2C_BOARD_INFO("pcf8574_keypad", 0x27),
-                .type = "pcf8574_keypad",
                 .irq = 39,
         },
 #endif
diff --git a/arch/blackfin/mach-bf537/boards/stamp.c b/arch/blackfin/mach-bf537/boards/stamp.c
index 0cec14b1ef5c..d3727b7c2d7d 100644
--- a/arch/blackfin/mach-bf537/boards/stamp.c
+++ b/arch/blackfin/mach-bf537/boards/stamp.c
@@ -751,20 +751,17 @@ static struct i2c_board_info __initdata bfin_i2c_board_info[] = {
 #if defined(CONFIG_JOYSTICK_AD7142) || defined(CONFIG_JOYSTICK_AD7142_MODULE)
         {
                 I2C_BOARD_INFO("ad7142_joystick", 0x2C),
-                .type = "ad7142_joystick",
                 .irq = 55,
         },
 #endif
 #if defined(CONFIG_TWI_LCD) || defined(CONFIG_TWI_LCD_MODULE)
         {
                 I2C_BOARD_INFO("pcf8574_lcd", 0x22),
-                .type = "pcf8574_lcd",
         },
 #endif
 #if defined(CONFIG_TWI_KEYPAD) || defined(CONFIG_TWI_KEYPAD_MODULE)
         {
                 I2C_BOARD_INFO("pcf8574_keypad", 0x27),
-                .type = "pcf8574_keypad",
                 .irq = 72,
         },
 #endif
diff --git a/arch/blackfin/mach-bf548/boards/ezkit.c b/arch/blackfin/mach-bf548/boards/ezkit.c
index 231dfbd3bc1f..b00f68ac6bc9 100644
--- a/arch/blackfin/mach-bf548/boards/ezkit.c
+++ b/arch/blackfin/mach-bf548/boards/ezkit.c
@@ -641,13 +641,11 @@ static struct i2c_board_info __initdata bfin_i2c_board_info1[] = {
 #if defined(CONFIG_TWI_LCD) || defined(CONFIG_TWI_LCD_MODULE)
         {
                 I2C_BOARD_INFO("pcf8574_lcd", 0x22),
-                .type = "pcf8574_lcd",
         },
 #endif
 #if defined(CONFIG_TWI_KEYPAD) || defined(CONFIG_TWI_KEYPAD_MODULE)
         {
                 I2C_BOARD_INFO("pcf8574_keypad", 0x27),
-                .type = "pcf8574_keypad",
                 .irq = 212,
         },
 #endif
diff --git a/arch/cris/kernel/profile.c b/arch/cris/kernel/profile.c
index aad0a9e5991a..44f7b4f79476 100644
--- a/arch/cris/kernel/profile.c
+++ b/arch/cris/kernel/profile.c
@@ -75,9 +75,9 @@ __init init_cris_profile(void)
 
         sample_buffer_pos = sample_buffer;
 
-        entry = create_proc_entry("system_profile", S_IWUSR | S_IRUGO, NULL);
+        entry = proc_create("system_profile", S_IWUSR | S_IRUGO, NULL,
+                            &cris_proc_profile_operations);
         if (entry) {
-                entry->proc_fops = &cris_proc_profile_operations;
                 entry->size = SAMPLE_BUFFER_SIZE;
         }
         prof_running = 1;
diff --git a/arch/frv/kernel/asm-offsets.c b/arch/frv/kernel/asm-offsets.c
index fbb19fc1af40..9de96843a278 100644
--- a/arch/frv/kernel/asm-offsets.c
+++ b/arch/frv/kernel/asm-offsets.c
@@ -7,15 +7,13 @@
 #include <linux/sched.h>
 #include <linux/signal.h>
 #include <linux/personality.h>
+#include <linux/kbuild.h>
 #include <asm/registers.h>
 #include <asm/ucontext.h>
 #include <asm/processor.h>
 #include <asm/thread_info.h>
 #include <asm/gdb-stub.h>
 
-#define DEFINE(sym, val) \
-        asm volatile("\n->" #sym " %0 " #val : : "i" (val))
-
 #define DEF_PTREG(sym, reg) \
         asm volatile("\n->" #sym " %0 offsetof(struct pt_regs, " #reg ")" \
                      : : "i" (offsetof(struct pt_regs, reg)))
@@ -32,11 +30,6 @@
         asm volatile("\n->" #sym " %0 offsetof(struct frv_frame0, " #reg ")" \
                      : : "i" (offsetof(struct frv_frame0, reg)))
 
-#define BLANK() asm volatile("\n->" : : )
-
-#define OFFSET(sym, str, mem) \
-        DEFINE(sym, offsetof(struct str, mem));
-
 void foo(void)
 {
         /* offsets into the thread_info structure */
diff --git a/arch/frv/kernel/pm.c b/arch/frv/kernel/pm.c
index c57ce3f1f2e2..73f3aeefd203 100644
--- a/arch/frv/kernel/pm.c
+++ b/arch/frv/kernel/pm.c
@@ -163,14 +163,11 @@ static int sysctl_pm_do_suspend(ctl_table *ctl, int write, struct file *filp,
         if ((mode != 1) && (mode != 5))
                 return -EINVAL;
 
-        retval = pm_send_all(PM_SUSPEND, (void *)3);
-
         if (retval == 0) {
                 if (mode == 5)
                     retval = pm_do_bus_sleep();
                 else
                     retval = pm_do_suspend();
-                pm_send_all(PM_RESUME, (void *)0);
         }
 
         return retval;
@@ -183,9 +180,6 @@ static int try_set_cmode(int new_cmode)
         if (!(clock_cmodes_permitted & (1<<new_cmode)))
                 return -EINVAL;
 
-        /* tell all the drivers we're suspending */
-        pm_send_all(PM_SUSPEND, (void *)3);
-
         /* now change cmode */
         local_irq_disable();
         frv_dma_pause_all();
@@ -201,8 +195,6 @@ static int try_set_cmode(int new_cmode)
         frv_dma_resume_all();
         local_irq_enable();
 
-        /* tell all the drivers we're resuming */
-        pm_send_all(PM_RESUME, (void *)0);
         return 0;
 }
 
diff --git a/arch/frv/kernel/signal.c b/arch/frv/kernel/signal.c
index d64bcaff54cd..3bdb368292a8 100644
--- a/arch/frv/kernel/signal.c
+++ b/arch/frv/kernel/signal.c
@@ -297,7 +297,7 @@ static int setup_frame(int sig, struct k_sigaction *ka, sigset_t *set)
         __frame->lr   = (unsigned long) &frame->retcode;
         __frame->gr8  = sig;
 
-        if (get_personality & FDPIC_FUNCPTRS) {
+        if (current->personality & FDPIC_FUNCPTRS) {
                 struct fdpic_func_descriptor __user *funcptr =
                         (struct fdpic_func_descriptor __user *) ka->sa.sa_handler;
                 __get_user(__frame->pc, &funcptr->text);
@@ -396,7 +396,7 @@ static int setup_rt_frame(int sig, struct k_sigaction *ka, siginfo_t *info,
         __frame->gr8 = sig;
         __frame->gr9 = (unsigned long) &frame->info;
 
-        if (get_personality & FDPIC_FUNCPTRS) {
+        if (current->personality & FDPIC_FUNCPTRS) {
                 struct fdpic_func_descriptor __user *funcptr =
                         (struct fdpic_func_descriptor __user *) ka->sa.sa_handler;
                 __get_user(__frame->pc, &funcptr->text);
diff --git a/arch/frv/kernel/sys_frv.c b/arch/frv/kernel/sys_frv.c
index 04c6b1677ccf..49b2cf2c38f3 100644
--- a/arch/frv/kernel/sys_frv.c
+++ b/arch/frv/kernel/sys_frv.c
@@ -28,23 +28,6 @@
 #include <asm/setup.h>
 #include <asm/uaccess.h>
 
-/*
- * sys_pipe() is the normal C calling standard for creating
- * a pipe. It's not the way unix traditionally does this, though.
- */
-asmlinkage long sys_pipe(unsigned long __user * fildes)
-{
-        int fd[2];
-        int error;
-
-        error = do_pipe(fd);
-        if (!error) {
-                if (copy_to_user(fildes, fd, 2*sizeof(int)))
-                        error = -EFAULT;
-        }
-        return error;
-}
-
 asmlinkage long sys_mmap2(unsigned long addr, unsigned long len,
                           unsigned long prot, unsigned long flags,
                           unsigned long fd, unsigned long pgoff)
diff --git a/arch/frv/kernel/traps.c b/arch/frv/kernel/traps.c
index a40df80b2ebd..1d2dfe67d442 100644
--- a/arch/frv/kernel/traps.c
+++ b/arch/frv/kernel/traps.c
@@ -362,11 +362,8 @@ asmlinkage void memory_access_exception(unsigned long esr0,
 #ifdef CONFIG_MMU
         unsigned long fixup;
 
-        if ((esr0 & ESRx_EC) == ESRx_EC_DATA_ACCESS)
-                if (handle_misalignment(esr0, ear0, epcr0) == 0)
-                        return;
-
-        if ((fixup = search_exception_table(__frame->pc)) != 0) {
+        fixup = search_exception_table(__frame->pc);
+        if (fixup) {
                 __frame->pc = fixup;
                 return;
         }
diff --git a/arch/frv/mb93090-mb00/pci-iomap.c b/arch/frv/mb93090-mb00/pci-iomap.c
index 068fa04bd527..35f6df28351e 100644
--- a/arch/frv/mb93090-mb00/pci-iomap.c
+++ b/arch/frv/mb93090-mb00/pci-iomap.c
@@ -13,8 +13,8 @@
 
 void __iomem *pci_iomap(struct pci_dev *dev, int bar, unsigned long maxlen)
 {
-        unsigned long start = pci_resource_start(dev, bar);
-        unsigned long len = pci_resource_len(dev, bar);
+        resource_size_t start = pci_resource_start(dev, bar);
+        resource_size_t len = pci_resource_len(dev, bar);
         unsigned long flags = pci_resource_flags(dev, bar);
 
         if (!len || !start)
diff --git a/arch/frv/mm/Makefile b/arch/frv/mm/Makefile
index fb8b1d860f46..1bca5ab8a6ab 100644
--- a/arch/frv/mm/Makefile
+++ b/arch/frv/mm/Makefile
@@ -6,4 +6,4 @@ obj-y := init.o kmap.o
 
 obj-$(CONFIG_MMU) += \
         pgalloc.o highmem.o fault.o extable.o cache-page.o tlb-flush.o tlb-miss.o \
-        mmu-context.o dma-alloc.o unaligned.o elf-fdpic.o
+        mmu-context.o dma-alloc.o elf-fdpic.o
diff --git a/arch/frv/mm/unaligned.c b/arch/frv/mm/unaligned.c
deleted file mode 100644
index 8f0375fc15a8..000000000000
--- a/arch/frv/mm/unaligned.c
+++ /dev/null
@@ -1,217 +0,0 @@
-/* unaligned.c: unalignment fixup handler for CPUs on which it is supported (FR451 only)
- *
- * Copyright (C) 2004 Red Hat, Inc. All Rights Reserved.
- * Written by David Howells (dhowells@redhat.com)
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version
- * 2 of the License, or (at your option) any later version.
- */
-
-#include <linux/sched.h>
-#include <linux/signal.h>
-#include <linux/kernel.h>
-#include <linux/mm.h>
-#include <linux/types.h>
-#include <linux/user.h>
-#include <linux/string.h>
-#include <linux/linkage.h>
-#include <linux/init.h>
-
-#include <asm/setup.h>
-#include <asm/system.h>
-#include <asm/uaccess.h>
-
-#if 0
-#define kdebug(fmt, ...) printk("FDPIC "fmt"\n" ,##__VA_ARGS__ )
-#else
-#define kdebug(fmt, ...) do {} while(0)
-#endif
-
-#define _MA_SIGNED      0x01
-#define _MA_HALF        0x02
-#define _MA_WORD        0x04
-#define _MA_DWORD       0x08
-#define _MA_SZ_MASK     0x0e
-#define _MA_LOAD        0x10
-#define _MA_STORE       0x20
-#define _MA_UPDATE      0x40
-#define _MA_IMM         0x80
-
-#define _MA_LDxU        _MA_LOAD | _MA_UPDATE
-#define _MA_LDxI        _MA_LOAD | _MA_IMM
-#define _MA_STxU        _MA_STORE | _MA_UPDATE
-#define _MA_STxI        _MA_STORE | _MA_IMM
-
-static const uint8_t tbl_LDGRk_reg[0x40] = {
-        [0x02] = _MA_LOAD | _MA_HALF | _MA_SIGNED,      /* LDSH  @(GRi,GRj),GRk */
-        [0x03] = _MA_LOAD | _MA_HALF,                   /* LDUH  @(GRi,GRj),GRk */
-        [0x04] = _MA_LOAD | _MA_WORD,                   /* LD    @(GRi,GRj),GRk */
-        [0x05] = _MA_LOAD | _MA_DWORD,                  /* LDD   @(GRi,GRj),GRk */
-        [0x12] = _MA_LDxU | _MA_HALF | _MA_SIGNED,      /* LDSHU @(GRi,GRj),GRk */
-        [0x13] = _MA_LDxU | _MA_HALF,                   /* LDUHU @(GRi,GRj),GRk */
-        [0x14] = _MA_LDxU | _MA_WORD,                   /* LDU   @(GRi,GRj),GRk */
-        [0x15] = _MA_LDxU | _MA_DWORD,                  /* LDDU  @(GRi,GRj),GRk */
-};
-
-static const uint8_t tbl_STGRk_reg[0x40] = {
-        [0x01] = _MA_STORE | _MA_HALF,                  /* STH   @(GRi,GRj),GRk */
-        [0x02] = _MA_STORE | _MA_WORD,                  /* ST    @(GRi,GRj),GRk */
-        [0x03] = _MA_STORE | _MA_DWORD,                 /* STD   @(GRi,GRj),GRk */
-        [0x11] = _MA_STxU  | _MA_HALF,                  /* STHU  @(GRi,GRj),GRk */
-        [0x12] = _MA_STxU  | _MA_WORD,                  /* STU   @(GRi,GRj),GRk */
-        [0x13] = _MA_STxU  | _MA_DWORD,                 /* STDU  @(GRi,GRj),GRk */
-};
-
-static const uint8_t tbl_LDSTGRk_imm[0x80] = {
-        [0x31] = _MA_LDxI | _MA_HALF | _MA_SIGNED,      /* LDSHI @(GRi,d12),GRk */
-        [0x32] = _MA_LDxI | _MA_WORD,                   /* LDI   @(GRi,d12),GRk */
-        [0x33] = _MA_LDxI | _MA_DWORD,                  /* LDDI  @(GRi,d12),GRk */
-        [0x36] = _MA_LDxI | _MA_HALF,                   /* LDUHI @(GRi,d12),GRk */
-        [0x51] = _MA_STxI | _MA_HALF,                   /* STHI  @(GRi,d12),GRk */
-        [0x52] = _MA_STxI | _MA_WORD,                   /* STI   @(GRi,d12),GRk */
-        [0x53] = _MA_STxI | _MA_DWORD,                  /* STDI  @(GRi,d12),GRk */
-};
-
-
-/*****************************************************************************/
-/*
- * see if we can handle the exception by fixing up a misaligned memory access
- */
-int handle_misalignment(unsigned long esr0, unsigned long ear0, unsigned long epcr0)
-{
-        unsigned long insn, addr, *greg;
-        int GRi, GRj, GRk, D12, op;
-
-        union {
-                uint64_t _64;
-                uint32_t _32[2];
-                uint16_t _16;
-                uint8_t _8[8];
-        } x;
-
-        if (!(esr0 & ESR0_EAV) || !(epcr0 & EPCR0_V) || !(ear0 & 7))
-                return -EAGAIN;
-
-        epcr0 &= EPCR0_PC;
-
-        if (__frame->pc != epcr0) {
-                kdebug("MISALIGN: Execution not halted on excepting instruction\n");
-                BUG();
-        }
-
-        if (__get_user(insn, (unsigned long *) epcr0) < 0)
-                return -EFAULT;
-
-        /* determine the instruction type first */
-        switch ((insn >> 18) & 0x7f) {
-        case 0x2:
-                /* LDx @(GRi,GRj),GRk */
-                op = tbl_LDGRk_reg[(insn >> 6) & 0x3f];
-                break;
-
-        case 0x3:
-                /* STx GRk,@(GRi,GRj) */
-                op = tbl_STGRk_reg[(insn >> 6) & 0x3f];
-                break;
-
-        default:
-                op = tbl_LDSTGRk_imm[(insn >> 18) & 0x7f];
-                break;
-        }
-
-        if (!op)
-                return -EAGAIN;
-
-        kdebug("MISALIGN: pc=%08lx insn=%08lx ad=%08lx op=%02x\n", epcr0, insn, ear0, op);
-
-        memset(&x, 0xba, 8);
-
-        /* validate the instruction parameters */
-        greg = (unsigned long *) &__frame->tbr;
-
-        GRi = (insn >> 12) & 0x3f;
-        GRk = (insn >> 25) & 0x3f;
-
-        if (GRi > 31 || GRk > 31)
-                return -ENOENT;
-
-        if (op & _MA_DWORD && GRk & 1)
-                return -EINVAL;
-
-        if (op & _MA_IMM) {
-                D12 = insn & 0xfff;
-                asm ("slli %0,#20,%0 ! srai %0,#20,%0" : "=r"(D12) : "0"(D12)); /* sign extend */
-                addr = (GRi ? greg[GRi] : 0) + D12;
-        }
-        else {
-                GRj = (insn >>  0) & 0x3f;
-                if (GRj > 31)
-                        return -ENOENT;
-                addr = (GRi ? greg[GRi] : 0) + (GRj ? greg[GRj] : 0);
-        }
-
-        if (addr != ear0) {
-                kdebug("MISALIGN: Calculated addr (%08lx) does not match EAR0 (%08lx)\n",
-                       addr, ear0);
-                return -EFAULT;
-        }
-
-        /* check the address is okay */
-        if (user_mode(__frame) && ___range_ok(ear0, 8) < 0)
-                return -EFAULT;
-
-        /* perform the memory op */
-        if (op & _MA_STORE) {
-                /* perform a store */
-                x._32[0] = 0;
-                if (GRk != 0) {
-                        if (op & _MA_HALF) {
-                                x._16 = greg[GRk];
-                        }
-                        else {
-                                x._32[0] = greg[GRk];
-                        }
-                }
-                if (op & _MA_DWORD)
-                        x._32[1] = greg[GRk + 1];
-
-                kdebug("MISALIGN: Store GR%d { %08x:%08x } -> %08lx (%dB)\n",
-                       GRk, x._32[1], x._32[0], addr, op & _MA_SZ_MASK);
-
-                if (__memcpy_user((void *) addr, &x, op & _MA_SZ_MASK) != 0)
-                        return -EFAULT;
-        }
-        else {
-                /* perform a load */
-                if (__memcpy_user(&x, (void *) addr, op & _MA_SZ_MASK) != 0)
-                        return -EFAULT;
-
-                if (op & _MA_HALF) {
-                        if (op & _MA_SIGNED)
-                                asm ("slli %0,#16,%0 ! srai %0,#16,%0"
-                                     : "=r"(x._32[0]) : "0"(x._16));
-                        else
-                                asm ("sethi #0,%0"
-                                     : "=r"(x._32[0]) : "0"(x._16));
-                }
-
-                kdebug("MISALIGN: Load %08lx (%dB) -> GR%d, { %08x:%08x }\n",
-                       addr, op & _MA_SZ_MASK, GRk, x._32[1], x._32[0]);
-
-                if (GRk != 0)
-                        greg[GRk] = x._32[0];
-                if (op & _MA_DWORD)
-                        greg[GRk + 1] = x._32[1];
-        }
-
-        /* update the base pointer if required */
-        if (op & _MA_UPDATE)
-                greg[GRi] = addr;
-
-        /* well... we've done that insn */
-        __frame->pc = __frame->pc + 4;
-
-        return 0;
-} /* end handle_misalignment() */
diff --git a/arch/h8300/kernel/asm-offsets.c b/arch/h8300/kernel/asm-offsets.c
index fc30b4fd0914..2042552e0871 100644
--- a/arch/h8300/kernel/asm-offsets.c
+++ b/arch/h8300/kernel/asm-offsets.c
@@ -13,15 +13,11 @@
 #include <linux/kernel_stat.h>
 #include <linux/ptrace.h>
 #include <linux/hardirq.h>
+#include <linux/kbuild.h>
 #include <asm/bootinfo.h>
 #include <asm/irq.h>
 #include <asm/ptrace.h>
 
-#define DEFINE(sym, val) \
-        asm volatile("\n->" #sym " %0 " #val : : "i" (val))
-
-#define BLANK() asm volatile("\n->" : : )
-
 int main(void)
 {
         /* offsets into the task struct */
diff --git a/arch/h8300/kernel/sys_h8300.c b/arch/h8300/kernel/sys_h8300.c
index 00608be6d567..2745656dcc52 100644
--- a/arch/h8300/kernel/sys_h8300.c
+++ b/arch/h8300/kernel/sys_h8300.c
@@ -27,23 +27,6 @@
 #include <asm/traps.h>
 #include <asm/unistd.h>
 
-/*
- * sys_pipe() is the normal C calling standard for creating
- * a pipe. It's not the way unix traditionally does this, though.
- */
-asmlinkage int sys_pipe(unsigned long * fildes)
-{
-        int fd[2];
-        int error;
-
-        error = do_pipe(fd);
-        if (!error) {
-                if (copy_to_user(fildes, fd, 2*sizeof(int)))
-                        error = -EFAULT;
-        }
-        return error;
-}
-
 /* common code for old and new mmaps */
 static inline long do_mmap2(
         unsigned long addr, unsigned long len,
diff --git a/arch/ia64/Kconfig b/arch/ia64/Kconfig
index 3aa6c821449a..0df5f6f75edf 100644
--- a/arch/ia64/Kconfig
+++ b/arch/ia64/Kconfig
@@ -19,6 +19,7 @@ config IA64
         select HAVE_OPROFILE
         select HAVE_KPROBES
         select HAVE_KRETPROBES
+        select HAVE_DMA_ATTRS
         select HAVE_KVM
         default y
         help
@@ -47,6 +48,9 @@ config MMU
 config SWIOTLB
        bool
 
+config IOMMU_HELPER
+       bool
+
 config GENERIC_LOCKBREAK
         bool
         default y
@@ -615,7 +619,7 @@ config IRQ_PER_CPU
         default y
 
 config IOMMU_HELPER
-        def_bool (IA64_HP_ZX1 || IA64_HP_ZX1_SWIOTLB || IA64_GENERIC)
+        def_bool (IA64_HP_ZX1 || IA64_HP_ZX1_SWIOTLB || IA64_GENERIC || SWIOTLB)
 
 source "arch/ia64/hp/sim/Kconfig"
 
diff --git a/arch/ia64/hp/common/hwsw_iommu.c b/arch/ia64/hp/common/hwsw_iommu.c
index 8f6bcfe1dada..1c44ec2a1d58 100644
--- a/arch/ia64/hp/common/hwsw_iommu.c
+++ b/arch/ia64/hp/common/hwsw_iommu.c
@@ -20,10 +20,10 @@
 extern int swiotlb_late_init_with_default_size (size_t size);
 extern ia64_mv_dma_alloc_coherent       swiotlb_alloc_coherent;
 extern ia64_mv_dma_free_coherent        swiotlb_free_coherent;
-extern ia64_mv_dma_map_single           swiotlb_map_single;
-extern ia64_mv_dma_unmap_single         swiotlb_unmap_single;
-extern ia64_mv_dma_map_sg               swiotlb_map_sg;
-extern ia64_mv_dma_unmap_sg             swiotlb_unmap_sg;
+extern ia64_mv_dma_map_single_attrs     swiotlb_map_single_attrs;
+extern ia64_mv_dma_unmap_single_attrs   swiotlb_unmap_single_attrs;
+extern ia64_mv_dma_map_sg_attrs         swiotlb_map_sg_attrs;
+extern ia64_mv_dma_unmap_sg_attrs       swiotlb_unmap_sg_attrs;
 extern ia64_mv_dma_supported            swiotlb_dma_supported;
 extern ia64_mv_dma_mapping_error        swiotlb_dma_mapping_error;
 
@@ -31,19 +31,19 @@ extern ia64_mv_dma_mapping_error	swiotlb_dma_mapping_error;
 
 extern ia64_mv_dma_alloc_coherent       sba_alloc_coherent;
 extern ia64_mv_dma_free_coherent        sba_free_coherent;
-extern ia64_mv_dma_map_single           sba_map_single;
-extern ia64_mv_dma_unmap_single         sba_unmap_single;
-extern ia64_mv_dma_map_sg               sba_map_sg;
-extern ia64_mv_dma_unmap_sg             sba_unmap_sg;
+extern ia64_mv_dma_map_single_attrs     sba_map_single_attrs;
+extern ia64_mv_dma_unmap_single_attrs   sba_unmap_single_attrs;
+extern ia64_mv_dma_map_sg_attrs         sba_map_sg_attrs;
+extern ia64_mv_dma_unmap_sg_attrs       sba_unmap_sg_attrs;
 extern ia64_mv_dma_supported            sba_dma_supported;
 extern ia64_mv_dma_mapping_error        sba_dma_mapping_error;
 
 #define hwiommu_alloc_coherent          sba_alloc_coherent
 #define hwiommu_free_coherent           sba_free_coherent
-#define hwiommu_map_single              sba_map_single
-#define hwiommu_unmap_single            sba_unmap_single
-#define hwiommu_map_sg                  sba_map_sg
-#define hwiommu_unmap_sg                sba_unmap_sg
+#define hwiommu_map_single_attrs        sba_map_single_attrs
+#define hwiommu_unmap_single_attrs      sba_unmap_single_attrs
+#define hwiommu_map_sg_attrs            sba_map_sg_attrs
+#define hwiommu_unmap_sg_attrs          sba_unmap_sg_attrs
 #define hwiommu_dma_supported           sba_dma_supported
 #define hwiommu_dma_mapping_error       sba_dma_mapping_error
 #define hwiommu_sync_single_for_cpu     machvec_dma_sync_single
@@ -98,41 +98,48 @@ hwsw_free_coherent (struct device *dev, size_t size, void *vaddr, dma_addr_t dma
 }
 
 dma_addr_t
-hwsw_map_single (struct device *dev, void *addr, size_t size, int dir)
+hwsw_map_single_attrs(struct device *dev, void *addr, size_t size, int dir,
+                       struct dma_attrs *attrs)
 {
         if (use_swiotlb(dev))
-                return swiotlb_map_single(dev, addr, size, dir);
+                return swiotlb_map_single_attrs(dev, addr, size, dir, attrs);
         else
-                return hwiommu_map_single(dev, addr, size, dir);
+                return hwiommu_map_single_attrs(dev, addr, size, dir, attrs);
 }
+EXPORT_SYMBOL(hwsw_map_single_attrs);
 
 void
-hwsw_unmap_single (struct device *dev, dma_addr_t iova, size_t size, int dir)
+hwsw_unmap_single_attrs(struct device *dev, dma_addr_t iova, size_t size,
+                         int dir, struct dma_attrs *attrs)
 {
         if (use_swiotlb(dev))
-                return swiotlb_unmap_single(dev, iova, size, dir);
+                return swiotlb_unmap_single_attrs(dev, iova, size, dir, attrs);
         else
-                return hwiommu_unmap_single(dev, iova, size, dir);
+                return hwiommu_unmap_single_attrs(dev, iova, size, dir, attrs);
 }
-
+EXPORT_SYMBOL(hwsw_unmap_single_attrs);
 
 int
-hwsw_map_sg (struct device *dev, struct scatterlist *sglist, int nents, int dir)
+hwsw_map_sg_attrs(struct device *dev, struct scatterlist *sglist, int nents,
+                   int dir, struct dma_attrs *attrs)
 {
         if (use_swiotlb(dev))
-                return swiotlb_map_sg(dev, sglist, nents, dir);
+                return swiotlb_map_sg_attrs(dev, sglist, nents, dir, attrs);
         else
-                return hwiommu_map_sg(dev, sglist, nents, dir);
+                return hwiommu_map_sg_attrs(dev, sglist, nents, dir, attrs);
 }
+EXPORT_SYMBOL(hwsw_map_sg_attrs);
 
 void
-hwsw_unmap_sg (struct device *dev, struct scatterlist *sglist, int nents, int dir)
+hwsw_unmap_sg_attrs(struct device *dev, struct scatterlist *sglist, int nents,
+                     int dir, struct dma_attrs *attrs)
 {
         if (use_swiotlb(dev))
-                return swiotlb_unmap_sg(dev, sglist, nents, dir);
+                return swiotlb_unmap_sg_attrs(dev, sglist, nents, dir, attrs);
         else
-                return hwiommu_unmap_sg(dev, sglist, nents, dir);
+                return hwiommu_unmap_sg_attrs(dev, sglist, nents, dir, attrs);
 }
+EXPORT_SYMBOL(hwsw_unmap_sg_attrs);
 
 void
 hwsw_sync_single_for_cpu (struct device *dev, dma_addr_t addr, size_t size, int dir)
@@ -185,10 +192,6 @@ hwsw_dma_mapping_error (dma_addr_t dma_addr)
 }
 
 EXPORT_SYMBOL(hwsw_dma_mapping_error);
-EXPORT_SYMBOL(hwsw_map_single);
-EXPORT_SYMBOL(hwsw_unmap_single);
-EXPORT_SYMBOL(hwsw_map_sg);
-EXPORT_SYMBOL(hwsw_unmap_sg);
 EXPORT_SYMBOL(hwsw_dma_supported);
 EXPORT_SYMBOL(hwsw_alloc_coherent);
 EXPORT_SYMBOL(hwsw_free_coherent);
diff --git a/arch/ia64/hp/common/sba_iommu.c b/arch/ia64/hp/common/sba_iommu.c
index 9409de5c9441..34421aed1e2a 100644
--- a/arch/ia64/hp/common/sba_iommu.c
+++ b/arch/ia64/hp/common/sba_iommu.c
@@ -899,16 +899,18 @@ sba_mark_invalid(struct ioc *ioc, dma_addr_t iova, size_t byte_cnt)
 }
 
 /**
- * sba_map_single - map one buffer and return IOVA for DMA
+ * sba_map_single_attrs - map one buffer and return IOVA for DMA
  * @dev: instance of PCI owned by the driver that's asking.
  * @addr:  driver buffer to map.
  * @size:  number of bytes to map in driver buffer.
  * @dir:  R/W or both.
+ * @attrs: optional dma attributes
  *
  * See Documentation/DMA-mapping.txt
  */
 dma_addr_t
-sba_map_single(struct device *dev, void *addr, size_t size, int dir)
+sba_map_single_attrs(struct device *dev, void *addr, size_t size, int dir,
+                     struct dma_attrs *attrs)
 {
         struct ioc *ioc;
         dma_addr_t iovp;
@@ -932,7 +934,8 @@ sba_map_single(struct device *dev, void *addr, size_t size, int dir)
                 ** Device is bit capable of DMA'ing to the buffer...
                 ** just return the PCI address of ptr
                 */
-                DBG_BYPASS("sba_map_single() bypass mask/addr: 0x%lx/0x%lx\n",
+                DBG_BYPASS("sba_map_single_attrs() bypass mask/addr: "
+                           "0x%lx/0x%lx\n",
                            to_pci_dev(dev)->dma_mask, pci_addr);
                 return pci_addr;
         }
@@ -953,7 +956,7 @@ sba_map_single(struct device *dev, void *addr, size_t size, int dir)
 
 #ifdef ASSERT_PDIR_SANITY
         spin_lock_irqsave(&ioc->res_lock, flags);
-        if (sba_check_pdir(ioc,"Check before sba_map_single()"))
+        if (sba_check_pdir(ioc,"Check before sba_map_single_attrs()"))
                 panic("Sanity check failed");
         spin_unlock_irqrestore(&ioc->res_lock, flags);
 #endif
@@ -982,11 +985,12 @@ sba_map_single(struct device *dev, void *addr, size_t size, int dir)
         /* form complete address */
 #ifdef ASSERT_PDIR_SANITY
         spin_lock_irqsave(&ioc->res_lock, flags);
-        sba_check_pdir(ioc,"Check after sba_map_single()");
+        sba_check_pdir(ioc,"Check after sba_map_single_attrs()");
         spin_unlock_irqrestore(&ioc->res_lock, flags);
 #endif
         return SBA_IOVA(ioc, iovp, offset);
 }
+EXPORT_SYMBOL(sba_map_single_attrs);
 
 #ifdef ENABLE_MARK_CLEAN
 static SBA_INLINE void
@@ -1013,15 +1017,17 @@ sba_mark_clean(struct ioc *ioc, dma_addr_t iova, size_t size)
 #endif
 
 /**
- * sba_unmap_single - unmap one IOVA and free resources
+ * sba_unmap_single_attrs - unmap one IOVA and free resources
  * @dev: instance of PCI owned by the driver that's asking.
  * @iova:  IOVA of driver buffer previously mapped.
  * @size:  number of bytes mapped in driver buffer.
  * @dir:  R/W or both.
+ * @attrs: optional dma attributes
  *
  * See Documentation/DMA-mapping.txt
  */
-void sba_unmap_single(struct device *dev, dma_addr_t iova, size_t size, int dir)
+void sba_unmap_single_attrs(struct device *dev, dma_addr_t iova, size_t size,
+                            int dir, struct dma_attrs *attrs)
 {
         struct ioc *ioc;
 #if DELAYED_RESOURCE_CNT > 0
@@ -1038,7 +1044,8 @@ void sba_unmap_single(struct device *dev, dma_addr_t iova, size_t size, int dir)
                 /*
                 ** Address does not fall w/in IOVA, must be bypassing
                 */
-                DBG_BYPASS("sba_unmap_single() bypass addr: 0x%lx\n", iova);
+                DBG_BYPASS("sba_unmap_single_atttrs() bypass addr: 0x%lx\n",
+                           iova);
 
 #ifdef ENABLE_MARK_CLEAN
                 if (dir == DMA_FROM_DEVICE) {
@@ -1087,7 +1094,7 @@ void sba_unmap_single(struct device *dev, dma_addr_t iova, size_t size, int dir)
         spin_unlock_irqrestore(&ioc->res_lock, flags);
 #endif /* DELAYED_RESOURCE_CNT == 0 */
 }
-
+EXPORT_SYMBOL(sba_unmap_single_attrs);
 
 /**
  * sba_alloc_coherent - allocate/map shared mem for DMA
@@ -1144,7 +1151,8 @@ sba_alloc_coherent (struct device *dev, size_t size, dma_addr_t *dma_handle, gfp
          * If device can't bypass or bypass is disabled, pass the 32bit fake
          * device to map single to get an iova mapping.
          */
-        *dma_handle = sba_map_single(&ioc->sac_only_dev->dev, addr, size, 0);
+        *dma_handle = sba_map_single_attrs(&ioc->sac_only_dev->dev, addr,
+                                           size, 0, NULL);
 
         return addr;
 }
@@ -1161,7 +1169,7 @@ sba_alloc_coherent (struct device *dev, size_t size, dma_addr_t *dma_handle, gfp
  */
 void sba_free_coherent (struct device *dev, size_t size, void *vaddr, dma_addr_t dma_handle)
 {
-        sba_unmap_single(dev, dma_handle, size, 0);
+        sba_unmap_single_attrs(dev, dma_handle, size, 0, NULL);
         free_pages((unsigned long) vaddr, get_order(size));
 }
 
@@ -1410,10 +1418,12 @@ sba_coalesce_chunks(struct ioc *ioc, struct device *dev,
  * @sglist:  array of buffer/length pairs
  * @nents:  number of entries in list
  * @dir:  R/W or both.
+ * @attrs: optional dma attributes
  *
  * See Documentation/DMA-mapping.txt
  */
-int sba_map_sg(struct device *dev, struct scatterlist *sglist, int nents, int dir)
+int sba_map_sg_attrs(struct device *dev, struct scatterlist *sglist, int nents,
+                     int dir, struct dma_attrs *attrs)
 {
         struct ioc *ioc;
         int coalesced, filled = 0;
@@ -1441,16 +1451,16 @@ int sba_map_sg(struct device *dev, struct scatterlist *sglist, int nents, int di
         /* Fast path single entry scatterlists. */
         if (nents == 1) {
                 sglist->dma_length = sglist->length;
-                sglist->dma_address = sba_map_single(dev, sba_sg_address(sglist), sglist->length, dir);
+                sglist->dma_address = sba_map_single_attrs(dev, sba_sg_address(sglist), sglist->length, dir, attrs);
                 return 1;
         }
 
 #ifdef ASSERT_PDIR_SANITY
         spin_lock_irqsave(&ioc->res_lock, flags);
-        if (sba_check_pdir(ioc,"Check before sba_map_sg()"))
+        if (sba_check_pdir(ioc,"Check before sba_map_sg_attrs()"))
         {
                 sba_dump_sg(ioc, sglist, nents);
-                panic("Check before sba_map_sg()");
+                panic("Check before sba_map_sg_attrs()");
         }
         spin_unlock_irqrestore(&ioc->res_lock, flags);
 #endif
@@ -1479,10 +1489,10 @@ int sba_map_sg(struct device *dev, struct scatterlist *sglist, int nents, int di
 
 #ifdef ASSERT_PDIR_SANITY
         spin_lock_irqsave(&ioc->res_lock, flags);
-        if (sba_check_pdir(ioc,"Check after sba_map_sg()"))
+        if (sba_check_pdir(ioc,"Check after sba_map_sg_attrs()"))
         {
                 sba_dump_sg(ioc, sglist, nents);
-                panic("Check after sba_map_sg()\n");
+                panic("Check after sba_map_sg_attrs()\n");
         }
         spin_unlock_irqrestore(&ioc->res_lock, flags);
 #endif
@@ -1492,18 +1502,20 @@ int sba_map_sg(struct device *dev, struct scatterlist *sglist, int nents, int di
 
         return filled;
 }
-
+EXPORT_SYMBOL(sba_map_sg_attrs);
 
 /**
- * sba_unmap_sg - unmap Scatter/Gather list
+ * sba_unmap_sg_attrs - unmap Scatter/Gather list
  * @dev: instance of PCI owned by the driver that's asking.
  * @sglist:  array of buffer/length pairs
  * @nents:  number of entries in list
  * @dir:  R/W or both.
+ * @attrs: optional dma attributes
  *
  * See Documentation/DMA-mapping.txt
  */
-void sba_unmap_sg (struct device *dev, struct scatterlist *sglist, int nents, int dir)
+void sba_unmap_sg_attrs(struct device *dev, struct scatterlist *sglist,
+                        int nents, int dir, struct dma_attrs *attrs)
 {
 #ifdef ASSERT_PDIR_SANITY
         struct ioc *ioc;
@@ -1518,13 +1530,14 @@ void sba_unmap_sg (struct device *dev, struct scatterlist *sglist, int nents, in
         ASSERT(ioc);
 
         spin_lock_irqsave(&ioc->res_lock, flags);
-        sba_check_pdir(ioc,"Check before sba_unmap_sg()");
+        sba_check_pdir(ioc,"Check before sba_unmap_sg_attrs()");
         spin_unlock_irqrestore(&ioc->res_lock, flags);
 #endif
 
         while (nents && sglist->dma_length) {
 
-                sba_unmap_single(dev, sglist->dma_address, sglist->dma_length, dir);
+                sba_unmap_single_attrs(dev, sglist->dma_address,
+                                       sglist->dma_length, dir, attrs);
                 sglist = sg_next(sglist);
                 nents--;
         }
@@ -1533,11 +1546,12 @@ void sba_unmap_sg (struct device *dev, struct scatterlist *sglist, int nents, in
 
 #ifdef ASSERT_PDIR_SANITY
         spin_lock_irqsave(&ioc->res_lock, flags);
-        sba_check_pdir(ioc,"Check after sba_unmap_sg()");
+        sba_check_pdir(ioc,"Check after sba_unmap_sg_attrs()");
         spin_unlock_irqrestore(&ioc->res_lock, flags);
 #endif
 
 }
+EXPORT_SYMBOL(sba_unmap_sg_attrs);
 
 /**************************************************************
 *
@@ -1918,15 +1932,13 @@ static const struct file_operations ioc_fops = {
 static void __init
 ioc_proc_init(void)
 {
-        struct proc_dir_entry *dir, *entry;
+        struct proc_dir_entry *dir;
 
         dir = proc_mkdir("bus/mckinley", NULL);
         if (!dir)
                 return;
 
-        entry = create_proc_entry(ioc_list->name, 0, dir);
-        if (entry)
-                entry->proc_fops = &ioc_fops;
+        proc_create(ioc_list->name, 0, dir, &ioc_fops);
 }
 #endif
 
@@ -2166,10 +2178,6 @@ sba_page_override(char *str)
 __setup("sbapagesize=",sba_page_override);
 
 EXPORT_SYMBOL(sba_dma_mapping_error);
-EXPORT_SYMBOL(sba_map_single);
-EXPORT_SYMBOL(sba_unmap_single);
-EXPORT_SYMBOL(sba_map_sg);
-EXPORT_SYMBOL(sba_unmap_sg);
 EXPORT_SYMBOL(sba_dma_supported);
 EXPORT_SYMBOL(sba_alloc_coherent);
 EXPORT_SYMBOL(sba_free_coherent);
diff --git a/arch/ia64/hp/sim/simserial.c b/arch/ia64/hp/sim/simserial.c
index eb0c32a85fd7..23cafc80d2a4 100644
--- a/arch/ia64/hp/sim/simserial.c
+++ b/arch/ia64/hp/sim/simserial.c
@@ -210,21 +210,23 @@ static void do_softint(struct work_struct *private_)
         printk(KERN_ERR "simserial: do_softint called\n");
 }
 
-static void rs_put_char(struct tty_struct *tty, unsigned char ch)
+static int rs_put_char(struct tty_struct *tty, unsigned char ch)
 {
         struct async_struct *info = (struct async_struct *)tty->driver_data;
         unsigned long flags;
 
-        if (!tty || !info->xmit.buf) return;
+        if (!tty || !info->xmit.buf)
+                return 0;
 
         local_irq_save(flags);
         if (CIRC_SPACE(info->xmit.head, info->xmit.tail, SERIAL_XMIT_SIZE) == 0) {
                 local_irq_restore(flags);
-                return;
+                return 0;
         }
         info->xmit.buf[info->xmit.head] = ch;
         info->xmit.head = (info->xmit.head + 1) & (SERIAL_XMIT_SIZE-1);
         local_irq_restore(flags);
+        return 1;
 }
 
 static void transmit_chars(struct async_struct *info, int *intr_done)
@@ -621,7 +623,8 @@ static void rs_close(struct tty_struct *tty, struct file * filp)
          * the line discipline to only process XON/XOFF characters.
          */
         shutdown(info);
-        if (tty->driver->flush_buffer) tty->driver->flush_buffer(tty);
+        if (tty->ops->flush_buffer)
+                tty->ops->flush_buffer(tty);
         if (tty->ldisc.flush_buffer) tty->ldisc.flush_buffer(tty);
         info->event = 0;
         info->tty = NULL;
diff --git a/arch/ia64/ia32/ia32_signal.c b/arch/ia64/ia32/ia32_signal.c
index 256a7faeda07..b763ca19ef17 100644
--- a/arch/ia64/ia32/ia32_signal.c
+++ b/arch/ia64/ia32/ia32_signal.c
@@ -463,7 +463,7 @@ sys32_sigsuspend (int history0, int history1, old_sigset_t mask)
 
         current->state = TASK_INTERRUPTIBLE;
         schedule();
-        set_thread_flag(TIF_RESTORE_SIGMASK);
+        set_restore_sigmask();
         return -ERESTARTNOHAND;
 }
 
diff --git a/arch/ia64/kernel/acpi.c b/arch/ia64/kernel/acpi.c
index c7467f863c7a..19709a079635 100644
--- a/arch/ia64/kernel/acpi.c
+++ b/arch/ia64/kernel/acpi.c
@@ -966,7 +966,7 @@ acpi_map_iosapics (void)
 fs_initcall(acpi_map_iosapics);
 #endif                          /* CONFIG_ACPI_NUMA */
 
-int acpi_register_ioapic(acpi_handle handle, u64 phys_addr, u32 gsi_base)
+int __ref acpi_register_ioapic(acpi_handle handle, u64 phys_addr, u32 gsi_base)
 {
         int err;
 
diff --git a/arch/ia64/kernel/asm-offsets.c b/arch/ia64/kernel/asm-offsets.c
index 230a6f92367f..c64a55af9b95 100644
--- a/arch/ia64/kernel/asm-offsets.c
+++ b/arch/ia64/kernel/asm-offsets.c
@@ -9,7 +9,7 @@
 #include <linux/sched.h>
 #include <linux/pid.h>
 #include <linux/clocksource.h>
-
+#include <linux/kbuild.h>
 #include <asm-ia64/processor.h>
 #include <asm-ia64/ptrace.h>
 #include <asm-ia64/siginfo.h>
@@ -19,11 +19,6 @@
 #include "../kernel/sigframe.h"
 #include "../kernel/fsyscall_gtod_data.h"
 
-#define DEFINE(sym, val) \
-        asm volatile("\n->" #sym " %0 " #val : : "i" (val))
-
-#define BLANK() asm volatile("\n->" : : )
-
 void foo(void)
 {
         DEFINE(IA64_TASK_SIZE, sizeof (struct task_struct));
diff --git a/arch/ia64/kernel/irq.c b/arch/ia64/kernel/irq.c
index 6dee579f205f..7fd18f54c056 100644
--- a/arch/ia64/kernel/irq.c
+++ b/arch/ia64/kernel/irq.c
@@ -183,10 +183,10 @@ void fixup_irqs(void)
 {
         unsigned int irq;
         extern void ia64_process_pending_intr(void);
-        extern void ia64_disable_timer(void);
         extern volatile int time_keeper_id;
 
-        ia64_disable_timer();
+        /* Mask ITV to disable timer */
+        ia64_set_itv(1 << 16);
 
         /*
          * Find a new timesync master
diff --git a/arch/ia64/kernel/palinfo.c b/arch/ia64/kernel/palinfo.c
index 396004e8cd14..4547a2092af9 100644
--- a/arch/ia64/kernel/palinfo.c
+++ b/arch/ia64/kernel/palinfo.c
@@ -1053,7 +1053,7 @@ static int __cpuinit palinfo_cpu_callback(struct notifier_block *nfb,
         return NOTIFY_OK;
 }
 
-static struct notifier_block palinfo_cpu_notifier __cpuinitdata =
+static struct notifier_block __refdata palinfo_cpu_notifier =
 {
         .notifier_call = palinfo_cpu_callback,
         .priority = 0,
diff --git a/arch/ia64/kernel/perfmon.c b/arch/ia64/kernel/perfmon.c
index c8e403752a0c..c1ad27de2dd2 100644
--- a/arch/ia64/kernel/perfmon.c
+++ b/arch/ia64/kernel/perfmon.c
@@ -867,7 +867,7 @@ pfm_rvfree(void *mem, unsigned long size)
 }
 
 static pfm_context_t *
-pfm_context_alloc(void)
+pfm_context_alloc(int ctx_flags)
 {
         pfm_context_t *ctx;
 
@@ -878,6 +878,46 @@ pfm_context_alloc(void)
         ctx = kzalloc(sizeof(pfm_context_t), GFP_KERNEL);
         if (ctx) {
                 DPRINT(("alloc ctx @%p\n", ctx));
+
+                /*
+                 * init context protection lock
+                 */
+                spin_lock_init(&ctx->ctx_lock);
+
+                /*
+                 * context is unloaded
+                 */
+                ctx->ctx_state = PFM_CTX_UNLOADED;
+
+                /*
+                 * initialization of context's flags
+                 */
+                ctx->ctx_fl_block       = (ctx_flags & PFM_FL_NOTIFY_BLOCK) ? 1 : 0;
+                ctx->ctx_fl_system      = (ctx_flags & PFM_FL_SYSTEM_WIDE) ? 1: 0;
+                ctx->ctx_fl_no_msg      = (ctx_flags & PFM_FL_OVFL_NO_MSG) ? 1: 0;
+                /*
+                 * will move to set properties
+                 * ctx->ctx_fl_excl_idle   = (ctx_flags & PFM_FL_EXCL_IDLE) ? 1: 0;
+                 */
+
+                /*
+                 * init restart semaphore to locked
+                 */
+                init_completion(&ctx->ctx_restart_done);
+
+                /*
+                 * activation is used in SMP only
+                 */
+                ctx->ctx_last_activation = PFM_INVALID_ACTIVATION;
+                SET_LAST_CPU(ctx, -1);
+
+                /*
+                 * initialize notification message queue
+                 */
+                ctx->ctx_msgq_head = ctx->ctx_msgq_tail = 0;
+                init_waitqueue_head(&ctx->ctx_msgq_wait);
+                init_waitqueue_head(&ctx->ctx_zombieq);
+
         }
         return ctx;
 }
@@ -2165,28 +2205,21 @@ static struct dentry_operations pfmfs_dentry_operations = {
 };
 
 
-static int
-pfm_alloc_fd(struct file **cfile)
+static struct file *
+pfm_alloc_file(pfm_context_t *ctx)
 {
-        int fd, ret = 0;
-        struct file *file = NULL;
-        struct inode * inode;
+        struct file *file;
+        struct inode *inode;
+        struct dentry *dentry;
         char name[32];
         struct qstr this;
 
-        fd = get_unused_fd();
-        if (fd < 0) return -ENFILE;
-
-        ret = -ENFILE;
-
-        file = get_empty_filp();
-        if (!file) goto out;
-
         /*
          * allocate a new inode
          */
         inode = new_inode(pfmfs_mnt->mnt_sb);
-        if (!inode) goto out;
+        if (!inode)
+                return ERR_PTR(-ENOMEM);
 
         DPRINT(("new inode ino=%ld @%p\n", inode->i_ino, inode));
 
@@ -2199,59 +2232,28 @@ pfm_alloc_fd(struct file **cfile)
         this.len  = strlen(name);
         this.hash = inode->i_ino;
 
-        ret = -ENOMEM;
-
         /*
          * allocate a new dcache entry
          */
-        file->f_path.dentry = d_alloc(pfmfs_mnt->mnt_sb->s_root, &this);
-        if (!file->f_path.dentry) goto out;
+        dentry = d_alloc(pfmfs_mnt->mnt_sb->s_root, &this);
+        if (!dentry) {
+                iput(inode);
+                return ERR_PTR(-ENOMEM);
+        }
 
-        file->f_path.dentry->d_op = &pfmfs_dentry_operations;
+        dentry->d_op = &pfmfs_dentry_operations;
+        d_add(dentry, inode);
 
-        d_add(file->f_path.dentry, inode);
-        file->f_path.mnt = mntget(pfmfs_mnt);
-        file->f_mapping = inode->i_mapping;
+        file = alloc_file(pfmfs_mnt, dentry, FMODE_READ, &pfm_file_ops);
+        if (!file) {
+                dput(dentry);
+                return ERR_PTR(-ENFILE);
+        }
 
-        file->f_op    = &pfm_file_ops;
-        file->f_mode  = FMODE_READ;
         file->f_flags = O_RDONLY;
-        file->f_pos   = 0;
-
-        /*
-         * may have to delay until context is attached?
-         */
-        fd_install(fd, file);
-
-        /*
-         * the file structure we will use
-         */
-        *cfile = file;
-
-        return fd;
-out:
-        if (file) put_filp(file);
-        put_unused_fd(fd);
-        return ret;
-}
-
-static void
-pfm_free_fd(int fd, struct file *file)
-{
-        struct files_struct *files = current->files;
-        struct fdtable *fdt;
+        file->private_data = ctx;
 
-        /* 
-         * there ie no fd_uninstall(), so we do it here
-         */
-        spin_lock(&files->file_lock);
-        fdt = files_fdtable(files);
-        rcu_assign_pointer(fdt->fd[fd], NULL);
-        spin_unlock(&files->file_lock);
-
-        if (file)
-                put_filp(file);
-        put_unused_fd(fd);
+        return file;
 }
 
 static int
@@ -2475,6 +2477,7 @@ pfm_setup_buffer_fmt(struct task_struct *task, struct file *filp, pfm_context_t
 
         /* link buffer format and context */
         ctx->ctx_buf_fmt = fmt;
+        ctx->ctx_fl_is_sampling = 1; /* assume record() is defined */
 
         /*
          * check if buffer format wants to use perfmon buffer allocation/mapping service
@@ -2669,78 +2672,45 @@ pfm_context_create(pfm_context_t *ctx, void *arg, int count, struct pt_regs *reg
 {
         pfarg_context_t *req = (pfarg_context_t *)arg;
         struct file *filp;
+        struct path path;
         int ctx_flags;
+        int fd;
         int ret;
 
         /* let's check the arguments first */
         ret = pfarg_is_sane(current, req);
-        if (ret < 0) return ret;
+        if (ret < 0)
+                return ret;
 
         ctx_flags = req->ctx_flags;
 
         ret = -ENOMEM;
 
-        ctx = pfm_context_alloc();
-        if (!ctx) goto error;
+        fd = get_unused_fd();
+        if (fd < 0)
+                return fd;
 
-        ret = pfm_alloc_fd(&filp);
-        if (ret < 0) goto error_file;
+        ctx = pfm_context_alloc(ctx_flags);
+        if (!ctx)
+                goto error;
 
-        req->ctx_fd = ctx->ctx_fd = ret;
+        filp = pfm_alloc_file(ctx);
+        if (IS_ERR(filp)) {
+                ret = PTR_ERR(filp);
+                goto error_file;
+        }
 
-        /*
-         * attach context to file
-         */
-        filp->private_data = ctx;
+        req->ctx_fd = ctx->ctx_fd = fd;
 
         /*
          * does the user want to sample?
          */
         if (pfm_uuid_cmp(req->ctx_smpl_buf_id, pfm_null_uuid)) {
                 ret = pfm_setup_buffer_fmt(current, filp, ctx, ctx_flags, 0, req);
-                if (ret) goto buffer_error;
+                if (ret)
+                        goto buffer_error;
         }
 
-        /*
-         * init context protection lock
-         */
-        spin_lock_init(&ctx->ctx_lock);
-
-        /*
-         * context is unloaded
-         */
-        ctx->ctx_state = PFM_CTX_UNLOADED;
-
-        /*
-         * initialization of context's flags
-         */
-        ctx->ctx_fl_block       = (ctx_flags & PFM_FL_NOTIFY_BLOCK) ? 1 : 0;
-        ctx->ctx_fl_system      = (ctx_flags & PFM_FL_SYSTEM_WIDE) ? 1: 0;
-        ctx->ctx_fl_is_sampling = ctx->ctx_buf_fmt ? 1 : 0; /* assume record() is defined */
-        ctx->ctx_fl_no_msg      = (ctx_flags & PFM_FL_OVFL_NO_MSG) ? 1: 0;
-        /*
-         * will move to set properties
-         * ctx->ctx_fl_excl_idle   = (ctx_flags & PFM_FL_EXCL_IDLE) ? 1: 0;
-         */
-
-        /*
-         * init restart semaphore to locked
-         */
-        init_completion(&ctx->ctx_restart_done);
-
-        /*
-         * activation is used in SMP only
-         */
-        ctx->ctx_last_activation = PFM_INVALID_ACTIVATION;
-        SET_LAST_CPU(ctx, -1);
-
-        /*
-         * initialize notification message queue
-         */
-        ctx->ctx_msgq_head = ctx->ctx_msgq_tail = 0;
-        init_waitqueue_head(&ctx->ctx_msgq_wait);
-        init_waitqueue_head(&ctx->ctx_zombieq);
-
         DPRINT(("ctx=%p flags=0x%x system=%d notify_block=%d excl_idle=%d no_msg=%d ctx_fd=%d \n",
                 ctx,
                 ctx_flags,
@@ -2755,10 +2725,14 @@ pfm_context_create(pfm_context_t *ctx, void *arg, int count, struct pt_regs *reg
          */
         pfm_reset_pmu_state(ctx);
 
+        fd_install(fd, filp);
+
         return 0;
 
 buffer_error:
-        pfm_free_fd(ctx->ctx_fd, filp);
+        path = filp->f_path;
+        put_filp(filp);
+        path_put(&path);
 
         if (ctx->ctx_buf_fmt) {
                 pfm_buf_fmt_exit(ctx->ctx_buf_fmt, current, NULL, regs);
@@ -2767,6 +2741,7 @@ error_file:
         pfm_context_free(ctx);
 
 error:
+        put_unused_fd(fd);
         return ret;
 }
 
@@ -6695,16 +6670,12 @@ pfm_init(void)
         /*
          * create /proc/perfmon (mostly for debugging purposes)
          */
-        perfmon_dir = create_proc_entry("perfmon", S_IRUGO, NULL);
+        perfmon_dir = proc_create("perfmon", S_IRUGO, NULL, &pfm_proc_fops);
         if (perfmon_dir == NULL) {
                 printk(KERN_ERR "perfmon: cannot create /proc entry, perfmon disabled\n");
                 pmu_conf = NULL;
                 return -1;
         }
-        /*
-         * install customized file operations for /proc/perfmon entry
-         */
-        perfmon_dir->proc_fops = &pfm_proc_fops;
 
         /*
          * create /proc/sys/kernel/perfmon (for debugging purposes)
diff --git a/arch/ia64/kernel/process.c b/arch/ia64/kernel/process.c
index a5ea817cbcbf..58dcfac5ea88 100644
--- a/arch/ia64/kernel/process.c
+++ b/arch/ia64/kernel/process.c
@@ -183,7 +183,7 @@ do_notify_resume_user (sigset_t *unused, struct sigscratch *scr, long in_syscall
 #endif
 
         /* deal with pending signal delivery */
-        if (test_thread_flag(TIF_SIGPENDING)||test_thread_flag(TIF_RESTORE_SIGMASK))
+        if (test_thread_flag(TIF_SIGPENDING))
                 ia64_do_signal(scr, in_syscall);
 
         /* copy user rbs to kernel rbs */
diff --git a/arch/ia64/kernel/salinfo.c b/arch/ia64/kernel/salinfo.c
index b11bb50a197a..ecb9eb78d687 100644
--- a/arch/ia64/kernel/salinfo.c
+++ b/arch/ia64/kernel/salinfo.c
@@ -648,18 +648,16 @@ salinfo_init(void)
                 if (!dir)
                         continue;
 
-                entry = create_proc_entry("event", S_IRUSR, dir);
+                entry = proc_create_data("event", S_IRUSR, dir,
+                                         &salinfo_event_fops, data);
                 if (!entry)
                         continue;
-                entry->data = data;
-                entry->proc_fops = &salinfo_event_fops;
                 *sdir++ = entry;
 
-                entry = create_proc_entry("data", S_IRUSR | S_IWUSR, dir);
+                entry = proc_create_data("data", S_IRUSR | S_IWUSR, dir,
+                                         &salinfo_data_fops, data);
                 if (!entry)
                         continue;
-                entry->data = data;
-                entry->proc_fops = &salinfo_data_fops;
                 *sdir++ = entry;
 
                 /* we missed any events before now */
diff --git a/arch/ia64/kernel/signal.c b/arch/ia64/kernel/signal.c
index 5740296c35af..19c5a78636fc 100644
--- a/arch/ia64/kernel/signal.c
+++ b/arch/ia64/kernel/signal.c
@@ -464,7 +464,7 @@ ia64_do_signal (struct sigscratch *scr, long in_syscall)
         if (!user_mode(&scr->pt))
                 return;
 
-        if (test_thread_flag(TIF_RESTORE_SIGMASK))
+        if (current_thread_info()->status & TS_RESTORE_SIGMASK)
                 oldset = &current->saved_sigmask;
         else
                 oldset = &current->blocked;
@@ -530,12 +530,13 @@ ia64_do_signal (struct sigscratch *scr, long in_syscall)
                  * continue to iterate in this loop so we can deliver the SIGSEGV...
                  */
                 if (handle_signal(signr, &ka, &info, oldset, scr)) {
-                        /* a signal was successfully delivered; the saved
+                        /*
+                         * A signal was successfully delivered; the saved
                          * sigmask will have been stored in the signal frame,
                          * and will be restored by sigreturn, so we can simply
-                         * clear the TIF_RESTORE_SIGMASK flag */
-                        if (test_thread_flag(TIF_RESTORE_SIGMASK))
-                                clear_thread_flag(TIF_RESTORE_SIGMASK);
+                         * clear the TS_RESTORE_SIGMASK flag.
+                         */
+                        current_thread_info()->status &= ~TS_RESTORE_SIGMASK;
                         return;
                 }
         }
@@ -566,8 +567,8 @@ ia64_do_signal (struct sigscratch *scr, long in_syscall)
 
         /* if there's no signal to deliver, we just put the saved sigmask
          * back */
-        if (test_thread_flag(TIF_RESTORE_SIGMASK)) {
-                clear_thread_flag(TIF_RESTORE_SIGMASK);
+        if (current_thread_info()->status & TS_RESTORE_SIGMASK) {
+                current_thread_info()->status &= ~TS_RESTORE_SIGMASK;
                 sigprocmask(SIG_SETMASK, &current->saved_sigmask, NULL);
         }
 }
diff --git a/arch/ia64/kernel/smp.c b/arch/ia64/kernel/smp.c
index 9a9d4c489330..983296f1c813 100644
--- a/arch/ia64/kernel/smp.c
+++ b/arch/ia64/kernel/smp.c
@@ -98,8 +98,33 @@ unlock_ipi_calllock(void)
         spin_unlock_irq(&call_lock);
 }
 
+static inline void
+handle_call_data(void)
+{
+        struct call_data_struct *data;
+        void (*func)(void *info);
+        void *info;
+        int wait;
+
+        /* release the 'pointer lock' */
+        data = (struct call_data_struct *)call_data;
+        func = data->func;
+        info = data->info;
+        wait = data->wait;
+
+        mb();
+        atomic_inc(&data->started);
+        /* At this point the structure may be gone unless wait is true. */
+        (*func)(info);
+
+        /* Notify the sending CPU that the task is done. */
+        mb();
+        if (wait)
+                atomic_inc(&data->finished);
+}
+
 static void
-stop_this_cpu (void)
+stop_this_cpu(void)
 {
         /*
          * Remove this CPU:
@@ -138,44 +163,21 @@ handle_IPI (int irq, void *dev_id)
                         ops &= ~(1 << which);
 
                         switch (which) {
-                              case IPI_CALL_FUNC:
-                              {
-                                      struct call_data_struct *data;
-                                      void (*func)(void *info);
-                                      void *info;
-                                      int wait;
-
-                                      /* release the 'pointer lock' */
-                                      data = (struct call_data_struct *) call_data;
-                                      func = data->func;
-                                      info = data->info;
-                                      wait = data->wait;
-
-                                      mb();
-                                      atomic_inc(&data->started);
-                                      /*
-                                       * At this point the structure may be gone unless
-                                       * wait is true.
-                                       */
-                                      (*func)(info);
-
-                                      /* Notify the sending CPU that the task is done.  */
-                                      mb();
-                                      if (wait)
-                                              atomic_inc(&data->finished);
-                              }
-                              break;
-
-                              case IPI_CPU_STOP:
+                        case IPI_CALL_FUNC:
+                                handle_call_data();
+                                break;
+
+                        case IPI_CPU_STOP:
                                 stop_this_cpu();
                                 break;
 #ifdef CONFIG_KEXEC
-                              case IPI_KDUMP_CPU_STOP:
+                        case IPI_KDUMP_CPU_STOP:
                                 unw_init_running(kdump_cpu_freeze, NULL);
                                 break;
 #endif
-                              default:
-                                printk(KERN_CRIT "Unknown IPI on CPU %d: %lu\n", this_cpu, which);
+                        default:
+                                printk(KERN_CRIT "Unknown IPI on CPU %d: %lu\n",
+                                                this_cpu, which);
                                 break;
                         }
                 } while (ops);
diff --git a/arch/ia64/kernel/smpboot.c b/arch/ia64/kernel/smpboot.c
index 16483be18c0b..d7ad42b77d41 100644
--- a/arch/ia64/kernel/smpboot.c
+++ b/arch/ia64/kernel/smpboot.c
@@ -873,7 +873,8 @@ identify_siblings(struct cpuinfo_ia64 *c)
         u16 pltid;
         pal_logical_to_physical_t info;
 
-        if ((status = ia64_pal_logical_to_phys(-1, &info)) != PAL_STATUS_SUCCESS) {
+        status = ia64_pal_logical_to_phys(-1, &info);
+        if (status != PAL_STATUS_SUCCESS) {
                 if (status != PAL_STATUS_UNIMPLEMENTED) {
                         printk(KERN_ERR
                                 "ia64_pal_logical_to_phys failed with %ld\n",
@@ -885,8 +886,13 @@ identify_siblings(struct cpuinfo_ia64 *c)
                 info.overview_cpp  = 1;
                 info.overview_tpc  = 1;
         }
-        if ((status = ia64_sal_physical_id_info(&pltid)) != PAL_STATUS_SUCCESS) {
-                printk(KERN_ERR "ia64_sal_pltid failed with %ld\n", status);
+
+        status = ia64_sal_physical_id_info(&pltid);
+        if (status != PAL_STATUS_SUCCESS) {
+                if (status != PAL_STATUS_UNIMPLEMENTED)
+                        printk(KERN_ERR
+                                "ia64_sal_pltid failed with %ld\n",
+                                status);
                 return;
         }
 
diff --git a/arch/ia64/kernel/time.c b/arch/ia64/kernel/time.c
index 48e15a51782f..8c73643f2d66 100644
--- a/arch/ia64/kernel/time.c
+++ b/arch/ia64/kernel/time.c
@@ -379,11 +379,6 @@ static struct irqaction timer_irqaction = {
         .name =         "timer"
 };
 
-void __devinit ia64_disable_timer(void)
-{
-        ia64_set_itv(1 << 16);
-}
-
 void __init
 time_init (void)
 {
diff --git a/arch/ia64/kernel/topology.c b/arch/ia64/kernel/topology.c
index a2484fc1a06c..26228e2d01ae 100644
--- a/arch/ia64/kernel/topology.c
+++ b/arch/ia64/kernel/topology.c
@@ -27,9 +27,20 @@
 
 static struct ia64_cpu *sysfs_cpus;
 
-int arch_register_cpu(int num)
+void arch_fix_phys_package_id(int num, u32 slot)
 {
-#if defined (CONFIG_ACPI) && defined (CONFIG_HOTPLUG_CPU)
+#ifdef CONFIG_SMP
+        if (cpu_data(num)->socket_id == -1)
+                cpu_data(num)->socket_id = slot;
+#endif
+}
+EXPORT_SYMBOL_GPL(arch_fix_phys_package_id);
+
+
+#ifdef CONFIG_HOTPLUG_CPU
+int __ref arch_register_cpu(int num)
+{
+#ifdef CONFIG_ACPI
         /*
          * If CPEI can be re-targetted or if this is not
          * CPEI target, then it is hotpluggable
@@ -38,19 +49,21 @@ int arch_register_cpu(int num)
                 sysfs_cpus[num].cpu.hotpluggable = 1;
         map_cpu_to_node(num, node_cpuid[num].nid);
 #endif
-
         return register_cpu(&sysfs_cpus[num].cpu, num);
 }
-
-#ifdef CONFIG_HOTPLUG_CPU
+EXPORT_SYMBOL(arch_register_cpu);
 
 void arch_unregister_cpu(int num)
 {
         unregister_cpu(&sysfs_cpus[num].cpu);
         unmap_cpu_from_node(num, cpu_to_node(num));
 }
-EXPORT_SYMBOL(arch_register_cpu);
 EXPORT_SYMBOL(arch_unregister_cpu);
+#else
+static int __init arch_register_cpu(int num)
+{
+        return register_cpu(&sysfs_cpus[num].cpu, num);
+}
 #endif /*CONFIG_HOTPLUG_CPU*/
 
 
diff --git a/arch/ia64/kernel/uncached.c b/arch/ia64/kernel/uncached.c
index 2a90c32024f4..e77995a6e3ed 100644
--- a/arch/ia64/kernel/uncached.c
+++ b/arch/ia64/kernel/uncached.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2001-2006 Silicon Graphics, Inc.  All rights reserved.
+ * Copyright (C) 2001-2008 Silicon Graphics, Inc.  All rights reserved.
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of version 2 of the GNU General Public License
@@ -177,12 +177,13 @@ failed:
  * uncached_alloc_page
  *
  * @starting_nid: node id of node to start with, or -1
+ * @n_pages: number of contiguous pages to allocate
  *
- * Allocate 1 uncached page. Allocates on the requested node. If no
- * uncached pages are available on the requested node, roundrobin starting
- * with the next higher node.
+ * Allocate the specified number of contiguous uncached pages on the
+ * the requested node. If not enough contiguous uncached pages are available
+ * on the requested node, roundrobin starting with the next higher node.
  */
-unsigned long uncached_alloc_page(int starting_nid)
+unsigned long uncached_alloc_page(int starting_nid, int n_pages)
 {
         unsigned long uc_addr;
         struct uncached_pool *uc_pool;
@@ -202,7 +203,8 @@ unsigned long uncached_alloc_page(int starting_nid)
                 if (uc_pool->pool == NULL)
                         continue;
                 do {
-                        uc_addr = gen_pool_alloc(uc_pool->pool, PAGE_SIZE);
+                        uc_addr = gen_pool_alloc(uc_pool->pool,
+                                                 n_pages * PAGE_SIZE);
                         if (uc_addr != 0)
                                 return uc_addr;
                 } while (uncached_add_chunk(uc_pool, nid) == 0);
@@ -217,11 +219,12 @@ EXPORT_SYMBOL(uncached_alloc_page);
 /*
  * uncached_free_page
  *
- * @uc_addr: uncached address of page to free
+ * @uc_addr: uncached address of first page to free
+ * @n_pages: number of contiguous pages to free
  *
- * Free a single uncached page.
+ * Free the specified number of uncached pages.
  */
-void uncached_free_page(unsigned long uc_addr)
+void uncached_free_page(unsigned long uc_addr, int n_pages)
 {
         int nid = paddr_to_nid(uc_addr - __IA64_UNCACHED_OFFSET);
         struct gen_pool *pool = uncached_pools[nid].pool;
@@ -232,7 +235,7 @@ void uncached_free_page(unsigned long uc_addr)
         if ((uc_addr & (0XFUL << 60)) != __IA64_UNCACHED_OFFSET)
                 panic("uncached_free_page invalid address %lx\n", uc_addr);
 
-        gen_pool_free(pool, uc_addr, PAGE_SIZE);
+        gen_pool_free(pool, uc_addr, n_pages * PAGE_SIZE);
 }
 EXPORT_SYMBOL(uncached_free_page);
 
diff --git a/arch/ia64/kvm/kvm-ia64.c b/arch/ia64/kvm/kvm-ia64.c
index 6df073240135..318b81100623 100644
--- a/arch/ia64/kvm/kvm-ia64.c
+++ b/arch/ia64/kvm/kvm-ia64.c
@@ -1,4 +1,3 @@
-
 /*
  * kvm_ia64.c: Basic KVM suppport On Itanium series processors
  *
@@ -431,7 +430,7 @@ int kvm_emulate_halt(struct kvm_vcpu *vcpu)
         if (itc_diff < 0)
                 itc_diff = -itc_diff;
 
-        expires = div64_64(itc_diff, cyc_per_usec);
+        expires = div64_u64(itc_diff, cyc_per_usec);
         kt = ktime_set(0, 1000 * expires);
         vcpu->arch.ht_active = 1;
         hrtimer_start(p_ht, kt, HRTIMER_MODE_ABS);
diff --git a/arch/ia64/mm/tlb.c b/arch/ia64/mm/tlb.c
index d52ec4e83409..8caf42471f0d 100644
--- a/arch/ia64/mm/tlb.c
+++ b/arch/ia64/mm/tlb.c
@@ -168,7 +168,10 @@ setup_ptcg_sem(int max_purges, int nptcg_from)
         static int firstcpu = 1;
 
         if (toolatetochangeptcgsem) {
-                BUG_ON(max_purges < nptcg);
+                if (nptcg_from == NPTCG_FROM_PAL && max_purges == 0)
+                        BUG_ON(1 < nptcg);
+                else
+                        BUG_ON(max_purges < nptcg);
                 return;
         }
 
diff --git a/arch/ia64/sn/kernel/sn2/sn2_smp.c b/arch/ia64/sn/kernel/sn2/sn2_smp.c
index dfc6bf1c7b41..49d3120415eb 100644
--- a/arch/ia64/sn/kernel/sn2/sn2_smp.c
+++ b/arch/ia64/sn/kernel/sn2/sn2_smp.c
@@ -550,11 +550,12 @@ static int __init sn2_ptc_init(void)
         if (!ia64_platform_is("sn2"))
                 return 0;
 
-        if (!(proc_sn2_ptc = create_proc_entry(PTC_BASENAME, 0444, NULL))) {
+        proc_sn2_ptc = proc_create(PTC_BASENAME, 0444,
+                                   NULL, &proc_sn2_ptc_operations);
+        if (!&proc_sn2_ptc_operations) {
                 printk(KERN_ERR "unable to create %s proc entry", PTC_BASENAME);
                 return -EINVAL;
         }
-        proc_sn2_ptc->proc_fops = &proc_sn2_ptc_operations;
         spin_lock_init(&sn2_global_ptc_lock);
         return 0;
 }
diff --git a/arch/ia64/sn/kernel/sn2/sn_proc_fs.c b/arch/ia64/sn/kernel/sn2/sn_proc_fs.c
index 62b3e9a496ac..2526e5c783a4 100644
--- a/arch/ia64/sn/kernel/sn2/sn_proc_fs.c
+++ b/arch/ia64/sn/kernel/sn2/sn_proc_fs.c
@@ -139,30 +139,21 @@ static const struct file_operations proc_sn_topo_fops = {
 void register_sn_procfs(void)
 {
         static struct proc_dir_entry *sgi_proc_dir = NULL;
-        struct proc_dir_entry *pde;
 
         BUG_ON(sgi_proc_dir != NULL);
         if (!(sgi_proc_dir = proc_mkdir("sgi_sn", NULL)))
                 return;
 
-        pde = create_proc_entry("partition_id", 0444, sgi_proc_dir);
-        if (pde)
-                pde->proc_fops = &proc_partition_id_fops;
-        pde = create_proc_entry("system_serial_number", 0444, sgi_proc_dir);
-        if (pde)
-                pde->proc_fops = &proc_system_sn_fops;
-        pde = create_proc_entry("licenseID", 0444, sgi_proc_dir);
-        if (pde)
-                pde->proc_fops = &proc_license_id_fops;
-        pde = create_proc_entry("sn_force_interrupt", 0644, sgi_proc_dir);
-        if (pde)
-                pde->proc_fops = &proc_sn_force_intr_fops;
-        pde = create_proc_entry("coherence_id", 0444, sgi_proc_dir);
-        if (pde)
-                pde->proc_fops = &proc_coherence_id_fops;
-        pde = create_proc_entry("sn_topology", 0444, sgi_proc_dir);
-        if (pde)
-                pde->proc_fops = &proc_sn_topo_fops;
+        proc_create("partition_id", 0444, sgi_proc_dir,
+                    &proc_partition_id_fops);
+        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);
 }
 
 #endif /* CONFIG_PROC_FS */
diff --git a/arch/ia64/sn/pci/pci_dma.c b/arch/ia64/sn/pci/pci_dma.c
index 18b94b792d54..52175af299a0 100644
--- a/arch/ia64/sn/pci/pci_dma.c
+++ b/arch/ia64/sn/pci/pci_dma.c
@@ -10,6 +10,7 @@
  */
 
 #include <linux/module.h>
+#include <linux/dma-attrs.h>
 #include <asm/dma.h>
 #include <asm/sn/intr.h>
 #include <asm/sn/pcibus_provider_defs.h>
@@ -149,11 +150,12 @@ void sn_dma_free_coherent(struct device *dev, size_t size, void *cpu_addr,
 EXPORT_SYMBOL(sn_dma_free_coherent);
 
 /**
- * sn_dma_map_single - map a single page for DMA
+ * sn_dma_map_single_attrs - map a single page for DMA
  * @dev: device to map for
  * @cpu_addr: kernel virtual address of the region to map
  * @size: size of the region
  * @direction: DMA direction
+ * @attrs: optional dma attributes
  *
  * Map the region pointed to by @cpu_addr for DMA and return the
  * DMA address.
@@ -163,42 +165,59 @@ EXPORT_SYMBOL(sn_dma_free_coherent);
  * no way of saving the dmamap handle from the alloc to later free
  * (which is pretty much unacceptable).
  *
+ * mappings with the DMA_ATTR_WRITE_BARRIER get mapped with
+ * dma_map_consistent() so that writes force a flush of pending DMA.
+ * (See "SGI Altix Architecture Considerations for Linux Device Drivers",
+ * Document Number: 007-4763-001)
+ *
  * TODO: simplify our interface;
  *       figure out how to save dmamap handle so can use two step.
  */
-dma_addr_t sn_dma_map_single(struct device *dev, void *cpu_addr, size_t size,
-                             int direction)
+dma_addr_t sn_dma_map_single_attrs(struct device *dev, void *cpu_addr,
+                                   size_t size, int direction,
+                                   struct dma_attrs *attrs)
 {
         dma_addr_t dma_addr;
         unsigned long phys_addr;
         struct pci_dev *pdev = to_pci_dev(dev);
         struct sn_pcibus_provider *provider = SN_PCIDEV_BUSPROVIDER(pdev);
+        int dmabarr;
+
+        dmabarr = dma_get_attr(DMA_ATTR_WRITE_BARRIER, attrs);
 
         BUG_ON(dev->bus != &pci_bus_type);
 
         phys_addr = __pa(cpu_addr);
-        dma_addr = provider->dma_map(pdev, phys_addr, size, SN_DMA_ADDR_PHYS);
+        if (dmabarr)
+                dma_addr = provider->dma_map_consistent(pdev, phys_addr,
+                                                        size, SN_DMA_ADDR_PHYS);
+        else
+                dma_addr = provider->dma_map(pdev, phys_addr, size,
+                                             SN_DMA_ADDR_PHYS);
+
         if (!dma_addr) {
                 printk(KERN_ERR "%s: out of ATEs\n", __func__);
                 return 0;
         }
         return dma_addr;
 }
-EXPORT_SYMBOL(sn_dma_map_single);
+EXPORT_SYMBOL(sn_dma_map_single_attrs);
 
 /**
- * sn_dma_unmap_single - unamp a DMA mapped page
+ * sn_dma_unmap_single_attrs - unamp a DMA mapped page
  * @dev: device to sync
  * @dma_addr: DMA address to sync
  * @size: size of region
  * @direction: DMA direction
+ * @attrs: optional dma attributes
  *
  * This routine is supposed to sync the DMA region specified
  * by @dma_handle into the coherence domain.  On SN, we're always cache
  * coherent, so we just need to free any ATEs associated with this mapping.
  */
-void sn_dma_unmap_single(struct device *dev, dma_addr_t dma_addr, size_t size,
-                         int direction)
+void sn_dma_unmap_single_attrs(struct device *dev, dma_addr_t dma_addr,
+                               size_t size, int direction,
+                               struct dma_attrs *attrs)
 {
         struct pci_dev *pdev = to_pci_dev(dev);
         struct sn_pcibus_provider *provider = SN_PCIDEV_BUSPROVIDER(pdev);
@@ -207,19 +226,21 @@ void sn_dma_unmap_single(struct device *dev, dma_addr_t dma_addr, size_t size,
 
         provider->dma_unmap(pdev, dma_addr, direction);
 }
-EXPORT_SYMBOL(sn_dma_unmap_single);
+EXPORT_SYMBOL(sn_dma_unmap_single_attrs);
 
 /**
- * sn_dma_unmap_sg - unmap a DMA scatterlist
+ * sn_dma_unmap_sg_attrs - unmap a DMA scatterlist
  * @dev: device to unmap
  * @sg: scatterlist to unmap
  * @nhwentries: number of scatterlist entries
  * @direction: DMA direction
+ * @attrs: optional dma attributes
  *
  * Unmap a set of streaming mode DMA translations.
  */
-void sn_dma_unmap_sg(struct device *dev, struct scatterlist *sgl,
-                     int nhwentries, int direction)
+void sn_dma_unmap_sg_attrs(struct device *dev, struct scatterlist *sgl,
+                           int nhwentries, int direction,
+                           struct dma_attrs *attrs)
 {
         int i;
         struct pci_dev *pdev = to_pci_dev(dev);
@@ -234,25 +255,34 @@ void sn_dma_unmap_sg(struct device *dev, struct scatterlist *sgl,
                 sg->dma_length = 0;
         }
 }
-EXPORT_SYMBOL(sn_dma_unmap_sg);
+EXPORT_SYMBOL(sn_dma_unmap_sg_attrs);
 
 /**
- * sn_dma_map_sg - map a scatterlist for DMA
+ * sn_dma_map_sg_attrs - map a scatterlist for DMA
  * @dev: device to map for
  * @sg: scatterlist to map
  * @nhwentries: number of entries
  * @direction: direction of the DMA transaction
+ * @attrs: optional dma attributes
+ *
+ * mappings with the DMA_ATTR_WRITE_BARRIER get mapped with
+ * dma_map_consistent() so that writes force a flush of pending DMA.
+ * (See "SGI Altix Architecture Considerations for Linux Device Drivers",
+ * Document Number: 007-4763-001)
  *
  * Maps each entry of @sg for DMA.
  */
-int sn_dma_map_sg(struct device *dev, struct scatterlist *sgl, int nhwentries,
-                  int direction)
+int sn_dma_map_sg_attrs(struct device *dev, struct scatterlist *sgl,
+                        int nhwentries, int direction, struct dma_attrs *attrs)
 {
         unsigned long phys_addr;
         struct scatterlist *saved_sg = sgl, *sg;
         struct pci_dev *pdev = to_pci_dev(dev);
         struct sn_pcibus_provider *provider = SN_PCIDEV_BUSPROVIDER(pdev);
         int i;
+        int dmabarr;
+
+        dmabarr = dma_get_attr(DMA_ATTR_WRITE_BARRIER, attrs);
 
         BUG_ON(dev->bus != &pci_bus_type);
 
@@ -260,11 +290,19 @@ int sn_dma_map_sg(struct device *dev, struct scatterlist *sgl, int nhwentries,
          * Setup a DMA address for each entry in the scatterlist.
          */
         for_each_sg(sgl, sg, nhwentries, i) {
+                dma_addr_t dma_addr;
                 phys_addr = SG_ENT_PHYS_ADDRESS(sg);
-                sg->dma_address = provider->dma_map(pdev,
-                                                    phys_addr, sg->length,
-                                                    SN_DMA_ADDR_PHYS);
+                if (dmabarr)
+                        dma_addr = provider->dma_map_consistent(pdev,
+                                                                phys_addr,
+                                                                sg->length,
+                                                                SN_DMA_ADDR_PHYS);
+                else
+                        dma_addr = provider->dma_map(pdev, phys_addr,
+                                                     sg->length,
+                                                     SN_DMA_ADDR_PHYS);
 
+                sg->dma_address = dma_addr;
                 if (!sg->dma_address) {
                         printk(KERN_ERR "%s: out of ATEs\n", __func__);
 
@@ -272,7 +310,8 @@ int sn_dma_map_sg(struct device *dev, struct scatterlist *sgl, int nhwentries,
                          * Free any successfully allocated entries.
                          */
                         if (i > 0)
-                                sn_dma_unmap_sg(dev, saved_sg, i, direction);
+                                sn_dma_unmap_sg_attrs(dev, saved_sg, i,
+                                                      direction, attrs);
                         return 0;
                 }
 
@@ -281,7 +320,7 @@ int sn_dma_map_sg(struct device *dev, struct scatterlist *sgl, int nhwentries,
 
         return nhwentries;
 }
-EXPORT_SYMBOL(sn_dma_map_sg);
+EXPORT_SYMBOL(sn_dma_map_sg_attrs);
 
 void sn_dma_sync_single_for_cpu(struct device *dev, dma_addr_t dma_handle,
                                 size_t size, int direction)
diff --git a/arch/m32r/Makefile b/arch/m32r/Makefile
index 4072a07ebf8e..469766b24e22 100644
--- a/arch/m32r/Makefile
+++ b/arch/m32r/Makefile
@@ -5,6 +5,8 @@
 # architecture-specific flags and dependencies.
 #
 
+KBUILD_DEFCONFIG := m32700ut.smp_defconfig
+
 LDFLAGS         :=
 OBJCOPYFLAGS    := -O binary -R .note -R .comment -S
 LDFLAGS_vmlinux :=
diff --git a/arch/m32r/defconfig b/arch/m32r/defconfig
deleted file mode 100644
index af3b98179113..000000000000
--- a/arch/m32r/defconfig
+++ /dev/null
@@ -1,863 +0,0 @@
-#
-# Automatically generated make config: don't edit
-# Linux kernel version: 2.6.23-rc1
-# Wed Aug  1 17:22:35 2007
-#
-CONFIG_M32R=y
-CONFIG_GENERIC_ISA_DMA=y
-CONFIG_ZONE_DMA=y
-CONFIG_GENERIC_HARDIRQS=y
-CONFIG_GENERIC_IRQ_PROBE=y
-CONFIG_NO_IOPORT=y
-CONFIG_NO_DMA=y
-CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
-
-#
-# Code maturity level options
-#
-CONFIG_EXPERIMENTAL=y
-CONFIG_LOCK_KERNEL=y
-CONFIG_INIT_ENV_ARG_LIMIT=32
-
-#
-# General setup
-#
-CONFIG_LOCALVERSION=""
-CONFIG_LOCALVERSION_AUTO=y
-CONFIG_SWAP=y
-CONFIG_SYSVIPC=y
-CONFIG_SYSVIPC_SYSCTL=y
-# CONFIG_POSIX_MQUEUE is not set
-CONFIG_BSD_PROCESS_ACCT=y
-# CONFIG_BSD_PROCESS_ACCT_V3 is not set
-# CONFIG_TASKSTATS is not set
-# CONFIG_USER_NS is not set
-# CONFIG_AUDIT is not set
-CONFIG_IKCONFIG=y
-CONFIG_IKCONFIG_PROC=y
-CONFIG_LOG_BUF_SHIFT=15
-# CONFIG_CPUSETS is not set
-CONFIG_SYSFS_DEPRECATED=y
-# CONFIG_RELAY is not set
-# CONFIG_BLK_DEV_INITRD is not set
-# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
-CONFIG_SYSCTL=y
-CONFIG_EMBEDDED=y
-CONFIG_SYSCTL_SYSCALL=y
-# CONFIG_KALLSYMS is not set
-CONFIG_HOTPLUG=y
-CONFIG_PRINTK=y
-CONFIG_BUG=y
-CONFIG_ELF_CORE=y
-CONFIG_BASE_FULL=y
-# CONFIG_FUTEX is not set
-CONFIG_ANON_INODES=y
-# CONFIG_EPOLL is not set
-CONFIG_SIGNALFD=y
-CONFIG_TIMERFD=y
-CONFIG_EVENTFD=y
-CONFIG_SHMEM=y
-CONFIG_VM_EVENT_COUNTERS=y
-CONFIG_SLAB=y
-# CONFIG_SLUB is not set
-# CONFIG_SLOB is not set
-# CONFIG_TINY_SHMEM is not set
-CONFIG_BASE_SMALL=0
-CONFIG_MODULES=y
-CONFIG_MODULE_UNLOAD=y
-# CONFIG_MODULE_FORCE_UNLOAD is not set
-# CONFIG_MODVERSIONS is not set
-# CONFIG_MODULE_SRCVERSION_ALL is not set
-CONFIG_KMOD=y
-CONFIG_STOP_MACHINE=y
-CONFIG_BLOCK=y
-# CONFIG_LBD is not set
-# CONFIG_BLK_DEV_IO_TRACE is not set
-# CONFIG_LSF is not set
-# CONFIG_BLK_DEV_BSG is not set
-
-#
-# IO Schedulers
-#
-CONFIG_IOSCHED_NOOP=y
-# CONFIG_IOSCHED_AS is not set
-CONFIG_IOSCHED_DEADLINE=y
-CONFIG_IOSCHED_CFQ=y
-# CONFIG_DEFAULT_AS is not set
-# CONFIG_DEFAULT_DEADLINE is not set
-CONFIG_DEFAULT_CFQ=y
-# CONFIG_DEFAULT_NOOP is not set
-CONFIG_DEFAULT_IOSCHED="cfq"
-
-#
-# Processor type and features
-#
-# CONFIG_PLAT_MAPPI is not set
-# CONFIG_PLAT_USRV is not set
-CONFIG_PLAT_M32700UT=y
-# CONFIG_PLAT_OPSPUT is not set
-# CONFIG_PLAT_OAKS32R is not set
-# CONFIG_PLAT_MAPPI2 is not set
-# CONFIG_PLAT_MAPPI3 is not set
-# CONFIG_PLAT_M32104UT is not set
-CONFIG_CHIP_M32700=y
-# CONFIG_CHIP_M32102 is not set
-# CONFIG_CHIP_M32104 is not set
-# CONFIG_CHIP_VDEC2 is not set
-# CONFIG_CHIP_OPSP is not set
-CONFIG_MMU=y
-CONFIG_TLB_ENTRIES=32
-CONFIG_ISA_M32R2=y
-CONFIG_ISA_DSP_LEVEL2=y
-CONFIG_ISA_DUAL_ISSUE=y
-CONFIG_BUS_CLOCK=50000000
-CONFIG_TIMER_DIVIDE=128
-# CONFIG_CPU_LITTLE_ENDIAN is not set
-CONFIG_MEMORY_START=0x08000000
-CONFIG_MEMORY_SIZE=0x01000000
-CONFIG_NOHIGHMEM=y
-CONFIG_ARCH_DISCONTIGMEM_ENABLE=y
-CONFIG_SELECT_MEMORY_MODEL=y
-# CONFIG_FLATMEM_MANUAL is not set
-CONFIG_DISCONTIGMEM_MANUAL=y
-# CONFIG_SPARSEMEM_MANUAL is not set
-CONFIG_DISCONTIGMEM=y
-CONFIG_FLAT_NODE_MEM_MAP=y
-CONFIG_NEED_MULTIPLE_NODES=y
-# CONFIG_SPARSEMEM_STATIC is not set
-CONFIG_SPLIT_PTLOCK_CPUS=4
-# CONFIG_RESOURCES_64BIT is not set
-CONFIG_ZONE_DMA_FLAG=1
-CONFIG_BOUNCE=y
-CONFIG_VIRT_TO_BUS=y
-CONFIG_IRAM_START=0x00f00000
-CONFIG_IRAM_SIZE=0x00080000
-CONFIG_RWSEM_GENERIC_SPINLOCK=y
-# CONFIG_RWSEM_XCHGADD_ALGORITHM is not set
-# CONFIG_ARCH_HAS_ILOG2_U32 is not set
-# CONFIG_ARCH_HAS_ILOG2_U64 is not set
-CONFIG_GENERIC_FIND_NEXT_BIT=y
-CONFIG_GENERIC_HWEIGHT=y
-CONFIG_GENERIC_CALIBRATE_DELAY=y
-CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
-CONFIG_PREEMPT=y
-CONFIG_SMP=y
-# CONFIG_CHIP_M32700_TS1 is not set
-CONFIG_NR_CPUS=2
-CONFIG_NODES_SHIFT=1
-
-#
-# Bus options (PCI, PCMCIA, EISA, MCA, ISA)
-#
-# CONFIG_ARCH_SUPPORTS_MSI is not set
-# CONFIG_ISA is not set
-
-#
-# PCCARD (PCMCIA/CardBus) support
-#
-# CONFIG_PCCARD is not set
-
-#
-# Executable file formats
-#
-CONFIG_BINFMT_ELF=y
-# CONFIG_BINFMT_MISC is not set
-
-#
-# Networking
-#
-CONFIG_NET=y
-
-#
-# Networking options
-#
-CONFIG_PACKET=y
-# CONFIG_PACKET_MMAP is not set
-CONFIG_UNIX=y
-CONFIG_XFRM=y
-# CONFIG_XFRM_USER is not set
-# CONFIG_XFRM_SUB_POLICY is not set
-# CONFIG_XFRM_MIGRATE is not set
-# CONFIG_NET_KEY is not set
-CONFIG_INET=y
-# CONFIG_IP_MULTICAST is not set
-# CONFIG_IP_ADVANCED_ROUTER is not set
-CONFIG_IP_FIB_HASH=y
-CONFIG_IP_PNP=y
-CONFIG_IP_PNP_DHCP=y
-# CONFIG_IP_PNP_BOOTP is not set
-# CONFIG_IP_PNP_RARP is not set
-# CONFIG_NET_IPIP is not set
-# CONFIG_NET_IPGRE is not set
-# CONFIG_ARPD is not set
-# CONFIG_SYN_COOKIES is not set
-# CONFIG_INET_AH is not set
-# CONFIG_INET_ESP is not set
-# CONFIG_INET_IPCOMP is not set
-# CONFIG_INET_XFRM_TUNNEL is not set
-# CONFIG_INET_TUNNEL is not set
-CONFIG_INET_XFRM_MODE_TRANSPORT=y
-CONFIG_INET_XFRM_MODE_TUNNEL=y
-CONFIG_INET_XFRM_MODE_BEET=y
-CONFIG_INET_DIAG=y
-CONFIG_INET_TCP_DIAG=y
-# CONFIG_TCP_CONG_ADVANCED is not set
-CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
-# CONFIG_TCP_MD5SIG is not set
-# CONFIG_IPV6 is not set
-# CONFIG_INET6_XFRM_TUNNEL is not set
-# CONFIG_INET6_TUNNEL is not set
-# CONFIG_NETWORK_SECMARK is not set
-# CONFIG_NETFILTER is not set
-# CONFIG_IP_DCCP is not set
-# CONFIG_IP_SCTP is not set
-# CONFIG_TIPC is not set
-# CONFIG_ATM is not set
-# CONFIG_BRIDGE is not set
-# CONFIG_VLAN_8021Q is not set
-# CONFIG_DECNET is not set
-# CONFIG_LLC2 is not set
-# CONFIG_IPX is not set
-# CONFIG_ATALK is not set
-# CONFIG_X25 is not set
-# CONFIG_LAPB is not set
-# CONFIG_ECONET is not set
-# CONFIG_WAN_ROUTER is not set
-
-#
-# QoS and/or fair queueing
-#
-# CONFIG_NET_SCHED is not set
-
-#
-# Network testing
-#
-# CONFIG_NET_PKTGEN is not set
-# CONFIG_HAMRADIO is not set
-# CONFIG_IRDA is not set
-# CONFIG_BT is not set
-# CONFIG_AF_RXRPC is not set
-
-#
-# Wireless
-#
-# CONFIG_CFG80211 is not set
-# CONFIG_WIRELESS_EXT is not set
-# CONFIG_MAC80211 is not set
-# CONFIG_IEEE80211 is not set
-# CONFIG_RFKILL is not set
-# CONFIG_NET_9P is not set
-
-#
-# Device Drivers
-#
-
-#
-# Generic Driver Options
-#
-CONFIG_STANDALONE=y
-CONFIG_PREVENT_FIRMWARE_BUILD=y
-CONFIG_FW_LOADER=y
-# CONFIG_SYS_HYPERVISOR is not set
-# CONFIG_CONNECTOR is not set
-CONFIG_MTD=y
-# CONFIG_MTD_DEBUG is not set
-# CONFIG_MTD_CONCAT is not set
-CONFIG_MTD_PARTITIONS=y
-CONFIG_MTD_REDBOOT_PARTS=y
-CONFIG_MTD_REDBOOT_DIRECTORY_BLOCK=-1
-# CONFIG_MTD_REDBOOT_PARTS_UNALLOCATED is not set
-# CONFIG_MTD_REDBOOT_PARTS_READONLY is not set
-# CONFIG_MTD_CMDLINE_PARTS is not set
-
-#
-# User Modules And Translation Layers
-#
-# CONFIG_MTD_CHAR is not set
-CONFIG_MTD_BLKDEVS=y
-CONFIG_MTD_BLOCK=y
-# CONFIG_FTL is not set
-# CONFIG_NFTL is not set
-# CONFIG_INFTL is not set
-# CONFIG_RFD_FTL is not set
-# CONFIG_SSFDC is not set
-
-#
-# RAM/ROM/Flash chip drivers
-#
-CONFIG_MTD_CFI=m
-CONFIG_MTD_JEDECPROBE=m
-CONFIG_MTD_GEN_PROBE=m
-CONFIG_MTD_CFI_ADV_OPTIONS=y
-# CONFIG_MTD_CFI_NOSWAP is not set
-CONFIG_MTD_CFI_BE_BYTE_SWAP=y
-# CONFIG_MTD_CFI_LE_BYTE_SWAP is not set
-CONFIG_MTD_CFI_GEOMETRY=y
-CONFIG_MTD_MAP_BANK_WIDTH_1=y
-CONFIG_MTD_MAP_BANK_WIDTH_2=y
-CONFIG_MTD_MAP_BANK_WIDTH_4=y
-# CONFIG_MTD_MAP_BANK_WIDTH_8 is not set
-# CONFIG_MTD_MAP_BANK_WIDTH_16 is not set
-# CONFIG_MTD_MAP_BANK_WIDTH_32 is not set
-CONFIG_MTD_CFI_I1=y
-# CONFIG_MTD_CFI_I2 is not set
-# CONFIG_MTD_CFI_I4 is not set
-# CONFIG_MTD_CFI_I8 is not set
-# CONFIG_MTD_OTP is not set
-# CONFIG_MTD_CFI_INTELEXT is not set
-CONFIG_MTD_CFI_AMDSTD=m
-# CONFIG_MTD_CFI_STAA is not set
-CONFIG_MTD_CFI_UTIL=m
-# CONFIG_MTD_RAM is not set
-# CONFIG_MTD_ROM is not set
-# CONFIG_MTD_ABSENT is not set
-
-#
-# Mapping drivers for chip access
-#
-# CONFIG_MTD_COMPLEX_MAPPINGS is not set
-# CONFIG_MTD_PHYSMAP is not set
-# CONFIG_MTD_PLATRAM is not set
-
-#
-# Self-contained MTD device drivers
-#
-# CONFIG_MTD_SLRAM is not set
-# CONFIG_MTD_PHRAM is not set
-# CONFIG_MTD_MTDRAM is not set
-# CONFIG_MTD_BLOCK2MTD is not set
-
-#
-# Disk-On-Chip Device Drivers
-#
-# CONFIG_MTD_DOC2000 is not set
-# CONFIG_MTD_DOC2001 is not set
-# CONFIG_MTD_DOC2001PLUS is not set
-# CONFIG_MTD_NAND is not set
-# CONFIG_MTD_ONENAND is not set
-
-#
-# UBI - Unsorted block images
-#
-# CONFIG_MTD_UBI is not set
-# CONFIG_PARPORT is not set
-CONFIG_BLK_DEV=y
-# CONFIG_BLK_DEV_COW_COMMON is not set
-CONFIG_BLK_DEV_LOOP=y
-# CONFIG_BLK_DEV_CRYPTOLOOP is not set
-CONFIG_BLK_DEV_NBD=y
-CONFIG_BLK_DEV_RAM=y
-CONFIG_BLK_DEV_RAM_COUNT=16
-CONFIG_BLK_DEV_RAM_SIZE=4096
-CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
-# CONFIG_CDROM_PKTCDVD is not set
-CONFIG_ATA_OVER_ETH=m
-CONFIG_MISC_DEVICES=y
-# CONFIG_EEPROM_93CX6 is not set
-CONFIG_IDE=y
-CONFIG_IDE_MAX_HWIFS=4
-CONFIG_BLK_DEV_IDE=y
-
-#
-# Please see Documentation/ide.txt for help/info on IDE drives
-#
-# CONFIG_BLK_DEV_IDE_SATA is not set
-CONFIG_BLK_DEV_IDEDISK=y
-# CONFIG_IDEDISK_MULTI_MODE is not set
-CONFIG_BLK_DEV_IDECD=m
-# CONFIG_BLK_DEV_IDETAPE is not set
-# CONFIG_BLK_DEV_IDEFLOPPY is not set
-# CONFIG_BLK_DEV_IDESCSI is not set
-# CONFIG_IDE_TASK_IOCTL is not set
-CONFIG_IDE_PROC_FS=y
-
-#
-# IDE chipset support/bugfixes
-#
-CONFIG_IDE_GENERIC=y
-# CONFIG_IDEPCI_PCIBUS_ORDER is not set
-# CONFIG_IDE_ARM is not set
-# CONFIG_BLK_DEV_IDEDMA is not set
-# CONFIG_BLK_DEV_HD is not set
-
-#
-# SCSI device support
-#
-# CONFIG_RAID_ATTRS is not set
-CONFIG_SCSI=m
-# CONFIG_SCSI_DMA is not set
-# CONFIG_SCSI_TGT is not set
-# CONFIG_SCSI_NETLINK is not set
-CONFIG_SCSI_PROC_FS=y
-
-#
-# SCSI support type (disk, tape, CD-ROM)
-#
-CONFIG_BLK_DEV_SD=m
-# CONFIG_CHR_DEV_ST is not set
-# CONFIG_CHR_DEV_OSST is not set
-CONFIG_BLK_DEV_SR=m
-# CONFIG_BLK_DEV_SR_VENDOR is not set
-CONFIG_CHR_DEV_SG=m
-# CONFIG_CHR_DEV_SCH is not set
-
-#
-# Some SCSI devices (e.g. CD jukebox) support multiple LUNs
-#
-CONFIG_SCSI_MULTI_LUN=y
-# CONFIG_SCSI_CONSTANTS is not set
-# CONFIG_SCSI_LOGGING is not set
-# CONFIG_SCSI_SCAN_ASYNC is not set
-CONFIG_SCSI_WAIT_SCAN=m
-
-#
-# SCSI Transports
-#
-# CONFIG_SCSI_SPI_ATTRS is not set
-# CONFIG_SCSI_FC_ATTRS is not set
-# CONFIG_SCSI_ISCSI_ATTRS is not set
-# CONFIG_SCSI_SAS_LIBSAS is not set
-CONFIG_SCSI_LOWLEVEL=y
-# CONFIG_ISCSI_TCP is not set
-# CONFIG_SCSI_DEBUG is not set
-# CONFIG_MD is not set
-CONFIG_NETDEVICES=y
-# CONFIG_NETDEVICES_MULTIQUEUE is not set
-# CONFIG_DUMMY is not set
-# CONFIG_BONDING is not set
-# CONFIG_MACVLAN is not set
-# CONFIG_EQUALIZER is not set
-# CONFIG_TUN is not set
-# CONFIG_PHYLIB is not set
-CONFIG_NET_ETHERNET=y
-CONFIG_MII=y
-CONFIG_SMC91X=y
-# CONFIG_NE2000 is not set
-CONFIG_NETDEV_1000=y
-CONFIG_NETDEV_10000=y
-
-#
-# Wireless LAN
-#
-# CONFIG_WLAN_PRE80211 is not set
-# CONFIG_WLAN_80211 is not set
-# CONFIG_WAN is not set
-# CONFIG_PPP is not set
-# CONFIG_SLIP is not set
-# CONFIG_SHAPER is not set
-# CONFIG_NETCONSOLE is not set
-# CONFIG_NETPOLL is not set
-# CONFIG_NET_POLL_CONTROLLER is not set
-# CONFIG_ISDN is not set
-# CONFIG_PHONE is not set
-
-#
-# Input device support
-#
-CONFIG_INPUT=y
-# CONFIG_INPUT_FF_MEMLESS is not set
-# CONFIG_INPUT_POLLDEV is not set
-
-#
-# Userland interfaces
-#
-# CONFIG_INPUT_MOUSEDEV is not set
-# CONFIG_INPUT_JOYDEV is not set
-# CONFIG_INPUT_TSDEV is not set
-# CONFIG_INPUT_EVDEV is not set
-# CONFIG_INPUT_EVBUG is not set
-
-#
-# Input Device Drivers
-#
-# CONFIG_INPUT_KEYBOARD is not set
-# CONFIG_INPUT_MOUSE is not set
-# CONFIG_INPUT_JOYSTICK is not set
-# CONFIG_INPUT_TABLET is not set
-# CONFIG_INPUT_TOUCHSCREEN is not set
-# CONFIG_INPUT_MISC is not set
-
-#
-# Hardware I/O ports
-#
-CONFIG_SERIO=y
-# CONFIG_SERIO_I8042 is not set
-CONFIG_SERIO_SERPORT=y
-# CONFIG_SERIO_LIBPS2 is not set
-# CONFIG_SERIO_RAW is not set
-# CONFIG_GAMEPORT is not set
-
-#
-# Character devices
-#
-CONFIG_VT=y
-CONFIG_VT_CONSOLE=y
-CONFIG_HW_CONSOLE=y
-# CONFIG_VT_HW_CONSOLE_BINDING is not set
-# CONFIG_SERIAL_NONSTANDARD is not set
-
-#
-# Serial drivers
-#
-# CONFIG_SERIAL_8250 is not set
-
-#
-# Non-8250 serial port support
-#
-CONFIG_SERIAL_CORE=y
-CONFIG_SERIAL_CORE_CONSOLE=y
-CONFIG_SERIAL_M32R_SIO=y
-CONFIG_SERIAL_M32R_SIO_CONSOLE=y
-CONFIG_SERIAL_M32R_PLDSIO=y
-CONFIG_UNIX98_PTYS=y
-CONFIG_LEGACY_PTYS=y
-CONFIG_LEGACY_PTY_COUNT=256
-# CONFIG_IPMI_HANDLER is not set
-# CONFIG_WATCHDOG is not set
-CONFIG_HW_RANDOM=y
-# CONFIG_RTC is not set
-CONFIG_DS1302=y
-# CONFIG_R3964 is not set
-# CONFIG_RAW_DRIVER is not set
-# CONFIG_TCG_TPM is not set
-# CONFIG_I2C is not set
-
-#
-# SPI support
-#
-# CONFIG_SPI is not set
-# CONFIG_SPI_MASTER is not set
-# CONFIG_W1 is not set
-# CONFIG_POWER_SUPPLY is not set
-CONFIG_HWMON=y
-# CONFIG_HWMON_VID is not set
-# CONFIG_SENSORS_ABITUGURU is not set
-# CONFIG_SENSORS_ABITUGURU3 is not set
-# CONFIG_SENSORS_F71805F is not set
-# CONFIG_SENSORS_IT87 is not set
-# CONFIG_SENSORS_PC87360 is not set
-# CONFIG_SENSORS_PC87427 is not set
-# CONFIG_SENSORS_SMSC47M1 is not set
-# CONFIG_SENSORS_SMSC47B397 is not set
-# CONFIG_SENSORS_VT1211 is not set
-# CONFIG_SENSORS_W83627HF is not set
-# CONFIG_SENSORS_W83627EHF is not set
-# CONFIG_HWMON_DEBUG_CHIP is not set
-
-#
-# Multifunction device drivers
-#
-# CONFIG_MFD_SM501 is not set
-
-#
-# Multimedia devices
-#
-CONFIG_VIDEO_DEV=m
-CONFIG_VIDEO_V4L1=y
-CONFIG_VIDEO_V4L1_COMPAT=y
-CONFIG_VIDEO_V4L2=y
-CONFIG_VIDEO_CAPTURE_DRIVERS=y
-# CONFIG_VIDEO_ADV_DEBUG is not set
-CONFIG_VIDEO_HELPER_CHIPS_AUTO=y
-# CONFIG_VIDEO_CPIA is not set
-CONFIG_VIDEO_M32R_AR=m
-CONFIG_VIDEO_M32R_AR_M64278=m
-CONFIG_RADIO_ADAPTERS=y
-# CONFIG_DVB_CORE is not set
-CONFIG_DAB=y
-
-#
-# Graphics support
-#
-# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
-
-#
-# Display device support
-#
-# CONFIG_DISPLAY_SUPPORT is not set
-# CONFIG_VGASTATE is not set
-CONFIG_VIDEO_OUTPUT_CONTROL=m
-CONFIG_FB=y
-CONFIG_FIRMWARE_EDID=y
-# CONFIG_FB_DDC is not set
-CONFIG_FB_CFB_FILLRECT=y
-CONFIG_FB_CFB_COPYAREA=y
-CONFIG_FB_CFB_IMAGEBLIT=y
-# CONFIG_FB_SYS_FILLRECT is not set
-# CONFIG_FB_SYS_COPYAREA is not set
-# CONFIG_FB_SYS_IMAGEBLIT is not set
-# CONFIG_FB_SYS_FOPS is not set
-CONFIG_FB_DEFERRED_IO=y
-# CONFIG_FB_SVGALIB is not set
-# CONFIG_FB_MACMODES is not set
-# CONFIG_FB_BACKLIGHT is not set
-# CONFIG_FB_MODE_HELPERS is not set
-# CONFIG_FB_TILEBLITTING is not set
-
-#
-# Frame buffer hardware drivers
-#
-CONFIG_FB_S1D13XXX=y
-# CONFIG_FB_VIRTUAL is not set
-
-#
-# Console display driver support
-#
-# CONFIG_VGA_CONSOLE is not set
-CONFIG_DUMMY_CONSOLE=y
-CONFIG_FRAMEBUFFER_CONSOLE=y
-# CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY is not set
-# CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set
-# CONFIG_FONTS is not set
-CONFIG_FONT_8x8=y
-CONFIG_FONT_8x16=y
-CONFIG_LOGO=y
-CONFIG_LOGO_LINUX_MONO=y
-CONFIG_LOGO_LINUX_VGA16=y
-CONFIG_LOGO_LINUX_CLUT224=y
-CONFIG_LOGO_M32R_CLUT224=y
-
-#
-# Sound
-#
-# CONFIG_SOUND is not set
-CONFIG_HID_SUPPORT=y
-CONFIG_HID=y
-# CONFIG_HID_DEBUG is not set
-CONFIG_USB_SUPPORT=y
-# CONFIG_USB_ARCH_HAS_HCD is not set
-# CONFIG_USB_ARCH_HAS_OHCI is not set
-# CONFIG_USB_ARCH_HAS_EHCI is not set
-
-#
-# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
-#
-
-#
-# USB Gadget Support
-#
-# CONFIG_USB_GADGET is not set
-CONFIG_MMC=y
-CONFIG_MMC_DEBUG=y
-# CONFIG_MMC_UNSAFE_RESUME is not set
-
-#
-# MMC/SD Card Drivers
-#
-CONFIG_MMC_BLOCK=y
-CONFIG_MMC_BLOCK_BOUNCE=y
-
-#
-# MMC/SD Host Controller Drivers
-#
-# CONFIG_NEW_LEDS is not set
-
-#
-# Real Time Clock
-#
-# CONFIG_RTC_CLASS is not set
-
-#
-# Userspace I/O
-#
-# CONFIG_UIO is not set
-
-#
-# File systems
-#
-CONFIG_EXT2_FS=y
-# CONFIG_EXT2_FS_XATTR is not set
-# CONFIG_EXT2_FS_XIP is not set
-CONFIG_EXT3_FS=y
-CONFIG_EXT3_FS_XATTR=y
-# CONFIG_EXT3_FS_POSIX_ACL is not set
-# CONFIG_EXT3_FS_SECURITY is not set
-# CONFIG_EXT4DEV_FS is not set
-CONFIG_JBD=y
-CONFIG_JBD_DEBUG=y
-CONFIG_FS_MBCACHE=y
-CONFIG_REISERFS_FS=m
-# CONFIG_REISERFS_CHECK is not set
-# CONFIG_REISERFS_PROC_INFO is not set
-# CONFIG_REISERFS_FS_XATTR is not set
-# CONFIG_JFS_FS is not set
-# CONFIG_FS_POSIX_ACL is not set
-# CONFIG_XFS_FS is not set
-# CONFIG_GFS2_FS is not set
-# CONFIG_OCFS2_FS is not set
-# CONFIG_MINIX_FS is not set
-# CONFIG_ROMFS_FS is not set
-CONFIG_INOTIFY=y
-CONFIG_INOTIFY_USER=y
-# CONFIG_QUOTA is not set
-CONFIG_DNOTIFY=y
-# CONFIG_AUTOFS_FS is not set
-# CONFIG_AUTOFS4_FS is not set
-# CONFIG_FUSE_FS is not set
-
-#
-# CD-ROM/DVD Filesystems
-#
-CONFIG_ISO9660_FS=m
-CONFIG_JOLIET=y
-# CONFIG_ZISOFS is not set
-CONFIG_UDF_FS=m
-CONFIG_UDF_NLS=y
-
-#
-# DOS/FAT/NT Filesystems
-#
-CONFIG_FAT_FS=m
-CONFIG_MSDOS_FS=m
-CONFIG_VFAT_FS=m
-CONFIG_FAT_DEFAULT_CODEPAGE=437
-CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"
-# CONFIG_NTFS_FS is not set
-
-#
-# Pseudo filesystems
-#
-CONFIG_PROC_FS=y
-CONFIG_PROC_KCORE=y
-CONFIG_PROC_SYSCTL=y
-CONFIG_SYSFS=y
-CONFIG_TMPFS=y
-# CONFIG_TMPFS_POSIX_ACL is not set
-# CONFIG_HUGETLB_PAGE is not set
-CONFIG_RAMFS=y
-# CONFIG_CONFIGFS_FS is not set
-
-#
-# Miscellaneous filesystems
-#
-# CONFIG_ADFS_FS is not set
-# CONFIG_AFFS_FS is not set
-# CONFIG_HFS_FS is not set
-# CONFIG_HFSPLUS_FS is not set
-# CONFIG_BEFS_FS is not set
-# CONFIG_BFS_FS is not set
-# CONFIG_EFS_FS is not set
-# CONFIG_JFFS2_FS is not set
-# CONFIG_CRAMFS is not set
-# CONFIG_VXFS_FS is not set
-# CONFIG_HPFS_FS is not set
-# CONFIG_QNX4FS_FS is not set
-# CONFIG_SYSV_FS is not set
-# CONFIG_UFS_FS is not set
-
-#
-# Network File Systems
-#
-CONFIG_NFS_FS=y
-CONFIG_NFS_V3=y
-# CONFIG_NFS_V3_ACL is not set
-# CONFIG_NFS_V4 is not set
-# CONFIG_NFS_DIRECTIO is not set
-# CONFIG_NFSD is not set
-CONFIG_ROOT_NFS=y
-CONFIG_LOCKD=y
-CONFIG_LOCKD_V4=y
-CONFIG_NFS_COMMON=y
-CONFIG_SUNRPC=y
-# CONFIG_SUNRPC_BIND34 is not set
-# CONFIG_RPCSEC_GSS_KRB5 is not set
-# CONFIG_RPCSEC_GSS_SPKM3 is not set
-# CONFIG_SMB_FS is not set
-# CONFIG_CIFS is not set
-# CONFIG_NCP_FS is not set
-# CONFIG_CODA_FS is not set
-# CONFIG_AFS_FS is not set
-
-#
-# Partition Types
-#
-# CONFIG_PARTITION_ADVANCED is not set
-CONFIG_MSDOS_PARTITION=y
-
-#
-# Native Language Support
-#
-CONFIG_NLS=y
-CONFIG_NLS_DEFAULT="iso8859-1"
-# CONFIG_NLS_CODEPAGE_437 is not set
-# CONFIG_NLS_CODEPAGE_737 is not set
-# CONFIG_NLS_CODEPAGE_775 is not set
-# CONFIG_NLS_CODEPAGE_850 is not set
-# CONFIG_NLS_CODEPAGE_852 is not set
-# CONFIG_NLS_CODEPAGE_855 is not set
-# CONFIG_NLS_CODEPAGE_857 is not set
-# CONFIG_NLS_CODEPAGE_860 is not set
-# CONFIG_NLS_CODEPAGE_861 is not set
-# CONFIG_NLS_CODEPAGE_862 is not set
-# CONFIG_NLS_CODEPAGE_863 is not set
-# CONFIG_NLS_CODEPAGE_864 is not set
-# CONFIG_NLS_CODEPAGE_865 is not set
-# CONFIG_NLS_CODEPAGE_866 is not set
-# CONFIG_NLS_CODEPAGE_869 is not set
-# CONFIG_NLS_CODEPAGE_936 is not set
-# CONFIG_NLS_CODEPAGE_950 is not set
-# CONFIG_NLS_CODEPAGE_932 is not set
-# CONFIG_NLS_CODEPAGE_949 is not set
-# CONFIG_NLS_CODEPAGE_874 is not set
-# CONFIG_NLS_ISO8859_8 is not set
-# CONFIG_NLS_CODEPAGE_1250 is not set
-# CONFIG_NLS_CODEPAGE_1251 is not set
-# CONFIG_NLS_ASCII is not set
-# CONFIG_NLS_ISO8859_1 is not set
-# CONFIG_NLS_ISO8859_2 is not set
-# CONFIG_NLS_ISO8859_3 is not set
-# CONFIG_NLS_ISO8859_4 is not set
-# CONFIG_NLS_ISO8859_5 is not set
-# CONFIG_NLS_ISO8859_6 is not set
-# CONFIG_NLS_ISO8859_7 is not set
-# CONFIG_NLS_ISO8859_9 is not set
-# CONFIG_NLS_ISO8859_13 is not set
-# CONFIG_NLS_ISO8859_14 is not set
-# CONFIG_NLS_ISO8859_15 is not set
-# CONFIG_NLS_KOI8_R is not set
-# CONFIG_NLS_KOI8_U is not set
-# CONFIG_NLS_UTF8 is not set
-
-#
-# Distributed Lock Manager
-#
-# CONFIG_DLM is not set
-
-#
-# Profiling support
-#
-CONFIG_PROFILING=y
-CONFIG_OPROFILE=y
-
-#
-# Kernel hacking
-#
-# CONFIG_PRINTK_TIME is not set
-CONFIG_ENABLE_MUST_CHECK=y
-# CONFIG_MAGIC_SYSRQ is not set
-# CONFIG_UNUSED_SYMBOLS is not set
-# CONFIG_DEBUG_FS is not set
-# CONFIG_HEADERS_CHECK is not set
-# CONFIG_DEBUG_KERNEL is not set
-# CONFIG_DEBUG_BUGVERBOSE is not set
-# CONFIG_FRAME_POINTER is not set
-
-#
-# Security options
-#
-# CONFIG_KEYS is not set
-# CONFIG_SECURITY is not set
-# CONFIG_CRYPTO is not set
-
-#
-# Library routines
-#
-CONFIG_BITREVERSE=y
-# CONFIG_CRC_CCITT is not set
-# CONFIG_CRC16 is not set
-# CONFIG_CRC_ITU_T is not set
-CONFIG_CRC32=y
-# CONFIG_CRC7 is not set
-# CONFIG_LIBCRC32C is not set
-CONFIG_HAS_IOMEM=y
diff --git a/arch/m32r/kernel/vmlinux.lds.S b/arch/m32r/kernel/vmlinux.lds.S
index 41b07854fcc6..15a6f36c06db 100644
--- a/arch/m32r/kernel/vmlinux.lds.S
+++ b/arch/m32r/kernel/vmlinux.lds.S
@@ -60,9 +60,6 @@ SECTIONS
   . = ALIGN(4096);
   __nosave_end = .;
 
-  . = ALIGN(4096);
-  .data.page_aligned : { *(.data.idt) }
-
   . = ALIGN(32);
   .data.cacheline_aligned : { *(.data.cacheline_aligned) }
 
diff --git a/arch/m68k/kernel/asm-offsets.c b/arch/m68k/kernel/asm-offsets.c
index 246a8820c223..b1f012f6c493 100644
--- a/arch/m68k/kernel/asm-offsets.c
+++ b/arch/m68k/kernel/asm-offsets.c
@@ -11,14 +11,12 @@
 #include <linux/stddef.h>
 #include <linux/sched.h>
 #include <linux/kernel_stat.h>
+#include <linux/kbuild.h>
 #include <asm/bootinfo.h>
 #include <asm/irq.h>
 #include <asm/amigahw.h>
 #include <linux/font.h>
 
-#define DEFINE(sym, val) \
-        asm volatile("\n->" #sym " %0 " #val : : "i" (val))
-
 int main(void)
 {
         /* offsets into the task struct */
diff --git a/arch/m68k/kernel/sys_m68k.c b/arch/m68k/kernel/sys_m68k.c
index e892f17ba3fa..7f54efaf60bb 100644
--- a/arch/m68k/kernel/sys_m68k.c
+++ b/arch/m68k/kernel/sys_m68k.c
@@ -30,23 +30,6 @@
 #include <asm/page.h>
 #include <asm/unistd.h>
 
-/*
- * sys_pipe() is the normal C calling standard for creating
- * a pipe. It's not the way unix traditionally does this, though.
- */
-asmlinkage int sys_pipe(unsigned long __user * fildes)
-{
-        int fd[2];
-        int error;
-
-        error = do_pipe(fd);
-        if (!error) {
-                if (copy_to_user(fildes, fd, 2*sizeof(int)))
-                        error = -EFAULT;
-        }
-        return error;
-}
-
 /* common code for old and new mmaps */
 static inline long do_mmap2(
         unsigned long addr, unsigned long len,
diff --git a/arch/m68k/mac/iop.c b/arch/m68k/mac/iop.c
index 5b2799eb96a6..326fb9978094 100644
--- a/arch/m68k/mac/iop.c
+++ b/arch/m68k/mac/iop.c
@@ -109,7 +109,6 @@
 #include <linux/mm.h>
 #include <linux/delay.h>
 #include <linux/init.h>
-#include <linux/proc_fs.h>
 #include <linux/interrupt.h>
 
 #include <asm/bootinfo.h>
@@ -124,10 +123,6 @@
 
 int iop_scc_present,iop_ism_present;
 
-#ifdef CONFIG_PROC_FS
-static int iop_get_proc_info(char *, char **, off_t, int);
-#endif /* CONFIG_PROC_FS */
-
 /* structure for tracking channel listeners */
 
 struct listener {
@@ -299,12 +294,6 @@ void __init iop_init(void)
                 iop_listeners[IOP_NUM_ISM][i].devname = NULL;
                 iop_listeners[IOP_NUM_ISM][i].handler = NULL;
         }
-
-#if 0   /* Crashing in 2.4 now, not yet sure why.   --jmt */
-#ifdef CONFIG_PROC_FS
-        create_proc_info_entry("mac_iop", 0, &proc_root, iop_get_proc_info);
-#endif
-#endif
 }
 
 /*
@@ -637,77 +626,3 @@ irqreturn_t iop_ism_irq(int irq, void *dev_id)
         }
         return IRQ_HANDLED;
 }
-
-#ifdef CONFIG_PROC_FS
-
-char *iop_chan_state(int state)
-{
-        switch(state) {
-                case IOP_MSG_IDLE       : return "idle      ";
-                case IOP_MSG_NEW        : return "new       ";
-                case IOP_MSG_RCVD       : return "received  ";
-                case IOP_MSG_COMPLETE   : return "completed ";
-                default                 : return "unknown   ";
-        }
-}
-
-int iop_dump_one_iop(char *buf, int iop_num, char *iop_name)
-{
-        int i,len = 0;
-        volatile struct mac_iop *iop = iop_base[iop_num];
-
-        len += sprintf(buf+len, "%s IOP channel states:\n\n", iop_name);
-        len += sprintf(buf+len, "##  send_state  recv_state  device\n");
-        len += sprintf(buf+len, "------------------------------------------------\n");
-        for (i = 0 ; i < NUM_IOP_CHAN ; i++) {
-                len += sprintf(buf+len, "%2d  %10s  %10s  %s\n", i,
-                        iop_chan_state(iop_readb(iop, IOP_ADDR_SEND_STATE+i)),
-                        iop_chan_state(iop_readb(iop, IOP_ADDR_RECV_STATE+i)),
-                        iop_listeners[iop_num][i].handler?
-                                      iop_listeners[iop_num][i].devname : "");
-
-        }
-        len += sprintf(buf+len, "\n");
-        return len;
-}
-
-static int iop_get_proc_info(char *buf, char **start, off_t pos, int count)
-{
-        int len, cnt;
-
-        cnt = 0;
-        len =  sprintf(buf, "IOPs detected:\n\n");
-
-        if (iop_scc_present) {
-                len += sprintf(buf+len, "SCC IOP (%p): status %02X\n",
-                                iop_base[IOP_NUM_SCC],
-                                (uint) iop_base[IOP_NUM_SCC]->status_ctrl);
-        }
-        if (iop_ism_present) {
-                len += sprintf(buf+len, "ISM IOP (%p): status %02X\n\n",
-                                iop_base[IOP_NUM_ISM],
-                                (uint) iop_base[IOP_NUM_ISM]->status_ctrl);
-        }
-
-        if (iop_scc_present) {
-                len += iop_dump_one_iop(buf+len, IOP_NUM_SCC, "SCC");
-
-        }
-
-        if (iop_ism_present) {
-                len += iop_dump_one_iop(buf+len, IOP_NUM_ISM, "ISM");
-
-        }
-
-        if (len >= pos) {
-                if (!*start) {
-                        *start = buf + pos;
-                        cnt = len - pos;
-                } else {
-                        cnt += len;
-                }
-        }
-        return (count > cnt) ? cnt : count;
-}
-
-#endif /* CONFIG_PROC_FS */
diff --git a/arch/m68k/mm/init.c b/arch/m68k/mm/init.c
index a2bb01f59642..d8fb9c5303cc 100644
--- a/arch/m68k/mm/init.c
+++ b/arch/m68k/mm/init.c
@@ -69,6 +69,7 @@ void __init m68k_setup_node(int node)
  */
 
 void *empty_zero_page;
+EXPORT_SYMBOL(empty_zero_page);
 
 void show_mem(void)
 {
diff --git a/arch/m68knommu/kernel/asm-offsets.c b/arch/m68knommu/kernel/asm-offsets.c
index d97b89bae53c..c785d07c02cc 100644
--- a/arch/m68knommu/kernel/asm-offsets.c
+++ b/arch/m68knommu/kernel/asm-offsets.c
@@ -13,15 +13,11 @@
 #include <linux/kernel_stat.h>
 #include <linux/ptrace.h>
 #include <linux/hardirq.h>
+#include <linux/kbuild.h>
 #include <asm/bootinfo.h>
 #include <asm/irq.h>
 #include <asm/thread_info.h>
 
-#define DEFINE(sym, val) \
-        asm volatile("\n->" #sym " %0 " #val : : "i" (val))
-
-#define BLANK() asm volatile("\n->" : : )
-
 int main(void)
 {
         /* offsets into the task struct */
@@ -91,6 +87,7 @@ int main(void)
         DEFINE(TI_TASK, offsetof(struct thread_info, task));
         DEFINE(TI_EXECDOMAIN, offsetof(struct thread_info, exec_domain));
         DEFINE(TI_FLAGS, offsetof(struct thread_info, flags));
+        DEFINE(TI_PREEMPTCOUNT, offsetof(struct thread_info, preempt_count));
         DEFINE(TI_CPU, offsetof(struct thread_info, cpu));
 
         return 0;
diff --git a/arch/m68knommu/kernel/entry.S b/arch/m68knommu/kernel/entry.S
index 1e7ea6a3e1a1..f4782d2dce8f 100644
--- a/arch/m68knommu/kernel/entry.S
+++ b/arch/m68knommu/kernel/entry.S
@@ -32,6 +32,7 @@
 #include <asm/segment.h>
 #include <asm/asm-offsets.h>
 #include <asm/entry.h>
+#include <asm/unistd.h>
 
 .text
 
@@ -140,3 +141,11 @@ ENTRY(sys_rt_sigreturn)
         RESTORE_SWITCH_STACK
         rts
 
+ENTRY(ret_from_user_signal)
+        moveq #__NR_sigreturn,%d0
+        trap #0
+
+ENTRY(ret_from_user_rt_signal)
+        move #__NR_rt_sigreturn,%d0
+        trap #0
+
diff --git a/arch/m68knommu/kernel/setup.c b/arch/m68knommu/kernel/setup.c
index d6f0200316fe..03f4fe6a2fc0 100644
--- a/arch/m68knommu/kernel/setup.c
+++ b/arch/m68knommu/kernel/setup.c
@@ -162,7 +162,7 @@ void __init setup_arch(char **cmdline_p)
         printk(KERN_INFO "DragonEngine II board support by Georges Menie\n");
 #endif
 #ifdef CONFIG_M5235EVB
-        printk(KERN_INFO "Motorola M5235EVB support (C)2005 Syn-tech Systems, Inc. (Jate Sujjavanich)");
+        printk(KERN_INFO "Motorola M5235EVB support (C)2005 Syn-tech Systems, Inc. (Jate Sujjavanich)\n");
 #endif
 
 #ifdef DEBUG
diff --git a/arch/m68knommu/kernel/signal.c b/arch/m68knommu/kernel/signal.c
index 70371378db86..bbfcae9e52b4 100644
--- a/arch/m68knommu/kernel/signal.c
+++ b/arch/m68knommu/kernel/signal.c
@@ -51,6 +51,8 @@
 
 #define _BLOCKABLE (~(sigmask(SIGKILL) | sigmask(SIGSTOP)))
 
+void ret_from_user_signal(void);
+void ret_from_user_rt_signal(void);
 asmlinkage int do_signal(sigset_t *oldset, struct pt_regs *regs);
 
 /*
@@ -539,10 +541,6 @@ static inline int rt_setup_ucontext(struct ucontext *uc, struct pt_regs *regs)
         return err;
 }
 
-static inline void push_cache (unsigned long vaddr)
-{
-}
-
 static inline void *
 get_sigframe(struct k_sigaction *ka, struct pt_regs *regs, size_t frame_size)
 {
@@ -586,16 +584,11 @@ static void setup_frame (int sig, struct k_sigaction *ka,
         err |= copy_to_user (&frame->sc, &context, sizeof(context));
 
         /* Set up to return from userspace.  */
-        err |= __put_user(frame->retcode, &frame->pretcode);
-        /* moveq #,d0; trap #0 */
-        err |= __put_user(0x70004e40 + (__NR_sigreturn << 16),
-                          (long *)(frame->retcode));
+        err |= __put_user((void *) ret_from_user_signal, &frame->pretcode);
 
         if (err)
                 goto give_sigsegv;
 
-        push_cache ((unsigned long) &frame->retcode);
-
         /* Set up registers for signal handler */
         wrusp ((unsigned long) frame);
         regs->pc = (unsigned long) ka->sa.sa_handler;
@@ -655,17 +648,11 @@ static void setup_rt_frame (int sig, struct k_sigaction *ka, siginfo_t *info,
         err |= copy_to_user (&frame->uc.uc_sigmask, set, sizeof(*set));
 
         /* Set up to return from userspace.  */
-        err |= __put_user(frame->retcode, &frame->pretcode);
-        /* moveq #,d0; notb d0; trap #0 */
-        err |= __put_user(0x70004600 + ((__NR_rt_sigreturn ^ 0xff) << 16),
-                          (long *)(frame->retcode + 0));
-        err |= __put_user(0x4e40, (short *)(frame->retcode + 4));
+        err |= __put_user((void *) ret_from_user_rt_signal, &frame->pretcode);
 
         if (err)
                 goto give_sigsegv;
 
-        push_cache ((unsigned long) &frame->retcode);
-
         /* Set up registers for signal handler */
         wrusp ((unsigned long) frame);
         regs->pc = (unsigned long) ka->sa.sa_handler;
diff --git a/arch/m68knommu/kernel/sys_m68k.c b/arch/m68knommu/kernel/sys_m68k.c
index 65f7a95f056e..700281638629 100644
--- a/arch/m68knommu/kernel/sys_m68k.c
+++ b/arch/m68knommu/kernel/sys_m68k.c
@@ -28,23 +28,6 @@
 #include <asm/cacheflush.h>
 #include <asm/unistd.h>
 
-/*
- * sys_pipe() is the normal C calling standard for creating
- * a pipe. It's not the way unix traditionally does this, though.
- */
-asmlinkage int sys_pipe(unsigned long * fildes)
-{
-        int fd[2];
-        int error;
-
-        error = do_pipe(fd);
-        if (!error) {
-                if (copy_to_user(fildes, fd, 2*sizeof(int)))
-                        error = -EFAULT;
-        }
-        return error;
-}
-
 /* common code for old and new mmaps */
 static inline long do_mmap2(
         unsigned long addr, unsigned long len,
diff --git a/arch/m68knommu/kernel/traps.c b/arch/m68knommu/kernel/traps.c
index 437a061d8b94..ec9aea652e79 100644
--- a/arch/m68knommu/kernel/traps.c
+++ b/arch/m68knommu/kernel/traps.c
@@ -28,6 +28,7 @@
 #include <linux/linkage.h>
 #include <linux/init.h>
 #include <linux/ptrace.h>
+#include <linux/kallsyms.h>
 
 #include <asm/setup.h>
 #include <asm/fpu.h>
@@ -102,56 +103,47 @@ asmlinkage void buserr_c(struct frame *fp)
         force_sig(SIGSEGV, current);
 }
 
-
 int kstack_depth_to_print = 48;
 
-void show_stack(struct task_struct *task, unsigned long *stack)
+static void __show_stack(struct task_struct *task, unsigned long *stack)
 {
         unsigned long *endstack, addr;
-        extern char _start, _etext;
+        unsigned long *last_stack;
         int i;
 
-        if (!stack) {
-                if (task)
-                        stack = (unsigned long *)task->thread.ksp;
-                else
-                        stack = (unsigned long *)&stack;
-        }
+        if (!stack)
+                stack = (unsigned long *)task->thread.ksp;
 
         addr = (unsigned long) stack;
         endstack = (unsigned long *) PAGE_ALIGN(addr);
 
         printk(KERN_EMERG "Stack from %08lx:", (unsigned long)stack);
         for (i = 0; i < kstack_depth_to_print; i++) {
-                if (stack + 1 > endstack)
+                if (stack + 1 + i > endstack)
                         break;
                 if (i % 8 == 0)
                         printk("\n" KERN_EMERG "       ");
-                printk(" %08lx", *stack++);
+                printk(" %08lx", *(stack + i));
         }
         printk("\n");
 
-        printk(KERN_EMERG "Call Trace:");
-        i = 0;
-        while (stack + 1 <= endstack) {
-                addr = *stack++;
-                /*
-                 * If the address is either in the text segment of the
-                 * kernel, or in the region which contains vmalloc'ed
-                 * memory, it *may* be the address of a calling
-                 * routine; if so, print it so that someone tracing
-                 * down the cause of the crash will be able to figure
-                 * out the call path that was taken.
-                 */
-                if (((addr >= (unsigned long) &_start) &&
-                     (addr <= (unsigned long) &_etext))) {
-                        if (i % 4 == 0)
-                                printk("\n" KERN_EMERG "       ");
-                        printk(" [<%08lx>]", addr);
-                        i++;
-                }
+#ifdef CONFIG_FRAME_POINTER
+        printk(KERN_EMERG "Call Trace:\n");
+
+        last_stack = stack - 1;
+        while (stack <= endstack && stack > last_stack) {
+
+                addr = *(stack + 1);
+                printk(KERN_EMERG " [%08lx] ", addr);
+                print_symbol(KERN_CONT "%s\n", addr);
+
+                last_stack = stack;
+                stack = (unsigned long *)*stack;
         }
         printk("\n");
+#else
+        printk(KERN_EMERG "CONFIG_FRAME_POINTER disabled, no symbolic call trace\n");
+#endif
 }
 
 void bad_super_trap(struct frame *fp)
@@ -298,19 +290,47 @@ asmlinkage void set_esp0(unsigned long ssp)
         current->thread.esp0 = ssp;
 }
 
-
 /*
  * The architecture-independent backtrace generator
  */
 void dump_stack(void)
 {
-        unsigned long stack;
+        /*
+         * We need frame pointers for this little trick, which works as follows:
+         *
+         * +------------+ 0x00
+         * | Next SP    |       -> 0x0c
+         * +------------+ 0x04
+         * | Caller     |
+         * +------------+ 0x08
+         * | Local vars |       -> our stack var
+         * +------------+ 0x0c
+         * | Next SP    |       -> 0x18, that is what we pass to show_stack()
+         * +------------+ 0x10
+         * | Caller     |
+         * +------------+ 0x14
+         * | Local vars |
+         * +------------+ 0x18
+         * | ...        |
+         * +------------+
+         */
 
-        show_stack(current, &stack);
-}
+        unsigned long *stack;
 
+        stack = (unsigned long *)&stack;
+        stack++;
+        __show_stack(current, stack);
+}
 EXPORT_SYMBOL(dump_stack);
 
+void show_stack(struct task_struct *task, unsigned long *stack)
+{
+        if (!stack && !task)
+                dump_stack();
+        else
+                __show_stack(task, stack);
+}
+
 #ifdef CONFIG_M68KFPU_EMU
 asmlinkage void fpemu_signal(int signal, int code, void *addr)
 {
diff --git a/arch/m68knommu/kernel/vmlinux.lds.S b/arch/m68knommu/kernel/vmlinux.lds.S
index b44edb08e212..5592e0bf951f 100644
--- a/arch/m68knommu/kernel/vmlinux.lds.S
+++ b/arch/m68knommu/kernel/vmlinux.lds.S
@@ -64,6 +64,7 @@ SECTIONS {
                 _stext = . ;
                 TEXT_TEXT
                 SCHED_TEXT
+                LOCK_TEXT
                 *(.text.lock)
 
                 . = ALIGN(16);          /* Exception table              */
@@ -73,6 +74,7 @@ SECTIONS {
 
                 *(.rodata) *(.rodata.*)
                 *(__vermagic)           /* Kernel version magic */
+                *(__markers_strings)
                 *(.rodata1)
                 *(.rodata.str1.1)
 
@@ -182,6 +184,7 @@ SECTIONS {
                 *(COMMON)
                 . = ALIGN(4) ;
                 _ebss = . ;
+                _end = . ;
         } > BSS
 
 }
diff --git a/arch/m68knommu/platform/5206e/config.c b/arch/m68knommu/platform/5206e/config.c
index a6692e958f6b..d01a5d2b7557 100644
--- a/arch/m68knommu/platform/5206e/config.c
+++ b/arch/m68knommu/platform/5206e/config.c
@@ -48,7 +48,7 @@ static struct platform_device *m5206e_devices[] __initdata = {
 
 /***************************************************************************/
 
-static void __init m5206_uart_init_line(int line, int irq)
+static void __init m5206e_uart_init_line(int line, int irq)
 {
         if (line == 0) {
                 writel(MCFSIM_ICR_LEVEL6 | MCFSIM_ICR_PRI1, MCF_MBAR + MCFSIM_UART1ICR);
diff --git a/arch/m68knommu/platform/5272/config.c b/arch/m68knommu/platform/5272/config.c
index 2aca599a1ca7..230bae691a7f 100644
--- a/arch/m68knommu/platform/5272/config.c
+++ b/arch/m68knommu/platform/5272/config.c
@@ -139,10 +139,6 @@ void __init config_BSP(char *commandp, int size)
         /* Copy command line from FLASH to local buffer... */
         memcpy(commandp, (char *) 0xf0004000, size);
         commandp[size-1] = 0;
-#elif defined(CONFIG_MTD_KeyTechnology)
-        /* Copy command line from FLASH to local buffer... */
-        memcpy(commandp, (char *) 0xffe06000, size);
-        commandp[size-1] = 0;
 #elif defined(CONFIG_CANCam)
         /* Copy command line from FLASH to local buffer... */
         memcpy(commandp, (char *) 0xf0010000, size);
diff --git a/arch/m68knommu/platform/528x/config.c b/arch/m68knommu/platform/528x/config.c
index 036e1b73d944..dfdb5c2ed8e6 100644
--- a/arch/m68knommu/platform/528x/config.c
+++ b/arch/m68knommu/platform/528x/config.c
@@ -26,9 +26,240 @@
 #include <asm/mcfuart.h>
 #include <asm/mcfqspi.h>
 
+#ifdef CONFIG_MTD_PARTITIONS
+#include <linux/mtd/partitions.h>
+#endif
+
 /***************************************************************************/
 
 void coldfire_reset(void);
+static void coldfire_qspi_cs_control(u8 cs, u8 command);
+
+/***************************************************************************/
+
+#if defined(CONFIG_SPI)
+
+#if defined(CONFIG_WILDFIRE)
+#define SPI_NUM_CHIPSELECTS     0x02
+#define SPI_PAR_VAL             0x07  /* Enable DIN, DOUT, CLK */
+#define SPI_CS_MASK             0x18
+
+#define FLASH_BLOCKSIZE         (1024*64)
+#define FLASH_NUMBLOCKS         16
+#define FLASH_TYPE              "m25p80"
+
+#define M25P80_CS               0
+#define MMC_CS                  1
+
+#ifdef CONFIG_MTD_PARTITIONS
+static struct mtd_partition stm25p_partitions[] = {
+        /* sflash */
+        [0] = {
+                .name = "stm25p80",
+                .offset = 0x00000000,
+                .size = FLASH_BLOCKSIZE * FLASH_NUMBLOCKS,
+                .mask_flags = 0
+        }
+};
+
+#endif
+
+#elif defined(CONFIG_WILDFIREMOD)
+
+#define SPI_NUM_CHIPSELECTS     0x08
+#define SPI_PAR_VAL             0x07  /* Enable DIN, DOUT, CLK */
+#define SPI_CS_MASK             0x78
+
+#define FLASH_BLOCKSIZE         (1024*64)
+#define FLASH_NUMBLOCKS         64
+#define FLASH_TYPE              "m25p32"
+/* Reserve 1M for the kernel parition */
+#define FLASH_KERNEL_SIZE   (1024 * 1024)
+
+#define M25P80_CS               5
+#define MMC_CS                  6
+
+#ifdef CONFIG_MTD_PARTITIONS
+static struct mtd_partition stm25p_partitions[] = {
+        /* sflash */
+        [0] = {
+                .name = "kernel",
+                .offset = FLASH_BLOCKSIZE * FLASH_NUMBLOCKS - FLASH_KERNEL_SIZE,
+                .size = FLASH_KERNEL_SIZE,
+                .mask_flags = 0
+        },
+        [1] = {
+                .name = "image",
+                .offset = 0x00000000,
+                .size = FLASH_BLOCKSIZE * FLASH_NUMBLOCKS - FLASH_KERNEL_SIZE,
+                .mask_flags = 0
+        },
+        [2] = {
+                .name = "all",
+                .offset = 0x00000000,
+                .size = FLASH_BLOCKSIZE * FLASH_NUMBLOCKS,
+                .mask_flags = 0
+        }
+};
+#endif
+
+#else
+#define SPI_NUM_CHIPSELECTS     0x04
+#define SPI_PAR_VAL             0x7F  /* Enable DIN, DOUT, CLK, CS0 - CS4 */
+#endif
+
+#ifdef MMC_CS
+static struct coldfire_spi_chip flash_chip_info = {
+        .mode = SPI_MODE_0,
+        .bits_per_word = 16,
+        .del_cs_to_clk = 17,
+        .del_after_trans = 1,
+        .void_write_data = 0
+};
+
+static struct coldfire_spi_chip mmc_chip_info = {
+        .mode = SPI_MODE_0,
+        .bits_per_word = 16,
+        .del_cs_to_clk = 17,
+        .del_after_trans = 1,
+        .void_write_data = 0xFFFF
+};
+#endif
+
+#ifdef M25P80_CS
+static struct flash_platform_data stm25p80_platform_data = {
+        .name = "ST M25P80 SPI Flash chip",
+#ifdef CONFIG_MTD_PARTITIONS
+        .parts = stm25p_partitions,
+        .nr_parts = sizeof(stm25p_partitions) / sizeof(*stm25p_partitions),
+#endif
+        .type = FLASH_TYPE
+};
+#endif
+
+static struct spi_board_info spi_board_info[] __initdata = {
+#ifdef M25P80_CS
+        {
+                .modalias = "m25p80",
+                .max_speed_hz = 16000000,
+                .bus_num = 1,
+                .chip_select = M25P80_CS,
+                .platform_data = &stm25p80_platform_data,
+                .controller_data = &flash_chip_info
+        },
+#endif
+#ifdef MMC_CS
+        {
+                .modalias = "mmc_spi",
+                .max_speed_hz = 16000000,
+                .bus_num = 1,
+                .chip_select = MMC_CS,
+                .controller_data = &mmc_chip_info
+        }
+#endif
+};
+
+static struct coldfire_spi_master coldfire_master_info = {
+        .bus_num = 1,
+        .num_chipselect = SPI_NUM_CHIPSELECTS,
+        .irq_source = MCF5282_QSPI_IRQ_SOURCE,
+        .irq_vector = MCF5282_QSPI_IRQ_VECTOR,
+        .irq_mask = ((0x01 << MCF5282_QSPI_IRQ_SOURCE) | 0x01),
+        .irq_lp = 0x2B,  /* Level 5 and Priority 3 */
+        .par_val = SPI_PAR_VAL,
+        .cs_control = coldfire_qspi_cs_control,
+};
+
+static struct resource coldfire_spi_resources[] = {
+        [0] = {
+                .name = "qspi-par",
+                .start = MCF5282_QSPI_PAR,
+                .end = MCF5282_QSPI_PAR,
+                .flags = IORESOURCE_MEM
+        },
+
+        [1] = {
+                .name = "qspi-module",
+                .start = MCF5282_QSPI_QMR,
+                .end = MCF5282_QSPI_QMR + 0x18,
+                .flags = IORESOURCE_MEM
+        },
+
+        [2] = {
+                .name = "qspi-int-level",
+                .start = MCF5282_INTC0 + MCFINTC_ICR0 + MCF5282_QSPI_IRQ_SOURCE,
+                .end = MCF5282_INTC0 + MCFINTC_ICR0 + MCF5282_QSPI_IRQ_SOURCE,
+                .flags = IORESOURCE_MEM
+        },
+
+        [3] = {
+                .name = "qspi-int-mask",
+                .start = MCF5282_INTC0 + MCFINTC_IMRL,
+                .end = MCF5282_INTC0 + MCFINTC_IMRL,
+                .flags = IORESOURCE_MEM
+        }
+};
+
+static struct platform_device coldfire_spi = {
+        .name = "spi_coldfire",
+        .id = -1,
+        .resource = coldfire_spi_resources,
+        .num_resources = ARRAY_SIZE(coldfire_spi_resources),
+        .dev = {
+                .platform_data = &coldfire_master_info,
+        }
+};
+
+static void coldfire_qspi_cs_control(u8 cs, u8 command)
+{
+        u8 cs_bit = ((0x01 << cs) << 3) & SPI_CS_MASK;
+
+#if defined(CONFIG_WILDFIRE)
+        u8 cs_mask = ~(((0x01 << cs) << 3) & SPI_CS_MASK);
+#endif
+#if defined(CONFIG_WILDFIREMOD)
+        u8 cs_mask = (cs << 3) & SPI_CS_MASK;
+#endif
+
+        /*
+         * Don't do anything if the chip select is not
+         * one of the port qs pins.
+         */
+        if (command & QSPI_CS_INIT) {
+#if defined(CONFIG_WILDFIRE)
+                MCF5282_GPIO_DDRQS  |= cs_bit;
+                MCF5282_GPIO_PQSPAR &= ~cs_bit;
+#endif
+
+#if defined(CONFIG_WILDFIREMOD)
+                MCF5282_GPIO_DDRQS  |= SPI_CS_MASK;
+                MCF5282_GPIO_PQSPAR &= ~SPI_CS_MASK;
+#endif
+        }
+
+        if (command & QSPI_CS_ASSERT) {
+                MCF5282_GPIO_PORTQS &= ~SPI_CS_MASK;
+                MCF5282_GPIO_PORTQS |= cs_mask;
+        } else if (command & QSPI_CS_DROP) {
+                MCF5282_GPIO_PORTQS |= SPI_CS_MASK;
+        }
+}
+
+static int __init spi_dev_init(void)
+{
+        int retval;
+
+        retval = platform_device_register(&coldfire_spi);
+        if (retval < 0)
+                return retval;
+
+        if (ARRAY_SIZE(spi_board_info))
+                retval = spi_register_board_info(spi_board_info, ARRAY_SIZE(spi_board_info));
+
+        return retval;
+}
+
+#endif /* CONFIG_SPI */
 
 /***************************************************************************/
 
@@ -111,10 +342,43 @@ void mcf_autovector(unsigned int vec)
 
 /***************************************************************************/
 
+#ifdef CONFIG_WILDFIRE
+void wildfire_halt(void)
+{
+        writeb(0, 0x30000007);
+        writeb(0x2, 0x30000007);
+}
+#endif
+
+#ifdef CONFIG_WILDFIREMOD
+void wildfiremod_halt(void)
+{
+        printk(KERN_INFO "WildFireMod hibernating...\n");
+
+        /* Set portE.5 to Digital IO */
+        MCF5282_GPIO_PEPAR &= ~(1 << (5 * 2));
+
+        /* Make portE.5 an output */
+        MCF5282_GPIO_DDRE |= (1 << 5);
+
+        /* Now toggle portE.5 from low to high */
+        MCF5282_GPIO_PORTE &= ~(1 << 5);
+        MCF5282_GPIO_PORTE |= (1 << 5);
+
+        printk(KERN_EMERG "Failed to hibernate. Halting!\n");
+}
+#endif
+
 void __init config_BSP(char *commandp, int size)
 {
         mcf_disableall();
-        mach_reset = coldfire_reset;
+
+#ifdef CONFIG_WILDFIRE
+        mach_halt = wildfire_halt;
+#endif
+#ifdef CONFIG_WILDFIREMOD
+        mach_halt = wildfiremod_halt;
+#endif
 }
 
 /***************************************************************************/
diff --git a/arch/m68knommu/platform/5307/config.c b/arch/m68knommu/platform/5307/config.c
index 92dc862fa826..11cff6625dcc 100644
--- a/arch/m68knommu/platform/5307/config.c
+++ b/arch/m68knommu/platform/5307/config.c
@@ -124,8 +124,7 @@ void __init config_BSP(char *commandp, int size)
         mcf_setimr(MCFSIM_IMR_MASKALL);
 
 #if defined(CONFIG_NETtel) || defined(CONFIG_eLIA) || \
-      defined(CONFIG_DISKtel) || defined(CONFIG_SECUREEDGEMP3) || \
-      defined(CONFIG_CLEOPATRA)
+    defined(CONFIG_SECUREEDGEMP3) || defined(CONFIG_CLEOPATRA)
         /* Copy command line from FLASH to local buffer... */
         memcpy(commandp, (char *) 0xf0004000, size);
         commandp[size-1] = 0;
diff --git a/arch/m68knommu/platform/coldfire/entry.S b/arch/m68knommu/platform/coldfire/entry.S
index 111b66dc737b..1e3c0dcbd7ac 100644
--- a/arch/m68knommu/platform/coldfire/entry.S
+++ b/arch/m68knommu/platform/coldfire/entry.S
@@ -103,9 +103,26 @@ ret_from_signal:
         addql   #4,%sp
 
 ret_from_exception:
+        move    #0x2700,%sr             /* disable intrs */
         btst    #5,%sp@(PT_SR)          /* check if returning to kernel */
         jeq     Luser_return            /* if so, skip resched, signals */
 
+#ifdef CONFIG_PREEMPT
+        movel   %sp,%d1                 /* get thread_info pointer */
+        andl    #-THREAD_SIZE,%d1       /* at base of kernel stack */
+        movel   %d1,%a0
+        movel   %a0@(TI_FLAGS),%d1      /* get thread_info->flags */
+        andl    #_TIF_NEED_RESCHED,%d1
+        jeq     Lkernel_return
+
+        movel   %a0@(TI_PREEMPTCOUNT),%d1
+        cmpl    #0,%d1
+        jne     Lkernel_return
+
+        pea     Lkernel_return
+        jmp     preempt_schedule_irq    /* preempt the kernel */
+#endif
+
 Lkernel_return:
         moveml  %sp@,%d1-%d5/%a0-%a2
         lea     %sp@(32),%sp            /* space for 8 regs */
@@ -140,6 +157,7 @@ Lreturn:
 
 Lwork_to_do:
         movel   %a0@(TI_FLAGS),%d1      /* get thread_info->flags */
+        move    #0x2000,%sr             /* enable intrs again */
         btst    #TIF_NEED_RESCHED,%d1
         jne     reschedule
 
diff --git a/arch/mips/au1000/common/power.c b/arch/mips/au1000/common/power.c
index 812a5f8b7d26..a8cd2c1b9e1b 100644
--- a/arch/mips/au1000/common/power.c
+++ b/arch/mips/au1000/common/power.c
@@ -251,7 +251,6 @@ int au_sleep(void)
 static int pm_do_sleep(ctl_table * ctl, int write, struct file *file,
                        void __user *buffer, size_t * len, loff_t *ppos)
 {
-        int retval = 0;
 #ifdef SLEEP_TEST_TIMEOUT
 #define TMPBUFLEN2 16
         char buf[TMPBUFLEN2], *p;
@@ -271,36 +270,12 @@ static int pm_do_sleep(ctl_table * ctl, int write, struct file *file,
                 p = buf;
                 sleep_ticks = simple_strtoul(p, &p, 0);
 #endif
-                retval = pm_send_all(PM_SUSPEND, (void *) 2);
-
-                if (retval)
-                        return retval;
 
                 au_sleep();
-                retval = pm_send_all(PM_RESUME, (void *) 0);
         }
-        return retval;
-}
-
-static int pm_do_suspend(ctl_table * ctl, int write, struct file *file,
-                         void __user *buffer, size_t * len, loff_t *ppos)
-{
-        int retval = 0;
-
-        if (!write) {
-                *len = 0;
-        } else {
-                retval = pm_send_all(PM_SUSPEND, (void *) 2);
-                if (retval)
-                        return retval;
-                suspend_mode = 1;
-
-                retval = pm_send_all(PM_RESUME, (void *) 0);
-        }
-        return retval;
+        return 0;
 }
 
-
 static int pm_do_freq(ctl_table * ctl, int write, struct file *file,
                       void __user *buffer, size_t * len, loff_t *ppos)
 {
@@ -414,14 +389,6 @@ static int pm_do_freq(ctl_table * ctl, int write, struct file *file,
 
 static struct ctl_table pm_table[] = {
         {
-                .ctl_name       = CTL_UNNUMBERED,
-                .procname       = "suspend",
-                .data           = NULL,
-                .maxlen         = 0,
-                .mode           = 0600,
-                .proc_handler   = &pm_do_suspend
-        },
-        {
                 .ctl_name       = CTL_UNNUMBERED,
                 .procname       = "sleep",
                 .data           = NULL,
diff --git a/arch/mips/basler/excite/excite_procfs.c b/arch/mips/basler/excite/excite_procfs.c
index 9ee67a95f6b9..08923e6825b5 100644
--- a/arch/mips/basler/excite/excite_procfs.c
+++ b/arch/mips/basler/excite/excite_procfs.c
@@ -18,8 +18,9 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
-
+#include <linux/module.h>
 #include <linux/proc_fs.h>
+#include <linux/seq_file.h>
 #include <linux/stat.h>
 #include <asm/page.h>
 #include <asm/io.h>
@@ -28,14 +29,25 @@
 
 #include <excite.h>
 
-static int excite_get_unit_id(char *buf, char **addr, off_t offs, int size)
+static int excite_unit_id_proc_show(struct seq_file *m, void *v)
 {
-        const int len = snprintf(buf, PAGE_SIZE, "%06x", unit_id);
-        const int w = len - offs;
-        *addr = buf + offs;
-        return w < size ? w : size;
+        seq_printf(m, "%06x", unit_id);
+        return 0;
 }
 
+static int excite_unit_id_proc_open(struct inode *inode, struct file *file)
+{
+        return single_open(file, excite_unit_id_proc_show, NULL);
+}
+
+static const struct file_operations excite_unit_id_proc_fops = {
+        .owner          = THIS_MODULE,
+        .open           = excite_unit_id_proc_open,
+        .read           = seq_read,
+        .llseek         = seq_lseek,
+        .release        = single_release,
+};
+
 static int
 excite_bootrom_read(char *page, char **start, off_t off, int count,
                   int *eof, void *data)
@@ -65,12 +77,12 @@ excite_bootrom_read(char *page, char **start, off_t off, int count,
 void excite_procfs_init(void)
 {
         /* Create & populate /proc/excite */
-        struct proc_dir_entry * const pdir = proc_mkdir("excite", &proc_root);
+        struct proc_dir_entry * const pdir = proc_mkdir("excite", NULL);
         if (pdir) {
                 struct proc_dir_entry * e;
 
-                e = create_proc_info_entry("unit_id", S_IRUGO, pdir,
-                                           excite_get_unit_id);
+                e = proc_create("unit_id", S_IRUGO, pdir,
+                                &excite_unit_id_proc_fops);
                 if (e) e->size = 6;
 
                 e = create_proc_read_entry("bootrom", S_IRUGO, pdir,
diff --git a/arch/mips/kernel/asm-offsets.c b/arch/mips/kernel/asm-offsets.c
index 5bf03b3c4150..72942226fcdd 100644
--- a/arch/mips/kernel/asm-offsets.c
+++ b/arch/mips/kernel/asm-offsets.c
@@ -13,327 +13,285 @@
 #include <linux/sched.h>
 #include <linux/mm.h>
 #include <linux/interrupt.h>
-
+#include <linux/kbuild.h>
 #include <asm/ptrace.h>
 #include <asm/processor.h>
 
-#define text(t) __asm__("\n->#" t)
-#define _offset(type, member) (&(((type *)NULL)->member))
-#define offset(string, ptr, member) \
-        __asm__("\n->" string " %0" : : "i" (_offset(ptr, member)))
-#define constant(string, member) \
-        __asm__("\n->" string " %0" : : "ri" (member))
-#define size(string, size) \
-        __asm__("\n->" string " %0" : : "i" (sizeof(size)))
-#define linefeed text("")
-
 void output_ptreg_defines(void)
 {
-        text("MIPS pt_regs offsets.");
-        offset("PT_R0", struct pt_regs, regs[0]);
-        offset("PT_R1", struct pt_regs, regs[1]);
-        offset("PT_R2", struct pt_regs, regs[2]);
-        offset("PT_R3", struct pt_regs, regs[3]);
-        offset("PT_R4", struct pt_regs, regs[4]);
-        offset("PT_R5", struct pt_regs, regs[5]);
-        offset("PT_R6", struct pt_regs, regs[6]);
-        offset("PT_R7", struct pt_regs, regs[7]);
-        offset("PT_R8", struct pt_regs, regs[8]);
-        offset("PT_R9", struct pt_regs, regs[9]);
-        offset("PT_R10", struct pt_regs, regs[10]);
-        offset("PT_R11", struct pt_regs, regs[11]);
-        offset("PT_R12", struct pt_regs, regs[12]);
-        offset("PT_R13", struct pt_regs, regs[13]);
-        offset("PT_R14", struct pt_regs, regs[14]);
-        offset("PT_R15", struct pt_regs, regs[15]);
-        offset("PT_R16", struct pt_regs, regs[16]);
-        offset("PT_R17", struct pt_regs, regs[17]);
-        offset("PT_R18", struct pt_regs, regs[18]);
-        offset("PT_R19", struct pt_regs, regs[19]);
-        offset("PT_R20", struct pt_regs, regs[20]);
-        offset("PT_R21", struct pt_regs, regs[21]);
-        offset("PT_R22", struct pt_regs, regs[22]);
-        offset("PT_R23", struct pt_regs, regs[23]);
-        offset("PT_R24", struct pt_regs, regs[24]);
-        offset("PT_R25", struct pt_regs, regs[25]);
-        offset("PT_R26", struct pt_regs, regs[26]);
-        offset("PT_R27", struct pt_regs, regs[27]);
-        offset("PT_R28", struct pt_regs, regs[28]);
-        offset("PT_R29", struct pt_regs, regs[29]);
-        offset("PT_R30", struct pt_regs, regs[30]);
-        offset("PT_R31", struct pt_regs, regs[31]);
-        offset("PT_LO", struct pt_regs, lo);
-        offset("PT_HI", struct pt_regs, hi);
+        COMMENT("MIPS pt_regs offsets.");
+        OFFSET(PT_R0, pt_regs, regs[0]);
+        OFFSET(PT_R1, pt_regs, regs[1]);
+        OFFSET(PT_R2, pt_regs, regs[2]);
+        OFFSET(PT_R3, pt_regs, regs[3]);
+        OFFSET(PT_R4, pt_regs, regs[4]);
+        OFFSET(PT_R5, pt_regs, regs[5]);
+        OFFSET(PT_R6, pt_regs, regs[6]);
+        OFFSET(PT_R7, pt_regs, regs[7]);
+        OFFSET(PT_R8, pt_regs, regs[8]);
+        OFFSET(PT_R9, pt_regs, regs[9]);
+        OFFSET(PT_R10, pt_regs, regs[10]);
+        OFFSET(PT_R11, pt_regs, regs[11]);
+        OFFSET(PT_R12, pt_regs, regs[12]);
+        OFFSET(PT_R13, pt_regs, regs[13]);
+        OFFSET(PT_R14, pt_regs, regs[14]);
+        OFFSET(PT_R15, pt_regs, regs[15]);
+        OFFSET(PT_R16, pt_regs, regs[16]);
+        OFFSET(PT_R17, pt_regs, regs[17]);
+        OFFSET(PT_R18, pt_regs, regs[18]);
+        OFFSET(PT_R19, pt_regs, regs[19]);
+        OFFSET(PT_R20, pt_regs, regs[20]);
+        OFFSET(PT_R21, pt_regs, regs[21]);
+        OFFSET(PT_R22, pt_regs, regs[22]);
+        OFFSET(PT_R23, pt_regs, regs[23]);
+        OFFSET(PT_R24, pt_regs, regs[24]);
+        OFFSET(PT_R25, pt_regs, regs[25]);
+        OFFSET(PT_R26, pt_regs, regs[26]);
+        OFFSET(PT_R27, pt_regs, regs[27]);
+        OFFSET(PT_R28, pt_regs, regs[28]);
+        OFFSET(PT_R29, pt_regs, regs[29]);
+        OFFSET(PT_R30, pt_regs, regs[30]);
+        OFFSET(PT_R31, pt_regs, regs[31]);
+        OFFSET(PT_LO, pt_regs, lo);
+        OFFSET(PT_HI, pt_regs, hi);
 #ifdef CONFIG_CPU_HAS_SMARTMIPS
-        offset("PT_ACX", struct pt_regs, acx);
+        OFFSET(PT_ACX, pt_regs, acx);
 #endif
-        offset("PT_EPC", struct pt_regs, cp0_epc);
-        offset("PT_BVADDR", struct pt_regs, cp0_badvaddr);
-        offset("PT_STATUS", struct pt_regs, cp0_status);
-        offset("PT_CAUSE", struct pt_regs, cp0_cause);
+        OFFSET(PT_EPC, pt_regs, cp0_epc);
+        OFFSET(PT_BVADDR, pt_regs, cp0_badvaddr);
+        OFFSET(PT_STATUS, pt_regs, cp0_status);
+        OFFSET(PT_CAUSE, pt_regs, cp0_cause);
 #ifdef CONFIG_MIPS_MT_SMTC
-        offset("PT_TCSTATUS", struct pt_regs, cp0_tcstatus);
+        OFFSET(PT_TCSTATUS, pt_regs, cp0_tcstatus);
 #endif /* CONFIG_MIPS_MT_SMTC */
-        size("PT_SIZE", struct pt_regs);
-        linefeed;
+        DEFINE(PT_SIZE, sizeof(struct pt_regs));
+        BLANK();
 }
 
 void output_task_defines(void)
 {
-        text("MIPS task_struct offsets.");
-        offset("TASK_STATE", struct task_struct, state);
-        offset("TASK_THREAD_INFO", struct task_struct, stack);
-        offset("TASK_FLAGS", struct task_struct, flags);
-        offset("TASK_MM", struct task_struct, mm);
-        offset("TASK_PID", struct task_struct, pid);
-        size(  "TASK_STRUCT_SIZE", struct task_struct);
-        linefeed;
+        COMMENT("MIPS task_struct offsets.");
+        OFFSET(TASK_STATE, task_struct, state);
+        OFFSET(TASK_THREAD_INFO, task_struct, stack);
+        OFFSET(TASK_FLAGS, task_struct, flags);
+        OFFSET(TASK_MM, task_struct, mm);
+        OFFSET(TASK_PID, task_struct, pid);
+        DEFINE(TASK_STRUCT_SIZE, sizeof(struct task_struct));
+        BLANK();
 }
 
 void output_thread_info_defines(void)
 {
-        text("MIPS thread_info offsets.");
-        offset("TI_TASK", struct thread_info, task);
-        offset("TI_EXEC_DOMAIN", struct thread_info, exec_domain);
-        offset("TI_FLAGS", struct thread_info, flags);
-        offset("TI_TP_VALUE", struct thread_info, tp_value);
-        offset("TI_CPU", struct thread_info, cpu);
-        offset("TI_PRE_COUNT", struct thread_info, preempt_count);
-        offset("TI_ADDR_LIMIT", struct thread_info, addr_limit);
-        offset("TI_RESTART_BLOCK", struct thread_info, restart_block);
-        offset("TI_REGS", struct thread_info, regs);
-        constant("_THREAD_SIZE", THREAD_SIZE);
-        constant("_THREAD_MASK", THREAD_MASK);
-        linefeed;
+        COMMENT("MIPS thread_info offsets.");
+        OFFSET(TI_TASK, thread_info, task);
+        OFFSET(TI_EXEC_DOMAIN, thread_info, exec_domain);
+        OFFSET(TI_FLAGS, thread_info, flags);
+        OFFSET(TI_TP_VALUE, thread_info, tp_value);
+        OFFSET(TI_CPU, thread_info, cpu);
+        OFFSET(TI_PRE_COUNT, thread_info, preempt_count);
+        OFFSET(TI_ADDR_LIMIT, thread_info, addr_limit);
+        OFFSET(TI_RESTART_BLOCK, thread_info, restart_block);
+        OFFSET(TI_REGS, thread_info, regs);
+        DEFINE(_THREAD_SIZE, THREAD_SIZE);
+        DEFINE(_THREAD_MASK, THREAD_MASK);
+        BLANK();
 }
 
 void output_thread_defines(void)
 {
-        text("MIPS specific thread_struct offsets.");
-        offset("THREAD_REG16", struct task_struct, thread.reg16);
-        offset("THREAD_REG17", struct task_struct, thread.reg17);
-        offset("THREAD_REG18", struct task_struct, thread.reg18);
-        offset("THREAD_REG19", struct task_struct, thread.reg19);
-        offset("THREAD_REG20", struct task_struct, thread.reg20);
-        offset("THREAD_REG21", struct task_struct, thread.reg21);
-        offset("THREAD_REG22", struct task_struct, thread.reg22);
-        offset("THREAD_REG23", struct task_struct, thread.reg23);
-        offset("THREAD_REG29", struct task_struct, thread.reg29);
-        offset("THREAD_REG30", struct task_struct, thread.reg30);
-        offset("THREAD_REG31", struct task_struct, thread.reg31);
-        offset("THREAD_STATUS", struct task_struct,
+        COMMENT("MIPS specific thread_struct offsets.");
+        OFFSET(THREAD_REG16, task_struct, thread.reg16);
+        OFFSET(THREAD_REG17, task_struct, thread.reg17);
+        OFFSET(THREAD_REG18, task_struct, thread.reg18);
+        OFFSET(THREAD_REG19, task_struct, thread.reg19);
+        OFFSET(THREAD_REG20, task_struct, thread.reg20);
+        OFFSET(THREAD_REG21, task_struct, thread.reg21);
+        OFFSET(THREAD_REG22, task_struct, thread.reg22);
+        OFFSET(THREAD_REG23, task_struct, thread.reg23);
+        OFFSET(THREAD_REG29, task_struct, thread.reg29);
+        OFFSET(THREAD_REG30, task_struct, thread.reg30);
+        OFFSET(THREAD_REG31, task_struct, thread.reg31);
+        OFFSET(THREAD_STATUS, task_struct,
                thread.cp0_status);
-        offset("THREAD_FPU", struct task_struct, thread.fpu);
+        OFFSET(THREAD_FPU, task_struct, thread.fpu);
 
-        offset("THREAD_BVADDR", struct task_struct, \
+        OFFSET(THREAD_BVADDR, task_struct, \
                thread.cp0_badvaddr);
-        offset("THREAD_BUADDR", struct task_struct, \
+        OFFSET(THREAD_BUADDR, task_struct, \
                thread.cp0_baduaddr);
-        offset("THREAD_ECODE", struct task_struct, \
+        OFFSET(THREAD_ECODE, task_struct, \
                thread.error_code);
-        offset("THREAD_TRAPNO", struct task_struct, thread.trap_no);
-        offset("THREAD_TRAMP", struct task_struct, \
+        OFFSET(THREAD_TRAPNO, task_struct, thread.trap_no);
+        OFFSET(THREAD_TRAMP, task_struct, \
                thread.irix_trampoline);
-        offset("THREAD_OLDCTX", struct task_struct, \
+        OFFSET(THREAD_OLDCTX, task_struct, \
                thread.irix_oldctx);
-        linefeed;
+        BLANK();
 }
 
 void output_thread_fpu_defines(void)
 {
-        offset("THREAD_FPR0",
-               struct task_struct, thread.fpu.fpr[0]);
-        offset("THREAD_FPR1",
-               struct task_struct, thread.fpu.fpr[1]);
-        offset("THREAD_FPR2",
-               struct task_struct, thread.fpu.fpr[2]);
-        offset("THREAD_FPR3",
-               struct task_struct, thread.fpu.fpr[3]);
-        offset("THREAD_FPR4",
-               struct task_struct, thread.fpu.fpr[4]);
-        offset("THREAD_FPR5",
-               struct task_struct, thread.fpu.fpr[5]);
-        offset("THREAD_FPR6",
-               struct task_struct, thread.fpu.fpr[6]);
-        offset("THREAD_FPR7",
-               struct task_struct, thread.fpu.fpr[7]);
-        offset("THREAD_FPR8",
-               struct task_struct, thread.fpu.fpr[8]);
-        offset("THREAD_FPR9",
-               struct task_struct, thread.fpu.fpr[9]);
-        offset("THREAD_FPR10",
-               struct task_struct, thread.fpu.fpr[10]);
-        offset("THREAD_FPR11",
-               struct task_struct, thread.fpu.fpr[11]);
-        offset("THREAD_FPR12",
-               struct task_struct, thread.fpu.fpr[12]);
-        offset("THREAD_FPR13",
-               struct task_struct, thread.fpu.fpr[13]);
-        offset("THREAD_FPR14",
-               struct task_struct, thread.fpu.fpr[14]);
-        offset("THREAD_FPR15",
-               struct task_struct, thread.fpu.fpr[15]);
-        offset("THREAD_FPR16",
-               struct task_struct, thread.fpu.fpr[16]);
-        offset("THREAD_FPR17",
-               struct task_struct, thread.fpu.fpr[17]);
-        offset("THREAD_FPR18",
-               struct task_struct, thread.fpu.fpr[18]);
-        offset("THREAD_FPR19",
-               struct task_struct, thread.fpu.fpr[19]);
-        offset("THREAD_FPR20",
-               struct task_struct, thread.fpu.fpr[20]);
-        offset("THREAD_FPR21",
-               struct task_struct, thread.fpu.fpr[21]);
-        offset("THREAD_FPR22",
-               struct task_struct, thread.fpu.fpr[22]);
-        offset("THREAD_FPR23",
-               struct task_struct, thread.fpu.fpr[23]);
-        offset("THREAD_FPR24",
-               struct task_struct, thread.fpu.fpr[24]);
-        offset("THREAD_FPR25",
-               struct task_struct, thread.fpu.fpr[25]);
-        offset("THREAD_FPR26",
-               struct task_struct, thread.fpu.fpr[26]);
-        offset("THREAD_FPR27",
-               struct task_struct, thread.fpu.fpr[27]);
-        offset("THREAD_FPR28",
-               struct task_struct, thread.fpu.fpr[28]);
-        offset("THREAD_FPR29",
-               struct task_struct, thread.fpu.fpr[29]);
-        offset("THREAD_FPR30",
-               struct task_struct, thread.fpu.fpr[30]);
-        offset("THREAD_FPR31",
-               struct task_struct, thread.fpu.fpr[31]);
+        OFFSET(THREAD_FPR0, task_struct, thread.fpu.fpr[0]);
+        OFFSET(THREAD_FPR1, task_struct, thread.fpu.fpr[1]);
+        OFFSET(THREAD_FPR2, task_struct, thread.fpu.fpr[2]);
+        OFFSET(THREAD_FPR3, task_struct, thread.fpu.fpr[3]);
+        OFFSET(THREAD_FPR4, task_struct, thread.fpu.fpr[4]);
+        OFFSET(THREAD_FPR5, task_struct, thread.fpu.fpr[5]);
+        OFFSET(THREAD_FPR6, task_struct, thread.fpu.fpr[6]);
+        OFFSET(THREAD_FPR7, task_struct, thread.fpu.fpr[7]);
+        OFFSET(THREAD_FPR8, task_struct, thread.fpu.fpr[8]);
+        OFFSET(THREAD_FPR9, task_struct, thread.fpu.fpr[9]);
+        OFFSET(THREAD_FPR10, task_struct, thread.fpu.fpr[10]);
+        OFFSET(THREAD_FPR11, task_struct, thread.fpu.fpr[11]);
+        OFFSET(THREAD_FPR12, task_struct, thread.fpu.fpr[12]);
+        OFFSET(THREAD_FPR13, task_struct, thread.fpu.fpr[13]);
+        OFFSET(THREAD_FPR14, task_struct, thread.fpu.fpr[14]);
+        OFFSET(THREAD_FPR15, task_struct, thread.fpu.fpr[15]);
+        OFFSET(THREAD_FPR16, task_struct, thread.fpu.fpr[16]);
+        OFFSET(THREAD_FPR17, task_struct, thread.fpu.fpr[17]);
+        OFFSET(THREAD_FPR18, task_struct, thread.fpu.fpr[18]);
+        OFFSET(THREAD_FPR19, task_struct, thread.fpu.fpr[19]);
+        OFFSET(THREAD_FPR20, task_struct, thread.fpu.fpr[20]);
+        OFFSET(THREAD_FPR21, task_struct, thread.fpu.fpr[21]);
+        OFFSET(THREAD_FPR22, task_struct, thread.fpu.fpr[22]);
+        OFFSET(THREAD_FPR23, task_struct, thread.fpu.fpr[23]);
+        OFFSET(THREAD_FPR24, task_struct, thread.fpu.fpr[24]);
+        OFFSET(THREAD_FPR25, task_struct, thread.fpu.fpr[25]);
+        OFFSET(THREAD_FPR26, task_struct, thread.fpu.fpr[26]);
+        OFFSET(THREAD_FPR27, task_struct, thread.fpu.fpr[27]);
+        OFFSET(THREAD_FPR28, task_struct, thread.fpu.fpr[28]);
+        OFFSET(THREAD_FPR29, task_struct, thread.fpu.fpr[29]);
+        OFFSET(THREAD_FPR30, task_struct, thread.fpu.fpr[30]);
+        OFFSET(THREAD_FPR31, task_struct, thread.fpu.fpr[31]);
 
-        offset("THREAD_FCR31",
-               struct task_struct, thread.fpu.fcr31);
-        linefeed;
+        OFFSET(THREAD_FCR31, task_struct, thread.fpu.fcr31);
+        BLANK();
 }
 
 void output_mm_defines(void)
 {
-        text("Size of struct page");
-        size("STRUCT_PAGE_SIZE", struct page);
-        linefeed;
-        text("Linux mm_struct offsets.");
-        offset("MM_USERS", struct mm_struct, mm_users);
-        offset("MM_PGD", struct mm_struct, pgd);
-        offset("MM_CONTEXT", struct mm_struct, context);
-        linefeed;
-        constant("_PAGE_SIZE", PAGE_SIZE);
-        constant("_PAGE_SHIFT", PAGE_SHIFT);
-        linefeed;
-        constant("_PGD_T_SIZE", sizeof(pgd_t));
-        constant("_PMD_T_SIZE", sizeof(pmd_t));
-        constant("_PTE_T_SIZE", sizeof(pte_t));
-        linefeed;
-        constant("_PGD_T_LOG2", PGD_T_LOG2);
-        constant("_PMD_T_LOG2", PMD_T_LOG2);
-        constant("_PTE_T_LOG2", PTE_T_LOG2);
-        linefeed;
-        constant("_PGD_ORDER", PGD_ORDER);
-        constant("_PMD_ORDER", PMD_ORDER);
-        constant("_PTE_ORDER", PTE_ORDER);
-        linefeed;
-        constant("_PMD_SHIFT", PMD_SHIFT);
-        constant("_PGDIR_SHIFT", PGDIR_SHIFT);
-        linefeed;
-        constant("_PTRS_PER_PGD", PTRS_PER_PGD);
-        constant("_PTRS_PER_PMD", PTRS_PER_PMD);
-        constant("_PTRS_PER_PTE", PTRS_PER_PTE);
-        linefeed;
+        COMMENT("Size of struct page");
+        DEFINE(STRUCT_PAGE_SIZE, sizeof(struct page));
+        BLANK();
+        COMMENT("Linux mm_struct offsets.");
+        OFFSET(MM_USERS, mm_struct, mm_users);
+        OFFSET(MM_PGD, mm_struct, pgd);
+        OFFSET(MM_CONTEXT, mm_struct, context);
+        BLANK();
+        DEFINE(_PAGE_SIZE, PAGE_SIZE);
+        DEFINE(_PAGE_SHIFT, PAGE_SHIFT);
+        BLANK();
+        DEFINE(_PGD_T_SIZE, sizeof(pgd_t));
+        DEFINE(_PMD_T_SIZE, sizeof(pmd_t));
+        DEFINE(_PTE_T_SIZE, sizeof(pte_t));
+        BLANK();
+        DEFINE(_PGD_T_LOG2, PGD_T_LOG2);
+        DEFINE(_PMD_T_LOG2, PMD_T_LOG2);
+        DEFINE(_PTE_T_LOG2, PTE_T_LOG2);
+        BLANK();
+        DEFINE(_PGD_ORDER, PGD_ORDER);
+        DEFINE(_PMD_ORDER, PMD_ORDER);
+        DEFINE(_PTE_ORDER, PTE_ORDER);
+        BLANK();
+        DEFINE(_PMD_SHIFT, PMD_SHIFT);
+        DEFINE(_PGDIR_SHIFT, PGDIR_SHIFT);
+        BLANK();
+        DEFINE(_PTRS_PER_PGD, PTRS_PER_PGD);
+        DEFINE(_PTRS_PER_PMD, PTRS_PER_PMD);
+        DEFINE(_PTRS_PER_PTE, PTRS_PER_PTE);
+        BLANK();
 }
 
 #ifdef CONFIG_32BIT
 void output_sc_defines(void)
 {
-        text("Linux sigcontext offsets.");
-        offset("SC_REGS", struct sigcontext, sc_regs);
-        offset("SC_FPREGS", struct sigcontext, sc_fpregs);
-        offset("SC_ACX", struct sigcontext, sc_acx);
-        offset("SC_MDHI", struct sigcontext, sc_mdhi);
-        offset("SC_MDLO", struct sigcontext, sc_mdlo);
-        offset("SC_PC", struct sigcontext, sc_pc);
-        offset("SC_FPC_CSR", struct sigcontext, sc_fpc_csr);
-        offset("SC_FPC_EIR", struct sigcontext, sc_fpc_eir);
-        offset("SC_HI1", struct sigcontext, sc_hi1);
-        offset("SC_LO1", struct sigcontext, sc_lo1);
-        offset("SC_HI2", struct sigcontext, sc_hi2);
-        offset("SC_LO2", struct sigcontext, sc_lo2);
-        offset("SC_HI3", struct sigcontext, sc_hi3);
-        offset("SC_LO3", struct sigcontext, sc_lo3);
-        linefeed;
+        COMMENT("Linux sigcontext offsets.");
+        OFFSET(SC_REGS, sigcontext, sc_regs);
+        OFFSET(SC_FPREGS, sigcontext, sc_fpregs);
+        OFFSET(SC_ACX, sigcontext, sc_acx);
+        OFFSET(SC_MDHI, sigcontext, sc_mdhi);
+        OFFSET(SC_MDLO, sigcontext, sc_mdlo);
+        OFFSET(SC_PC, sigcontext, sc_pc);
+        OFFSET(SC_FPC_CSR, sigcontext, sc_fpc_csr);
+        OFFSET(SC_FPC_EIR, sigcontext, sc_fpc_eir);
+        OFFSET(SC_HI1, sigcontext, sc_hi1);
+        OFFSET(SC_LO1, sigcontext, sc_lo1);
+        OFFSET(SC_HI2, sigcontext, sc_hi2);
+        OFFSET(SC_LO2, sigcontext, sc_lo2);
+        OFFSET(SC_HI3, sigcontext, sc_hi3);
+        OFFSET(SC_LO3, sigcontext, sc_lo3);
+        BLANK();
 }
 #endif
 
 #ifdef CONFIG_64BIT
 void output_sc_defines(void)
 {
-        text("Linux sigcontext offsets.");
-        offset("SC_REGS", struct sigcontext, sc_regs);
-        offset("SC_FPREGS", struct sigcontext, sc_fpregs);
-        offset("SC_MDHI", struct sigcontext, sc_mdhi);
-        offset("SC_MDLO", struct sigcontext, sc_mdlo);
-        offset("SC_PC", struct sigcontext, sc_pc);
-        offset("SC_FPC_CSR", struct sigcontext, sc_fpc_csr);
-        linefeed;
+        COMMENT("Linux sigcontext offsets.");
+        OFFSET(SC_REGS, sigcontext, sc_regs);
+        OFFSET(SC_FPREGS, sigcontext, sc_fpregs);
+        OFFSET(SC_MDHI, sigcontext, sc_mdhi);
+        OFFSET(SC_MDLO, sigcontext, sc_mdlo);
+        OFFSET(SC_PC, sigcontext, sc_pc);
+        OFFSET(SC_FPC_CSR, sigcontext, sc_fpc_csr);
+        BLANK();
 }
 #endif
 
 #ifdef CONFIG_MIPS32_COMPAT
 void output_sc32_defines(void)
 {
-        text("Linux 32-bit sigcontext offsets.");
-        offset("SC32_FPREGS", struct sigcontext32, sc_fpregs);
-        offset("SC32_FPC_CSR", struct sigcontext32, sc_fpc_csr);
-        offset("SC32_FPC_EIR", struct sigcontext32, sc_fpc_eir);
-        linefeed;
+        COMMENT("Linux 32-bit sigcontext offsets.");
+        OFFSET(SC32_FPREGS, sigcontext32, sc_fpregs);
+        OFFSET(SC32_FPC_CSR, sigcontext32, sc_fpc_csr);
+        OFFSET(SC32_FPC_EIR, sigcontext32, sc_fpc_eir);
+        BLANK();
 }
 #endif
 
 void output_signal_defined(void)
 {
-        text("Linux signal numbers.");
-        constant("_SIGHUP", SIGHUP);
-        constant("_SIGINT", SIGINT);
-        constant("_SIGQUIT", SIGQUIT);
-        constant("_SIGILL", SIGILL);
-        constant("_SIGTRAP", SIGTRAP);
-        constant("_SIGIOT", SIGIOT);
-        constant("_SIGABRT", SIGABRT);
-        constant("_SIGEMT", SIGEMT);
-        constant("_SIGFPE", SIGFPE);
-        constant("_SIGKILL", SIGKILL);
-        constant("_SIGBUS", SIGBUS);
-        constant("_SIGSEGV", SIGSEGV);
-        constant("_SIGSYS", SIGSYS);
-        constant("_SIGPIPE", SIGPIPE);
-        constant("_SIGALRM", SIGALRM);
-        constant("_SIGTERM", SIGTERM);
-        constant("_SIGUSR1", SIGUSR1);
-        constant("_SIGUSR2", SIGUSR2);
-        constant("_SIGCHLD", SIGCHLD);
-        constant("_SIGPWR", SIGPWR);
-        constant("_SIGWINCH", SIGWINCH);
-        constant("_SIGURG", SIGURG);
-        constant("_SIGIO", SIGIO);
-        constant("_SIGSTOP", SIGSTOP);
-        constant("_SIGTSTP", SIGTSTP);
-        constant("_SIGCONT", SIGCONT);
-        constant("_SIGTTIN", SIGTTIN);
-        constant("_SIGTTOU", SIGTTOU);
-        constant("_SIGVTALRM", SIGVTALRM);
-        constant("_SIGPROF", SIGPROF);
-        constant("_SIGXCPU", SIGXCPU);
-        constant("_SIGXFSZ", SIGXFSZ);
-        linefeed;
+        COMMENT("Linux signal numbers.");
+        DEFINE(_SIGHUP, SIGHUP);
+        DEFINE(_SIGINT, SIGINT);
+        DEFINE(_SIGQUIT, SIGQUIT);
+        DEFINE(_SIGILL, SIGILL);
+        DEFINE(_SIGTRAP, SIGTRAP);
+        DEFINE(_SIGIOT, SIGIOT);
+        DEFINE(_SIGABRT, SIGABRT);
+        DEFINE(_SIGEMT, SIGEMT);
+        DEFINE(_SIGFPE, SIGFPE);
+        DEFINE(_SIGKILL, SIGKILL);
+        DEFINE(_SIGBUS, SIGBUS);
+        DEFINE(_SIGSEGV, SIGSEGV);
+        DEFINE(_SIGSYS, SIGSYS);
+        DEFINE(_SIGPIPE, SIGPIPE);
+        DEFINE(_SIGALRM, SIGALRM);
+        DEFINE(_SIGTERM, SIGTERM);
+        DEFINE(_SIGUSR1, SIGUSR1);
+        DEFINE(_SIGUSR2, SIGUSR2);
+        DEFINE(_SIGCHLD, SIGCHLD);
+        DEFINE(_SIGPWR, SIGPWR);
+        DEFINE(_SIGWINCH, SIGWINCH);
+        DEFINE(_SIGURG, SIGURG);
+        DEFINE(_SIGIO, SIGIO);
+        DEFINE(_SIGSTOP, SIGSTOP);
+        DEFINE(_SIGTSTP, SIGTSTP);
+        DEFINE(_SIGCONT, SIGCONT);
+        DEFINE(_SIGTTIN, SIGTTIN);
+        DEFINE(_SIGTTOU, SIGTTOU);
+        DEFINE(_SIGVTALRM, SIGVTALRM);
+        DEFINE(_SIGPROF, SIGPROF);
+        DEFINE(_SIGXCPU, SIGXCPU);
+        DEFINE(_SIGXFSZ, SIGXFSZ);
+        BLANK();
 }
 
 void output_irq_cpustat_t_defines(void)
 {
-        text("Linux irq_cpustat_t offsets.");
-        offset("IC_SOFTIRQ_PENDING", irq_cpustat_t, __softirq_pending);
-        size("IC_IRQ_CPUSTAT_T", irq_cpustat_t);
-        linefeed;
+        COMMENT("Linux irq_cpustat_t offsets.");
+        DEFINE(IC_SOFTIRQ_PENDING,
+                        offsetof(irq_cpustat_t, __softirq_pending));
+        DEFINE(IC_IRQ_CPUSTAT_T, sizeof(irq_cpustat_t));
+        BLANK();
 }
diff --git a/arch/mips/kernel/binfmt_elfn32.c b/arch/mips/kernel/binfmt_elfn32.c
index 77db3473deab..9fdd8bcdd21e 100644
--- a/arch/mips/kernel/binfmt_elfn32.c
+++ b/arch/mips/kernel/binfmt_elfn32.c
@@ -54,6 +54,7 @@ typedef elf_fpreg_t elf_fpregset_t[ELF_NFPREG];
 #include <linux/module.h>
 #include <linux/elfcore.h>
 #include <linux/compat.h>
+#include <linux/math64.h>
 
 #define elf_prstatus elf_prstatus32
 struct elf_prstatus32
@@ -102,8 +103,8 @@ jiffies_to_compat_timeval(unsigned long jiffies, struct compat_timeval *value)
          * one divide.
          */
         u64 nsec = (u64)jiffies * TICK_NSEC;
-        long rem;
-        value->tv_sec = div_long_long_rem(nsec, NSEC_PER_SEC, &rem);
+        u32 rem;
+        value->tv_sec = div_u64_rem(nsec, NSEC_PER_SEC, &rem);
         value->tv_usec = rem / NSEC_PER_USEC;
 }
 
diff --git a/arch/mips/kernel/binfmt_elfo32.c b/arch/mips/kernel/binfmt_elfo32.c
index 08f4cd781ee3..e1333d7319e2 100644
--- a/arch/mips/kernel/binfmt_elfo32.c
+++ b/arch/mips/kernel/binfmt_elfo32.c
@@ -56,6 +56,7 @@ typedef elf_fpreg_t elf_fpregset_t[ELF_NFPREG];
 #include <linux/module.h>
 #include <linux/elfcore.h>
 #include <linux/compat.h>
+#include <linux/math64.h>
 
 #define elf_prstatus elf_prstatus32
 struct elf_prstatus32
@@ -104,8 +105,8 @@ jiffies_to_compat_timeval(unsigned long jiffies, struct compat_timeval *value)
          * one divide.
          */
         u64 nsec = (u64)jiffies * TICK_NSEC;
-        long rem;
-        value->tv_sec = div_long_long_rem(nsec, NSEC_PER_SEC, &rem);
+        u32 rem;
+        value->tv_sec = div_u64_rem(nsec, NSEC_PER_SEC, &rem);
         value->tv_usec = rem / NSEC_PER_USEC;
 }
 
diff --git a/arch/mips/kernel/irixioctl.c b/arch/mips/kernel/irixioctl.c
index 2bde200d5ad0..b39bdba82e02 100644
--- a/arch/mips/kernel/irixioctl.c
+++ b/arch/mips/kernel/irixioctl.c
@@ -27,33 +27,6 @@ struct irix_termios {
         cc_t c_cc[NCCS];
 };
 
-extern void start_tty(struct tty_struct *tty);
-static struct tty_struct *get_tty(int fd)
-{
-        struct file *filp;
-        struct tty_struct *ttyp = NULL;
-
-        rcu_read_lock();
-        filp = fcheck(fd);
-        if(filp && filp->private_data) {
-                ttyp = (struct tty_struct *) filp->private_data;
-
-                if(ttyp->magic != TTY_MAGIC)
-                        ttyp =NULL;
-        }
-        rcu_read_unlock();
-        return ttyp;
-}
-
-static struct tty_struct *get_real_tty(struct tty_struct *tp)
-{
-        if (tp->driver->type == TTY_DRIVER_TYPE_PTY &&
-           tp->driver->subtype == PTY_TYPE_MASTER)
-                return tp->link;
-        else
-                return tp;
-}
-
 asmlinkage int irix_ioctl(int fd, unsigned long cmd, unsigned long arg)
 {
         struct tty_struct *tp, *rtp;
@@ -146,34 +119,24 @@ asmlinkage int irix_ioctl(int fd, unsigned long cmd, unsigned long arg)
                 error = sys_ioctl(fd, TIOCNOTTY, arg);
                 break;
 
-        case 0x00007416:
+        case 0x00007416: {
+                pid_t pid;
 #ifdef DEBUG_IOCTLS
                 printk("TIOCGSID, %08lx) ", arg);
 #endif
-                tp = get_tty(fd);
-                if(!tp) {
-                        error = -EINVAL;
-                        break;
-                }
-                rtp = get_real_tty(tp);
-#ifdef DEBUG_IOCTLS
-                printk("rtp->session=%d ", rtp->session);
-#endif
-                error = put_user(rtp->session, (unsigned long __user *) arg);
+                old_fs = get_fs(); set_fs(get_ds());
+                error = sys_ioctl(fd, TIOCGSID, (unsigned long)&pid);
+                set_fs(old_fs);
+                if (!error)
+                        error = put_user(pid, (unsigned long __user *) arg);
                 break;
-
+        }
         case 0x746e:
                 /* TIOCSTART, same effect as hitting ^Q */
 #ifdef DEBUG_IOCTLS
                 printk("TIOCSTART, %08lx) ", arg);
 #endif
-                tp = get_tty(fd);
-                if(!tp) {
-                        error = -EINVAL;
-                        break;
-                }
-                rtp = get_real_tty(tp);
-                start_tty(rtp);
+                error = sys_ioctl(fd, TCXONC, TCOON);
                 break;
 
         case 0x20006968:
diff --git a/arch/mips/kernel/kspd.c b/arch/mips/kernel/kspd.c
index 998c4efcce88..ceb62dce1c9c 100644
--- a/arch/mips/kernel/kspd.c
+++ b/arch/mips/kernel/kspd.c
@@ -20,6 +20,7 @@
 #include <linux/sched.h>
 #include <linux/unistd.h>
 #include <linux/file.h>
+#include <linux/fdtable.h>
 #include <linux/fs.h>
 #include <linux/syscalls.h>
 #include <linux/workqueue.h>
diff --git a/arch/mips/lib/iomap-pci.c b/arch/mips/lib/iomap-pci.c
index c11b2494bb6e..2ab899c4b4ce 100644
--- a/arch/mips/lib/iomap-pci.c
+++ b/arch/mips/lib/iomap-pci.c
@@ -45,8 +45,8 @@ static void __iomem *ioport_map_pci(struct pci_dev *dev,
  */
 void __iomem *pci_iomap(struct pci_dev *dev, int bar, unsigned long maxlen)
 {
-        unsigned long start = pci_resource_start(dev, bar);
-        unsigned long len = pci_resource_len(dev, bar);
+        resource_size_t start = pci_resource_start(dev, bar);
+        resource_size_t len = pci_resource_len(dev, bar);
         unsigned long flags = pci_resource_flags(dev, bar);
 
         if (!len || !start)
diff --git a/arch/mips/pmc-sierra/yosemite/setup.c b/arch/mips/pmc-sierra/yosemite/setup.c
index 855977ca51cd..6537d90a25bb 100644
--- a/arch/mips/pmc-sierra/yosemite/setup.c
+++ b/arch/mips/pmc-sierra/yosemite/setup.c
@@ -143,9 +143,6 @@ void __init plat_time_init(void)
 mips_hpt_frequency = 33000000 * 3 * 5;
 }
 
-/* No other usable initialization hook than this ...  */
-extern void (*late_time_init)(void);
-
 unsigned long ocd_base;
 
 EXPORT_SYMBOL(ocd_base);
diff --git a/arch/mn10300/kernel/asm-offsets.c b/arch/mn10300/kernel/asm-offsets.c
index ee2d9f8af5ad..2646fcbd7d89 100644
--- a/arch/mn10300/kernel/asm-offsets.c
+++ b/arch/mn10300/kernel/asm-offsets.c
@@ -7,6 +7,7 @@
 #include <linux/sched.h>
 #include <linux/signal.h>
 #include <linux/personality.h>
+#include <linux/kbuild.h>
 #include <asm/ucontext.h>
 #include <asm/processor.h>
 #include <asm/thread_info.h>
@@ -14,14 +15,6 @@
 #include "sigframe.h"
 #include "mn10300-serial.h"
 
-#define DEFINE(sym, val) \
-        asm volatile("\n->" #sym " %0 " #val : : "i" (val))
-
-#define BLANK() asm volatile("\n->")
-
-#define OFFSET(sym, str, mem) \
-        DEFINE(sym, offsetof(struct str, mem));
-
 void foo(void)
 {
         OFFSET(SIGCONTEXT_d0, sigcontext, d0);
diff --git a/arch/mn10300/kernel/sys_mn10300.c b/arch/mn10300/kernel/sys_mn10300.c
index 5f17a1ebc825..bca5a84dc72c 100644
--- a/arch/mn10300/kernel/sys_mn10300.c
+++ b/arch/mn10300/kernel/sys_mn10300.c
@@ -29,23 +29,6 @@
 #define MIN_MAP_ADDR    PAGE_SIZE       /* minimum fixed mmap address */
 
 /*
- * sys_pipe() is the normal C calling standard for creating
- * a pipe. It's not the way Unix traditionally does this, though.
- */
-asmlinkage long sys_pipe(unsigned long __user *fildes)
-{
-        int fd[2];
-        int error;
-
-        error = do_pipe(fd);
-        if (!error) {
-                if (copy_to_user(fildes, fd, 2 * sizeof(int)))
-                        error = -EFAULT;
-        }
-        return error;
-}
-
-/*
  * memory mapping syscall
  */
 asmlinkage long sys_mmap2(unsigned long addr, unsigned long len,
diff --git a/arch/mn10300/unit-asb2305/pci-iomap.c b/arch/mn10300/unit-asb2305/pci-iomap.c
index dbceae4307da..c1a8d8f941fd 100644
--- a/arch/mn10300/unit-asb2305/pci-iomap.c
+++ b/arch/mn10300/unit-asb2305/pci-iomap.c
@@ -16,8 +16,8 @@
  */
 void __iomem *pci_iomap(struct pci_dev *dev, int bar, unsigned long maxlen)
 {
-        unsigned long start = pci_resource_start(dev, bar);
-        unsigned long len = pci_resource_len(dev, bar);
+        resource_size_t start = pci_resource_start(dev, bar);
+        resource_size_t len = pci_resource_len(dev, bar);
         unsigned long flags = pci_resource_flags(dev, bar);
 
         if (!len || !start)
diff --git a/arch/parisc/kernel/asm-offsets.c b/arch/parisc/kernel/asm-offsets.c
index eaa79bc14d94..3efc0b73e4ff 100644
--- a/arch/parisc/kernel/asm-offsets.c
+++ b/arch/parisc/kernel/asm-offsets.c
@@ -32,6 +32,7 @@
 #include <linux/thread_info.h>
 #include <linux/ptrace.h>
 #include <linux/hardirq.h>
+#include <linux/kbuild.h>
 
 #include <asm/pgtable.h>
 #include <asm/ptrace.h>
@@ -39,11 +40,6 @@
 #include <asm/pdc.h>
 #include <asm/uaccess.h>
 
-#define DEFINE(sym, val) \
-        asm volatile("\n->" #sym " %0 " #val : : "i" (val))
-
-#define BLANK() asm volatile("\n->" : : )
-
 #ifdef CONFIG_64BIT
 #define FRAME_SIZE      128
 #else
diff --git a/arch/parisc/kernel/pci-dma.c b/arch/parisc/kernel/pci-dma.c
index 9448d4e91142..ccd61b9567a6 100644
--- a/arch/parisc/kernel/pci-dma.c
+++ b/arch/parisc/kernel/pci-dma.c
@@ -397,10 +397,9 @@ pcxl_dma_init(void)
                         "pcxl_dma_init: Unable to create gsc /proc dir entry\n");
         else {
                 struct proc_dir_entry* ent;
-                ent = create_proc_entry("pcxl_dma", 0, proc_gsc_root);
-                if (ent)
-                        ent->proc_fops = &proc_pcxl_dma_ops;
-                else
+                ent = proc_create("pcxl_dma", 0, proc_gsc_root,
+                                  &proc_pcxl_dma_ops);
+                if (!ent)
                         printk(KERN_WARNING
                                 "pci-dma.c: Unable to create pcxl_dma /proc entry.\n");
         }
diff --git a/arch/parisc/kernel/sys_parisc.c b/arch/parisc/kernel/sys_parisc.c
index 4f589216b39e..71b31957c8f1 100644
--- a/arch/parisc/kernel/sys_parisc.c
+++ b/arch/parisc/kernel/sys_parisc.c
@@ -33,19 +33,6 @@
 #include <linux/utsname.h>
 #include <linux/personality.h>
 
-int sys_pipe(int __user *fildes)
-{
-        int fd[2];
-        int error;
-
-        error = do_pipe(fd);
-        if (!error) {
-                if (copy_to_user(fildes, fd, 2*sizeof(int)))
-                        error = -EFAULT;
-        }
-        return error;
-}
-
 static unsigned long get_unshared_area(unsigned long addr, unsigned long len)
 {
         struct vm_area_struct *vma;
diff --git a/arch/parisc/lib/iomap.c b/arch/parisc/lib/iomap.c
index f4a811690ab3..9abed07db7fc 100644
--- a/arch/parisc/lib/iomap.c
+++ b/arch/parisc/lib/iomap.c
@@ -438,8 +438,8 @@ void ioport_unmap(void __iomem *addr)
 /* Create a virtual mapping cookie for a PCI BAR (memory or IO) */
 void __iomem *pci_iomap(struct pci_dev *dev, int bar, unsigned long maxlen)
 {
-        unsigned long start = pci_resource_start(dev, bar);
-        unsigned long len = pci_resource_len(dev, bar);
+        resource_size_t start = pci_resource_start(dev, bar);
+        resource_size_t len = pci_resource_len(dev, bar);
         unsigned long flags = pci_resource_flags(dev, bar);
 
         if (!len || !start)
diff --git a/arch/powerpc/boot/dts/sequoia.dts b/arch/powerpc/boot/dts/sequoia.dts
index a1ae4d6ec990..72d67564bdfc 100644
--- a/arch/powerpc/boot/dts/sequoia.dts
+++ b/arch/powerpc/boot/dts/sequoia.dts
@@ -342,9 +342,14 @@
                         /* Outbound ranges, one memory and one IO,
                          * later cannot be changed. Chip supports a second
                          * IO range but we don't use it for now
+                         * From the 440EPx user manual:
+                         * PCI 1 Memory     1 8000 0000     1 BFFF FFFF     1GB
+                         * I/O              1 E800 0000     1 E800 FFFF     64KB
+                         * I/O              1 E880 0000     1 EBFF FFFF     56MB
                          */
-                        ranges = <02000000 0 80000000 1 80000000 0 10000000
-                                01000000 0 00000000 1 e8000000 0 00100000>;
+                        ranges = <02000000 0 80000000 1 80000000 0 40000000
+                                01000000 0 00000000 1 e8000000 0 00010000
+                                01000000 0 00000000 1 e8800000 0 03800000>;
 
                         /* Inbound 2GB range starting at 0 */
                         dma-ranges = <42000000 0 0 0 0 0 80000000>;
diff --git a/arch/powerpc/kernel/asm-offsets.c b/arch/powerpc/kernel/asm-offsets.c
index af1d2c894ee1..ec9228d687b0 100644
--- a/arch/powerpc/kernel/asm-offsets.c
+++ b/arch/powerpc/kernel/asm-offsets.c
@@ -30,6 +30,7 @@
 #include <linux/time.h>
 #include <linux/hardirq.h>
 #endif
+#include <linux/kbuild.h>
 
 #include <asm/io.h>
 #include <asm/page.h>
@@ -51,11 +52,6 @@
 #include <asm/iseries/alpaca.h>
 #endif
 
-#define DEFINE(sym, val) \
-        asm volatile("\n->" #sym " %0 " #val : : "i" (val))
-
-#define BLANK() asm volatile("\n->" : : )
-
 int main(void)
 {
         DEFINE(THREAD, offsetof(struct task_struct, thread));
diff --git a/arch/powerpc/kernel/head_44x.S b/arch/powerpc/kernel/head_44x.S
index b84ec6a2fc94..c2b9dc4fce5d 100644
--- a/arch/powerpc/kernel/head_44x.S
+++ b/arch/powerpc/kernel/head_44x.S
@@ -653,7 +653,14 @@ finish_tlb_load:
         rlwimi  r10, r11, 0, 26, 26             /* UX = HWEXEC & USER */
 
         rlwimi  r12, r10, 0, 26, 31             /* Insert static perms */
-        rlwinm  r12, r12, 0, 20, 15             /* Clear U0-U3 */
+
+        /*
+         * Clear U0-U3 and WL1 IL1I IL1D IL2I IL2D bits which are added
+         * on newer 440 cores like the 440x6 used on AMCC 460EX/460GT (see
+         * include/asm-powerpc/pgtable-ppc32.h for details).
+         */
+        rlwinm  r12, r12, 0, 20, 10
+
         tlbwe   r12, r13, PPC44x_TLB_ATTRIB     /* Write ATTRIB */
 
         /* Done...restore registers and get out of here.
diff --git a/arch/powerpc/kernel/lparcfg.c b/arch/powerpc/kernel/lparcfg.c
index 1ffacc698ffb..1e656b43ad7f 100644
--- a/arch/powerpc/kernel/lparcfg.c
+++ b/arch/powerpc/kernel/lparcfg.c
@@ -591,10 +591,8 @@ int __init lparcfg_init(void)
                         !firmware_has_feature(FW_FEATURE_ISERIES))
                 mode |= S_IWUSR;
 
-        ent = create_proc_entry("ppc64/lparcfg", mode, NULL);
-        if (ent) {
-                ent->proc_fops = &lparcfg_fops;
-        } else {
+        ent = proc_create("ppc64/lparcfg", mode, NULL, &lparcfg_fops);
+        if (!ent) {
                 printk(KERN_ERR "Failed to create ppc64/lparcfg\n");
                 return -EIO;
         }
diff --git a/arch/powerpc/kernel/ppc_ksyms.c b/arch/powerpc/kernel/ppc_ksyms.c
index 09fcb50c45ae..cf6b5a7d8b3f 100644
--- a/arch/powerpc/kernel/ppc_ksyms.c
+++ b/arch/powerpc/kernel/ppc_ksyms.c
@@ -133,9 +133,6 @@ EXPORT_SYMBOL(adb_try_handler_change);
 EXPORT_SYMBOL(cuda_request);
 EXPORT_SYMBOL(cuda_poll);
 #endif /* CONFIG_ADB_CUDA */
-#ifdef CONFIG_VT
-EXPORT_SYMBOL(kd_mksound);
-#endif
 EXPORT_SYMBOL(to_tm);
 
 #ifdef CONFIG_PPC32
diff --git a/arch/powerpc/kernel/proc_ppc64.c b/arch/powerpc/kernel/proc_ppc64.c
index f78dfce1b771..c647ddef40dc 100644
--- a/arch/powerpc/kernel/proc_ppc64.c
+++ b/arch/powerpc/kernel/proc_ppc64.c
@@ -68,12 +68,11 @@ static int __init proc_ppc64_init(void)
 {
         struct proc_dir_entry *pde;
 
-        pde = create_proc_entry("ppc64/systemcfg", S_IFREG|S_IRUGO, NULL);
+        pde = proc_create_data("ppc64/systemcfg", S_IFREG|S_IRUGO, NULL,
+                               &page_map_fops, vdso_data);
         if (!pde)
                 return 1;
-        pde->data = vdso_data;
         pde->size = PAGE_SIZE;
-        pde->proc_fops = &page_map_fops;
 
         return 0;
 }
diff --git a/arch/powerpc/kernel/rtas-proc.c b/arch/powerpc/kernel/rtas-proc.c
index f2e3bc714d76..f9c6abc84a94 100644
--- a/arch/powerpc/kernel/rtas-proc.c
+++ b/arch/powerpc/kernel/rtas-proc.c
@@ -255,8 +255,6 @@ static void check_location(struct seq_file *m, const char *c);
 
 static int __init proc_rtas_init(void)
 {
-        struct proc_dir_entry *entry;
-
         if (!machine_is(pseries))
                 return -ENODEV;
 
@@ -264,35 +262,20 @@ static int __init proc_rtas_init(void)
         if (rtas_node == NULL)
                 return -ENODEV;
 
-        entry = create_proc_entry("ppc64/rtas/progress", S_IRUGO|S_IWUSR, NULL);
-        if (entry)
-                entry->proc_fops = &ppc_rtas_progress_operations;
-
-        entry = create_proc_entry("ppc64/rtas/clock", S_IRUGO|S_IWUSR, NULL);
-        if (entry)
-                entry->proc_fops = &ppc_rtas_clock_operations;
-
-        entry = create_proc_entry("ppc64/rtas/poweron", S_IWUSR|S_IRUGO, NULL);
-        if (entry)
-                entry->proc_fops = &ppc_rtas_poweron_operations;
-
-        entry = create_proc_entry("ppc64/rtas/sensors", S_IRUGO, NULL);
-        if (entry)
-                entry->proc_fops = &ppc_rtas_sensors_operations;
-
-        entry = create_proc_entry("ppc64/rtas/frequency", S_IWUSR|S_IRUGO,
-                                  NULL);
-        if (entry)
-                entry->proc_fops = &ppc_rtas_tone_freq_operations;
-
-        entry = create_proc_entry("ppc64/rtas/volume", S_IWUSR|S_IRUGO, NULL);
-        if (entry)
-                entry->proc_fops = &ppc_rtas_tone_volume_operations;
-
-        entry = create_proc_entry("ppc64/rtas/rmo_buffer", S_IRUSR, NULL);
-        if (entry)
-                entry->proc_fops = &ppc_rtas_rmo_buf_ops;
-
+        proc_create("ppc64/rtas/progress", S_IRUGO|S_IWUSR, NULL,
+                    &ppc_rtas_progress_operations);
+        proc_create("ppc64/rtas/clock", S_IRUGO|S_IWUSR, NULL,
+                    &ppc_rtas_clock_operations);
+        proc_create("ppc64/rtas/poweron", S_IWUSR|S_IRUGO, NULL,
+                    &ppc_rtas_poweron_operations);
+        proc_create("ppc64/rtas/sensors", S_IRUGO, NULL,
+                    &ppc_rtas_sensors_operations);
+        proc_create("ppc64/rtas/frequency", S_IWUSR|S_IRUGO, NULL,
+                    &ppc_rtas_tone_freq_operations);
+        proc_create("ppc64/rtas/volume", S_IWUSR|S_IRUGO, NULL,
+                    &ppc_rtas_tone_volume_operations);
+        proc_create("ppc64/rtas/rmo_buffer", S_IRUSR, NULL,
+                    &ppc_rtas_rmo_buf_ops);
         return 0;
 }
 
diff --git a/arch/powerpc/kernel/rtas_flash.c b/arch/powerpc/kernel/rtas_flash.c
index 627f126d1848..0a5e22b22729 100644
--- a/arch/powerpc/kernel/rtas_flash.c
+++ b/arch/powerpc/kernel/rtas_flash.c
@@ -704,18 +704,11 @@ static int initialize_flash_pde_data(const char *rtas_call_name,
 static struct proc_dir_entry *create_flash_pde(const char *filename,
                                                const struct file_operations *fops)
 {
-        struct proc_dir_entry *ent = NULL;
-
-        ent = create_proc_entry(filename, S_IRUSR | S_IWUSR, NULL);
-        if (ent != NULL) {
-                ent->proc_fops = fops;
-                ent->owner = THIS_MODULE;
-        }
-
-        return ent;
+        return proc_create(filename, S_IRUSR | S_IWUSR, NULL, fops);
 }
 
 static const struct file_operations rtas_flash_operations = {
+        .owner          = THIS_MODULE,
         .read           = rtas_flash_read,
         .write          = rtas_flash_write,
         .open           = rtas_excl_open,
@@ -723,6 +716,7 @@ static const struct file_operations rtas_flash_operations = {
 };
 
 static const struct file_operations manage_flash_operations = {
+        .owner          = THIS_MODULE,
         .read           = manage_flash_read,
         .write          = manage_flash_write,
         .open           = rtas_excl_open,
@@ -730,6 +724,7 @@ static const struct file_operations manage_flash_operations = {
 };
 
 static const struct file_operations validate_flash_operations = {
+        .owner          = THIS_MODULE,
         .read           = validate_flash_read,
         .write          = validate_flash_write,
         .open           = rtas_excl_open,
diff --git a/arch/powerpc/kernel/syscalls.c b/arch/powerpc/kernel/syscalls.c
index e722a4eeb5d0..4fe69ca24481 100644
--- a/arch/powerpc/kernel/syscalls.c
+++ b/arch/powerpc/kernel/syscalls.c
@@ -136,23 +136,6 @@ int sys_ipc(uint call, int first, unsigned long second, long third,
         return ret;
 }
 
-/*
- * sys_pipe() is the normal C calling standard for creating
- * a pipe. It's not the way unix traditionally does this, though.
- */
-int sys_pipe(int __user *fildes)
-{
-        int fd[2];
-        int error;
-
-        error = do_pipe(fd);
-        if (!error) {
-                if (copy_to_user(fildes, fd, 2*sizeof(int)))
-                        error = -EFAULT;
-        }
-        return error;
-}
-
 static inline unsigned long do_mmap2(unsigned long addr, size_t len,
                         unsigned long prot, unsigned long flags,
                         unsigned long fd, unsigned long off, int shift)
diff --git a/arch/powerpc/kernel/time.c b/arch/powerpc/kernel/time.c
index 3b26fbd6bec9..73401e83739a 100644
--- a/arch/powerpc/kernel/time.c
+++ b/arch/powerpc/kernel/time.c
@@ -149,7 +149,7 @@ EXPORT_SYMBOL(tb_ticks_per_sec);	/* for cputime_t conversions */
 u64 tb_to_xs;
 unsigned tb_to_us;
 
-#define TICKLEN_SCALE   TICK_LENGTH_SHIFT
+#define TICKLEN_SCALE   NTP_SCALE_SHIFT
 u64 last_tick_len;      /* units are ns / 2^TICKLEN_SCALE */
 u64 ticklen_to_xs;      /* 0.64 fraction */
 
@@ -1007,8 +1007,6 @@ void __init time_init(void)
         vdso_data->stamp_xsec = (u64) xtime.tv_sec * XSEC_PER_SEC;
         vdso_data->tb_to_xs = tb_to_xs;
 
-        time_freq = 0;
-
         write_sequnlock_irqrestore(&xtime_lock, flags);
 
         /* Register the clocksource, if we're not running on iSeries */
diff --git a/arch/powerpc/kvm/booke_guest.c b/arch/powerpc/kvm/booke_guest.c
index 6d9884a6884a..712d89a28c46 100644
--- a/arch/powerpc/kvm/booke_guest.c
+++ b/arch/powerpc/kvm/booke_guest.c
@@ -49,6 +49,7 @@ struct kvm_stats_debugfs_item debugfs_entries[] = {
         { "inst_emu",   VCPU_STAT(emulated_inst_exits) },
         { "dec",        VCPU_STAT(dec_exits) },
         { "ext_intr",   VCPU_STAT(ext_intr_exits) },
+        { "halt_wakeup", VCPU_STAT(halt_wakeup) },
         { NULL }
 };
 
@@ -338,6 +339,11 @@ int kvmppc_handle_exit(struct kvm_run *run, struct kvm_vcpu *vcpu,
                 }
                 break;
 
+        case BOOKE_INTERRUPT_FP_UNAVAIL:
+                kvmppc_queue_exception(vcpu, exit_nr);
+                r = RESUME_GUEST;
+                break;
+
         case BOOKE_INTERRUPT_DATA_STORAGE:
                 vcpu->arch.dear = vcpu->arch.fault_dear;
                 vcpu->arch.esr = vcpu->arch.fault_esr;
diff --git a/arch/powerpc/kvm/powerpc.c b/arch/powerpc/kvm/powerpc.c
index bad40bd2d3ac..777e0f34e0ea 100644
--- a/arch/powerpc/kvm/powerpc.c
+++ b/arch/powerpc/kvm/powerpc.c
@@ -36,13 +36,12 @@ gfn_t unalias_gfn(struct kvm *kvm, gfn_t gfn)
 
 int kvm_cpu_has_interrupt(struct kvm_vcpu *v)
 {
-        /* XXX implement me */
-        return 0;
+        return !!(v->arch.pending_exceptions);
 }
 
 int kvm_arch_vcpu_runnable(struct kvm_vcpu *v)
 {
-        return 1;
+        return !(v->arch.msr & MSR_WE);
 }
 
 
@@ -214,6 +213,11 @@ static void kvmppc_decrementer_func(unsigned long data)
         struct kvm_vcpu *vcpu = (struct kvm_vcpu *)data;
 
         kvmppc_queue_exception(vcpu, BOOKE_INTERRUPT_DECREMENTER);
+
+        if (waitqueue_active(&vcpu->wq)) {
+                wake_up_interruptible(&vcpu->wq);
+                vcpu->stat.halt_wakeup++;
+        }
 }
 
 int kvm_arch_vcpu_init(struct kvm_vcpu *vcpu)
@@ -339,6 +343,8 @@ int kvm_arch_vcpu_ioctl_run(struct kvm_vcpu *vcpu, struct kvm_run *run)
         int r;
         sigset_t sigsaved;
 
+        vcpu_load(vcpu);
+
         if (vcpu->sigset_active)
                 sigprocmask(SIG_SETMASK, &vcpu->sigset, &sigsaved);
 
@@ -363,12 +369,20 @@ int kvm_arch_vcpu_ioctl_run(struct kvm_vcpu *vcpu, struct kvm_run *run)
         if (vcpu->sigset_active)
                 sigprocmask(SIG_SETMASK, &sigsaved, NULL);
 
+        vcpu_put(vcpu);
+
         return r;
 }
 
 int kvm_vcpu_ioctl_interrupt(struct kvm_vcpu *vcpu, struct kvm_interrupt *irq)
 {
         kvmppc_queue_exception(vcpu, BOOKE_INTERRUPT_EXTERNAL);
+
+        if (waitqueue_active(&vcpu->wq)) {
+                wake_up_interruptible(&vcpu->wq);
+                vcpu->stat.halt_wakeup++;
+        }
+
         return 0;
 }
 
diff --git a/arch/powerpc/lib/Makefile b/arch/powerpc/lib/Makefile
index 4bb023f4c869..f1d2cdc5331b 100644
--- a/arch/powerpc/lib/Makefile
+++ b/arch/powerpc/lib/Makefile
@@ -23,3 +23,4 @@ obj-$(CONFIG_SMP)	+= locks.o
 endif
 
 obj-$(CONFIG_PPC_LIB_RHEAP) += rheap.o
+obj-$(CONFIG_HAS_IOMEM) += devres.o
diff --git a/arch/powerpc/lib/devres.c b/arch/powerpc/lib/devres.c
new file mode 100644
index 000000000000..292115d98ea9
--- /dev/null
+++ b/arch/powerpc/lib/devres.c
@@ -0,0 +1,42 @@
+/*
+ * Copyright (C) 2008 Freescale Semiconductor, Inc.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version
+ * 2 of the License, or (at your option) any later version.
+ */
+
+#include <linux/device.h>       /* devres_*(), devm_ioremap_release() */
+#include <linux/io.h>           /* ioremap_flags() */
+#include <linux/module.h>       /* EXPORT_SYMBOL() */
+
+/**
+ * devm_ioremap_prot - Managed ioremap_flags()
+ * @dev: Generic device to remap IO address for
+ * @offset: BUS offset to map
+ * @size: Size of map
+ * @flags: Page flags
+ *
+ * Managed ioremap_prot().  Map is automatically unmapped on driver
+ * detach.
+ */
+void __iomem *devm_ioremap_prot(struct device *dev, resource_size_t offset,
+                                 size_t size, unsigned long flags)
+{
+        void __iomem **ptr, *addr;
+
+        ptr = devres_alloc(devm_ioremap_release, sizeof(*ptr), GFP_KERNEL);
+        if (!ptr)
+                return NULL;
+
+        addr = ioremap_flags(offset, size, flags);
+        if (addr) {
+                *ptr = addr;
+                devres_add(dev, ptr);
+        } else
+                devres_free(ptr);
+
+        return addr;
+}
+EXPORT_SYMBOL(devm_ioremap_prot);
diff --git a/arch/powerpc/platforms/cell/spufs/coredump.c b/arch/powerpc/platforms/cell/spufs/coredump.c
index b962c3ab470c..af116aadba10 100644
--- a/arch/powerpc/platforms/cell/spufs/coredump.c
+++ b/arch/powerpc/platforms/cell/spufs/coredump.c
@@ -22,6 +22,7 @@
 
 #include <linux/elf.h>
 #include <linux/file.h>
+#include <linux/fdtable.h>
 #include <linux/fs.h>
 #include <linux/list.h>
 #include <linux/module.h>
diff --git a/arch/powerpc/platforms/cell/spufs/sched.c b/arch/powerpc/platforms/cell/spufs/sched.c
index 8a05ac863a27..2e411f23462b 100644
--- a/arch/powerpc/platforms/cell/spufs/sched.c
+++ b/arch/powerpc/platforms/cell/spufs/sched.c
@@ -1068,10 +1068,9 @@ int __init spu_sched_init(void)
 
         mod_timer(&spuloadavg_timer, 0);
 
-        entry = create_proc_entry("spu_loadavg", 0, NULL);
+        entry = proc_create("spu_loadavg", 0, NULL, &spu_loadavg_fops);
         if (!entry)
                 goto out_stop_kthread;
-        entry->proc_fops = &spu_loadavg_fops;
 
         pr_debug("spusched: tick: %d, min ticks: %d, default ticks: %d\n",
                         SPUSCHED_TICK, MIN_SPU_TIMESLICE, DEF_SPU_TIMESLICE);
diff --git a/arch/powerpc/platforms/cell/spufs/sputrace.c b/arch/powerpc/platforms/cell/spufs/sputrace.c
index b9c79eda3359..53202422ba72 100644
--- a/arch/powerpc/platforms/cell/spufs/sputrace.c
+++ b/arch/powerpc/platforms/cell/spufs/sputrace.c
@@ -201,10 +201,9 @@ static int __init sputrace_init(void)
         if (!sputrace_log)
                 goto out;
 
-        entry = create_proc_entry("sputrace", S_IRUSR, NULL);
+        entry = proc_create("sputrace", S_IRUSR, NULL, &sputrace_fops);
         if (!entry)
                 goto out_free_log;
-        entry->proc_fops = &sputrace_fops;
 
         for (i = 0; i < ARRAY_SIZE(spu_probes); i++) {
                 struct spu_probe *p = &spu_probes[i];
diff --git a/arch/powerpc/platforms/iseries/lpevents.c b/arch/powerpc/platforms/iseries/lpevents.c
index e5b40e3e0082..b0f8a857ec02 100644
--- a/arch/powerpc/platforms/iseries/lpevents.c
+++ b/arch/powerpc/platforms/iseries/lpevents.c
@@ -330,15 +330,11 @@ static const struct file_operations proc_lpevents_operations = {
 
 static int __init proc_lpevents_init(void)
 {
-        struct proc_dir_entry *e;
-
         if (!firmware_has_feature(FW_FEATURE_ISERIES))
                 return 0;
 
-        e = create_proc_entry("iSeries/lpevents", S_IFREG|S_IRUGO, NULL);
-        if (e)
-                e->proc_fops = &proc_lpevents_operations;
-
+        proc_create("iSeries/lpevents", S_IFREG|S_IRUGO, NULL,
+                    &proc_lpevents_operations);
         return 0;
 }
 __initcall(proc_lpevents_init);
diff --git a/arch/powerpc/platforms/iseries/mf.c b/arch/powerpc/platforms/iseries/mf.c
index c0f2433bc16e..1dc7295746da 100644
--- a/arch/powerpc/platforms/iseries/mf.c
+++ b/arch/powerpc/platforms/iseries/mf.c
@@ -1255,11 +1255,11 @@ static int __init mf_proc_init(void)
                 if (i == 3)     /* no vmlinux entry for 'D' */
                         continue;
 
-                ent = create_proc_entry("vmlinux", S_IFREG|S_IWUSR, mf);
+                ent = proc_create_data("vmlinux", S_IFREG|S_IWUSR, mf,
+                                       &proc_vmlinux_operations,
+                                       (void *)(long)i);
                 if (!ent)
                         return 1;
-                ent->data = (void *)(long)i;
-                ent->proc_fops = &proc_vmlinux_operations;
         }
 
         ent = create_proc_entry("side", S_IFREG|S_IRUSR|S_IWUSR, mf_proc_root);
diff --git a/arch/powerpc/platforms/iseries/proc.c b/arch/powerpc/platforms/iseries/proc.c
index f2cde4180204..91f4c6cd4b99 100644
--- a/arch/powerpc/platforms/iseries/proc.c
+++ b/arch/powerpc/platforms/iseries/proc.c
@@ -110,15 +110,11 @@ static const struct file_operations proc_titantod_operations = {
 
 static int __init iseries_proc_init(void)
 {
-        struct proc_dir_entry *e;
-
         if (!firmware_has_feature(FW_FEATURE_ISERIES))
                 return 0;
 
-        e = create_proc_entry("iSeries/titanTod", S_IFREG|S_IRUGO, NULL);
-        if (e)
-                e->proc_fops = &proc_titantod_operations;
-
+        proc_create("iSeries/titanTod", S_IFREG|S_IRUGO, NULL,
+                    &proc_titantod_operations);
         return 0;
 }
 __initcall(iseries_proc_init);
diff --git a/arch/powerpc/platforms/iseries/viopath.c b/arch/powerpc/platforms/iseries/viopath.c
index df23331eb25c..49ff4dc422b7 100644
--- a/arch/powerpc/platforms/iseries/viopath.c
+++ b/arch/powerpc/platforms/iseries/viopath.c
@@ -180,15 +180,10 @@ static const struct file_operations proc_viopath_operations = {
 
 static int __init vio_proc_init(void)
 {
-        struct proc_dir_entry *e;
-
         if (!firmware_has_feature(FW_FEATURE_ISERIES))
                 return 0;
 
-        e = create_proc_entry("iSeries/config", 0, NULL);
-        if (e)
-                e->proc_fops = &proc_viopath_operations;
-
+        proc_create("iSeries/config", 0, NULL, &proc_viopath_operations);
         return 0;
 }
 __initcall(vio_proc_init);
diff --git a/arch/powerpc/platforms/pseries/eeh.c b/arch/powerpc/platforms/pseries/eeh.c
index a3fd56b186e6..6f544ba4b37f 100644
--- a/arch/powerpc/platforms/pseries/eeh.c
+++ b/arch/powerpc/platforms/pseries/eeh.c
@@ -1259,14 +1259,8 @@ static const struct file_operations proc_eeh_operations = {
 
 static int __init eeh_init_proc(void)
 {
-        struct proc_dir_entry *e;
-
-        if (machine_is(pseries)) {
-                e = create_proc_entry("ppc64/eeh", 0, NULL);
-                if (e)
-                        e->proc_fops = &proc_eeh_operations;
-        }
-
+        if (machine_is(pseries))
+                proc_create("ppc64/eeh", 0, NULL, &proc_eeh_operations);
         return 0;
 }
 __initcall(eeh_init_proc);
diff --git a/arch/powerpc/platforms/pseries/reconfig.c b/arch/powerpc/platforms/pseries/reconfig.c
index ac75c10de278..75769aae41d5 100644
--- a/arch/powerpc/platforms/pseries/reconfig.c
+++ b/arch/powerpc/platforms/pseries/reconfig.c
@@ -512,12 +512,9 @@ static int proc_ppc64_create_ofdt(void)
         if (!machine_is(pseries))
                 return 0;
 
-        ent = create_proc_entry("ppc64/ofdt", S_IWUSR, NULL);
-        if (ent) {
-                ent->data = NULL;
+        ent = proc_create("ppc64/ofdt", S_IWUSR, NULL, &ofdt_fops);
+        if (ent)
                 ent->size = 0;
-                ent->proc_fops = &ofdt_fops;
-        }
 
         return 0;
 }
diff --git a/arch/powerpc/platforms/pseries/rtasd.c b/arch/powerpc/platforms/pseries/rtasd.c
index befadd4f9524..7d3e2b0bd4d2 100644
--- a/arch/powerpc/platforms/pseries/rtasd.c
+++ b/arch/powerpc/platforms/pseries/rtasd.c
@@ -468,10 +468,9 @@ static int __init rtas_init(void)
                 return -ENOMEM;
         }
 
-        entry = create_proc_entry("ppc64/rtas/error_log", S_IRUSR, NULL);
-        if (entry)
-                entry->proc_fops = &proc_rtas_log_operations;
-        else
+        entry = proc_create("ppc64/rtas/error_log", S_IRUSR, NULL,
+                            &proc_rtas_log_operations);
+        if (!entry)
                 printk(KERN_ERR "Failed to create error_log proc entry\n");
 
         if (kernel_thread(rtasd, NULL, CLONE_FS) < 0)
diff --git a/arch/powerpc/platforms/pseries/scanlog.c b/arch/powerpc/platforms/pseries/scanlog.c
index bec3803f0618..417eca79df69 100644
--- a/arch/powerpc/platforms/pseries/scanlog.c
+++ b/arch/powerpc/platforms/pseries/scanlog.c
@@ -55,11 +55,6 @@ static ssize_t scanlog_read(struct file *file, char __user *buf,
         dp = PDE(inode);
         data = (unsigned int *)dp->data;
 
-        if (!data) {
-                printk(KERN_ERR "scanlog: read failed no data\n");
-                return -EIO;
-        }
-
         if (count > RTAS_DATA_BUF_SIZE)
                 count = RTAS_DATA_BUF_SIZE;
 
@@ -146,11 +141,6 @@ static int scanlog_open(struct inode * inode, struct file * file)
         struct proc_dir_entry *dp = PDE(inode);
         unsigned int *data = (unsigned int *)dp->data;
 
-        if (!data) {
-                printk(KERN_ERR "scanlog: open failed no data\n");
-                return -EIO;
-        }
-
         if (data[0] != 0) {
                 /* This imperfect test stops a second copy of the
                  * data (or a reset while data is being copied)
@@ -168,10 +158,6 @@ static int scanlog_release(struct inode * inode, struct file * file)
         struct proc_dir_entry *dp = PDE(inode);
         unsigned int *data = (unsigned int *)dp->data;
 
-        if (!data) {
-                printk(KERN_ERR "scanlog: release failed no data\n");
-                return -EIO;
-        }
         data[0] = 0;
 
         return 0;
@@ -200,12 +186,11 @@ static int __init scanlog_init(void)
         if (!data)
                 goto err;
 
-        ent = proc_create("ppc64/rtas/scan-log-dump", S_IRUSR, NULL,
-                          &scanlog_fops);
+        ent = proc_create_data("ppc64/rtas/scan-log-dump", S_IRUSR, NULL,
+                               &scanlog_fops, data);
         if (!ent)
                 goto err;
 
-        ent->data = data;
         proc_ppc64_scan_log_dump = ent;
 
         return 0;
diff --git a/arch/powerpc/sysdev/fsl_soc.c b/arch/powerpc/sysdev/fsl_soc.c
index b59408798fd8..3a7054e2bb75 100644
--- a/arch/powerpc/sysdev/fsl_soc.c
+++ b/arch/powerpc/sysdev/fsl_soc.c
@@ -418,22 +418,21 @@ arch_initcall(gfar_of_init);
 #include <linux/i2c.h>
 struct i2c_driver_device {
         char    *of_device;
-        char    *i2c_driver;
         char    *i2c_type;
 };
 
 static struct i2c_driver_device i2c_devices[] __initdata = {
-        {"ricoh,rs5c372a", "rtc-rs5c372", "rs5c372a",},
-        {"ricoh,rs5c372b", "rtc-rs5c372", "rs5c372b",},
-        {"ricoh,rv5c386",  "rtc-rs5c372", "rv5c386",},
-        {"ricoh,rv5c387a", "rtc-rs5c372", "rv5c387a",},
-        {"dallas,ds1307",  "rtc-ds1307",  "ds1307",},
-        {"dallas,ds1337",  "rtc-ds1307",  "ds1337",},
-        {"dallas,ds1338",  "rtc-ds1307",  "ds1338",},
-        {"dallas,ds1339",  "rtc-ds1307",  "ds1339",},
-        {"dallas,ds1340",  "rtc-ds1307",  "ds1340",},
-        {"stm,m41t00",     "rtc-ds1307",  "m41t00"},
-        {"dallas,ds1374",  "rtc-ds1374",  "rtc-ds1374",},
+        {"ricoh,rs5c372a", "rs5c372a"},
+        {"ricoh,rs5c372b", "rs5c372b"},
+        {"ricoh,rv5c386",  "rv5c386"},
+        {"ricoh,rv5c387a", "rv5c387a"},
+        {"dallas,ds1307",  "ds1307"},
+        {"dallas,ds1337",  "ds1337"},
+        {"dallas,ds1338",  "ds1338"},
+        {"dallas,ds1339",  "ds1339"},
+        {"dallas,ds1340",  "ds1340"},
+        {"stm,m41t00",     "m41t00"},
+        {"dallas,ds1374",  "rtc-ds1374"},
 };
 
 static int __init of_find_i2c_driver(struct device_node *node,
@@ -444,9 +443,7 @@ static int __init of_find_i2c_driver(struct device_node *node,
         for (i = 0; i < ARRAY_SIZE(i2c_devices); i++) {
                 if (!of_device_is_compatible(node, i2c_devices[i].of_device))
                         continue;
-                if (strlcpy(info->driver_name, i2c_devices[i].i2c_driver,
-                            KOBJ_NAME_LEN) >= KOBJ_NAME_LEN ||
-                    strlcpy(info->type, i2c_devices[i].i2c_type,
+                if (strlcpy(info->type, i2c_devices[i].i2c_type,
                             I2C_NAME_SIZE) >= I2C_NAME_SIZE)
                         return -ENOMEM;
                 return 0;
diff --git a/arch/powerpc/sysdev/ppc4xx_pci.c b/arch/powerpc/sysdev/ppc4xx_pci.c
index 1814adbd2236..b4a54c52e880 100644
--- a/arch/powerpc/sysdev/ppc4xx_pci.c
+++ b/arch/powerpc/sysdev/ppc4xx_pci.c
@@ -1387,28 +1387,59 @@ static void __init ppc4xx_configure_pciex_PIMs(struct ppc4xx_pciex_port *port,
         resource_size_t size = res->end - res->start + 1;
         u64 sa;
 
-        /* Calculate window size */
-        sa = (0xffffffffffffffffull << ilog2(size));;
-        if (res->flags & IORESOURCE_PREFETCH)
-                sa |= 0x8;
+        if (port->endpoint) {
+                resource_size_t ep_addr = 0;
+                resource_size_t ep_size = 32 << 20;
+
+                /* Currently we map a fixed 64MByte window to PLB address
+                 * 0 (SDRAM). This should probably be configurable via a dts
+                 * property.
+                 */
+
+                /* Calculate window size */
+                sa = (0xffffffffffffffffull << ilog2(ep_size));;
+
+                /* Setup BAR0 */
+                out_le32(mbase + PECFG_BAR0HMPA, RES_TO_U32_HIGH(sa));
+                out_le32(mbase + PECFG_BAR0LMPA, RES_TO_U32_LOW(sa) |
+                         PCI_BASE_ADDRESS_MEM_TYPE_64);
 
-        out_le32(mbase + PECFG_BAR0HMPA, RES_TO_U32_HIGH(sa));
-        out_le32(mbase + PECFG_BAR0LMPA, RES_TO_U32_LOW(sa));
+                /* Disable BAR1 & BAR2 */
+                out_le32(mbase + PECFG_BAR1MPA, 0);
+                out_le32(mbase + PECFG_BAR2HMPA, 0);
+                out_le32(mbase + PECFG_BAR2LMPA, 0);
 
-        /* The setup of the split looks weird to me ... let's see if it works */
-        out_le32(mbase + PECFG_PIM0LAL, 0x00000000);
-        out_le32(mbase + PECFG_PIM0LAH, 0x00000000);
-        out_le32(mbase + PECFG_PIM1LAL, 0x00000000);
-        out_le32(mbase + PECFG_PIM1LAH, 0x00000000);
-        out_le32(mbase + PECFG_PIM01SAH, 0xffff0000);
-        out_le32(mbase + PECFG_PIM01SAL, 0x00000000);
+                out_le32(mbase + PECFG_PIM01SAH, RES_TO_U32_HIGH(sa));
+                out_le32(mbase + PECFG_PIM01SAL, RES_TO_U32_LOW(sa));
+
+                out_le32(mbase + PCI_BASE_ADDRESS_0, RES_TO_U32_LOW(ep_addr));
+                out_le32(mbase + PCI_BASE_ADDRESS_1, RES_TO_U32_HIGH(ep_addr));
+        } else {
+                /* Calculate window size */
+                sa = (0xffffffffffffffffull << ilog2(size));;
+                if (res->flags & IORESOURCE_PREFETCH)
+                        sa |= 0x8;
+
+                out_le32(mbase + PECFG_BAR0HMPA, RES_TO_U32_HIGH(sa));
+                out_le32(mbase + PECFG_BAR0LMPA, RES_TO_U32_LOW(sa));
+
+                /* The setup of the split looks weird to me ... let's see
+                 * if it works
+                 */
+                out_le32(mbase + PECFG_PIM0LAL, 0x00000000);
+                out_le32(mbase + PECFG_PIM0LAH, 0x00000000);
+                out_le32(mbase + PECFG_PIM1LAL, 0x00000000);
+                out_le32(mbase + PECFG_PIM1LAH, 0x00000000);
+                out_le32(mbase + PECFG_PIM01SAH, 0xffff0000);
+                out_le32(mbase + PECFG_PIM01SAL, 0x00000000);
+
+                out_le32(mbase + PCI_BASE_ADDRESS_0, RES_TO_U32_LOW(res->start));
+                out_le32(mbase + PCI_BASE_ADDRESS_1, RES_TO_U32_HIGH(res->start));
+        }
 
         /* Enable inbound mapping */
         out_le32(mbase + PECFG_PIMEN, 0x1);
 
-        out_le32(mbase + PCI_BASE_ADDRESS_0, RES_TO_U32_LOW(res->start));
-        out_le32(mbase + PCI_BASE_ADDRESS_1, RES_TO_U32_HIGH(res->start));
-
         /* Enable I/O, Mem, and Busmaster cycles */
         out_le16(mbase + PCI_COMMAND,
                  in_le16(mbase + PCI_COMMAND) |
@@ -1422,13 +1453,8 @@ static void __init ppc4xx_pciex_port_setup_hose(struct ppc4xx_pciex_port *port)
         const int *bus_range;
         int primary = 0, busses;
         void __iomem *mbase = NULL, *cfg_data = NULL;
-
-        /* XXX FIXME: Handle endpoint mode properly */
-        if (port->endpoint) {
-                printk(KERN_WARNING "PCIE%d: Port in endpoint mode !\n",
-                       port->index);
-                return;
-        }
+        const u32 *pval;
+        u32 val;
 
         /* Check if primary bridge */
         if (of_get_property(port->node, "primary", NULL))
@@ -1462,21 +1488,30 @@ static void __init ppc4xx_pciex_port_setup_hose(struct ppc4xx_pciex_port *port)
                 hose->last_busno = hose->first_busno + busses;
         }
 
-        /* We map the external config space in cfg_data and the host config
-         * space in cfg_addr. External space is 1M per bus, internal space
-         * is 4K
+        if (!port->endpoint) {
+                /* Only map the external config space in cfg_data for
+                 * PCIe root-complexes. External space is 1M per bus
+                 */
+                cfg_data = ioremap(port->cfg_space.start +
+                                   (hose->first_busno + 1) * 0x100000,
+                                   busses * 0x100000);
+                if (cfg_data == NULL) {
+                        printk(KERN_ERR "%s: Can't map external config space !",
+                               port->node->full_name);
+                        goto fail;
+                }
+                hose->cfg_data = cfg_data;
+        }
+
+        /* Always map the host config space in cfg_addr.
+         * Internal space is 4K
          */
-        cfg_data = ioremap(port->cfg_space.start +
-                                 (hose->first_busno + 1) * 0x100000,
-                                 busses * 0x100000);
         mbase = ioremap(port->cfg_space.start + 0x10000000, 0x1000);
-        if (cfg_data == NULL || mbase == NULL) {
-                printk(KERN_ERR "%s: Can't map config space !",
+        if (mbase == NULL) {
+                printk(KERN_ERR "%s: Can't map internal config space !",
                        port->node->full_name);
                 goto fail;
         }
-
-        hose->cfg_data = cfg_data;
         hose->cfg_addr = mbase;
 
         pr_debug("PCIE %s, bus %d..%d\n", port->node->full_name,
@@ -1489,12 +1524,14 @@ static void __init ppc4xx_pciex_port_setup_hose(struct ppc4xx_pciex_port *port)
         port->hose = hose;
         mbase = (void __iomem *)hose->cfg_addr;
 
-        /*
-         * Set bus numbers on our root port
-         */
-        out_8(mbase + PCI_PRIMARY_BUS, hose->first_busno);
-        out_8(mbase + PCI_SECONDARY_BUS, hose->first_busno + 1);
-        out_8(mbase + PCI_SUBORDINATE_BUS, hose->last_busno);
+        if (!port->endpoint) {
+                /*
+                 * Set bus numbers on our root port
+                 */
+                out_8(mbase + PCI_PRIMARY_BUS, hose->first_busno);
+                out_8(mbase + PCI_SECONDARY_BUS, hose->first_busno + 1);
+                out_8(mbase + PCI_SUBORDINATE_BUS, hose->last_busno);
+        }
 
         /*
          * OMRs are already reset, also disable PIMs
@@ -1515,17 +1552,49 @@ static void __init ppc4xx_pciex_port_setup_hose(struct ppc4xx_pciex_port *port)
         ppc4xx_configure_pciex_PIMs(port, hose, mbase, &dma_window);
 
         /* The root complex doesn't show up if we don't set some vendor
-         * and device IDs into it. Those are the same bogus one that the
-         * initial code in arch/ppc add. We might want to change that.
+         * and device IDs into it. The defaults below are the same bogus
+         * one that the initial code in arch/ppc had. This can be
+         * overwritten by setting the "vendor-id/device-id" properties
+         * in the pciex node.
          */
-        out_le16(mbase + 0x200, 0xaaa0 + port->index);
-        out_le16(mbase + 0x202, 0xbed0 + port->index);
 
-        /* Set Class Code to PCI-PCI bridge and Revision Id to 1 */
-        out_le32(mbase + 0x208, 0x06040001);
+        /* Get the (optional) vendor-/device-id from the device-tree */
+        pval = of_get_property(port->node, "vendor-id", NULL);
+        if (pval) {
+                val = *pval;
+        } else {
+                if (!port->endpoint)
+                        val = 0xaaa0 + port->index;
+                else
+                        val = 0xeee0 + port->index;
+        }
+        out_le16(mbase + 0x200, val);
+
+        pval = of_get_property(port->node, "device-id", NULL);
+        if (pval) {
+                val = *pval;
+        } else {
+                if (!port->endpoint)
+                        val = 0xbed0 + port->index;
+                else
+                        val = 0xfed0 + port->index;
+        }
+        out_le16(mbase + 0x202, val);
+
+        if (!port->endpoint) {
+                /* Set Class Code to PCI-PCI bridge and Revision Id to 1 */
+                out_le32(mbase + 0x208, 0x06040001);
+
+                printk(KERN_INFO "PCIE%d: successfully set as root-complex\n",
+                       port->index);
+        } else {
+                /* Set Class Code to Processor/PPC */
+                out_le32(mbase + 0x208, 0x0b200001);
+
+                printk(KERN_INFO "PCIE%d: successfully set as endpoint\n",
+                       port->index);
+        }
 
-        printk(KERN_INFO "PCIE%d: successfully set as root-complex\n",
-               port->index);
         return;
  fail:
         if (hose)
@@ -1542,6 +1611,7 @@ static void __init ppc4xx_probe_pciex_bridge(struct device_node *np)
         const u32 *pval;
         int portno;
         unsigned int dcrs;
+        const char *val;
 
         /* First, proceed to core initialization as we assume there's
          * only one PCIe core in the system
@@ -1573,8 +1643,20 @@ static void __init ppc4xx_probe_pciex_bridge(struct device_node *np)
         }
         port->sdr_base = *pval;
 
-        /* XXX Currently, we only support root complex mode */
-        port->endpoint = 0;
+        /* Check if device_type property is set to "pci" or "pci-endpoint".
+         * Resulting from this setup this PCIe port will be configured
+         * as root-complex or as endpoint.
+         */
+        val = of_get_property(port->node, "device_type", NULL);
+        if (!strcmp(val, "pci-endpoint")) {
+                port->endpoint = 1;
+        } else if (!strcmp(val, "pci")) {
+                port->endpoint = 0;
+        } else {
+                printk(KERN_ERR "PCIE: missing or incorrect device_type for %s\n",
+                       np->full_name);
+                return;
+        }
 
         /* Fetch config space registers address */
         if (of_address_to_resource(np, 0, &port->cfg_space)) {
diff --git a/arch/ppc/kernel/asm-offsets.c b/arch/ppc/kernel/asm-offsets.c
index a51a17714231..8dcbdd6c2d2c 100644
--- a/arch/ppc/kernel/asm-offsets.c
+++ b/arch/ppc/kernel/asm-offsets.c
@@ -18,6 +18,8 @@
 #include <linux/suspend.h>
 #include <linux/mman.h>
 #include <linux/mm.h>
+#include <linux/kbuild.h>
+
 #include <asm/io.h>
 #include <asm/page.h>
 #include <asm/pgtable.h>
@@ -26,11 +28,6 @@
 #include <asm/thread_info.h>
 #include <asm/vdso_datapage.h>
 
-#define DEFINE(sym, val) \
-        asm volatile("\n->" #sym " %0 " #val : : "i" (val))
-
-#define BLANK() asm volatile("\n->" : : )
-
 int
 main(void)
 {
diff --git a/arch/ppc/kernel/pci.c b/arch/ppc/kernel/pci.c
index 50ce83f20adb..df3ef6db072c 100644
--- a/arch/ppc/kernel/pci.c
+++ b/arch/ppc/kernel/pci.c
@@ -1121,8 +1121,8 @@ void __init pci_init_resource(struct resource *res, resource_size_t start,
 
 void __iomem *pci_iomap(struct pci_dev *dev, int bar, unsigned long max)
 {
-        unsigned long start = pci_resource_start(dev, bar);
-        unsigned long len = pci_resource_len(dev, bar);
+        resource_size_t start = pci_resource_start(dev, bar);
+        resource_size_t len = pci_resource_len(dev, bar);
         unsigned long flags = pci_resource_flags(dev, bar);
 
         if (!len)
diff --git a/arch/ppc/kernel/ppc_ksyms.c b/arch/ppc/kernel/ppc_ksyms.c
index d9036ef0b658..16ac11ca7ba0 100644
--- a/arch/ppc/kernel/ppc_ksyms.c
+++ b/arch/ppc/kernel/ppc_ksyms.c
@@ -183,9 +183,6 @@ EXPORT_SYMBOL(cuda_poll);
 #if defined(CONFIG_BOOTX_TEXT)
 EXPORT_SYMBOL(btext_update_display);
 #endif
-#ifdef CONFIG_VT
-EXPORT_SYMBOL(kd_mksound);
-#endif
 EXPORT_SYMBOL(to_tm);
 
 EXPORT_SYMBOL(pm_power_off);
diff --git a/arch/ppc/platforms/sbc82xx.c b/arch/ppc/platforms/sbc82xx.c
index 0df6aacb8237..24f6e0694ac1 100644
--- a/arch/ppc/platforms/sbc82xx.c
+++ b/arch/ppc/platforms/sbc82xx.c
@@ -30,8 +30,6 @@ static void (*callback_init_IRQ)(void);
 
 extern unsigned char __res[sizeof(bd_t)];
 
-extern void (*late_time_init)(void);
-
 #ifdef CONFIG_GEN_RTC
 TODC_ALLOC();
 
diff --git a/arch/s390/Kconfig b/arch/s390/Kconfig
index 8f5f02160ffc..29a7940f284f 100644
--- a/arch/s390/Kconfig
+++ b/arch/s390/Kconfig
@@ -300,6 +300,14 @@ comment "Kernel preemption"
 
 source "kernel/Kconfig.preempt"
 
+config ARCH_SPARSEMEM_ENABLE
+        def_bool y
+        select SPARSEMEM_VMEMMAP_ENABLE
+        select SPARSEMEM_VMEMMAP
+
+config ARCH_SPARSEMEM_DEFAULT
+        def_bool y
+
 source "mm/Kconfig"
 
 comment "I/O subsystem configuration"
diff --git a/arch/s390/defconfig b/arch/s390/defconfig
index a72f208e62d0..aa341d0ea1e6 100644
--- a/arch/s390/defconfig
+++ b/arch/s390/defconfig
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.25-rc4
-# Wed Mar  5 11:22:59 2008
+# Linux kernel version: 2.6.25
+# Wed Apr 30 11:07:45 2008
 #
 CONFIG_SCHED_MC=y
 CONFIG_MMU=y
@@ -14,10 +14,12 @@ CONFIG_RWSEM_XCHGADD_ALGORITHM=y
 # CONFIG_ARCH_HAS_ILOG2_U64 is not set
 CONFIG_GENERIC_HWEIGHT=y
 CONFIG_GENERIC_TIME=y
+CONFIG_GENERIC_CLOCKEVENTS=y
 CONFIG_GENERIC_BUG=y
 CONFIG_NO_IOMEM=y
 CONFIG_NO_DMA=y
 CONFIG_GENERIC_LOCKBREAK=y
+CONFIG_PGSTE=y
 CONFIG_S390=y
 CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
 
@@ -43,6 +45,7 @@ CONFIG_LOG_BUF_SHIFT=17
 CONFIG_CGROUPS=y
 # CONFIG_CGROUP_DEBUG is not set
 CONFIG_CGROUP_NS=y
+# CONFIG_CGROUP_DEVICE is not set
 # CONFIG_CPUSETS is not set
 CONFIG_GROUP_SCHED=y
 CONFIG_FAIR_GROUP_SCHED=y
@@ -65,6 +68,7 @@ CONFIG_INITRAMFS_SOURCE=""
 CONFIG_SYSCTL=y
 # CONFIG_EMBEDDED is not set
 CONFIG_SYSCTL_SYSCALL=y
+CONFIG_SYSCTL_SYSCALL_CHECK=y
 CONFIG_KALLSYMS=y
 # CONFIG_KALLSYMS_ALL is not set
 # CONFIG_KALLSYMS_EXTRA_PASS is not set
@@ -92,6 +96,7 @@ CONFIG_KPROBES=y
 CONFIG_KRETPROBES=y
 CONFIG_HAVE_KPROBES=y
 CONFIG_HAVE_KRETPROBES=y
+# CONFIG_HAVE_DMA_ATTRS is not set
 CONFIG_PROC_PAGE_MONITOR=y
 CONFIG_SLABINFO=y
 CONFIG_RT_MUTEXES=y
@@ -121,8 +126,8 @@ CONFIG_DEFAULT_DEADLINE=y
 # CONFIG_DEFAULT_CFQ is not set
 # CONFIG_DEFAULT_NOOP is not set
 CONFIG_DEFAULT_IOSCHED="deadline"
+CONFIG_PREEMPT_NOTIFIERS=y
 CONFIG_CLASSIC_RCU=y
-# CONFIG_PREEMPT_RCU is not set
 
 #
 # Base setup
@@ -131,6 +136,10 @@ CONFIG_CLASSIC_RCU=y
 #
 # Processor type and features
 #
+CONFIG_TICK_ONESHOT=y
+CONFIG_NO_HZ=y
+CONFIG_HIGH_RES_TIMERS=y
+CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
 CONFIG_64BIT=y
 CONFIG_SMP=y
 CONFIG_NR_CPUS=32
@@ -161,15 +170,20 @@ CONFIG_ARCH_POPULATES_NODE_MAP=y
 # CONFIG_PREEMPT_NONE is not set
 # CONFIG_PREEMPT_VOLUNTARY is not set
 CONFIG_PREEMPT=y
-# CONFIG_RCU_TRACE is not set
+# CONFIG_PREEMPT_RCU is not set
+CONFIG_ARCH_SPARSEMEM_ENABLE=y
+CONFIG_ARCH_SPARSEMEM_DEFAULT=y
 CONFIG_SELECT_MEMORY_MODEL=y
-CONFIG_FLATMEM_MANUAL=y
+# CONFIG_FLATMEM_MANUAL is not set
 # CONFIG_DISCONTIGMEM_MANUAL is not set
-# CONFIG_SPARSEMEM_MANUAL is not set
-CONFIG_FLATMEM=y
-CONFIG_FLAT_NODE_MEM_MAP=y
+CONFIG_SPARSEMEM_MANUAL=y
+CONFIG_SPARSEMEM=y
+CONFIG_HAVE_MEMORY_PRESENT=y
 # CONFIG_SPARSEMEM_STATIC is not set
-# CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set
+CONFIG_SPARSEMEM_EXTREME=y
+CONFIG_SPARSEMEM_VMEMMAP_ENABLE=y
+CONFIG_SPARSEMEM_VMEMMAP=y
+CONFIG_PAGEFLAGS_EXTENDED=y
 CONFIG_SPLIT_PTLOCK_CPUS=4
 CONFIG_RESOURCES_64BIT=y
 CONFIG_ZONE_DMA_FLAG=1
@@ -205,11 +219,10 @@ CONFIG_HZ_100=y
 # CONFIG_HZ_1000 is not set
 CONFIG_HZ=100
 # CONFIG_SCHED_HRTICK is not set
-CONFIG_NO_IDLE_HZ=y
-CONFIG_NO_IDLE_HZ_INIT=y
 CONFIG_S390_HYPFS_FS=y
 CONFIG_KEXEC=y
 # CONFIG_ZFCPDUMP is not set
+CONFIG_S390_GUEST=y
 
 #
 # Networking
@@ -272,8 +285,10 @@ CONFIG_INET6_XFRM_MODE_TUNNEL=y
 CONFIG_INET6_XFRM_MODE_BEET=y
 # CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION is not set
 CONFIG_IPV6_SIT=y
+CONFIG_IPV6_NDISC_NODETYPE=y
 # CONFIG_IPV6_TUNNEL is not set
 # CONFIG_IPV6_MULTIPLE_TABLES is not set
+# CONFIG_IPV6_MROUTE is not set
 # CONFIG_NETWORK_SECMARK is not set
 CONFIG_NETFILTER=y
 # CONFIG_NETFILTER_DEBUG is not set
@@ -289,6 +304,7 @@ CONFIG_NF_CONNTRACK=m
 # CONFIG_NF_CT_ACCT is not set
 # CONFIG_NF_CONNTRACK_MARK is not set
 # CONFIG_NF_CONNTRACK_EVENTS is not set
+# CONFIG_NF_CT_PROTO_DCCP is not set
 # CONFIG_NF_CT_PROTO_SCTP is not set
 # CONFIG_NF_CT_PROTO_UDPLITE is not set
 # CONFIG_NF_CONNTRACK_AMANDA is not set
@@ -439,6 +455,7 @@ CONFIG_DASD_ECKD=y
 CONFIG_DASD_FBA=y
 CONFIG_DASD_DIAG=y
 CONFIG_DASD_EER=y
+CONFIG_VIRTIO_BLK=m
 CONFIG_MISC_DEVICES=y
 # CONFIG_EEPROM_93CX6 is not set
 # CONFIG_ENCLOSURE_SERVICES is not set
@@ -533,7 +550,7 @@ CONFIG_NETDEV_10000=y
 # S/390 network device drivers
 #
 CONFIG_LCS=m
-CONFIG_CTC=m
+CONFIG_CTCM=m
 # CONFIG_NETIUCV is not set
 # CONFIG_SMSGIUCV is not set
 # CONFIG_CLAW is not set
@@ -547,10 +564,12 @@ CONFIG_CCWGROUP=y
 # CONFIG_NETCONSOLE is not set
 # CONFIG_NETPOLL is not set
 # CONFIG_NET_POLL_CONTROLLER is not set
+CONFIG_VIRTIO_NET=m
 
 #
 # Character devices
 #
+CONFIG_DEVKMEM=y
 CONFIG_UNIX98_PTYS=y
 CONFIG_LEGACY_PTYS=y
 CONFIG_LEGACY_PTY_COUNT=256
@@ -600,6 +619,7 @@ CONFIG_S390_VMUR=m
 # Sonics Silicon Backplane
 #
 # CONFIG_MEMSTICK is not set
+# CONFIG_NEW_LEDS is not set
 
 #
 # File systems
@@ -652,6 +672,7 @@ CONFIG_PROC_SYSCTL=y
 CONFIG_SYSFS=y
 CONFIG_TMPFS=y
 CONFIG_TMPFS_POSIX_ACL=y
+# CONFIG_HUGETLBFS is not set
 # CONFIG_HUGETLB_PAGE is not set
 CONFIG_CONFIGFS_FS=m
 
@@ -678,12 +699,10 @@ CONFIG_NFS_FS=y
 CONFIG_NFS_V3=y
 # CONFIG_NFS_V3_ACL is not set
 # CONFIG_NFS_V4 is not set
-# CONFIG_NFS_DIRECTIO is not set
 CONFIG_NFSD=y
 CONFIG_NFSD_V3=y
 # CONFIG_NFSD_V3_ACL is not set
 # CONFIG_NFSD_V4 is not set
-CONFIG_NFSD_TCP=y
 CONFIG_LOCKD=y
 CONFIG_LOCKD_V4=y
 CONFIG_EXPORTFS=y
@@ -731,6 +750,7 @@ CONFIG_TRACE_IRQFLAGS_SUPPORT=y
 # CONFIG_PRINTK_TIME is not set
 CONFIG_ENABLE_WARN_DEPRECATED=y
 CONFIG_ENABLE_MUST_CHECK=y
+CONFIG_FRAME_WARN=2048
 CONFIG_MAGIC_SYSRQ=y
 # CONFIG_UNUSED_SYMBOLS is not set
 CONFIG_DEBUG_FS=y
@@ -754,6 +774,7 @@ CONFIG_DEBUG_SPINLOCK_SLEEP=y
 CONFIG_DEBUG_BUGVERBOSE=y
 # CONFIG_DEBUG_INFO is not set
 # CONFIG_DEBUG_VM is not set
+# CONFIG_DEBUG_WRITECOUNT is not set
 # CONFIG_DEBUG_LIST is not set
 # CONFIG_DEBUG_SG is not set
 # CONFIG_FRAME_POINTER is not set
@@ -775,58 +796,88 @@ CONFIG_SAMPLES=y
 # CONFIG_SECURITY is not set
 # CONFIG_SECURITY_FILE_CAPABILITIES is not set
 CONFIG_CRYPTO=y
+
+#
+# Crypto core or helper
+#
 CONFIG_CRYPTO_ALGAPI=y
 CONFIG_CRYPTO_AEAD=m
 CONFIG_CRYPTO_BLKCIPHER=y
-CONFIG_CRYPTO_SEQIV=m
 CONFIG_CRYPTO_HASH=m
 CONFIG_CRYPTO_MANAGER=y
+CONFIG_CRYPTO_GF128MUL=m
+# CONFIG_CRYPTO_NULL is not set
+# CONFIG_CRYPTO_CRYPTD is not set
+CONFIG_CRYPTO_AUTHENC=m
+# CONFIG_CRYPTO_TEST is not set
+
+#
+# Authenticated Encryption with Associated Data
+#
+CONFIG_CRYPTO_CCM=m
+CONFIG_CRYPTO_GCM=m
+CONFIG_CRYPTO_SEQIV=m
+
+#
+# Block modes
+#
+CONFIG_CRYPTO_CBC=y
+CONFIG_CRYPTO_CTR=m
+CONFIG_CRYPTO_CTS=m
+CONFIG_CRYPTO_ECB=m
+# CONFIG_CRYPTO_LRW is not set
+CONFIG_CRYPTO_PCBC=m
+# CONFIG_CRYPTO_XTS is not set
+
+#
+# Hash modes
+#
 CONFIG_CRYPTO_HMAC=m
 # CONFIG_CRYPTO_XCBC is not set
-# CONFIG_CRYPTO_NULL is not set
+
+#
+# Digest
+#
+# CONFIG_CRYPTO_CRC32C is not set
 # CONFIG_CRYPTO_MD4 is not set
 CONFIG_CRYPTO_MD5=m
+# CONFIG_CRYPTO_MICHAEL_MIC is not set
 CONFIG_CRYPTO_SHA1=m
 # CONFIG_CRYPTO_SHA256 is not set
 # CONFIG_CRYPTO_SHA512 is not set
-# CONFIG_CRYPTO_WP512 is not set
 # CONFIG_CRYPTO_TGR192 is not set
-CONFIG_CRYPTO_GF128MUL=m
-CONFIG_CRYPTO_ECB=m
-CONFIG_CRYPTO_CBC=y
-CONFIG_CRYPTO_PCBC=m
-# CONFIG_CRYPTO_LRW is not set
-# CONFIG_CRYPTO_XTS is not set
-CONFIG_CRYPTO_CTR=m
-CONFIG_CRYPTO_GCM=m
-CONFIG_CRYPTO_CCM=m
-# CONFIG_CRYPTO_CRYPTD is not set
-# CONFIG_CRYPTO_DES is not set
-CONFIG_CRYPTO_FCRYPT=m
-# CONFIG_CRYPTO_BLOWFISH is not set
-# CONFIG_CRYPTO_TWOFISH is not set
-# CONFIG_CRYPTO_SERPENT is not set
+# CONFIG_CRYPTO_WP512 is not set
+
+#
+# Ciphers
+#
 # CONFIG_CRYPTO_AES is not set
+# CONFIG_CRYPTO_ANUBIS is not set
+# CONFIG_CRYPTO_ARC4 is not set
+# CONFIG_CRYPTO_BLOWFISH is not set
+CONFIG_CRYPTO_CAMELLIA=m
 # CONFIG_CRYPTO_CAST5 is not set
 # CONFIG_CRYPTO_CAST6 is not set
-# CONFIG_CRYPTO_TEA is not set
-# CONFIG_CRYPTO_ARC4 is not set
+# CONFIG_CRYPTO_DES is not set
+CONFIG_CRYPTO_FCRYPT=m
 # CONFIG_CRYPTO_KHAZAD is not set
-# CONFIG_CRYPTO_ANUBIS is not set
-CONFIG_CRYPTO_SEED=m
 CONFIG_CRYPTO_SALSA20=m
+CONFIG_CRYPTO_SEED=m
+# CONFIG_CRYPTO_SERPENT is not set
+# CONFIG_CRYPTO_TEA is not set
+# CONFIG_CRYPTO_TWOFISH is not set
+
+#
+# Compression
+#
 # CONFIG_CRYPTO_DEFLATE is not set
-# CONFIG_CRYPTO_MICHAEL_MIC is not set
-# CONFIG_CRYPTO_CRC32C is not set
-CONFIG_CRYPTO_CAMELLIA=m
-# CONFIG_CRYPTO_TEST is not set
-CONFIG_CRYPTO_AUTHENC=m
 CONFIG_CRYPTO_LZO=m
 CONFIG_CRYPTO_HW=y
 CONFIG_ZCRYPT=m
 # CONFIG_ZCRYPT_MONOLITHIC is not set
 # CONFIG_CRYPTO_SHA1_S390 is not set
 # CONFIG_CRYPTO_SHA256_S390 is not set
+CONFIG_CRYPTO_SHA512_S390=m
 # CONFIG_CRYPTO_DES_S390 is not set
 # CONFIG_CRYPTO_AES_S390 is not set
 CONFIG_S390_PRNG=m
@@ -835,6 +886,8 @@ CONFIG_S390_PRNG=m
 # Library routines
 #
 CONFIG_BITREVERSE=m
+# CONFIG_GENERIC_FIND_FIRST_BIT is not set
+# CONFIG_GENERIC_FIND_NEXT_BIT is not set
 # CONFIG_CRC_CCITT is not set
 # CONFIG_CRC16 is not set
 # CONFIG_CRC_ITU_T is not set
@@ -844,3 +897,9 @@ CONFIG_LIBCRC32C=m
 CONFIG_LZO_COMPRESS=m
 CONFIG_LZO_DECOMPRESS=m
 CONFIG_PLIST=y
+CONFIG_HAVE_KVM=y
+CONFIG_VIRTUALIZATION=y
+CONFIG_KVM=m
+CONFIG_VIRTIO=y
+CONFIG_VIRTIO_RING=y
+CONFIG_VIRTIO_BALLOON=m
diff --git a/arch/s390/kernel/Makefile b/arch/s390/kernel/Makefile
index 77051cd27925..6302f5082588 100644
--- a/arch/s390/kernel/Makefile
+++ b/arch/s390/kernel/Makefile
@@ -2,8 +2,6 @@
 # Makefile for the linux kernel.
 #
 
-EXTRA_AFLAGS    := -traditional
-
 #
 # Passing null pointers is ok for smp code, since we access the lowcore here.
 #
diff --git a/arch/s390/kernel/asm-offsets.c b/arch/s390/kernel/asm-offsets.c
index 1375f8a4469e..fa28ecae636b 100644
--- a/arch/s390/kernel/asm-offsets.c
+++ b/arch/s390/kernel/asm-offsets.c
@@ -5,44 +5,38 @@
  */
 
 #include <linux/sched.h>
-
-/* Use marker if you need to separate the values later */
-
-#define DEFINE(sym, val, marker) \
-        asm volatile("\n->" #sym " %0 " #val " " #marker : : "i" (val))
-
-#define BLANK() asm volatile("\n->" : : )
+#include <linux/kbuild.h>
 
 int main(void)
 {
-        DEFINE(__THREAD_info, offsetof(struct task_struct, stack),);
-        DEFINE(__THREAD_ksp, offsetof(struct task_struct, thread.ksp),);
-        DEFINE(__THREAD_per, offsetof(struct task_struct, thread.per_info),);
+        DEFINE(__THREAD_info, offsetof(struct task_struct, stack));
+        DEFINE(__THREAD_ksp, offsetof(struct task_struct, thread.ksp));
+        DEFINE(__THREAD_per, offsetof(struct task_struct, thread.per_info));
         DEFINE(__THREAD_mm_segment,
-               offsetof(struct task_struct, thread.mm_segment),);
+               offsetof(struct task_struct, thread.mm_segment));
         BLANK();
-        DEFINE(__TASK_pid, offsetof(struct task_struct, pid),);
+        DEFINE(__TASK_pid, offsetof(struct task_struct, pid));
         BLANK();
-        DEFINE(__PER_atmid, offsetof(per_struct, lowcore.words.perc_atmid),);
-        DEFINE(__PER_address, offsetof(per_struct, lowcore.words.address),);
-        DEFINE(__PER_access_id, offsetof(per_struct, lowcore.words.access_id),);
+        DEFINE(__PER_atmid, offsetof(per_struct, lowcore.words.perc_atmid));
+        DEFINE(__PER_address, offsetof(per_struct, lowcore.words.address));
+        DEFINE(__PER_access_id, offsetof(per_struct, lowcore.words.access_id));
         BLANK();
-        DEFINE(__TI_task, offsetof(struct thread_info, task),);
-        DEFINE(__TI_domain, offsetof(struct thread_info, exec_domain),);
-        DEFINE(__TI_flags, offsetof(struct thread_info, flags),);
-        DEFINE(__TI_cpu, offsetof(struct thread_info, cpu),);
-        DEFINE(__TI_precount, offsetof(struct thread_info, preempt_count),);
+        DEFINE(__TI_task, offsetof(struct thread_info, task));
+        DEFINE(__TI_domain, offsetof(struct thread_info, exec_domain));
+        DEFINE(__TI_flags, offsetof(struct thread_info, flags));
+        DEFINE(__TI_cpu, offsetof(struct thread_info, cpu));
+        DEFINE(__TI_precount, offsetof(struct thread_info, preempt_count));
         BLANK();
-        DEFINE(__PT_ARGS, offsetof(struct pt_regs, args),);
-        DEFINE(__PT_PSW, offsetof(struct pt_regs, psw),);
-        DEFINE(__PT_GPRS, offsetof(struct pt_regs, gprs),);
-        DEFINE(__PT_ORIG_GPR2, offsetof(struct pt_regs, orig_gpr2),);
-        DEFINE(__PT_ILC, offsetof(struct pt_regs, ilc),);
-        DEFINE(__PT_TRAP, offsetof(struct pt_regs, trap),);
-        DEFINE(__PT_SIZE, sizeof(struct pt_regs),);
+        DEFINE(__PT_ARGS, offsetof(struct pt_regs, args));
+        DEFINE(__PT_PSW, offsetof(struct pt_regs, psw));
+        DEFINE(__PT_GPRS, offsetof(struct pt_regs, gprs));
+        DEFINE(__PT_ORIG_GPR2, offsetof(struct pt_regs, orig_gpr2));
+        DEFINE(__PT_ILC, offsetof(struct pt_regs, ilc));
+        DEFINE(__PT_TRAP, offsetof(struct pt_regs, trap));
+        DEFINE(__PT_SIZE, sizeof(struct pt_regs));
         BLANK();
-        DEFINE(__SF_BACKCHAIN, offsetof(struct stack_frame, back_chain),);
-        DEFINE(__SF_GPRS, offsetof(struct stack_frame, gprs),);
-        DEFINE(__SF_EMPTY, offsetof(struct stack_frame, empty1),);
+        DEFINE(__SF_BACKCHAIN, offsetof(struct stack_frame, back_chain));
+        DEFINE(__SF_GPRS, offsetof(struct stack_frame, gprs));
+        DEFINE(__SF_EMPTY, offsetof(struct stack_frame, empty1));
         return 0;
 }
diff --git a/arch/s390/kernel/early.c b/arch/s390/kernel/early.c
index 68ec4083bf73..d0e09684b9ce 100644
--- a/arch/s390/kernel/early.c
+++ b/arch/s390/kernel/early.c
@@ -139,15 +139,15 @@ static noinline __init void detect_machine_type(void)
 
         /* Running under z/VM ? */
         if (cpuinfo->cpu_id.version == 0xff)
-                machine_flags |= 1;
+                machine_flags |= MACHINE_FLAG_VM;
 
         /* Running on a P/390 ? */
         if (cpuinfo->cpu_id.machine == 0x7490)
-                machine_flags |= 4;
+                machine_flags |= MACHINE_FLAG_P390;
 
         /* Running under KVM ? */
         if (cpuinfo->cpu_id.version == 0xfe)
-                machine_flags |= 64;
+                machine_flags |= MACHINE_FLAG_KVM;
 }
 
 #ifdef CONFIG_64BIT
@@ -268,6 +268,118 @@ static noinline __init void setup_lowcore_early(void)
         s390_base_pgm_handler_fn = early_pgm_check_handler;
 }
 
+static noinline __init void setup_hpage(void)
+{
+#ifndef CONFIG_DEBUG_PAGEALLOC
+        unsigned int facilities;
+
+        facilities = stfl();
+        if (!(facilities & (1UL << 23)) || !(facilities & (1UL << 29)))
+                return;
+        machine_flags |= MACHINE_FLAG_HPAGE;
+        __ctl_set_bit(0, 23);
+#endif
+}
+
+static __init void detect_mvpg(void)
+{
+#ifndef CONFIG_64BIT
+        int rc;
+
+        asm volatile(
+                "       la      0,0\n"
+                "       mvpg    %2,%2\n"
+                "0:     la      %0,0\n"
+                "1:\n"
+                EX_TABLE(0b,1b)
+                : "=d" (rc) : "0" (-EOPNOTSUPP), "a" (0) : "memory", "cc", "0");
+        if (!rc)
+                machine_flags |= MACHINE_FLAG_MVPG;
+#endif
+}
+
+static __init void detect_ieee(void)
+{
+#ifndef CONFIG_64BIT
+        int rc, tmp;
+
+        asm volatile(
+                "       efpc    %1,0\n"
+                "0:     la      %0,0\n"
+                "1:\n"
+                EX_TABLE(0b,1b)
+                : "=d" (rc), "=d" (tmp): "0" (-EOPNOTSUPP) : "cc");
+        if (!rc)
+                machine_flags |= MACHINE_FLAG_IEEE;
+#endif
+}
+
+static __init void detect_csp(void)
+{
+#ifndef CONFIG_64BIT
+        int rc;
+
+        asm volatile(
+                "       la      0,0\n"
+                "       la      1,0\n"
+                "       la      2,4\n"
+                "       csp     0,2\n"
+                "0:     la      %0,0\n"
+                "1:\n"
+                EX_TABLE(0b,1b)
+                : "=d" (rc) : "0" (-EOPNOTSUPP) : "cc", "0", "1", "2");
+        if (!rc)
+                machine_flags |= MACHINE_FLAG_CSP;
+#endif
+}
+
+static __init void detect_diag9c(void)
+{
+        unsigned int cpu_address;
+        int rc;
+
+        cpu_address = stap();
+        asm volatile(
+                "       diag    %2,0,0x9c\n"
+                "0:     la      %0,0\n"
+                "1:\n"
+                EX_TABLE(0b,1b)
+                : "=d" (rc) : "0" (-EOPNOTSUPP), "d" (cpu_address) : "cc");
+        if (!rc)
+                machine_flags |= MACHINE_FLAG_DIAG9C;
+}
+
+static __init void detect_diag44(void)
+{
+#ifdef CONFIG_64BIT
+        int rc;
+
+        asm volatile(
+                "       diag    0,0,0x44\n"
+                "0:     la      %0,0\n"
+                "1:\n"
+                EX_TABLE(0b,1b)
+                : "=d" (rc) : "0" (-EOPNOTSUPP) : "cc");
+        if (!rc)
+                machine_flags |= MACHINE_FLAG_DIAG44;
+#endif
+}
+
+static __init void detect_machine_facilities(void)
+{
+#ifdef CONFIG_64BIT
+        unsigned int facilities;
+
+        facilities = stfl();
+        if (facilities & (1 << 28))
+                machine_flags |= MACHINE_FLAG_IDTE;
+        if (facilities & (1 << 23))
+                machine_flags |= MACHINE_FLAG_PFMF;
+        if (facilities & (1 << 4))
+                machine_flags |= MACHINE_FLAG_MVCOS;
+#endif
+}
+
 /*
  * Save ipl parameters, clear bss memory, initialize storage keys
  * and create a kernel NSS at startup if the SAVESYS= parm is defined
@@ -285,6 +397,13 @@ void __init startup_init(void)
         create_kernel_nss();
         sort_main_extable();
         setup_lowcore_early();
+        detect_mvpg();
+        detect_ieee();
+        detect_csp();
+        detect_diag9c();
+        detect_diag44();
+        detect_machine_facilities();
+        setup_hpage();
         sclp_read_info_early();
         sclp_facilities_detect();
         memsize = sclp_memory_detect();
diff --git a/arch/s390/kernel/entry.S b/arch/s390/kernel/entry.S
index 6766e37fe8ea..bdbb3bcd78a5 100644
--- a/arch/s390/kernel/entry.S
+++ b/arch/s390/kernel/entry.S
@@ -49,9 +49,9 @@ SP_ILC	     =	STACK_FRAME_OVERHEAD + __PT_ILC
 SP_TRAP      =  STACK_FRAME_OVERHEAD + __PT_TRAP
 SP_SIZE      =  STACK_FRAME_OVERHEAD + __PT_SIZE
 
-_TIF_WORK_SVC = (_TIF_SIGPENDING | _TIF_RESTORE_SIGMASK | _TIF_NEED_RESCHED | \
+_TIF_WORK_SVC = (_TIF_SIGPENDING | _TIF_NEED_RESCHED | \
                  _TIF_MCCK_PENDING | _TIF_RESTART_SVC | _TIF_SINGLE_STEP )
-_TIF_WORK_INT = (_TIF_SIGPENDING | _TIF_RESTORE_SIGMASK | _TIF_NEED_RESCHED | \
+_TIF_WORK_INT = (_TIF_SIGPENDING | _TIF_NEED_RESCHED | \
                  _TIF_MCCK_PENDING)
 
 STACK_SHIFT = PAGE_SHIFT + THREAD_ORDER
@@ -316,7 +316,7 @@ sysc_work:
         bo      BASED(sysc_mcck_pending)
         tm      __TI_flags+3(%r9),_TIF_NEED_RESCHED
         bo      BASED(sysc_reschedule)
-        tm      __TI_flags+3(%r9),(_TIF_SIGPENDING | _TIF_RESTORE_SIGMASK)
+        tm      __TI_flags+3(%r9),_TIF_SIGPENDING
         bnz     BASED(sysc_sigpending)
         tm      __TI_flags+3(%r9),_TIF_RESTART_SVC
         bo      BASED(sysc_restart)
@@ -342,7 +342,7 @@ sysc_mcck_pending:
         br      %r1                     # TIF bit will be cleared by handler
 
 #
-# _TIF_SIGPENDING or _TIF_RESTORE_SIGMASK is set, call do_signal
+# _TIF_SIGPENDING is set, call do_signal
 #
 sysc_sigpending:
         ni      __TI_flags+3(%r9),255-_TIF_SINGLE_STEP # clear TIF_SINGLE_STEP
@@ -657,7 +657,7 @@ io_work:
         lr      %r15,%r1
 #
 # One of the work bits is on. Find out which one.
-# Checked are: _TIF_SIGPENDING, _TIF_RESTORE_SIGMASK, _TIF_NEED_RESCHED
+# Checked are: _TIF_SIGPENDING, _TIF_NEED_RESCHED
 #               and _TIF_MCCK_PENDING
 #
 io_work_loop:
@@ -665,7 +665,7 @@ io_work_loop:
         bo      BASED(io_mcck_pending)
         tm      __TI_flags+3(%r9),_TIF_NEED_RESCHED
         bo      BASED(io_reschedule)
-        tm      __TI_flags+3(%r9),(_TIF_SIGPENDING | _TIF_RESTORE_SIGMASK)
+        tm      __TI_flags+3(%r9),_TIF_SIGPENDING
         bnz     BASED(io_sigpending)
         b       BASED(io_restore)
 io_work_done:
@@ -693,7 +693,7 @@ io_reschedule:
         b       BASED(io_work_loop)
 
 #
-# _TIF_SIGPENDING or _TIF_RESTORE_SIGMASK is set, call do_signal
+# _TIF_SIGPENDING is set, call do_signal
 #
 io_sigpending:
         TRACE_IRQS_ON
diff --git a/arch/s390/kernel/entry64.S b/arch/s390/kernel/entry64.S
index cd959c0b2e16..5a4a7bcd2bba 100644
--- a/arch/s390/kernel/entry64.S
+++ b/arch/s390/kernel/entry64.S
@@ -52,9 +52,9 @@ SP_SIZE      =	STACK_FRAME_OVERHEAD + __PT_SIZE
 STACK_SHIFT = PAGE_SHIFT + THREAD_ORDER
 STACK_SIZE  = 1 << STACK_SHIFT
 
-_TIF_WORK_SVC = (_TIF_SIGPENDING | _TIF_RESTORE_SIGMASK | _TIF_NEED_RESCHED | \
+_TIF_WORK_SVC = (_TIF_SIGPENDING | _TIF_NEED_RESCHED | \
                  _TIF_MCCK_PENDING | _TIF_RESTART_SVC | _TIF_SINGLE_STEP )
-_TIF_WORK_INT = (_TIF_SIGPENDING | _TIF_RESTORE_SIGMASK | _TIF_NEED_RESCHED | \
+_TIF_WORK_INT = (_TIF_SIGPENDING | _TIF_NEED_RESCHED | \
                  _TIF_MCCK_PENDING)
 
 #define BASED(name) name-system_call(%r13)
@@ -308,7 +308,7 @@ sysc_work:
         jo      sysc_mcck_pending
         tm      __TI_flags+7(%r9),_TIF_NEED_RESCHED
         jo      sysc_reschedule
-        tm      __TI_flags+7(%r9),(_TIF_SIGPENDING | _TIF_RESTORE_SIGMASK)
+        tm      __TI_flags+7(%r9),_TIF_SIGPENDING
         jnz     sysc_sigpending
         tm      __TI_flags+7(%r9),_TIF_RESTART_SVC
         jo      sysc_restart
@@ -332,7 +332,7 @@ sysc_mcck_pending:
         jg      s390_handle_mcck        # TIF bit will be cleared by handler
 
 #
-# _TIF_SIGPENDING or _TIF_RESTORE_SIGMASK is set, call do_signal
+# _TIF_SIGPENDING is set, call do_signal
 #
 sysc_sigpending:
         ni      __TI_flags+7(%r9),255-_TIF_SINGLE_STEP # clear TIF_SINGLE_STEP
@@ -648,7 +648,7 @@ io_work_loop:
         jo      io_mcck_pending
         tm      __TI_flags+7(%r9),_TIF_NEED_RESCHED
         jo      io_reschedule
-        tm      __TI_flags+7(%r9),(_TIF_SIGPENDING | _TIF_RESTORE_SIGMASK)
+        tm      __TI_flags+7(%r9),_TIF_SIGPENDING
         jnz     io_sigpending
         j       io_restore
 io_work_done:
@@ -674,7 +674,7 @@ io_reschedule:
         j       io_work_loop
 
 #
-# _TIF_SIGPENDING or _TIF_RESTORE_SIGMASK is set, call do_signal
+# _TIF_SIGPENDING or is set, call do_signal
 #
 io_sigpending:
         TRACE_IRQS_ON
diff --git a/arch/s390/kernel/head31.S b/arch/s390/kernel/head31.S
index dc364c1419af..a816e2de32b9 100644
--- a/arch/s390/kernel/head31.S
+++ b/arch/s390/kernel/head31.S
@@ -57,61 +57,6 @@ startup_continue:
 #
         l       %r14,.Lstartup_init-.LPG1(%r13)
         basr    %r14,%r14
-
-        l       %r12,.Lmflags-.LPG1(%r13) # get address of machine_flags
-#
-# find out if we have an IEEE fpu
-#
-        mvc     __LC_PGM_NEW_PSW(8),.Lpcfpu-.LPG1(%r13)
-        efpc    %r0,0                   # test IEEE extract fpc instruction
-        oi      3(%r12),2               # set IEEE fpu flag
-.Lchkfpu:
-
-#
-# find out if we have the CSP instruction
-#
-       mvc       __LC_PGM_NEW_PSW(8),.Lpccsp-.LPG1(%r13)
-       la        %r0,0
-       lr       %r1,%r0
-       la       %r2,4
-       csp      %r0,%r2                 # Test CSP instruction
-       oi       3(%r12),8               # set CSP flag
-.Lchkcsp:
-
-#
-# find out if we have the MVPG instruction
-#
-       mvc      __LC_PGM_NEW_PSW(8),.Lpcmvpg-.LPG1(%r13)
-       sr       %r0,%r0
-       la       %r1,0
-       la       %r2,0
-       mvpg     %r1,%r2                 # Test CSP instruction
-       oi       3(%r12),16              # set MVPG flag
-.Lchkmvpg:
-
-#
-# find out if we have the IDTE instruction
-#
-        mvc     __LC_PGM_NEW_PSW(8),.Lpcidte-.LPG1(%r13)
-        .long   0xb2b10000              # store facility list
-        tm      0xc8,0x08               # check bit for clearing-by-ASCE
-        bno     .Lchkidte-.LPG1(%r13)
-        lhi     %r1,2094
-        lhi     %r2,0
-        .long   0xb98e2001
-        oi      3(%r12),0x80            # set IDTE flag
-.Lchkidte:
-
-#
-# find out if the diag 0x9c is available
-#
-        mvc     __LC_PGM_NEW_PSW(8),.Lpcdiag9c-.LPG1(%r13)
-        stap    __LC_CPUID+4            # store cpu address
-        lh      %r1,__LC_CPUID+4
-        diag    %r1,0,0x9c              # test diag 0x9c
-        oi      2(%r12),1               # set diag9c flag
-.Lchkdiag9c:
-
         lpsw  .Lentry-.LPG1(13)         # jump to _stext in primary-space,
                                         # virtual and never return ...
         .align  8
@@ -132,13 +77,7 @@ startup_continue:
         .long   0                       # cr13: home space segment table
         .long   0xc0000000              # cr14: machine check handling off
         .long   0                       # cr15: linkage stack operations
-.Lpcfpu:.long   0x00080000,0x80000000 + .Lchkfpu
-.Lpccsp:.long   0x00080000,0x80000000 + .Lchkcsp
-.Lpcmvpg:.long  0x00080000,0x80000000 + .Lchkmvpg
-.Lpcidte:.long  0x00080000,0x80000000 + .Lchkidte
-.Lpcdiag9c:.long 0x00080000,0x80000000 + .Lchkdiag9c
 .Lmchunk:.long  memory_chunk
-.Lmflags:.long  machine_flags
 .Lbss_bgn:  .long __bss_start
 .Lbss_end:  .long _end
 .Lparmaddr: .long PARMAREA
diff --git a/arch/s390/kernel/head64.S b/arch/s390/kernel/head64.S
index 79dccd206a6e..1d06961e87b3 100644
--- a/arch/s390/kernel/head64.S
+++ b/arch/s390/kernel/head64.S
@@ -125,73 +125,11 @@ startup_continue:
 # and create a kernel NSS if the SAVESYS= parm is defined
 #
         brasl   %r14,startup_init
-                                        # set program check new psw mask
-        mvc     __LC_PGM_NEW_PSW(8),.Lpcmsk-.LPG1(%r13)
-        larl    %r12,machine_flags
-#
-# find out if we have the MVPG instruction
-#
-        la      %r1,0f-.LPG1(%r13)      # set program check address
-        stg     %r1,__LC_PGM_NEW_PSW+8
-        sgr     %r0,%r0
-        lghi    %r1,0
-        lghi    %r2,0
-        mvpg    %r1,%r2                 # test MVPG instruction
-        oi      7(%r12),16              # set MVPG flag
-0:
-
-#
-# find out if the diag 0x44 works in 64 bit mode
-#
-        la      %r1,0f-.LPG1(%r13)      # set program check address
-        stg     %r1,__LC_PGM_NEW_PSW+8
-        diag    0,0,0x44                # test diag 0x44
-        oi      7(%r12),32              # set diag44 flag
-0:
-
-#
-# find out if we have the IDTE instruction
-#
-        la      %r1,0f-.LPG1(%r13)      # set program check address
-        stg     %r1,__LC_PGM_NEW_PSW+8
-        .long   0xb2b10000              # store facility list
-        tm      0xc8,0x08               # check bit for clearing-by-ASCE
-        bno     0f-.LPG1(%r13)
-        lhi     %r1,2048
-        lhi     %r2,0
-        .long   0xb98e2001
-        oi      7(%r12),0x80            # set IDTE flag
-0:
-
-#
-# find out if the diag 0x9c is available
-#
-        la      %r1,0f-.LPG1(%r13)      # set program check address
-        stg     %r1,__LC_PGM_NEW_PSW+8
-        stap    __LC_CPUID+4            # store cpu address
-        lh      %r1,__LC_CPUID+4
-        diag    %r1,0,0x9c              # test diag 0x9c
-        oi      6(%r12),1               # set diag9c flag
-0:
-
-#
-# find out if we have the MVCOS instruction
-#
-        la      %r1,0f-.LPG1(%r13)      # set program check address
-        stg     %r1,__LC_PGM_NEW_PSW+8
-        .short  0xc800                  # mvcos 0(%r0),0(%r0),%r0
-        .short  0x0000
-        .short  0x0000
-0:      tm      0x8f,0x13               # special-operation exception?
-        bno     1f-.LPG1(%r13)          # if yes, MVCOS is present
-        oi      6(%r12),2               # set MVCOS flag
-1:
-
         lpswe   .Lentry-.LPG1(13)       # jump to _stext in primary-space,
                                         # virtual and never return ...
         .align  16
 .Lentry:.quad   0x0000000180000000,_stext
-.Lctl:  .quad   0x04b50002              # cr0: various things
+.Lctl:  .quad   0x04350002              # cr0: various things
         .quad   0                       # cr1: primary space segment table
         .quad   .Lduct                  # cr2: dispatchable unit control table
         .quad   0                       # cr3: instruction authorization
diff --git a/arch/s390/kernel/irq.c b/arch/s390/kernel/irq.c
index c36d8123ca14..c59a86dca584 100644
--- a/arch/s390/kernel/irq.c
+++ b/arch/s390/kernel/irq.c
@@ -60,8 +60,6 @@ init_IRQ(void)
 /*
  * Switch to the asynchronous interrupt stack for softirq execution.
  */
-extern void __do_softirq(void);
-
 asmlinkage void do_softirq(void)
 {
         unsigned long flags, old, new;
diff --git a/arch/s390/kernel/process.c b/arch/s390/kernel/process.c
index c1aff194141d..7920861109d2 100644
--- a/arch/s390/kernel/process.c
+++ b/arch/s390/kernel/process.c
@@ -180,24 +180,6 @@ void cpu_idle(void)
         }
 }
 
-void show_regs(struct pt_regs *regs)
-{
-        print_modules();
-        printk("CPU: %d %s %s %.*s\n",
-               task_thread_info(current)->cpu, print_tainted(),
-               init_utsname()->release,
-               (int)strcspn(init_utsname()->version, " "),
-               init_utsname()->version);
-        printk("Process %s (pid: %d, task: %p, ksp: %p)\n",
-               current->comm, current->pid, current,
-               (void *) current->thread.ksp);
-        show_registers(regs);
-        /* Show stack backtrace if pt_regs is from kernel mode */
-        if (!(regs->psw.mask & PSW_MASK_PSTATE))
-                show_trace(NULL, (unsigned long *) regs->gprs[15]);
-        show_last_breaking_event(regs);
-}
-
 extern void kernel_thread_starter(void);
 
 asm(
diff --git a/arch/s390/kernel/ptrace.c b/arch/s390/kernel/ptrace.c
index 58a064296987..7f4270163744 100644
--- a/arch/s390/kernel/ptrace.c
+++ b/arch/s390/kernel/ptrace.c
@@ -607,38 +607,8 @@ do_ptrace_emu31(struct task_struct *child, long request, long addr, long data)
 }
 #endif
 
-#define PT32_IEEE_IP 0x13c
-
-static int
-do_ptrace(struct task_struct *child, long request, long addr, long data)
+long arch_ptrace(struct task_struct *child, long request, long addr, long data)
 {
-        int ret;
-
-        if (request == PTRACE_ATTACH)
-                return ptrace_attach(child);
-
-        /*
-         * Special cases to get/store the ieee instructions pointer.
-         */
-        if (child == current) {
-                if (request == PTRACE_PEEKUSR && addr == PT_IEEE_IP)
-                        return peek_user(child, addr, data);
-                if (request == PTRACE_POKEUSR && addr == PT_IEEE_IP)
-                        return poke_user(child, addr, data);
-#ifdef CONFIG_COMPAT
-                if (request == PTRACE_PEEKUSR &&
-                    addr == PT32_IEEE_IP && test_thread_flag(TIF_31BIT))
-                        return peek_user_emu31(child, addr, data);
-                if (request == PTRACE_POKEUSR &&
-                    addr == PT32_IEEE_IP && test_thread_flag(TIF_31BIT))
-                        return poke_user_emu31(child, addr, data);
-#endif
-        }
-
-        ret = ptrace_check_attach(child, request == PTRACE_KILL);
-        if (ret < 0)
-                return ret;
-
         switch (request) {
         case PTRACE_SYSCALL:
                 /* continue and stop at next (return from) syscall */
@@ -693,31 +663,6 @@ do_ptrace(struct task_struct *child, long request, long addr, long data)
         return -EIO;
 }
 
-asmlinkage long
-sys_ptrace(long request, long pid, long addr, long data)
-{
-        struct task_struct *child;
-        int ret;
-
-        lock_kernel();
-        if (request == PTRACE_TRACEME) {
-                 ret = ptrace_traceme();
-                 goto out;
-        }
-
-        child = ptrace_get_task_struct(pid);
-        if (IS_ERR(child)) {
-                ret = PTR_ERR(child);
-                goto out;
-        }
-
-        ret = do_ptrace(child, request, addr, data);
-        put_task_struct(child);
-out:
-        unlock_kernel();
-        return ret;
-}
-
 asmlinkage void
 syscall_trace(struct pt_regs *regs, int entryexit)
 {
diff --git a/arch/s390/kernel/setup.c b/arch/s390/kernel/setup.c
index a9d18aafa5f4..2bc70b6e876a 100644
--- a/arch/s390/kernel/setup.c
+++ b/arch/s390/kernel/setup.c
@@ -73,7 +73,7 @@ EXPORT_SYMBOL(uaccess);
 unsigned int console_mode = 0;
 unsigned int console_devno = -1;
 unsigned int console_irq = -1;
-unsigned long machine_flags = 0;
+unsigned long machine_flags;
 unsigned long elf_hwcap = 0;
 char elf_platform[ELF_PLATFORM_SIZE];
 
@@ -683,15 +683,6 @@ setup_memory(void)
 #endif
 }
 
-static __init unsigned int stfl(void)
-{
-        asm volatile(
-                "       .insn   s,0xb2b10000,0(0)\n" /* stfl */
-                "0:\n"
-                EX_TABLE(0b,0b));
-        return S390_lowcore.stfl_fac_list;
-}
-
 static int __init __stfle(unsigned long long *list, int doublewords)
 {
         typedef struct { unsigned long long _[doublewords]; } addrtype;
@@ -758,6 +749,9 @@ static void __init setup_hwcaps(void)
                         elf_hwcap |= 1UL << 6;
         }
 
+        if (MACHINE_HAS_HPAGE)
+                elf_hwcap |= 1UL << 7;
+
         switch (cpuinfo->cpu_id.machine) {
         case 0x9672:
 #if !defined(CONFIG_64BIT)
@@ -881,8 +875,9 @@ void __cpuinit print_cpu_info(struct cpuinfo_S390 *cpuinfo)
 
 static int show_cpuinfo(struct seq_file *m, void *v)
 {
-        static const char *hwcap_str[7] = {
-                "esan3", "zarch", "stfle", "msa", "ldisp", "eimm", "dfp"
+        static const char *hwcap_str[8] = {
+                "esan3", "zarch", "stfle", "msa", "ldisp", "eimm", "dfp",
+                "edat"
         };
         struct cpuinfo_S390 *cpuinfo;
         unsigned long n = (unsigned long) v - 1;
@@ -897,7 +892,7 @@ static int show_cpuinfo(struct seq_file *m, void *v)
                                num_online_cpus(), loops_per_jiffy/(500000/HZ),
                                (loops_per_jiffy/(5000/HZ))%100);
                 seq_puts(m, "features\t: ");
-                for (i = 0; i < 7; i++)
+                for (i = 0; i < 8; i++)
                         if (hwcap_str[i] && (elf_hwcap & (1UL << i)))
                                 seq_printf(m, "%s ", hwcap_str[i]);
                 seq_puts(m, "\n");
diff --git a/arch/s390/kernel/smp.c b/arch/s390/kernel/smp.c
index 0dfa988c1b26..0aeb290060d9 100644
--- a/arch/s390/kernel/smp.c
+++ b/arch/s390/kernel/smp.c
@@ -505,7 +505,7 @@ out:
         return rc;
 }
 
-static int smp_rescan_cpus(void)
+static int __smp_rescan_cpus(void)
 {
         cpumask_t avail;
 
@@ -570,7 +570,7 @@ out:
         kfree(info);
         printk(KERN_INFO "CPUs: %d configured, %d standby\n", c_cpus, s_cpus);
         get_online_cpus();
-        smp_rescan_cpus();
+        __smp_rescan_cpus();
         put_online_cpus();
 }
 
@@ -890,8 +890,8 @@ static ssize_t cpu_configure_store(struct sys_device *dev, const char *buf,
         if (val != 0 && val != 1)
                 return -EINVAL;
 
-        mutex_lock(&smp_cpu_state_mutex);
         get_online_cpus();
+        mutex_lock(&smp_cpu_state_mutex);
         rc = -EBUSY;
         if (cpu_online(cpu))
                 goto out;
@@ -919,8 +919,8 @@ static ssize_t cpu_configure_store(struct sys_device *dev, const char *buf,
                 break;
         }
 out:
-        put_online_cpus();
         mutex_unlock(&smp_cpu_state_mutex);
+        put_online_cpus();
         return rc ? rc : count;
 }
 static SYSDEV_ATTR(configure, 0644, cpu_configure_show, cpu_configure_store);
@@ -1088,17 +1088,17 @@ out:
 }
 
 #ifdef CONFIG_HOTPLUG_CPU
-static ssize_t __ref rescan_store(struct sys_device *dev,
-                                  const char *buf, size_t count)
+
+int smp_rescan_cpus(void)
 {
         cpumask_t newcpus;
         int cpu;
         int rc;
 
-        mutex_lock(&smp_cpu_state_mutex);
         get_online_cpus();
+        mutex_lock(&smp_cpu_state_mutex);
         newcpus = cpu_present_map;
-        rc = smp_rescan_cpus();
+        rc = __smp_rescan_cpus();
         if (rc)
                 goto out;
         cpus_andnot(newcpus, cpu_present_map, newcpus);
@@ -1109,10 +1109,19 @@ static ssize_t __ref rescan_store(struct sys_device *dev,
         }
         rc = 0;
 out:
-        put_online_cpus();
         mutex_unlock(&smp_cpu_state_mutex);
+        put_online_cpus();
         if (!cpus_empty(newcpus))
                 topology_schedule_update();
+        return rc;
+}
+
+static ssize_t __ref rescan_store(struct sys_device *dev, const char *buf,
+                                  size_t count)
+{
+        int rc;
+
+        rc = smp_rescan_cpus();
         return rc ? rc : count;
 }
 static SYSDEV_ATTR(rescan, 0200, NULL, rescan_store);
@@ -1139,16 +1148,16 @@ static ssize_t dispatching_store(struct sys_device *dev, const char *buf,
         if (val != 0 && val != 1)
                 return -EINVAL;
         rc = 0;
-        mutex_lock(&smp_cpu_state_mutex);
         get_online_cpus();
+        mutex_lock(&smp_cpu_state_mutex);
         if (cpu_management == val)
                 goto out;
         rc = topology_set_cpu_management(val);
         if (!rc)
                 cpu_management = val;
 out:
-        put_online_cpus();
         mutex_unlock(&smp_cpu_state_mutex);
+        put_online_cpus();
         return rc ? rc : count;
 }
 static SYSDEV_ATTR(dispatching, 0644, dispatching_show, dispatching_store);
diff --git a/arch/s390/kernel/sys_s390.c b/arch/s390/kernel/sys_s390.c
index 988d0d64c2c8..5fdb799062b7 100644
--- a/arch/s390/kernel/sys_s390.c
+++ b/arch/s390/kernel/sys_s390.c
@@ -32,23 +32,6 @@
 #include <asm/uaccess.h>
 #include "entry.h"
 
-/*
- * sys_pipe() is the normal C calling standard for creating
- * a pipe. It's not the way Unix traditionally does this, though.
- */
-asmlinkage long sys_pipe(unsigned long __user *fildes)
-{
-        int fd[2];
-        int error;
-
-        error = do_pipe(fd);
-        if (!error) {
-                if (copy_to_user(fildes, fd, 2*sizeof(int)))
-                        error = -EFAULT;
-        }
-        return error;
-}
-
 /* common code for old and new mmaps */
 static inline long do_mmap2(
         unsigned long addr, unsigned long len,
diff --git a/arch/s390/kernel/topology.c b/arch/s390/kernel/topology.c
index 12b39b3d9c38..661a07217057 100644
--- a/arch/s390/kernel/topology.c
+++ b/arch/s390/kernel/topology.c
@@ -9,6 +9,7 @@
 #include <linux/device.h>
 #include <linux/bootmem.h>
 #include <linux/sched.h>
+#include <linux/kthread.h>
 #include <linux/workqueue.h>
 #include <linux/cpu.h>
 #include <linux/smp.h>
@@ -66,6 +67,8 @@ static struct timer_list topology_timer;
 static void set_topology_timer(void);
 static DECLARE_WORK(topology_work, topology_work_fn);
 
+cpumask_t cpu_core_map[NR_CPUS];
+
 cpumask_t cpu_coregroup_map(unsigned int cpu)
 {
         struct core_info *core = &core_info;
@@ -199,6 +202,14 @@ int topology_set_cpu_management(int fc)
         return rc;
 }
 
+static void update_cpu_core_map(void)
+{
+        int cpu;
+
+        for_each_present_cpu(cpu)
+                cpu_core_map[cpu] = cpu_coregroup_map(cpu);
+}
+
 void arch_update_cpu_topology(void)
 {
         struct tl_info *info = tl_info;
@@ -206,20 +217,33 @@ void arch_update_cpu_topology(void)
         int cpu;
 
         if (!machine_has_topology) {
+                update_cpu_core_map();
                 topology_update_polarization_simple();
                 return;
         }
         stsi(info, 15, 1, 2);
         tl_to_cores(info);
+        update_cpu_core_map();
         for_each_online_cpu(cpu) {
                 sysdev = get_cpu_sysdev(cpu);
                 kobject_uevent(&sysdev->kobj, KOBJ_CHANGE);
         }
 }
 
-static void topology_work_fn(struct work_struct *work)
+static int topology_kthread(void *data)
 {
         arch_reinit_sched_domains();
+        return 0;
+}
+
+static void topology_work_fn(struct work_struct *work)
+{
+        /* We can't call arch_reinit_sched_domains() from a multi-threaded
+         * workqueue context since it may deadlock in case of cpu hotplug.
+         * So we have to create a kernel thread in order to call
+         * arch_reinit_sched_domains().
+         */
+        kthread_run(topology_kthread, NULL, "topology_update");
 }
 
 void topology_schedule_update(void)
@@ -251,20 +275,23 @@ static int __init init_topology_update(void)
 {
         int rc;
 
+        rc = 0;
         if (!machine_has_topology) {
                 topology_update_polarization_simple();
-                return 0;
+                goto out;
         }
         init_timer_deferrable(&topology_timer);
         if (machine_has_topology_irq) {
                 rc = register_external_interrupt(0x2005, topology_interrupt);
                 if (rc)
-                        return rc;
+                        goto out;
                 ctl_set_bit(0, 8);
         }
         else
                 set_topology_timer();
-        return 0;
+out:
+        update_cpu_core_map();
+        return rc;
 }
 __initcall(init_topology_update);
 
diff --git a/arch/s390/kernel/traps.c b/arch/s390/kernel/traps.c
index 57b607b61100..4584d81984c0 100644
--- a/arch/s390/kernel/traps.c
+++ b/arch/s390/kernel/traps.c
@@ -113,7 +113,7 @@ __show_trace(unsigned long sp, unsigned long low, unsigned long high)
         }
 }
 
-void show_trace(struct task_struct *task, unsigned long *stack)
+static void show_trace(struct task_struct *task, unsigned long *stack)
 {
         register unsigned long __r15 asm ("15");
         unsigned long sp;
@@ -161,14 +161,14 @@ void show_stack(struct task_struct *task, unsigned long *sp)
         show_trace(task, sp);
 }
 
-#ifdef CONFIG_64BIT
-void show_last_breaking_event(struct pt_regs *regs)
+static void show_last_breaking_event(struct pt_regs *regs)
 {
+#ifdef CONFIG_64BIT
         printk("Last Breaking-Event-Address:\n");
         printk(" [<%016lx>] ", regs->args[0] & PSW_ADDR_INSN);
         print_symbol("%s\n", regs->args[0] & PSW_ADDR_INSN);
-}
 #endif
+}
 
 /*
  * The architecture-independent dump_stack generator
@@ -223,6 +223,24 @@ void show_registers(struct pt_regs *regs)
         show_code(regs);
 }       
 
+void show_regs(struct pt_regs *regs)
+{
+        print_modules();
+        printk("CPU: %d %s %s %.*s\n",
+               task_thread_info(current)->cpu, print_tainted(),
+               init_utsname()->release,
+               (int)strcspn(init_utsname()->version, " "),
+               init_utsname()->version);
+        printk("Process %s (pid: %d, task: %p, ksp: %p)\n",
+               current->comm, current->pid, current,
+               (void *) current->thread.ksp);
+        show_registers(regs);
+        /* Show stack backtrace if pt_regs is from kernel mode */
+        if (!(regs->psw.mask & PSW_MASK_PSTATE))
+                show_trace(NULL, (unsigned long *) regs->gprs[15]);
+        show_last_breaking_event(regs);
+}
+
 /* This is called from fs/proc/array.c */
 void task_show_regs(struct seq_file *m, struct task_struct *task)
 {
diff --git a/arch/s390/kvm/priv.c b/arch/s390/kvm/priv.c
index 1465946325c5..c02286c6a931 100644
--- a/arch/s390/kvm/priv.c
+++ b/arch/s390/kvm/priv.c
@@ -151,18 +151,9 @@ static int handle_chsc(struct kvm_vcpu *vcpu)
         return 0;
 }
 
-static unsigned int kvm_stfl(void)
-{
-        asm volatile(
-                "       .insn   s,0xb2b10000,0(0)\n" /* stfl */
-                "0:\n"
-                EX_TABLE(0b, 0b));
-        return S390_lowcore.stfl_fac_list;
-}
-
 static int handle_stfl(struct kvm_vcpu *vcpu)
 {
-        unsigned int facility_list = kvm_stfl();
+        unsigned int facility_list = stfl();
         int rc;
 
         vcpu->stat.instruction_stfl++;
diff --git a/arch/s390/lib/Makefile b/arch/s390/lib/Makefile
index 52084436ab69..ab6735df2d21 100644
--- a/arch/s390/lib/Makefile
+++ b/arch/s390/lib/Makefile
@@ -2,8 +2,6 @@
 # Makefile for s390-specific library files..
 #
 
-EXTRA_AFLAGS := -traditional
-
 lib-y += delay.o string.o uaccess_std.o uaccess_pt.o
 obj-$(CONFIG_32BIT) += div64.o qrnnd.o
 lib-$(CONFIG_64BIT) += uaccess_mvcos.o
diff --git a/arch/s390/lib/uaccess_mvcos.c b/arch/s390/lib/uaccess_mvcos.c
index 6d8772339d76..3f15aaf54855 100644
--- a/arch/s390/lib/uaccess_mvcos.c
+++ b/arch/s390/lib/uaccess_mvcos.c
@@ -162,6 +162,7 @@ static size_t clear_user_mvcos(size_t size, void __user *to)
         return size;
 }
 
+#ifdef CONFIG_S390_SWITCH_AMODE
 static size_t strnlen_user_mvcos(size_t count, const char __user *src)
 {
         char buf[256];
@@ -199,6 +200,7 @@ static size_t strncpy_from_user_mvcos(size_t count, const char __user *src,
         } while ((len_str == len) && (done < count));
         return done;
 }
+#endif /* CONFIG_S390_SWITCH_AMODE */
 
 struct uaccess_ops uaccess_mvcos = {
         .copy_from_user = copy_from_user_mvcos_check,
diff --git a/arch/s390/math-emu/Makefile b/arch/s390/math-emu/Makefile
index 73b3e72efc46..c84890341052 100644
--- a/arch/s390/math-emu/Makefile
+++ b/arch/s390/math-emu/Makefile
@@ -5,4 +5,3 @@
 obj-$(CONFIG_MATHEMU) := math.o
 
 EXTRA_CFLAGS := -I$(src) -Iinclude/math-emu -w
-EXTRA_AFLAGS := -traditional
diff --git a/arch/s390/mm/Makefile b/arch/s390/mm/Makefile
index 66401930f83e..fb988a48a754 100644
--- a/arch/s390/mm/Makefile
+++ b/arch/s390/mm/Makefile
@@ -4,4 +4,4 @@
 
 obj-y    := init.o fault.o extmem.o mmap.o vmem.o pgtable.o
 obj-$(CONFIG_CMM) += cmm.o
-
+obj-$(CONFIG_HUGETLB_PAGE) += hugetlbpage.o
diff --git a/arch/s390/mm/extmem.c b/arch/s390/mm/extmem.c
index ed2af0a3303b..f231f5ec74b6 100644
--- a/arch/s390/mm/extmem.c
+++ b/arch/s390/mm/extmem.c
@@ -287,7 +287,7 @@ __segment_load (char *name, int do_nonshared, unsigned long *addr, unsigned long
         if (rc < 0)
                 goto out_free;
 
-        rc = add_shared_memory(seg->start_addr, seg->end - seg->start_addr + 1);
+        rc = vmem_add_mapping(seg->start_addr, seg->end - seg->start_addr + 1);
 
         if (rc)
                 goto out_free;
@@ -351,7 +351,7 @@ __segment_load (char *name, int do_nonshared, unsigned long *addr, unsigned long
         release_resource(seg->res);
         kfree(seg->res);
  out_shared:
-        remove_shared_memory(seg->start_addr, seg->end - seg->start_addr + 1);
+        vmem_remove_mapping(seg->start_addr, seg->end - seg->start_addr + 1);
  out_free:
         kfree(seg);
  out:
@@ -474,7 +474,7 @@ segment_modify_shared (char *name, int do_nonshared)
         rc = 0;
         goto out_unlock;
  out_del:
-        remove_shared_memory(seg->start_addr, seg->end - seg->start_addr + 1);
+        vmem_remove_mapping(seg->start_addr, seg->end - seg->start_addr + 1);
         list_del(&seg->list);
         dcss_diag(DCSS_PURGESEG, seg->dcss_name, &dummy, &dummy);
         kfree(seg);
@@ -508,7 +508,7 @@ segment_unload(char *name)
                 goto out_unlock;
         release_resource(seg->res);
         kfree(seg->res);
-        remove_shared_memory(seg->start_addr, seg->end - seg->start_addr + 1);
+        vmem_remove_mapping(seg->start_addr, seg->end - seg->start_addr + 1);
         list_del(&seg->list);
         dcss_diag(DCSS_PURGESEG, seg->dcss_name, &dummy, &dummy);
         kfree(seg);
diff --git a/arch/s390/mm/fault.c b/arch/s390/mm/fault.c
index 2650f46001d0..4d537205e83c 100644
--- a/arch/s390/mm/fault.c
+++ b/arch/s390/mm/fault.c
@@ -28,6 +28,7 @@
 #include <linux/hardirq.h>
 #include <linux/kprobes.h>
 #include <linux/uaccess.h>
+#include <linux/hugetlb.h>
 #include <asm/system.h>
 #include <asm/pgtable.h>
 #include <asm/s390_ext.h>
@@ -367,6 +368,8 @@ good_area:
         }
 
 survive:
+        if (is_vm_hugetlb_page(vma))
+                address &= HPAGE_MASK;
         /*
          * If for any reason at all we couldn't handle the fault,
          * make sure we exit gracefully rather than endlessly redo
diff --git a/arch/s390/mm/hugetlbpage.c b/arch/s390/mm/hugetlbpage.c
new file mode 100644
index 000000000000..f4b6124fdb75
--- /dev/null
+++ b/arch/s390/mm/hugetlbpage.c
@@ -0,0 +1,134 @@
+/*
+ *  IBM System z Huge TLB Page Support for Kernel.
+ *
+ *    Copyright 2007 IBM Corp.
+ *    Author(s): Gerald Schaefer <gerald.schaefer@de.ibm.com>
+ */
+
+#include <linux/mm.h>
+#include <linux/hugetlb.h>
+
+
+void set_huge_pte_at(struct mm_struct *mm, unsigned long addr,
+                                   pte_t *pteptr, pte_t pteval)
+{
+        pmd_t *pmdp = (pmd_t *) pteptr;
+        pte_t shadow_pteval = pteval;
+        unsigned long mask;
+
+        if (!MACHINE_HAS_HPAGE) {
+                pteptr = (pte_t *) pte_page(pteval)[1].index;
+                mask = pte_val(pteval) &
+                                (_SEGMENT_ENTRY_INV | _SEGMENT_ENTRY_RO);
+                pte_val(pteval) = (_SEGMENT_ENTRY + __pa(pteptr)) | mask;
+                if (mm->context.noexec) {
+                        pteptr += PTRS_PER_PTE;
+                        pte_val(shadow_pteval) =
+                                        (_SEGMENT_ENTRY + __pa(pteptr)) | mask;
+                }
+        }
+
+        pmd_val(*pmdp) = pte_val(pteval);
+        if (mm->context.noexec) {
+                pmdp = get_shadow_table(pmdp);
+                pmd_val(*pmdp) = pte_val(shadow_pteval);
+        }
+}
+
+int arch_prepare_hugepage(struct page *page)
+{
+        unsigned long addr = page_to_phys(page);
+        pte_t pte;
+        pte_t *ptep;
+        int i;
+
+        if (MACHINE_HAS_HPAGE)
+                return 0;
+
+        ptep = (pte_t *) pte_alloc_one(&init_mm, address);
+        if (!ptep)
+                return -ENOMEM;
+
+        pte = mk_pte(page, PAGE_RW);
+        for (i = 0; i < PTRS_PER_PTE; i++) {
+                set_pte_at(&init_mm, addr + i * PAGE_SIZE, ptep + i, pte);
+                pte_val(pte) += PAGE_SIZE;
+        }
+        page[1].index = (unsigned long) ptep;
+        return 0;
+}
+
+void arch_release_hugepage(struct page *page)
+{
+        pte_t *ptep;
+
+        if (MACHINE_HAS_HPAGE)
+                return;
+
+        ptep = (pte_t *) page[1].index;
+        if (!ptep)
+                return;
+        pte_free(&init_mm, ptep);
+        page[1].index = 0;
+}
+
+pte_t *huge_pte_alloc(struct mm_struct *mm, unsigned long addr)
+{
+        pgd_t *pgdp;
+        pud_t *pudp;
+        pmd_t *pmdp = NULL;
+
+        pgdp = pgd_offset(mm, addr);
+        pudp = pud_alloc(mm, pgdp, addr);
+        if (pudp)
+                pmdp = pmd_alloc(mm, pudp, addr);
+        return (pte_t *) pmdp;
+}
+
+pte_t *huge_pte_offset(struct mm_struct *mm, unsigned long addr)
+{
+        pgd_t *pgdp;
+        pud_t *pudp;
+        pmd_t *pmdp = NULL;
+
+        pgdp = pgd_offset(mm, addr);
+        if (pgd_present(*pgdp)) {
+                pudp = pud_offset(pgdp, addr);
+                if (pud_present(*pudp))
+                        pmdp = pmd_offset(pudp, addr);
+        }
+        return (pte_t *) pmdp;
+}
+
+int huge_pmd_unshare(struct mm_struct *mm, unsigned long *addr, pte_t *ptep)
+{
+        return 0;
+}
+
+struct page *follow_huge_addr(struct mm_struct *mm, unsigned long address,
+                              int write)
+{
+        return ERR_PTR(-EINVAL);
+}
+
+int pmd_huge(pmd_t pmd)
+{
+        if (!MACHINE_HAS_HPAGE)
+                return 0;
+
+        return !!(pmd_val(pmd) & _SEGMENT_ENTRY_LARGE);
+}
+
+struct page *follow_huge_pmd(struct mm_struct *mm, unsigned long address,
+                             pmd_t *pmdp, int write)
+{
+        struct page *page;
+
+        if (!MACHINE_HAS_HPAGE)
+                return NULL;
+
+        page = pmd_page(*pmdp);
+        if (page)
+                page += ((address & ~HPAGE_MASK) >> PAGE_SHIFT);
+        return page;
+}
diff --git a/arch/s390/mm/init.c b/arch/s390/mm/init.c
index 202c952a29b4..fa31de6ae97a 100644
--- a/arch/s390/mm/init.c
+++ b/arch/s390/mm/init.c
@@ -77,28 +77,6 @@ void show_mem(void)
         printk("%lu pages pagetables\n", global_page_state(NR_PAGETABLE));
 }
 
-static void __init setup_ro_region(void)
-{
-        pgd_t *pgd;
-        pud_t *pud;
-        pmd_t *pmd;
-        pte_t *pte;
-        pte_t new_pte;
-        unsigned long address, end;
-
-        address = ((unsigned long)&_stext) & PAGE_MASK;
-        end = PFN_ALIGN((unsigned long)&_eshared);
-
-        for (; address < end; address += PAGE_SIZE) {
-                pgd = pgd_offset_k(address);
-                pud = pud_offset(pgd, address);
-                pmd = pmd_offset(pud, address);
-                pte = pte_offset_kernel(pmd, address);
-                new_pte = mk_pte_phys(address, __pgprot(_PAGE_RO));
-                *pte = new_pte;
-        }
-}
-
 /*
  * paging_init() sets up the page tables
  */
@@ -121,7 +99,6 @@ void __init paging_init(void)
         clear_table((unsigned long *) init_mm.pgd, pgd_type,
                     sizeof(unsigned long)*2048);
         vmem_map_init();
-        setup_ro_region();
 
         /* enable virtual mapping in kernel mode */
         __ctl_load(S390_lowcore.kernel_asce, 1, 1);
@@ -129,6 +106,8 @@ void __init paging_init(void)
         __ctl_load(S390_lowcore.kernel_asce, 13, 13);
         __raw_local_irq_ssm(ssm_mask);
 
+        sparse_memory_present_with_active_regions(MAX_NUMNODES);
+        sparse_init();
         memset(max_zone_pfns, 0, sizeof(max_zone_pfns));
 #ifdef CONFIG_ZONE_DMA
         max_zone_pfns[ZONE_DMA] = PFN_DOWN(MAX_DMA_ADDRESS);
diff --git a/arch/s390/mm/vmem.c b/arch/s390/mm/vmem.c
index 35d90a4720fd..beccacf907f3 100644
--- a/arch/s390/mm/vmem.c
+++ b/arch/s390/mm/vmem.c
@@ -10,10 +10,12 @@
 #include <linux/mm.h>
 #include <linux/module.h>
 #include <linux/list.h>
+#include <linux/hugetlb.h>
 #include <asm/pgalloc.h>
 #include <asm/pgtable.h>
 #include <asm/setup.h>
 #include <asm/tlbflush.h>
+#include <asm/sections.h>
 
 static DEFINE_MUTEX(vmem_mutex);
 
@@ -25,43 +27,6 @@ struct memory_segment {
 
 static LIST_HEAD(mem_segs);
 
-void __meminit memmap_init(unsigned long size, int nid, unsigned long zone,
-                           unsigned long start_pfn)
-{
-        struct page *start, *end;
-        struct page *map_start, *map_end;
-        int i;
-
-        start = pfn_to_page(start_pfn);
-        end = start + size;
-
-        for (i = 0; i < MEMORY_CHUNKS && memory_chunk[i].size > 0; i++) {
-                unsigned long cstart, cend;
-
-                cstart = PFN_DOWN(memory_chunk[i].addr);
-                cend = cstart + PFN_DOWN(memory_chunk[i].size);
-
-                map_start = mem_map + cstart;
-                map_end = mem_map + cend;
-
-                if (map_start < start)
-                        map_start = start;
-                if (map_end > end)
-                        map_end = end;
-
-                map_start -= ((unsigned long) map_start & (PAGE_SIZE - 1))
-                        / sizeof(struct page);
-                map_end += ((PFN_ALIGN((unsigned long) map_end)
-                             - (unsigned long) map_end)
-                            / sizeof(struct page));
-
-                if (map_start < map_end)
-                        memmap_init_zone((unsigned long)(map_end - map_start),
-                                         nid, zone, page_to_pfn(map_start),
-                                         MEMMAP_EARLY);
-        }
-}
-
 static void __ref *vmem_alloc_pages(unsigned int order)
 {
         if (slab_is_available())
@@ -77,8 +42,7 @@ static inline pud_t *vmem_pud_alloc(void)
         pud = vmem_alloc_pages(2);
         if (!pud)
                 return NULL;
-        pud_val(*pud) = _REGION3_ENTRY_EMPTY;
-        memcpy(pud + 1, pud, (PTRS_PER_PUD - 1)*sizeof(pud_t));
+        clear_table((unsigned long *) pud, _REGION3_ENTRY_EMPTY, PAGE_SIZE * 4);
 #endif
         return pud;
 }
@@ -91,7 +55,7 @@ static inline pmd_t *vmem_pmd_alloc(void)
         pmd = vmem_alloc_pages(2);
         if (!pmd)
                 return NULL;
-        clear_table((unsigned long *) pmd, _SEGMENT_ENTRY_EMPTY, PAGE_SIZE*4);
+        clear_table((unsigned long *) pmd, _SEGMENT_ENTRY_EMPTY, PAGE_SIZE * 4);
 #endif
         return pmd;
 }
@@ -114,7 +78,7 @@ static pte_t __init_refok *vmem_pte_alloc(void)
 /*
  * Add a physical memory range to the 1:1 mapping.
  */
-static int vmem_add_range(unsigned long start, unsigned long size)
+static int vmem_add_mem(unsigned long start, unsigned long size, int ro)
 {
         unsigned long address;
         pgd_t *pg_dir;
@@ -141,7 +105,19 @@ static int vmem_add_range(unsigned long start, unsigned long size)
                         pud_populate_kernel(&init_mm, pu_dir, pm_dir);
                 }
 
+                pte = mk_pte_phys(address, __pgprot(ro ? _PAGE_RO : 0));
                 pm_dir = pmd_offset(pu_dir, address);
+
+#ifdef __s390x__
+                if (MACHINE_HAS_HPAGE && !(address & ~HPAGE_MASK) &&
+                    (address + HPAGE_SIZE <= start + size) &&
+                    (address >= HPAGE_SIZE)) {
+                        pte_val(pte) |= _SEGMENT_ENTRY_LARGE;
+                        pmd_val(*pm_dir) = pte_val(pte);
+                        address += HPAGE_SIZE - PAGE_SIZE;
+                        continue;
+                }
+#endif
                 if (pmd_none(*pm_dir)) {
                         pt_dir = vmem_pte_alloc();
                         if (!pt_dir)
@@ -150,7 +126,6 @@ static int vmem_add_range(unsigned long start, unsigned long size)
                 }
 
                 pt_dir = pte_offset_kernel(pm_dir, address);
-                pte = pfn_pte(address >> PAGE_SHIFT, PAGE_KERNEL);
                 *pt_dir = pte;
         }
         ret = 0;
@@ -181,6 +156,13 @@ static void vmem_remove_range(unsigned long start, unsigned long size)
                 pm_dir = pmd_offset(pu_dir, address);
                 if (pmd_none(*pm_dir))
                         continue;
+
+                if (pmd_huge(*pm_dir)) {
+                        pmd_clear_kernel(pm_dir);
+                        address += HPAGE_SIZE - PAGE_SIZE;
+                        continue;
+                }
+
                 pt_dir = pte_offset_kernel(pm_dir, address);
                 *pt_dir = pte;
         }
@@ -190,10 +172,9 @@ static void vmem_remove_range(unsigned long start, unsigned long size)
 /*
  * Add a backed mem_map array to the virtual mem_map array.
  */
-static int vmem_add_mem_map(unsigned long start, unsigned long size)
+int __meminit vmemmap_populate(struct page *start, unsigned long nr, int node)
 {
         unsigned long address, start_addr, end_addr;
-        struct page *map_start, *map_end;
         pgd_t *pg_dir;
         pud_t *pu_dir;
         pmd_t *pm_dir;
@@ -201,11 +182,8 @@ static int vmem_add_mem_map(unsigned long start, unsigned long size)
         pte_t  pte;
         int ret = -ENOMEM;
 
-        map_start = VMEM_MAP + PFN_DOWN(start);
-        map_end = VMEM_MAP + PFN_DOWN(start + size);
-
-        start_addr = (unsigned long) map_start & PAGE_MASK;
-        end_addr = PFN_ALIGN((unsigned long) map_end);
+        start_addr = (unsigned long) start;
+        end_addr = (unsigned long) (start + nr);
 
         for (address = start_addr; address < end_addr; address += PAGE_SIZE) {
                 pg_dir = pgd_offset_k(address);
@@ -249,16 +227,6 @@ out:
         return ret;
 }
 
-static int vmem_add_mem(unsigned long start, unsigned long size)
-{
-        int ret;
-
-        ret = vmem_add_mem_map(start, size);
-        if (ret)
-                return ret;
-        return vmem_add_range(start, size);
-}
-
 /*
  * Add memory segment to the segment list if it doesn't overlap with
  * an already present segment.
@@ -296,7 +264,7 @@ static void __remove_shared_memory(struct memory_segment *seg)
         vmem_remove_range(seg->start, seg->size);
 }
 
-int remove_shared_memory(unsigned long start, unsigned long size)
+int vmem_remove_mapping(unsigned long start, unsigned long size)
 {
         struct memory_segment *seg;
         int ret;
@@ -320,11 +288,9 @@ out:
         return ret;
 }
 
-int add_shared_memory(unsigned long start, unsigned long size)
+int vmem_add_mapping(unsigned long start, unsigned long size)
 {
         struct memory_segment *seg;
-        struct page *page;
-        unsigned long pfn, num_pfn, end_pfn;
         int ret;
 
         mutex_lock(&vmem_mutex);
@@ -339,24 +305,9 @@ int add_shared_memory(unsigned long start, unsigned long size)
         if (ret)
                 goto out_free;
 
-        ret = vmem_add_mem(start, size);
+        ret = vmem_add_mem(start, size, 0);
         if (ret)
                 goto out_remove;
-
-        pfn = PFN_DOWN(start);
-        num_pfn = PFN_DOWN(size);
-        end_pfn = pfn + num_pfn;
-
-        page = pfn_to_page(pfn);
-        memset(page, 0, num_pfn * sizeof(struct page));
-
-        for (; pfn < end_pfn; pfn++) {
-                page = pfn_to_page(pfn);
-                init_page_count(page);
-                reset_page_mapcount(page);
-                SetPageReserved(page);
-                INIT_LIST_HEAD(&page->lru);
-        }
         goto out;
 
 out_remove:
@@ -375,14 +326,34 @@ out:
  */
 void __init vmem_map_init(void)
 {
+        unsigned long ro_start, ro_end;
+        unsigned long start, end;
         int i;
 
         INIT_LIST_HEAD(&init_mm.context.crst_list);
         INIT_LIST_HEAD(&init_mm.context.pgtable_list);
         init_mm.context.noexec = 0;
-        NODE_DATA(0)->node_mem_map = VMEM_MAP;
-        for (i = 0; i < MEMORY_CHUNKS && memory_chunk[i].size > 0; i++)
-                vmem_add_mem(memory_chunk[i].addr, memory_chunk[i].size);
+        ro_start = ((unsigned long)&_stext) & PAGE_MASK;
+        ro_end = PFN_ALIGN((unsigned long)&_eshared);
+        for (i = 0; i < MEMORY_CHUNKS && memory_chunk[i].size > 0; i++) {
+                start = memory_chunk[i].addr;
+                end = memory_chunk[i].addr + memory_chunk[i].size;
+                if (start >= ro_end || end <= ro_start)
+                        vmem_add_mem(start, end - start, 0);
+                else if (start >= ro_start && end <= ro_end)
+                        vmem_add_mem(start, end - start, 1);
+                else if (start >= ro_start) {
+                        vmem_add_mem(start, ro_end - start, 1);
+                        vmem_add_mem(ro_end, end - ro_end, 0);
+                } else if (end < ro_end) {
+                        vmem_add_mem(start, ro_start - start, 0);
+                        vmem_add_mem(ro_start, end - ro_start, 1);
+                } else {
+                        vmem_add_mem(start, ro_start - start, 0);
+                        vmem_add_mem(ro_start, ro_end - ro_start, 1);
+                        vmem_add_mem(ro_end, end - ro_end, 0);
+                }
+        }
 }
 
 /*
diff --git a/arch/sh/boards/renesas/migor/setup.c b/arch/sh/boards/renesas/migor/setup.c
index 00d52a20d8a5..e7c150d49702 100644
--- a/arch/sh/boards/renesas/migor/setup.c
+++ b/arch/sh/boards/renesas/migor/setup.c
@@ -199,8 +199,7 @@ static struct platform_device *migor_devices[] __initdata = {
 
 static struct i2c_board_info __initdata migor_i2c_devices[] = {
         {
-                I2C_BOARD_INFO("rtc-rs5c372", 0x32),
-                .type   = "rs5c372b",
+                I2C_BOARD_INFO("rs5c372b", 0x32),
         },
         {
                 I2C_BOARD_INFO("migor_ts", 0x51),
diff --git a/arch/sh/boards/renesas/r7780rp/setup.c b/arch/sh/boards/renesas/r7780rp/setup.c
index a5c5e9236501..ac0a96522e45 100644
--- a/arch/sh/boards/renesas/r7780rp/setup.c
+++ b/arch/sh/boards/renesas/r7780rp/setup.c
@@ -199,8 +199,7 @@ static struct platform_device smbus_device = {
 
 static struct i2c_board_info __initdata highlander_i2c_devices[] = {
         {
-                I2C_BOARD_INFO("rtc-rs5c372", 0x32),
-                .type   = "r2025sd",
+                I2C_BOARD_INFO("r2025sd", 0x32),
         },
 };
 
diff --git a/arch/sh/drivers/pci/pci.c b/arch/sh/drivers/pci/pci.c
index 49b435c3a57a..08d2e7325252 100644
--- a/arch/sh/drivers/pci/pci.c
+++ b/arch/sh/drivers/pci/pci.c
@@ -191,8 +191,8 @@ void __init pcibios_update_irq(struct pci_dev *dev, int irq)
 
 void __iomem *pci_iomap(struct pci_dev *dev, int bar, unsigned long maxlen)
 {
-        unsigned long start = pci_resource_start(dev, bar);
-        unsigned long len = pci_resource_len(dev, bar);
+        resource_size_t start = pci_resource_start(dev, bar);
+        resource_size_t len = pci_resource_len(dev, bar);
         unsigned long flags = pci_resource_flags(dev, bar);
 
         if (unlikely(!len || !start))
diff --git a/arch/sh/kernel/asm-offsets.c b/arch/sh/kernel/asm-offsets.c
index dc6725c51a89..57cf0e0680f3 100644
--- a/arch/sh/kernel/asm-offsets.c
+++ b/arch/sh/kernel/asm-offsets.c
@@ -11,12 +11,9 @@
 #include <linux/stddef.h>
 #include <linux/types.h>
 #include <linux/mm.h>
-#include <asm/thread_info.h>
-
-#define DEFINE(sym, val) \
-        asm volatile("\n->" #sym " %0 " #val : : "i" (val))
+#include <linux/kbuild.h>
 
-#define BLANK() asm volatile("\n->" : : )
+#include <asm/thread_info.h>
 
 int main(void)
 {
diff --git a/arch/sh/kernel/irq.c b/arch/sh/kernel/irq.c
index 9bf19b00696a..a2a99e487e33 100644
--- a/arch/sh/kernel/irq.c
+++ b/arch/sh/kernel/irq.c
@@ -200,8 +200,6 @@ void irq_ctx_exit(int cpu)
         hardirq_ctx[cpu] = NULL;
 }
 
-extern asmlinkage void __do_softirq(void);
-
 asmlinkage void do_softirq(void)
 {
         unsigned long flags;
diff --git a/arch/sh/kernel/sys_sh64.c b/arch/sh/kernel/sys_sh64.c
index 578004d71e02..91fb8445a5a0 100644
--- a/arch/sh/kernel/sys_sh64.c
+++ b/arch/sh/kernel/sys_sh64.c
@@ -31,23 +31,6 @@
 #include <asm/unistd.h>
 
 /*
- * sys_pipe() is the normal C calling standard for creating
- * a pipe. It's not the way Unix traditionally does this, though.
- */
-asmlinkage int sys_pipe(unsigned long * fildes)
-{
-        int fd[2];
-        int error;
-
-        error = do_pipe(fd);
-        if (!error) {
-                if (copy_to_user(fildes, fd, 2*sizeof(int)))
-                        error = -EFAULT;
-        }
-        return error;
-}
-
-/*
  * Do a system call from kernel instead of calling sys_execve so we
  * end up with proper pt_regs.
  */
diff --git a/arch/sparc/Kconfig b/arch/sparc/Kconfig
index 49590f8fe98c..d211fdb24584 100644
--- a/arch/sparc/Kconfig
+++ b/arch/sparc/Kconfig
@@ -68,6 +68,7 @@ config SPARC
         default y
         select HAVE_IDE
         select HAVE_OPROFILE
+        select HAVE_ARCH_KGDB if !SMP
 
 # Identify this as a Sparc32 build
 config SPARC32
diff --git a/arch/sparc/defconfig b/arch/sparc/defconfig
index 6a2c57a2fe71..2e3a149ea0e7 100644
--- a/arch/sparc/defconfig
+++ b/arch/sparc/defconfig
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
 # Linux kernel version: 2.6.25
-# Sun Apr 20 01:49:51 2008
+# Tue Apr 29 01:28:58 2008
 #
 CONFIG_MMU=y
 CONFIG_HIGHMEM=y
@@ -217,12 +217,7 @@ CONFIG_IPV6_TUNNEL=m
 # CONFIG_NETWORK_SECMARK is not set
 # CONFIG_NETFILTER is not set
 # CONFIG_IP_DCCP is not set
-CONFIG_IP_SCTP=m
-# CONFIG_SCTP_DBG_MSG is not set
-CONFIG_SCTP_DBG_OBJCNT=y
-# CONFIG_SCTP_HMAC_NONE is not set
-# CONFIG_SCTP_HMAC_SHA1 is not set
-CONFIG_SCTP_HMAC_MD5=y
+# CONFIG_IP_SCTP is not set
 # CONFIG_TIPC is not set
 # CONFIG_ATM is not set
 # CONFIG_BRIDGE is not set
@@ -245,9 +240,7 @@ CONFIG_NET_PKTGEN=m
 # CONFIG_CAN is not set
 # CONFIG_IRDA is not set
 # CONFIG_BT is not set
-CONFIG_AF_RXRPC=m
-# CONFIG_AF_RXRPC_DEBUG is not set
-# CONFIG_RXKAD is not set
+# CONFIG_AF_RXRPC is not set
 
 #
 # Wireless
@@ -390,7 +383,7 @@ CONFIG_DUMMY=m
 # CONFIG_BONDING is not set
 # CONFIG_MACVLAN is not set
 # CONFIG_EQUALIZER is not set
-CONFIG_TUN=m
+# CONFIG_TUN is not set
 # CONFIG_VETH is not set
 # CONFIG_ARCNET is not set
 # CONFIG_PHYLIB is not set
@@ -544,6 +537,7 @@ CONFIG_SERIAL_SUNSU_CONSOLE=y
 # CONFIG_SERIAL_SUNSAB is not set
 CONFIG_SERIAL_CORE=y
 CONFIG_SERIAL_CORE_CONSOLE=y
+CONFIG_CONSOLE_POLL=y
 # CONFIG_SERIAL_JSM is not set
 CONFIG_UNIX98_PTYS=y
 CONFIG_LEGACY_PTYS=y
@@ -595,6 +589,7 @@ CONFIG_SSB_POSSIBLE=y
 # Multifunction device drivers
 #
 # CONFIG_MFD_SM501 is not set
+# CONFIG_HTC_PASIC3 is not set
 
 #
 # Multimedia devices
@@ -645,10 +640,6 @@ CONFIG_USB_ARCH_HAS_EHCI=y
 # CONFIG_NEW_LEDS is not set
 # CONFIG_INFINIBAND is not set
 # CONFIG_RTC_CLASS is not set
-
-#
-# Userspace I/O
-#
 # CONFIG_UIO is not set
 
 #
@@ -680,16 +671,12 @@ CONFIG_FS_MBCACHE=y
 # CONFIG_REISERFS_FS is not set
 # CONFIG_JFS_FS is not set
 CONFIG_FS_POSIX_ACL=y
-CONFIG_XFS_FS=m
-CONFIG_XFS_QUOTA=y
-CONFIG_XFS_POSIX_ACL=y
-CONFIG_XFS_RT=y
+# CONFIG_XFS_FS is not set
 # CONFIG_OCFS2_FS is not set
 CONFIG_DNOTIFY=y
 CONFIG_INOTIFY=y
 CONFIG_INOTIFY_USER=y
 # CONFIG_QUOTA is not set
-CONFIG_QUOTACTL=y
 CONFIG_AUTOFS_FS=m
 CONFIG_AUTOFS4_FS=m
 # CONFIG_FUSE_FS is not set
@@ -725,11 +712,9 @@ CONFIG_SYSFS=y
 #
 # CONFIG_ADFS_FS is not set
 # CONFIG_AFFS_FS is not set
-# CONFIG_ECRYPT_FS is not set
 # CONFIG_HFS_FS is not set
 # CONFIG_HFSPLUS_FS is not set
-CONFIG_BEFS_FS=m
-# CONFIG_BEFS_DEBUG is not set
+# CONFIG_BEFS_FS is not set
 # CONFIG_BFS_FS is not set
 # CONFIG_EFS_FS is not set
 # CONFIG_CRAMFS is not set
@@ -744,7 +729,6 @@ CONFIG_NETWORK_FILESYSTEMS=y
 CONFIG_NFS_FS=y
 # CONFIG_NFS_V3 is not set
 # CONFIG_NFS_V4 is not set
-# CONFIG_NFS_DIRECTIO is not set
 # CONFIG_NFSD is not set
 CONFIG_ROOT_NFS=y
 CONFIG_LOCKD=y
@@ -755,16 +739,10 @@ CONFIG_SUNRPC_GSS=m
 CONFIG_RPCSEC_GSS_KRB5=m
 # CONFIG_RPCSEC_GSS_SPKM3 is not set
 # CONFIG_SMB_FS is not set
-CONFIG_CIFS=m
-# CONFIG_CIFS_STATS is not set
-# CONFIG_CIFS_WEAK_PW_HASH is not set
-# CONFIG_CIFS_XATTR is not set
-# CONFIG_CIFS_DEBUG2 is not set
-# CONFIG_CIFS_EXPERIMENTAL is not set
+# CONFIG_CIFS is not set
 # CONFIG_NCP_FS is not set
 # CONFIG_CODA_FS is not set
-CONFIG_AFS_FS=m
-# CONFIG_AFS_DEBUG is not set
+# CONFIG_AFS_FS is not set
 
 #
 # Partition Types
@@ -821,6 +799,7 @@ CONFIG_TRACE_IRQFLAGS_SUPPORT=y
 # CONFIG_PRINTK_TIME is not set
 # CONFIG_ENABLE_WARN_DEPRECATED is not set
 CONFIG_ENABLE_MUST_CHECK=y
+CONFIG_FRAME_WARN=1024
 CONFIG_MAGIC_SYSRQ=y
 # CONFIG_UNUSED_SYMBOLS is not set
 # CONFIG_DEBUG_FS is not set
@@ -842,70 +821,105 @@ CONFIG_DETECT_SOFTLOCKUP=y
 CONFIG_DEBUG_BUGVERBOSE=y
 # CONFIG_DEBUG_INFO is not set
 # CONFIG_DEBUG_VM is not set
+# CONFIG_DEBUG_WRITECOUNT is not set
 # CONFIG_DEBUG_LIST is not set
 # CONFIG_DEBUG_SG is not set
+CONFIG_FRAME_POINTER=y
 # CONFIG_BOOT_PRINTK_DELAY is not set
 # CONFIG_RCU_TORTURE_TEST is not set
 # CONFIG_BACKTRACE_SELF_TEST is not set
 # CONFIG_FAULT_INJECTION is not set
 # CONFIG_SAMPLES is not set
+CONFIG_KGDB=y
+CONFIG_HAVE_ARCH_KGDB=y
+CONFIG_KGDB_SERIAL_CONSOLE=y
+CONFIG_KGDB_TESTS=y
+# CONFIG_KGDB_TESTS_ON_BOOT is not set
 # CONFIG_DEBUG_STACK_USAGE is not set
 
 #
 # Security options
 #
-CONFIG_KEYS=y
-# CONFIG_KEYS_DEBUG_PROC_KEYS is not set
+# CONFIG_KEYS is not set
 # CONFIG_SECURITY is not set
 # CONFIG_SECURITY_FILE_CAPABILITIES is not set
 CONFIG_CRYPTO=y
+
+#
+# Crypto core or helper
+#
 CONFIG_CRYPTO_ALGAPI=y
 CONFIG_CRYPTO_AEAD=y
 CONFIG_CRYPTO_BLKCIPHER=y
-# CONFIG_CRYPTO_SEQIV is not set
 CONFIG_CRYPTO_HASH=y
 CONFIG_CRYPTO_MANAGER=y
+# CONFIG_CRYPTO_GF128MUL is not set
+CONFIG_CRYPTO_NULL=m
+# CONFIG_CRYPTO_CRYPTD is not set
+CONFIG_CRYPTO_AUTHENC=y
+# CONFIG_CRYPTO_TEST is not set
+
+#
+# Authenticated Encryption with Associated Data
+#
+# CONFIG_CRYPTO_CCM is not set
+# CONFIG_CRYPTO_GCM is not set
+# CONFIG_CRYPTO_SEQIV is not set
+
+#
+# Block modes
+#
+CONFIG_CRYPTO_CBC=y
+# CONFIG_CRYPTO_CTR is not set
+# CONFIG_CRYPTO_CTS is not set
+CONFIG_CRYPTO_ECB=m
+# CONFIG_CRYPTO_LRW is not set
+CONFIG_CRYPTO_PCBC=m
+# CONFIG_CRYPTO_XTS is not set
+
+#
+# Hash modes
+#
 CONFIG_CRYPTO_HMAC=y
 # CONFIG_CRYPTO_XCBC is not set
-CONFIG_CRYPTO_NULL=m
+
+#
+# Digest
+#
+CONFIG_CRYPTO_CRC32C=m
 CONFIG_CRYPTO_MD4=y
 CONFIG_CRYPTO_MD5=y
+CONFIG_CRYPTO_MICHAEL_MIC=m
 CONFIG_CRYPTO_SHA1=y
 CONFIG_CRYPTO_SHA256=m
 CONFIG_CRYPTO_SHA512=m
-# CONFIG_CRYPTO_WP512 is not set
 # CONFIG_CRYPTO_TGR192 is not set
-# CONFIG_CRYPTO_GF128MUL is not set
-CONFIG_CRYPTO_ECB=m
-CONFIG_CRYPTO_CBC=y
-CONFIG_CRYPTO_PCBC=m
-# CONFIG_CRYPTO_LRW is not set
-# CONFIG_CRYPTO_XTS is not set
-# CONFIG_CRYPTO_CTR is not set
-# CONFIG_CRYPTO_GCM is not set
-# CONFIG_CRYPTO_CCM is not set
-# CONFIG_CRYPTO_CRYPTD is not set
-CONFIG_CRYPTO_DES=y
-# CONFIG_CRYPTO_FCRYPT is not set
-CONFIG_CRYPTO_BLOWFISH=m
-CONFIG_CRYPTO_TWOFISH=m
-CONFIG_CRYPTO_TWOFISH_COMMON=m
-CONFIG_CRYPTO_SERPENT=m
+# CONFIG_CRYPTO_WP512 is not set
+
+#
+# Ciphers
+#
 CONFIG_CRYPTO_AES=m
+# CONFIG_CRYPTO_ANUBIS is not set
+CONFIG_CRYPTO_ARC4=m
+CONFIG_CRYPTO_BLOWFISH=m
+# CONFIG_CRYPTO_CAMELLIA is not set
 CONFIG_CRYPTO_CAST5=m
 CONFIG_CRYPTO_CAST6=m
-# CONFIG_CRYPTO_TEA is not set
-CONFIG_CRYPTO_ARC4=m
+CONFIG_CRYPTO_DES=y
+# CONFIG_CRYPTO_FCRYPT is not set
 # CONFIG_CRYPTO_KHAZAD is not set
-# CONFIG_CRYPTO_ANUBIS is not set
-# CONFIG_CRYPTO_SEED is not set
 # CONFIG_CRYPTO_SALSA20 is not set
+# CONFIG_CRYPTO_SEED is not set
+CONFIG_CRYPTO_SERPENT=m
+# CONFIG_CRYPTO_TEA is not set
+CONFIG_CRYPTO_TWOFISH=m
+CONFIG_CRYPTO_TWOFISH_COMMON=m
+
+#
+# Compression
+#
 CONFIG_CRYPTO_DEFLATE=y
-CONFIG_CRYPTO_MICHAEL_MIC=m
-CONFIG_CRYPTO_CRC32C=m
-# CONFIG_CRYPTO_CAMELLIA is not set
-# CONFIG_CRYPTO_TEST is not set
-CONFIG_CRYPTO_AUTHENC=y
 # CONFIG_CRYPTO_LZO is not set
 # CONFIG_CRYPTO_HW is not set
 
@@ -913,6 +927,7 @@ CONFIG_CRYPTO_AUTHENC=y
 # Library routines
 #
 CONFIG_BITREVERSE=y
+# CONFIG_GENERIC_FIND_FIRST_BIT is not set
 # CONFIG_CRC_CCITT is not set
 # CONFIG_CRC16 is not set
 # CONFIG_CRC_ITU_T is not set
diff --git a/arch/sparc/kernel/Makefile b/arch/sparc/kernel/Makefile
index 59700aaaae93..6e03a2a7863c 100644
--- a/arch/sparc/kernel/Makefile
+++ b/arch/sparc/kernel/Makefile
@@ -25,3 +25,4 @@ obj-$(CONFIG_PCI) += ebus.o
 obj-$(CONFIG_SUN_PM) += apc.o pmc.o
 obj-$(CONFIG_MODULES) += module.o sparc_ksyms.o
 obj-$(CONFIG_SPARC_LED) += led.o
+obj-$(CONFIG_KGDB) += kgdb.o
diff --git a/arch/sparc/kernel/asm-offsets.c b/arch/sparc/kernel/asm-offsets.c
index 6773ed76e414..cd3f7694e9b9 100644
--- a/arch/sparc/kernel/asm-offsets.c
+++ b/arch/sparc/kernel/asm-offsets.c
@@ -12,11 +12,7 @@
 
 #include <linux/sched.h>
 // #include <linux/mm.h>
-
-#define DEFINE(sym, val) \
-        asm volatile("\n->" #sym " %0 " #val : : "i" (val))
-
-#define BLANK() asm volatile("\n->" : : )
+#include <linux/kbuild.h>
 
 int foo(void)
 {
diff --git a/arch/sparc/kernel/entry.S b/arch/sparc/kernel/entry.S
index 484c83d23eef..57d1bbdd0bd2 100644
--- a/arch/sparc/kernel/entry.S
+++ b/arch/sparc/kernel/entry.S
@@ -12,7 +12,6 @@
 #include <asm/head.h>
 #include <asm/asi.h>
 #include <asm/smp.h>
-#include <asm/kgdb.h>
 #include <asm/contregs.h>
 #include <asm/ptrace.h>
 #include <asm/asm-offsets.h>
@@ -45,91 +44,20 @@
         _SV; _SV; _SV; _SV; _SV; _SV; _SV; \
         _RS; _RS; _RS; _RS; _RS; _RS; _RS;
 
-/* First, KGDB low level things.  This is a rewrite
- * of the routines found in the sparc-stub.c asm() statement
- * from the gdb distribution.  This is also dual-purpose
- * as a software trap for userlevel programs.
- */
-        .data
-        .align  4
-
-in_trap_handler:
-        .word   0
-
         .text
-        .align  4
 
-#if 0 /* kgdb is dropped from 2.5.33 */
-! This function is called when any SPARC trap (except window overflow or
-! underflow) occurs.  It makes sure that the invalid register window is still
-! available before jumping into C code.  It will also restore the world if you
-! return from handle_exception.
-
-        .globl  trap_low
-trap_low:
-        rd      %wim, %l3
-        SAVE_ALL
-
-        sethi   %hi(in_trap_handler), %l4
-        ld      [%lo(in_trap_handler) + %l4], %l5
-        inc     %l5
-        st      %l5, [%lo(in_trap_handler) + %l4]
-
-        /* Make sure kgdb sees the same state we just saved. */
-        LOAD_PT_GLOBALS(sp)
-        LOAD_PT_INS(sp)
-        ld      [%sp + STACKFRAME_SZ + PT_Y], %l4
-        ld      [%sp + STACKFRAME_SZ + PT_WIM], %l3
-        ld      [%sp + STACKFRAME_SZ + PT_PSR], %l0
-        ld      [%sp + STACKFRAME_SZ + PT_PC], %l1
-        ld      [%sp + STACKFRAME_SZ + PT_NPC], %l2
-        rd      %tbr, %l5       /* Never changes... */
-
-        /* Make kgdb exception frame. */        
-        sub     %sp,(16+1+6+1+72)*4,%sp ! Make room for input & locals
-                                        ! + hidden arg + arg spill
-                                        ! + doubleword alignment
-                                        ! + registers[72] local var
-        SAVE_KGDB_GLOBALS(sp)
-        SAVE_KGDB_INS(sp)
-        SAVE_KGDB_SREGS(sp, l4, l0, l3, l5, l1, l2)
-
-        /* We are increasing PIL, so two writes. */
-        or      %l0, PSR_PIL, %l0
-        wr      %l0, 0, %psr
-        WRITE_PAUSE
-        wr      %l0, PSR_ET, %psr
-        WRITE_PAUSE
-
-        call    handle_exception
-         add    %sp, STACKFRAME_SZ, %o0 ! Pass address of registers
-
-        /* Load new kgdb register set. */
-        LOAD_KGDB_GLOBALS(sp)
-        LOAD_KGDB_INS(sp)
-        LOAD_KGDB_SREGS(sp, l4, l0, l3, l5, l1, l2)
-        wr      %l4, 0x0, %y
-
-        sethi   %hi(in_trap_handler), %l4
-        ld      [%lo(in_trap_handler) + %l4], %l5
-        dec     %l5
-        st      %l5, [%lo(in_trap_handler) + %l4]
-
-        add     %sp,(16+1+6+1+72)*4,%sp ! Undo the kgdb trap frame.
-
-        /* Now take what kgdb did and place it into the pt_regs
-         * frame which SparcLinux RESTORE_ALL understands.,
-         */
-        STORE_PT_INS(sp)
-        STORE_PT_GLOBALS(sp)
-        STORE_PT_YREG(sp, g2)
-        STORE_PT_PRIV(sp, l0, l1, l2)
-
-        RESTORE_ALL
+#ifdef CONFIG_KGDB
+        .align  4
+        .globl          arch_kgdb_breakpoint
+        .type           arch_kgdb_breakpoint,#function
+arch_kgdb_breakpoint:
+        ta              0x7d
+        retl
+         nop
+        .size           arch_kgdb_breakpoint,.-arch_kgdb_breakpoint
 #endif
 
 #if defined(CONFIG_BLK_DEV_FD) || defined(CONFIG_BLK_DEV_FD_MODULE)
-        .text
         .align  4
         .globl  floppy_hardint
 floppy_hardint:
@@ -1596,6 +1524,23 @@ breakpoint_trap:
 
         RESTORE_ALL
 
+#ifdef CONFIG_KGDB
+        .align  4
+        .globl  kgdb_trap_low
+        .type   kgdb_trap_low,#function
+kgdb_trap_low:
+        rd      %wim,%l3
+        SAVE_ALL
+        wr      %l0, PSR_ET, %psr
+        WRITE_PAUSE
+
+        call    kgdb_trap
+         add    %sp, STACKFRAME_SZ, %o0
+
+        RESTORE_ALL
+        .size   kgdb_trap_low,.-kgdb_trap_low
+#endif
+
         .align  4
         .globl  __handle_exception, flush_patch_exception
 __handle_exception:
@@ -1698,4 +1643,22 @@ pcic_nmi_trap_patch:
 
 #endif /* CONFIG_PCI */
 
+        .globl  flushw_all
+flushw_all:
+        save    %sp, -0x40, %sp
+        save    %sp, -0x40, %sp
+        save    %sp, -0x40, %sp
+        save    %sp, -0x40, %sp
+        save    %sp, -0x40, %sp
+        save    %sp, -0x40, %sp
+        save    %sp, -0x40, %sp
+        restore
+        restore
+        restore
+        restore
+        restore
+        restore
+        ret
+         restore
+
 /* End of entry.S */
diff --git a/arch/sparc/kernel/head.S b/arch/sparc/kernel/head.S
index b7f1e81c8ff2..8bec05fa5795 100644
--- a/arch/sparc/kernel/head.S
+++ b/arch/sparc/kernel/head.S
@@ -191,7 +191,8 @@ t_bade8:BAD_TRAP(0xe8) BAD_TRAP(0xe9) BAD_TRAP(0xea) BAD_TRAP(0xeb) BAD_TRAP(0xe
 t_baded:BAD_TRAP(0xed) BAD_TRAP(0xee) BAD_TRAP(0xef) BAD_TRAP(0xf0) BAD_TRAP(0xf1)
 t_badf2:BAD_TRAP(0xf2) BAD_TRAP(0xf3) BAD_TRAP(0xf4) BAD_TRAP(0xf5) BAD_TRAP(0xf6)
 t_badf7:BAD_TRAP(0xf7) BAD_TRAP(0xf8) BAD_TRAP(0xf9) BAD_TRAP(0xfa) BAD_TRAP(0xfb)
-t_badfc:BAD_TRAP(0xfc) BAD_TRAP(0xfd)
+t_badfc:BAD_TRAP(0xfc)
+t_kgdb: KGDB_TRAP(0xfd)
 dbtrap: BAD_TRAP(0xfe)                      /* Debugger/PROM breakpoint #1   */
 dbtrap2:BAD_TRAP(0xff)                      /* Debugger/PROM breakpoint #2   */ 
 
@@ -267,7 +268,7 @@ trapbase_cpu1:
         BAD_TRAP(0xed) BAD_TRAP(0xee) BAD_TRAP(0xef) BAD_TRAP(0xf0) BAD_TRAP(0xf1)
         BAD_TRAP(0xf2) BAD_TRAP(0xf3) BAD_TRAP(0xf4) BAD_TRAP(0xf5) BAD_TRAP(0xf6)
         BAD_TRAP(0xf7) BAD_TRAP(0xf8) BAD_TRAP(0xf9) BAD_TRAP(0xfa) BAD_TRAP(0xfb)
-        BAD_TRAP(0xfc) BAD_TRAP(0xfd) BAD_TRAP(0xfe) BAD_TRAP(0xff)
+        BAD_TRAP(0xfc) KGDB_TRAP(0xfd) BAD_TRAP(0xfe) BAD_TRAP(0xff)
 
 trapbase_cpu2:
         BAD_TRAP(0x0) SRMMU_TFAULT TRAP_ENTRY(0x2, bad_instruction)
@@ -335,7 +336,7 @@ trapbase_cpu2:
         BAD_TRAP(0xed) BAD_TRAP(0xee) BAD_TRAP(0xef) BAD_TRAP(0xf0) BAD_TRAP(0xf1)
         BAD_TRAP(0xf2) BAD_TRAP(0xf3) BAD_TRAP(0xf4) BAD_TRAP(0xf5) BAD_TRAP(0xf6)
         BAD_TRAP(0xf7) BAD_TRAP(0xf8) BAD_TRAP(0xf9) BAD_TRAP(0xfa) BAD_TRAP(0xfb)
-        BAD_TRAP(0xfc) BAD_TRAP(0xfd) BAD_TRAP(0xfe) BAD_TRAP(0xff)
+        BAD_TRAP(0xfc) KGDB_TRAP(0xfd) BAD_TRAP(0xfe) BAD_TRAP(0xff)
 
 trapbase_cpu3:
         BAD_TRAP(0x0) SRMMU_TFAULT TRAP_ENTRY(0x2, bad_instruction)
@@ -403,7 +404,7 @@ trapbase_cpu3:
         BAD_TRAP(0xed) BAD_TRAP(0xee) BAD_TRAP(0xef) BAD_TRAP(0xf0) BAD_TRAP(0xf1)
         BAD_TRAP(0xf2) BAD_TRAP(0xf3) BAD_TRAP(0xf4) BAD_TRAP(0xf5) BAD_TRAP(0xf6)
         BAD_TRAP(0xf7) BAD_TRAP(0xf8) BAD_TRAP(0xf9) BAD_TRAP(0xfa) BAD_TRAP(0xfb)
-        BAD_TRAP(0xfc) BAD_TRAP(0xfd) BAD_TRAP(0xfe) BAD_TRAP(0xff)
+        BAD_TRAP(0xfc) KGDB_TRAP(0xfd) BAD_TRAP(0xfe) BAD_TRAP(0xff)
 
 #endif
         .align PAGE_SIZE
diff --git a/arch/sparc/kernel/kgdb.c b/arch/sparc/kernel/kgdb.c
new file mode 100644
index 000000000000..757805ce02ee
--- /dev/null
+++ b/arch/sparc/kernel/kgdb.c
@@ -0,0 +1,164 @@
+/* kgdb.c: KGDB support for 32-bit sparc.
+ *
+ * Copyright (C) 2008 David S. Miller <davem@davemloft.net>
+ */
+
+#include <linux/kgdb.h>
+#include <linux/kdebug.h>
+
+#include <asm/kdebug.h>
+#include <asm/ptrace.h>
+#include <asm/irq.h>
+
+extern unsigned long trapbase;
+
+void pt_regs_to_gdb_regs(unsigned long *gdb_regs, struct pt_regs *regs)
+{
+        struct reg_window *win;
+        int i;
+
+        gdb_regs[GDB_G0] = 0;
+        for (i = 0; i < 15; i++)
+                gdb_regs[GDB_G1 + i] = regs->u_regs[UREG_G1 + i];
+
+        win = (struct reg_window *) regs->u_regs[UREG_FP];
+        for (i = 0; i < 8; i++)
+                gdb_regs[GDB_L0 + i] = win->locals[i];
+        for (i = 0; i < 8; i++)
+                gdb_regs[GDB_I0 + i] = win->ins[i];
+
+        for (i = GDB_F0; i <= GDB_F31; i++)
+                gdb_regs[i] = 0;
+
+        gdb_regs[GDB_Y] = regs->y;
+        gdb_regs[GDB_PSR] = regs->psr;
+        gdb_regs[GDB_WIM] = 0;
+        gdb_regs[GDB_TBR] = (unsigned long) &trapbase;
+        gdb_regs[GDB_PC] = regs->pc;
+        gdb_regs[GDB_NPC] = regs->npc;
+        gdb_regs[GDB_FSR] = 0;
+        gdb_regs[GDB_CSR] = 0;
+}
+
+void sleeping_thread_to_gdb_regs(unsigned long *gdb_regs, struct task_struct *p)
+{
+        struct thread_info *t = task_thread_info(p);
+        struct reg_window *win;
+        int i;
+
+        for (i = GDB_G0; i < GDB_G6; i++)
+                gdb_regs[i] = 0;
+        gdb_regs[GDB_G6] = (unsigned long) t;
+        gdb_regs[GDB_G7] = 0;
+        for (i = GDB_O0; i < GDB_SP; i++)
+                gdb_regs[i] = 0;
+        gdb_regs[GDB_SP] = t->ksp;
+        gdb_regs[GDB_O7] = 0;
+
+        win = (struct reg_window *) t->ksp;
+        for (i = 0; i < 8; i++)
+                gdb_regs[GDB_L0 + i] = win->locals[i];
+        for (i = 0; i < 8; i++)
+                gdb_regs[GDB_I0 + i] = win->ins[i];
+
+        for (i = GDB_F0; i <= GDB_F31; i++)
+                gdb_regs[i] = 0;
+
+        gdb_regs[GDB_Y] = 0;
+
+        gdb_regs[GDB_PSR] = t->kpsr;
+        gdb_regs[GDB_WIM] = t->kwim;
+        gdb_regs[GDB_TBR] = (unsigned long) &trapbase;
+        gdb_regs[GDB_PC] = t->kpc;
+        gdb_regs[GDB_NPC] = t->kpc + 4;
+        gdb_regs[GDB_FSR] = 0;
+        gdb_regs[GDB_CSR] = 0;
+}
+
+void gdb_regs_to_pt_regs(unsigned long *gdb_regs, struct pt_regs *regs)
+{
+        struct reg_window *win;
+        int i;
+
+        for (i = 0; i < 15; i++)
+                regs->u_regs[UREG_G1 + i] = gdb_regs[GDB_G1 + i];
+
+        /* If the PSR register is changing, we have to preserve
+         * the CWP field, otherwise window save/restore explodes.
+         */
+        if (regs->psr != gdb_regs[GDB_PSR]) {
+                unsigned long cwp = regs->psr & PSR_CWP;
+
+                regs->psr = (gdb_regs[GDB_PSR] & ~PSR_CWP) | cwp;
+        }
+
+        regs->pc = gdb_regs[GDB_PC];
+        regs->npc = gdb_regs[GDB_NPC];
+        regs->y = gdb_regs[GDB_Y];
+
+        win = (struct reg_window *) regs->u_regs[UREG_FP];
+        for (i = 0; i < 8; i++)
+                win->locals[i] = gdb_regs[GDB_L0 + i];
+        for (i = 0; i < 8; i++)
+                win->ins[i] = gdb_regs[GDB_I0 + i];
+}
+
+int kgdb_arch_handle_exception(int e_vector, int signo, int err_code,
+                               char *remcomInBuffer, char *remcomOutBuffer,
+                               struct pt_regs *linux_regs)
+{
+        unsigned long addr;
+        char *ptr;
+
+        switch (remcomInBuffer[0]) {
+        case 'c':
+                /* try to read optional parameter, pc unchanged if no parm */
+                ptr = &remcomInBuffer[1];
+                if (kgdb_hex2long(&ptr, &addr)) {
+                        linux_regs->pc = addr;
+                        linux_regs->npc = addr + 4;
+                }
+                /* fallthru */
+
+        case 'D':
+        case 'k':
+                if (linux_regs->pc == (unsigned long) arch_kgdb_breakpoint) {
+                        linux_regs->pc = linux_regs->npc;
+                        linux_regs->npc += 4;
+                }
+                return 0;
+        }
+        return -1;
+}
+
+extern void do_hw_interrupt(struct pt_regs *regs, unsigned long type);
+
+asmlinkage void kgdb_trap(struct pt_regs *regs)
+{
+        unsigned long flags;
+
+        if (user_mode(regs)) {
+                do_hw_interrupt(regs, 0xfd);
+                return;
+        }
+
+        flushw_all();
+
+        local_irq_save(flags);
+        kgdb_handle_exception(0x172, SIGTRAP, 0, regs);
+        local_irq_restore(flags);
+}
+
+int kgdb_arch_init(void)
+{
+        return 0;
+}
+
+void kgdb_arch_exit(void)
+{
+}
+
+struct kgdb_arch arch_kgdb_ops = {
+        /* Breakpoint instruction: ta 0x7d */
+        .gdb_bpt_instr          = { 0x91, 0xd0, 0x20, 0x7d },
+};
diff --git a/arch/sparc/kernel/setup.c b/arch/sparc/kernel/setup.c
index 3c13137685da..8a55c4f0df84 100644
--- a/arch/sparc/kernel/setup.c
+++ b/arch/sparc/kernel/setup.c
@@ -180,11 +180,9 @@ static void __init boot_flags_init(char *commands)
 
 /* This routine will in the future do all the nasty prom stuff
  * to probe for the mmu type and its parameters, etc. This will
- * also be where SMP things happen plus the Sparc specific memory
- * physical memory probe as on the alpha.
+ * also be where SMP things happen.
  */
 
-extern int prom_probe_memory(void);
 extern void sun4c_probe_vac(void);
 extern char cputypval;
 extern unsigned long start, end;
@@ -268,7 +266,6 @@ void __init setup_arch(char **cmdline_p)
         if (ARCH_SUN4C_SUN4)
                 sun4c_probe_vac();
         load_mmu();
-        (void) prom_probe_memory();
 
         phys_base = 0xffffffffUL;
         highest_paddr = 0UL;
diff --git a/arch/sparc/kernel/sparc-stub.c b/arch/sparc/kernel/sparc-stub.c
deleted file mode 100644
index e84f815e6903..000000000000
--- a/arch/sparc/kernel/sparc-stub.c
+++ /dev/null
@@ -1,724 +0,0 @@
-/* $Id: sparc-stub.c,v 1.28 2001/10/30 04:54:21 davem Exp $
- * sparc-stub.c:  KGDB support for the Linux kernel.
- *
- * Modifications to run under Linux
- * Copyright (C) 1995 David S. Miller (davem@caip.rutgers.edu)
- *
- * This file originally came from the gdb sources, and the
- * copyright notices have been retained below.
- */
-
-/****************************************************************************
-
-                THIS SOFTWARE IS NOT COPYRIGHTED
-
-   HP offers the following for use in the public domain.  HP makes no
-   warranty with regard to the software or its performance and the
-   user accepts the software "AS IS" with all faults.
-
-   HP DISCLAIMS ANY WARRANTIES, EXPRESS OR IMPLIED, WITH REGARD
-   TO THIS SOFTWARE INCLUDING BUT NOT LIMITED TO THE WARRANTIES
-   OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
-
-****************************************************************************/
-
-/****************************************************************************
- *  Header: remcom.c,v 1.34 91/03/09 12:29:49 glenne Exp $
- *
- *  Module name: remcom.c $
- *  Revision: 1.34 $
- *  Date: 91/03/09 12:29:49 $
- *  Contributor:     Lake Stevens Instrument Division$
- *
- *  Description:     low level support for gdb debugger. $
- *
- *  Considerations:  only works on target hardware $
- *
- *  Written by:      Glenn Engel $
- *  ModuleState:     Experimental $
- *
- *  NOTES:           See Below $
- *
- *  Modified for SPARC by Stu Grossman, Cygnus Support.
- *
- *  This code has been extensively tested on the Fujitsu SPARClite demo board.
- *
- *  To enable debugger support, two things need to happen.  One, a
- *  call to set_debug_traps() is necessary in order to allow any breakpoints
- *  or error conditions to be properly intercepted and reported to gdb.
- *  Two, a breakpoint needs to be generated to begin communication.  This
- *  is most easily accomplished by a call to breakpoint().  Breakpoint()
- *  simulates a breakpoint by executing a trap #1.
- *
- *************
- *
- *    The following gdb commands are supported:
- *
- * command          function                               Return value
- *
- *    g             return the value of the CPU registers  hex data or ENN
- *    G             set the value of the CPU registers     OK or ENN
- *
- *    mAA..AA,LLLL  Read LLLL bytes at address AA..AA      hex data or ENN
- *    MAA..AA,LLLL: Write LLLL bytes at address AA.AA      OK or ENN
- *
- *    c             Resume at current address              SNN   ( signal NN)
- *    cAA..AA       Continue at address AA..AA             SNN
- *
- *    s             Step one instruction                   SNN
- *    sAA..AA       Step one instruction from AA..AA       SNN
- *
- *    k             kill
- *
- *    ?             What was the last sigval ?             SNN   (signal NN)
- *
- *    bBB..BB       Set baud rate to BB..BB                OK or BNN, then sets
- *                                                         baud rate
- *
- * All commands and responses are sent with a packet which includes a
- * checksum.  A packet consists of
- *
- * $<packet info>#<checksum>.
- *
- * where
- * <packet info> :: <characters representing the command or response>
- * <checksum>    :: < two hex digits computed as modulo 256 sum of <packetinfo>>
- *
- * When a packet is received, it is first acknowledged with either '+' or '-'.
- * '+' indicates a successful transfer.  '-' indicates a failed transfer.
- *
- * Example:
- *
- * Host:                  Reply:
- * $m0,10#2a               +$00010203040506070809101112131415#42
- *
- ****************************************************************************/
-
-#include <linux/kernel.h>
-#include <linux/string.h>
-#include <linux/mm.h>
-#include <linux/smp.h>
-#include <linux/smp_lock.h>
-
-#include <asm/system.h>
-#include <asm/signal.h>
-#include <asm/oplib.h>
-#include <asm/head.h>
-#include <asm/traps.h>
-#include <asm/vac-ops.h>
-#include <asm/kgdb.h>
-#include <asm/pgalloc.h>
-#include <asm/pgtable.h>
-#include <asm/cacheflush.h>
-
-/*
- *
- * external low-level support routines
- */
-
-extern void putDebugChar(char);   /* write a single character      */
-extern char getDebugChar(void);   /* read and return a single char */
-
-/*
- * BUFMAX defines the maximum number of characters in inbound/outbound buffers
- * at least NUMREGBYTES*2 are needed for register packets
- */
-#define BUFMAX 2048
-
-static int initialized; /* !0 means we've been initialized */
-
-static const char hexchars[]="0123456789abcdef";
-
-#define NUMREGS 72
-
-/* Number of bytes of registers.  */
-#define NUMREGBYTES (NUMREGS * 4)
-enum regnames {G0, G1, G2, G3, G4, G5, G6, G7,
-                 O0, O1, O2, O3, O4, O5, SP, O7,
-                 L0, L1, L2, L3, L4, L5, L6, L7,
-                 I0, I1, I2, I3, I4, I5, FP, I7,
-
-                 F0, F1, F2, F3, F4, F5, F6, F7,
-                 F8, F9, F10, F11, F12, F13, F14, F15,
-                 F16, F17, F18, F19, F20, F21, F22, F23,
-                 F24, F25, F26, F27, F28, F29, F30, F31,
-                 Y, PSR, WIM, TBR, PC, NPC, FPSR, CPSR };
-
-
-extern void trap_low(void);  /* In arch/sparc/kernel/entry.S */
-
-unsigned long get_sun4cpte(unsigned long addr)
-{
-        unsigned long entry;
-
-        __asm__ __volatile__("\n\tlda [%1] %2, %0\n\t" : 
-                             "=r" (entry) :
-                             "r" (addr), "i" (ASI_PTE));
-        return entry;
-}
-
-unsigned long get_sun4csegmap(unsigned long addr)
-{
-        unsigned long entry;
-
-        __asm__ __volatile__("\n\tlduba [%1] %2, %0\n\t" : 
-                             "=r" (entry) :
-                             "r" (addr), "i" (ASI_SEGMAP));
-        return entry;
-}
-
-#if 0
-/* Have to sort this out. This cannot be done after initialization. */
-static void flush_cache_all_nop(void) {}
-#endif
-
-/* Place where we save old trap entries for restoration */
-struct tt_entry kgdb_savettable[256];
-typedef void (*trapfunc_t)(void);
-
-/* Helper routine for manipulation of kgdb_savettable */
-static inline void copy_ttentry(struct tt_entry *src, struct tt_entry *dest)
-{
-        dest->inst_one = src->inst_one;
-        dest->inst_two = src->inst_two;
-        dest->inst_three = src->inst_three;
-        dest->inst_four = src->inst_four;
-}
-
-/* Initialize the kgdb_savettable so that debugging can commence */
-static void eh_init(void)
-{
-        int i;
-
-        for(i=0; i < 256; i++)
-                copy_ttentry(&sparc_ttable[i], &kgdb_savettable[i]);
-}
-
-/* Install an exception handler for kgdb */
-static void exceptionHandler(int tnum, trapfunc_t trap_entry)
-{
-        unsigned long te_addr = (unsigned long) trap_entry;
-
-        /* Make new vector */
-        sparc_ttable[tnum].inst_one =
-                SPARC_BRANCH((unsigned long) te_addr,
-                             (unsigned long) &sparc_ttable[tnum].inst_one);
-        sparc_ttable[tnum].inst_two = SPARC_RD_PSR_L0;
-        sparc_ttable[tnum].inst_three = SPARC_NOP;
-        sparc_ttable[tnum].inst_four = SPARC_NOP;
-}
-
-/* Convert ch from a hex digit to an int */
-static int
-hex(unsigned char ch)
-{
-        if (ch >= 'a' && ch <= 'f')
-                return ch-'a'+10;
-        if (ch >= '0' && ch <= '9')
-                return ch-'0';
-        if (ch >= 'A' && ch <= 'F')
-                return ch-'A'+10;
-        return -1;
-}
-
-/* scan for the sequence $<data>#<checksum>     */
-static void
-getpacket(char *buffer)
-{
-        unsigned char checksum;
-        unsigned char xmitcsum;
-        int i;
-        int count;
-        unsigned char ch;
-
-        do {
-                /* wait around for the start character, ignore all other characters */
-                while ((ch = (getDebugChar() & 0x7f)) != '$') ;
-
-                checksum = 0;
-                xmitcsum = -1;
-
-                count = 0;
-
-                /* now, read until a # or end of buffer is found */
-                while (count < BUFMAX) {
-                        ch = getDebugChar() & 0x7f;
-                        if (ch == '#')
-                                break;
-                        checksum = checksum + ch;
-                        buffer[count] = ch;
-                        count = count + 1;
-                }
-
-                if (count >= BUFMAX)
-                        continue;
-
-                buffer[count] = 0;
-
-                if (ch == '#') {
-                        xmitcsum = hex(getDebugChar() & 0x7f) << 4;
-                        xmitcsum |= hex(getDebugChar() & 0x7f);
-                        if (checksum != xmitcsum)
-                                putDebugChar('-');      /* failed checksum */
-                        else {
-                                putDebugChar('+'); /* successful transfer */
-                                /* if a sequence char is present, reply the ID */
-                                if (buffer[2] == ':') {
-                                        putDebugChar(buffer[0]);
-                                        putDebugChar(buffer[1]);
-                                        /* remove sequence chars from buffer */
-                                        count = strlen(buffer);
-                                        for (i=3; i <= count; i++)
-                                                buffer[i-3] = buffer[i];
-                                }
-                        }
-                }
-        } while (checksum != xmitcsum);
-}
-
-/* send the packet in buffer.  */
-
-static void
-putpacket(unsigned char *buffer)
-{
-        unsigned char checksum;
-        int count;
-        unsigned char ch, recv;
-
-        /*  $<packet info>#<checksum>. */
-        do {
-                putDebugChar('$');
-                checksum = 0;
-                count = 0;
-
-                while ((ch = buffer[count])) {
-                        putDebugChar(ch);
-                        checksum += ch;
-                        count += 1;
-                }
-
-                putDebugChar('#');
-                putDebugChar(hexchars[checksum >> 4]);
-                putDebugChar(hexchars[checksum & 0xf]);
-                recv = getDebugChar();
-        } while ((recv & 0x7f) != '+');
-}
-
-static char remcomInBuffer[BUFMAX];
-static char remcomOutBuffer[BUFMAX];
-
-/* Convert the memory pointed to by mem into hex, placing result in buf.
- * Return a pointer to the last char put in buf (null), in case of mem fault,
- * return 0.
- */
-
-static unsigned char *
-mem2hex(char *mem, char *buf, int count)
-{
-        unsigned char ch;
-
-        while (count-- > 0) {
-                /* This assembler code is basically:  ch = *mem++;
-                 * except that we use the SPARC/Linux exception table
-                 * mechanism (see how "fixup" works in kernel_mna_trap_fault)
-                 * to arrange for a "return 0" upon a memory fault
-                 */
-                __asm__(
-                        "\n1:\n\t"
-                        "ldub [%0], %1\n\t"
-                        "inc %0\n\t"
-                        ".section .fixup,#alloc,#execinstr\n\t"
-                        ".align 4\n"
-                        "2:\n\t"
-                        "retl\n\t"
-                        " mov 0, %%o0\n\t"
-                        ".section __ex_table, #alloc\n\t"
-                        ".align 4\n\t"
-                        ".word 1b, 2b\n\t"
-                        ".text\n"
-                        : "=r" (mem), "=r" (ch) : "0" (mem));
-                *buf++ = hexchars[ch >> 4];
-                *buf++ = hexchars[ch & 0xf];
-        }
-
-        *buf = 0;
-        return buf;
-}
-
-/* convert the hex array pointed to by buf into binary to be placed in mem
- * return a pointer to the character AFTER the last byte written.
-*/
-static char *
-hex2mem(char *buf, char *mem, int count)
-{
-        int i;
-        unsigned char ch;
-
-        for (i=0; i<count; i++) {
-
-                ch = hex(*buf++) << 4;
-                ch |= hex(*buf++);
-                /* Assembler code is   *mem++ = ch;   with return 0 on fault */
-                __asm__(
-                        "\n1:\n\t"
-                        "stb %1, [%0]\n\t"
-                        "inc %0\n\t"
-                        ".section .fixup,#alloc,#execinstr\n\t"
-                        ".align 4\n"
-                        "2:\n\t"
-                        "retl\n\t"
-                        " mov 0, %%o0\n\t"
-                        ".section __ex_table, #alloc\n\t"
-                        ".align 4\n\t"
-                        ".word 1b, 2b\n\t"
-                        ".text\n"
-                        : "=r" (mem) : "r" (ch) , "0" (mem));
-        }
-        return mem;
-}
-
-/* This table contains the mapping between SPARC hardware trap types, and
-   signals, which are primarily what GDB understands.  It also indicates
-   which hardware traps we need to commandeer when initializing the stub. */
-
-static struct hard_trap_info
-{
-  unsigned char tt;             /* Trap type code for SPARC */
-  unsigned char signo;          /* Signal that we map this trap into */
-} hard_trap_info[] = {
-  {SP_TRAP_SBPT, SIGTRAP},      /* ta 1 - Linux/KGDB software breakpoint */
-  {0, 0}                        /* Must be last */
-};
-
-/* Set up exception handlers for tracing and breakpoints */
-
-void
-set_debug_traps(void)
-{
-        struct hard_trap_info *ht;
-        unsigned long flags;
-
-        local_irq_save(flags);
-#if 0   
-/* Have to sort this out. This cannot be done after initialization. */
-        BTFIXUPSET_CALL(flush_cache_all, flush_cache_all_nop, BTFIXUPCALL_NOP);
-#endif
-
-        /* Initialize our copy of the Linux Sparc trap table */
-        eh_init();
-
-        for (ht = hard_trap_info; ht->tt && ht->signo; ht++) {
-                /* Only if it doesn't destroy our fault handlers */
-                if((ht->tt != SP_TRAP_TFLT) && 
-                   (ht->tt != SP_TRAP_DFLT))
-                        exceptionHandler(ht->tt, trap_low);
-        }
-
-        /* In case GDB is started before us, ack any packets (presumably
-         * "$?#xx") sitting there.
-         *
-         * I've found this code causes more problems than it solves,
-         * so that's why it's commented out.  GDB seems to work fine
-         * now starting either before or after the kernel   -bwb
-         */
-#if 0
-        while((c = getDebugChar()) != '$');
-        while((c = getDebugChar()) != '#');
-        c = getDebugChar(); /* eat first csum byte */
-        c = getDebugChar(); /* eat second csum byte */
-        putDebugChar('+'); /* ack it */
-#endif
-
-        initialized = 1; /* connect! */
-        local_irq_restore(flags);
-}
-
-/* Convert the SPARC hardware trap type code to a unix signal number. */
-
-static int
-computeSignal(int tt)
-{
-        struct hard_trap_info *ht;
-
-        for (ht = hard_trap_info; ht->tt && ht->signo; ht++)
-                if (ht->tt == tt)
-                        return ht->signo;
-
-        return SIGHUP;         /* default for things we don't know about */
-}
-
-/*
- * While we find nice hex chars, build an int.
- * Return number of chars processed.
- */
-
-static int
-hexToInt(char **ptr, int *intValue)
-{
-        int numChars = 0;
-        int hexValue;
-
-        *intValue = 0;
-
-        while (**ptr) {
-                hexValue = hex(**ptr);
-                if (hexValue < 0)
-                        break;
-
-                *intValue = (*intValue << 4) | hexValue;
-                numChars ++;
-
-                (*ptr)++;
-        }
-
-        return (numChars);
-}
-
-/*
- * This function does all command processing for interfacing to gdb.  It
- * returns 1 if you should skip the instruction at the trap address, 0
- * otherwise.
- */
-
-extern void breakinst(void);
-
-void
-handle_exception (unsigned long *registers)
-{
-        int tt;       /* Trap type */
-        int sigval;
-        int addr;
-        int length;
-        char *ptr;
-        unsigned long *sp;
-
-        /* First, we must force all of the windows to be spilled out */
-
-        asm("save %sp, -64, %sp\n\t"
-            "save %sp, -64, %sp\n\t"
-            "save %sp, -64, %sp\n\t"
-            "save %sp, -64, %sp\n\t"
-            "save %sp, -64, %sp\n\t"
-            "save %sp, -64, %sp\n\t"
-            "save %sp, -64, %sp\n\t"
-            "save %sp, -64, %sp\n\t"
-            "restore\n\t"
-            "restore\n\t"
-            "restore\n\t"
-            "restore\n\t"
-            "restore\n\t"
-            "restore\n\t"
-            "restore\n\t"
-            "restore\n\t");
-
-        lock_kernel();
-        if (registers[PC] == (unsigned long)breakinst) {
-                /* Skip over breakpoint trap insn */
-                registers[PC] = registers[NPC];
-                registers[NPC] += 4;
-        }
-
-        sp = (unsigned long *)registers[SP];
-
-        tt = (registers[TBR] >> 4) & 0xff;
-
-        /* reply to host that an exception has occurred */
-        sigval = computeSignal(tt);
-        ptr = remcomOutBuffer;
-
-        *ptr++ = 'T';
-        *ptr++ = hexchars[sigval >> 4];
-        *ptr++ = hexchars[sigval & 0xf];
-
-        *ptr++ = hexchars[PC >> 4];
-        *ptr++ = hexchars[PC & 0xf];
-        *ptr++ = ':';
-        ptr = mem2hex((char *)&registers[PC], ptr, 4);
-        *ptr++ = ';';
-
-        *ptr++ = hexchars[FP >> 4];
-        *ptr++ = hexchars[FP & 0xf];
-        *ptr++ = ':';
-        ptr = mem2hex((char *) (sp + 8 + 6), ptr, 4); /* FP */
-        *ptr++ = ';';
-
-        *ptr++ = hexchars[SP >> 4];
-        *ptr++ = hexchars[SP & 0xf];
-        *ptr++ = ':';
-        ptr = mem2hex((char *)&sp, ptr, 4);
-        *ptr++ = ';';
-
-        *ptr++ = hexchars[NPC >> 4];
-        *ptr++ = hexchars[NPC & 0xf];
-        *ptr++ = ':';
-        ptr = mem2hex((char *)&registers[NPC], ptr, 4);
-        *ptr++ = ';';
-
-        *ptr++ = hexchars[O7 >> 4];
-        *ptr++ = hexchars[O7 & 0xf];
-        *ptr++ = ':';
-        ptr = mem2hex((char *)&registers[O7], ptr, 4);
-        *ptr++ = ';';
-
-        *ptr++ = 0;
-
-        putpacket(remcomOutBuffer);
-
-        /* XXX We may want to add some features dealing with poking the
-         * XXX page tables, the real ones on the srmmu, and what is currently
-         * XXX loaded in the sun4/sun4c tlb at this point in time.  But this
-         * XXX also required hacking to the gdb sources directly...
-         */
-
-        while (1) {
-                remcomOutBuffer[0] = 0;
-
-                getpacket(remcomInBuffer);
-                switch (remcomInBuffer[0]) {
-                case '?':
-                        remcomOutBuffer[0] = 'S';
-                        remcomOutBuffer[1] = hexchars[sigval >> 4];
-                        remcomOutBuffer[2] = hexchars[sigval & 0xf];
-                        remcomOutBuffer[3] = 0;
-                        break;
-
-                case 'd':
-                        /* toggle debug flag */
-                        break;
-
-                case 'g':               /* return the value of the CPU registers */
-                {
-                        ptr = remcomOutBuffer;
-                        /* G & O regs */
-                        ptr = mem2hex((char *)registers, ptr, 16 * 4);
-                        /* L & I regs */
-                        ptr = mem2hex((char *) (sp + 0), ptr, 16 * 4);
-                        /* Floating point */
-                        memset(ptr, '0', 32 * 8);
-                        /* Y, PSR, WIM, TBR, PC, NPC, FPSR, CPSR */
-                        mem2hex((char *)&registers[Y], (ptr + 32 * 4 * 2), (8 * 4));
-                }
-                        break;
-
-                case 'G':          /* set the value of the CPU registers - return OK */
-                {
-                        unsigned long *newsp, psr;
-
-                        psr = registers[PSR];
-
-                        ptr = &remcomInBuffer[1];
-                        /* G & O regs */
-                        hex2mem(ptr, (char *)registers, 16 * 4);
-                        /* L & I regs */
-                        hex2mem(ptr + 16 * 4 * 2, (char *) (sp + 0), 16 * 4);
-                        /* Y, PSR, WIM, TBR, PC, NPC, FPSR, CPSR */
-                        hex2mem(ptr + 64 * 4 * 2, (char *)&registers[Y], 8 * 4);
-
-                        /* See if the stack pointer has moved.  If so,
-                         * then copy the saved locals and ins to the
-                         * new location.  This keeps the window
-                         * overflow and underflow routines happy.
-                         */
-
-                        newsp = (unsigned long *)registers[SP];
-                        if (sp != newsp)
-                                sp = memcpy(newsp, sp, 16 * 4);
-
-                        /* Don't allow CWP to be modified. */
-
-                        if (psr != registers[PSR])
-                                registers[PSR] = (psr & 0x1f) | (registers[PSR] & ~0x1f);
-
-                        strcpy(remcomOutBuffer,"OK");
-                }
-                        break;
-
-                case 'm':         /* mAA..AA,LLLL  Read LLLL bytes at address AA..AA */
-                        /* Try to read %x,%x.  */
-
-                        ptr = &remcomInBuffer[1];
-
-                        if (hexToInt(&ptr, &addr)
-                            && *ptr++ == ','
-                            && hexToInt(&ptr, &length)) {
-                                if (mem2hex((char *)addr, remcomOutBuffer, length))
-                                        break;
-
-                                strcpy (remcomOutBuffer, "E03");
-                        } else {
-                                strcpy(remcomOutBuffer,"E01");
-                        }
-                        break;
-
-                case 'M': /* MAA..AA,LLLL: Write LLLL bytes at address AA.AA return OK */
-                        /* Try to read '%x,%x:'.  */
-
-                        ptr = &remcomInBuffer[1];
-
-                        if (hexToInt(&ptr, &addr)
-                            && *ptr++ == ','
-                            && hexToInt(&ptr, &length)
-                            && *ptr++ == ':') {
-                                if (hex2mem(ptr, (char *)addr, length)) {
-                                        strcpy(remcomOutBuffer, "OK");
-                                } else {
-                                        strcpy(remcomOutBuffer, "E03");
-                                }
-                        } else {
-                                strcpy(remcomOutBuffer, "E02");
-                        }
-                        break;
-
-                case 'c':    /* cAA..AA    Continue at address AA..AA(optional) */
-                        /* try to read optional parameter, pc unchanged if no parm */
-
-                        ptr = &remcomInBuffer[1];
-                        if (hexToInt(&ptr, &addr)) {
-                                registers[PC] = addr;
-                                registers[NPC] = addr + 4;
-                        }
-
-/* Need to flush the instruction cache here, as we may have deposited a
- * breakpoint, and the icache probably has no way of knowing that a data ref to
- * some location may have changed something that is in the instruction cache.
- */
-                        flush_cache_all();
-                        unlock_kernel();
-                        return;
-
-                        /* kill the program */
-                case 'k' :              /* do nothing */
-                        break;
-                case 'r':               /* Reset */
-                        asm ("call 0\n\t"
-                             "nop\n\t");
-                        break;
-                }                       /* switch */
-
-                /* reply to the request */
-                putpacket(remcomOutBuffer);
-        } /* while(1) */
-}
-
-/* This function will generate a breakpoint exception.  It is used at the
-   beginning of a program to sync up with a debugger and can be used
-   otherwise as a quick means to stop program execution and "break" into
-   the debugger. */
-
-void
-breakpoint(void)
-{
-        if (!initialized)
-                return;
-
-        /* Again, watch those c-prefixes for ELF kernels */
-#if defined(__svr4__) || defined(__ELF__)
-        asm(".globl breakinst\n"
-            "breakinst:\n\t"
-            "ta 1\n");
-#else
-        asm(".globl _breakinst\n"
-            "_breakinst:\n\t"
-            "ta 1\n");
-#endif
-}
diff --git a/arch/sparc/kernel/sparc_ksyms.c b/arch/sparc/kernel/sparc_ksyms.c
index 0bcf98a7ef38..aa8ee06cf488 100644
--- a/arch/sparc/kernel/sparc_ksyms.c
+++ b/arch/sparc/kernel/sparc_ksyms.c
@@ -282,3 +282,5 @@ EXPORT_SYMBOL(do_BUG);
 
 /* Sun Power Management Idle Handler */
 EXPORT_SYMBOL(pm_idle);
+
+EXPORT_SYMBOL(empty_zero_page);
diff --git a/arch/sparc/kernel/sun4d_smp.c b/arch/sparc/kernel/sun4d_smp.c
index 0def48158c7d..dfde77ff0848 100644
--- a/arch/sparc/kernel/sun4d_smp.c
+++ b/arch/sparc/kernel/sun4d_smp.c
@@ -335,37 +335,6 @@ void smp4d_cross_call_irq(void)
         ccall_info.processors_out[i] = 1;
 }
 
-static int smp4d_stop_cpu_sender;
-
-static void smp4d_stop_cpu(void)
-{
-        int me = hard_smp4d_processor_id();
-        
-        if (me != smp4d_stop_cpu_sender)
-                while(1) barrier();
-}
-
-/* Cross calls, in order to work efficiently and atomically do all
- * the message passing work themselves, only stopcpu and reschedule
- * messages come through here.
- */
-void smp4d_message_pass(int target, int msg, unsigned long data, int wait)
-{
-        int me = hard_smp4d_processor_id();
-
-        SMP_PRINTK(("smp4d_message_pass %d %d %08lx %d\n", target, msg, data, wait));
-        if (msg == MSG_STOP_CPU && target == MSG_ALL_BUT_SELF) {
-                unsigned long flags;
-                static DEFINE_SPINLOCK(stop_cpu_lock);
-                spin_lock_irqsave(&stop_cpu_lock, flags);
-                smp4d_stop_cpu_sender = me;
-                smp4d_cross_call((smpfunc_t)smp4d_stop_cpu, 0, 0, 0, 0, 0);
-                spin_unlock_irqrestore(&stop_cpu_lock, flags);
-        }
-        printk("Yeeee, trying to send SMP msg(%d) to %d on cpu %d\n", msg, target, me);
-        panic("Bogon SMP message pass.");
-}
-
 void smp4d_percpu_timer_interrupt(struct pt_regs *regs)
 {
         struct pt_regs *old_regs;
@@ -439,7 +408,6 @@ void __init sun4d_init_smp(void)
         BTFIXUPSET_BLACKBOX(hard_smp_processor_id, smp4d_blackbox_id);
         BTFIXUPSET_BLACKBOX(load_current, smp4d_blackbox_current);
         BTFIXUPSET_CALL(smp_cross_call, smp4d_cross_call, BTFIXUPCALL_NORM);
-        BTFIXUPSET_CALL(smp_message_pass, smp4d_message_pass, BTFIXUPCALL_NORM);
         BTFIXUPSET_CALL(__hard_smp_processor_id, __smp4d_processor_id, BTFIXUPCALL_NORM);
         
         for (i = 0; i < NR_CPUS; i++) {
diff --git a/arch/sparc/kernel/sun4m_smp.c b/arch/sparc/kernel/sun4m_smp.c
index 0b9407267162..ffb875aacb7e 100644
--- a/arch/sparc/kernel/sun4m_smp.c
+++ b/arch/sparc/kernel/sun4m_smp.c
@@ -34,8 +34,6 @@
 
 #include "irq.h"
 
-#define IRQ_RESCHEDULE          13
-#define IRQ_STOP_CPU            14
 #define IRQ_CROSS_CALL          15
 
 extern ctxd_t *srmmu_ctx_table_phys;
@@ -232,48 +230,6 @@ void smp4m_irq_rotate(int cpu)
                 set_irq_udt(next);
 }
 
-/* Cross calls, in order to work efficiently and atomically do all
- * the message passing work themselves, only stopcpu and reschedule
- * messages come through here.
- */
-void smp4m_message_pass(int target, int msg, unsigned long data, int wait)
-{
-        static unsigned long smp_cpu_in_msg[NR_CPUS];
-        cpumask_t mask;
-        int me = smp_processor_id();
-        int irq, i;
-
-        if(msg == MSG_RESCHEDULE) {
-                irq = IRQ_RESCHEDULE;
-
-                if(smp_cpu_in_msg[me])
-                        return;
-        } else if(msg == MSG_STOP_CPU) {
-                irq = IRQ_STOP_CPU;
-        } else {
-                goto barf;
-        }
-
-        smp_cpu_in_msg[me]++;
-        if(target == MSG_ALL_BUT_SELF || target == MSG_ALL) {
-                mask = cpu_online_map;
-                if(target == MSG_ALL_BUT_SELF)
-                        cpu_clear(me, mask);
-                for(i = 0; i < 4; i++) {
-                        if (cpu_isset(i, mask))
-                                set_cpu_int(i, irq);
-                }
-        } else {
-                set_cpu_int(target, irq);
-        }
-        smp_cpu_in_msg[me]--;
-
-        return;
-barf:
-        printk("Yeeee, trying to send SMP msg(%d) on cpu %d\n", msg, me);
-        panic("Bogon SMP message pass.");
-}
-
 static struct smp_funcall {
         smpfunc_t func;
         unsigned long arg1;
@@ -413,6 +369,5 @@ void __init sun4m_init_smp(void)
         BTFIXUPSET_BLACKBOX(hard_smp_processor_id, smp4m_blackbox_id);
         BTFIXUPSET_BLACKBOX(load_current, smp4m_blackbox_current);
         BTFIXUPSET_CALL(smp_cross_call, smp4m_cross_call, BTFIXUPCALL_NORM);
-        BTFIXUPSET_CALL(smp_message_pass, smp4m_message_pass, BTFIXUPCALL_NORM);
         BTFIXUPSET_CALL(__hard_smp_processor_id, __smp4m_processor_id, BTFIXUPCALL_NORM);
 }
diff --git a/arch/sparc/lib/iomap.c b/arch/sparc/lib/iomap.c
index 54501c1ca785..9ef37e13a920 100644
--- a/arch/sparc/lib/iomap.c
+++ b/arch/sparc/lib/iomap.c
@@ -21,8 +21,8 @@ EXPORT_SYMBOL(ioport_unmap);
 /* Create a virtual mapping cookie for a PCI BAR (memory or IO) */
 void __iomem *pci_iomap(struct pci_dev *dev, int bar, unsigned long maxlen)
 {
-        unsigned long start = pci_resource_start(dev, bar);
-        unsigned long len = pci_resource_len(dev, bar);
+        resource_size_t start = pci_resource_start(dev, bar);
+        resource_size_t len = pci_resource_len(dev, bar);
         unsigned long flags = pci_resource_flags(dev, bar);
 
         if (!len || !start)
diff --git a/arch/sparc/mm/fault.c b/arch/sparc/mm/fault.c
index e4d9c8e19df5..abd50795a7b6 100644
--- a/arch/sparc/mm/fault.c
+++ b/arch/sparc/mm/fault.c
@@ -47,64 +47,15 @@ int vac_size, vac_linesize, vac_do_hw_vac_flushes;
 int vac_entries_per_context, vac_entries_per_segment;
 int vac_entries_per_page;
 
-/* Nice, simple, prom library does all the sweating for us. ;) */
-int prom_probe_memory (void)
+/* Return how much physical memory we have.  */
+unsigned long probe_memory(void)
 {
-        register struct linux_mlist_v0 *mlist;
-        register unsigned long bytes, base_paddr, tally;
-        register int i;
-
-        i = 0;
-        mlist= *prom_meminfo()->v0_available;
-        bytes = tally = mlist->num_bytes;
-        base_paddr = (unsigned long) mlist->start_adr;
-  
-        sp_banks[0].base_addr = base_paddr;
-        sp_banks[0].num_bytes = bytes;
-
-        while (mlist->theres_more != (void *) 0){
-                i++;
-                mlist = mlist->theres_more;
-                bytes = mlist->num_bytes;
-                tally += bytes;
-                if (i > SPARC_PHYS_BANKS-1) {
-                        printk ("The machine has more banks than "
-                                "this kernel can support\n"
-                                "Increase the SPARC_PHYS_BANKS "
-                                "setting (currently %d)\n",
-                                SPARC_PHYS_BANKS);
-                        i = SPARC_PHYS_BANKS-1;
-                        break;
-                }
-    
-                sp_banks[i].base_addr = (unsigned long) mlist->start_adr;
-                sp_banks[i].num_bytes = mlist->num_bytes;
-        }
-
-        i++;
-        sp_banks[i].base_addr = 0xdeadbeef;
-        sp_banks[i].num_bytes = 0;
-
-        /* Now mask all bank sizes on a page boundary, it is all we can
-         * use anyways.
-         */
-        for(i=0; sp_banks[i].num_bytes != 0; i++)
-                sp_banks[i].num_bytes &= PAGE_MASK;
-
-        return tally;
-}
-
-/* Traverse the memory lists in the prom to see how much physical we
- * have.
- */
-unsigned long
-probe_memory(void)
-{
-        int total;
+        unsigned long total = 0;
+        int i;
 
-        total = prom_probe_memory();
+        for (i = 0; sp_banks[i].num_bytes; i++)
+                total += sp_banks[i].num_bytes;
 
-        /* Oh man, much nicer, keep the dirt in promlib. */
         return total;
 }
 
diff --git a/arch/sparc/prom/init.c b/arch/sparc/prom/init.c
index 50abfb1b880e..2fa3a474e3a2 100644
--- a/arch/sparc/prom/init.c
+++ b/arch/sparc/prom/init.c
@@ -21,8 +21,6 @@ linux_sun4_romvec *sun4_romvec;
 /* The root node of the prom device tree. */
 int prom_root_node;
 
-int prom_stdin, prom_stdout;
-
 /* Pointer to the device tree operations structure. */
 struct linux_nodeops *prom_nodeops;
 
@@ -74,11 +72,6 @@ void __init prom_init(struct linux_romvec *rp)
            (((unsigned long) prom_nodeops) == -1))
                 prom_halt();
 
-        if(prom_vers == PROM_V2 || prom_vers == PROM_V3) {
-                prom_stdout = *romvec->pv_v2bootargs.fd_stdout;
-                prom_stdin  = *romvec->pv_v2bootargs.fd_stdin;
-        }
-        
         prom_meminit();
 
         prom_ranges_init();
diff --git a/arch/sparc/prom/memory.c b/arch/sparc/prom/memory.c
index b0c0f9c4fc14..947f047dc95a 100644
--- a/arch/sparc/prom/memory.c
+++ b/arch/sparc/prom/memory.c
@@ -1,215 +1,100 @@
-/* $Id: memory.c,v 1.15 2000/01/29 01:09:12 anton Exp $
- * memory.c: Prom routine for acquiring various bits of information
+/* memory.c: Prom routine for acquiring various bits of information
  *           about RAM on the machine, both virtual and physical.
  *
- * Copyright (C) 1995 David S. Miller (davem@caip.rutgers.edu)
+ * Copyright (C) 1995, 2008 David S. Miller (davem@davemloft.net)
  * Copyright (C) 1997 Michael A. Griffith (grif@acm.org)
  */
 
 #include <linux/kernel.h>
+#include <linux/sort.h>
 #include <linux/init.h>
 
 #include <asm/openprom.h>
 #include <asm/sun4prom.h>
 #include <asm/oplib.h>
+#include <asm/page.h>
 
-/* This routine, for consistency, returns the ram parameters in the
- * V0 prom memory descriptor format.  I choose this format because I
- * think it was the easiest to work with.  I feel the religious
- * arguments now... ;)  Also, I return the linked lists sorted to
- * prevent paging_init() upset stomach as I have not yet written
- * the pepto-bismol kernel module yet.
- */
+static int __init prom_meminit_v0(void)
+{
+        struct linux_mlist_v0 *p;
+        int index;
+
+        index = 0;
+        for (p = *(romvec->pv_v0mem.v0_available); p; p = p->theres_more) {
+                sp_banks[index].base_addr = (unsigned long) p->start_adr;
+                sp_banks[index].num_bytes = p->num_bytes;
+                index++;
+        }
 
-struct linux_prom_registers prom_reg_memlist[64];
-struct linux_prom_registers prom_reg_tmp[64];
+        return index;
+}
 
-struct linux_mlist_v0 prom_phys_total[64];
-struct linux_mlist_v0 prom_prom_taken[64];
-struct linux_mlist_v0 prom_phys_avail[64];
+static int __init prom_meminit_v2(void)
+{
+        struct linux_prom_registers reg[64];
+        int node, size, num_ents, i;
 
-struct linux_mlist_v0 *prom_ptot_ptr = prom_phys_total;
-struct linux_mlist_v0 *prom_ptak_ptr = prom_prom_taken;
-struct linux_mlist_v0 *prom_pavl_ptr = prom_phys_avail;
+        node = prom_searchsiblings(prom_getchild(prom_root_node), "memory");
+        size = prom_getproperty(node, "available", (char *) reg, sizeof(reg));
+        num_ents = size / sizeof(struct linux_prom_registers);
 
-struct linux_mem_v0 prom_memlist;
+        for (i = 0; i < num_ents; i++) {
+                sp_banks[i].base_addr = reg[i].phys_addr;
+                sp_banks[i].num_bytes = reg[i].reg_size;
+        }
 
+        return num_ents;
+}
 
-/* Internal Prom library routine to sort a linux_mlist_v0 memory
- * list.  Used below in initialization.
- */
-static void __init
-prom_sortmemlist(struct linux_mlist_v0 *thislist)
+static int __init prom_meminit_sun4(void)
 {
-        int swapi = 0;
-        int i, mitr, tmpsize;
-        char *tmpaddr;
-        char *lowest;
-
-        for(i=0; thislist[i].theres_more; i++) {
-                lowest = thislist[i].start_adr;
-                for(mitr = i+1; thislist[mitr-1].theres_more; mitr++)
-                        if(thislist[mitr].start_adr < lowest) {
-                                lowest = thislist[mitr].start_adr;
-                                swapi = mitr;
-                        }
-                if(lowest == thislist[i].start_adr) continue;
-                tmpaddr = thislist[swapi].start_adr;
-                tmpsize = thislist[swapi].num_bytes;
-                for(mitr = swapi; mitr > i; mitr--) {
-                        thislist[mitr].start_adr = thislist[mitr-1].start_adr;
-                        thislist[mitr].num_bytes = thislist[mitr-1].num_bytes;
-                }
-                thislist[i].start_adr = tmpaddr;
-                thislist[i].num_bytes = tmpsize;
-        }
+#ifdef CONFIG_SUN4
+        sp_banks[0].base_addr = 0;
+        sp_banks[0].num_bytes = *(sun4_romvec->memoryavail);
+#endif
+        return 1;
+}
+
+static int sp_banks_cmp(const void *a, const void *b)
+{
+        const struct sparc_phys_banks *x = a, *y = b;
 
-        return;
+        if (x->base_addr > y->base_addr)
+                return 1;
+        if (x->base_addr < y->base_addr)
+                return -1;
+        return 0;
 }
 
 /* Initialize the memory lists based upon the prom version. */
 void __init prom_meminit(void)
 {
-        int node = 0;
-        unsigned int iter, num_regs;
-        struct linux_mlist_v0 *mptr;  /* ptr for traversal */
+        int i, num_ents = 0;
 
-        switch(prom_vers) {
+        switch (prom_vers) {
         case PROM_V0:
-                /* Nice, kind of easier to do in this case. */
-                /* First, the total physical descriptors. */
-                for(mptr = (*(romvec->pv_v0mem.v0_totphys)), iter=0;
-                    mptr; mptr=mptr->theres_more, iter++) {
-                        prom_phys_total[iter].start_adr = mptr->start_adr;
-                        prom_phys_total[iter].num_bytes = mptr->num_bytes;
-                        prom_phys_total[iter].theres_more = &prom_phys_total[iter+1];
-                }
-                prom_phys_total[iter-1].theres_more = NULL;
-                /* Second, the total prom taken descriptors. */
-                for(mptr = (*(romvec->pv_v0mem.v0_prommap)), iter=0;
-                    mptr; mptr=mptr->theres_more, iter++) {
-                        prom_prom_taken[iter].start_adr = mptr->start_adr;
-                        prom_prom_taken[iter].num_bytes = mptr->num_bytes;
-                        prom_prom_taken[iter].theres_more = &prom_prom_taken[iter+1];
-                }
-                prom_prom_taken[iter-1].theres_more = NULL;
-                /* Last, the available physical descriptors. */
-                for(mptr = (*(romvec->pv_v0mem.v0_available)), iter=0;
-                    mptr; mptr=mptr->theres_more, iter++) {
-                        prom_phys_avail[iter].start_adr = mptr->start_adr;
-                        prom_phys_avail[iter].num_bytes = mptr->num_bytes;
-                        prom_phys_avail[iter].theres_more = &prom_phys_avail[iter+1];
-                }
-                prom_phys_avail[iter-1].theres_more = NULL;
-                /* Sort all the lists. */
-                prom_sortmemlist(prom_phys_total);
-                prom_sortmemlist(prom_prom_taken);
-                prom_sortmemlist(prom_phys_avail);
+                num_ents = prom_meminit_v0();
                 break;
+
         case PROM_V2:
         case PROM_V3:
-                /* Grrr, have to traverse the prom device tree ;( */
-                node = prom_getchild(prom_root_node);
-                node = prom_searchsiblings(node, "memory");
-                num_regs = prom_getproperty(node, "available",
-                                            (char *) prom_reg_memlist,
-                                            sizeof(prom_reg_memlist));
-                num_regs = (num_regs/sizeof(struct linux_prom_registers));
-                for(iter=0; iter<num_regs; iter++) {
-                        prom_phys_avail[iter].start_adr =
-                                (char *) prom_reg_memlist[iter].phys_addr;
-                        prom_phys_avail[iter].num_bytes =
-                                (unsigned long) prom_reg_memlist[iter].reg_size;
-                        prom_phys_avail[iter].theres_more =
-                                &prom_phys_avail[iter+1];
-                }
-                prom_phys_avail[iter-1].theres_more = NULL;
-
-                num_regs = prom_getproperty(node, "reg",
-                                            (char *) prom_reg_memlist,
-                                            sizeof(prom_reg_memlist));
-                num_regs = (num_regs/sizeof(struct linux_prom_registers));
-                for(iter=0; iter<num_regs; iter++) {
-                        prom_phys_total[iter].start_adr =
-                                (char *) prom_reg_memlist[iter].phys_addr;
-                        prom_phys_total[iter].num_bytes =
-                                (unsigned long) prom_reg_memlist[iter].reg_size;
-                        prom_phys_total[iter].theres_more =
-                                &prom_phys_total[iter+1];
-                }
-                prom_phys_total[iter-1].theres_more = NULL;
-
-                node = prom_getchild(prom_root_node);
-                node = prom_searchsiblings(node, "virtual-memory");
-                num_regs = prom_getproperty(node, "available",
-                                            (char *) prom_reg_memlist,
-                                            sizeof(prom_reg_memlist));
-                num_regs = (num_regs/sizeof(struct linux_prom_registers));
-
-                /* Convert available virtual areas to taken virtual
-                 * areas.  First sort, then convert.
-                 */
-                for(iter=0; iter<num_regs; iter++) {
-                        prom_prom_taken[iter].start_adr =
-                                (char *) prom_reg_memlist[iter].phys_addr;
-                        prom_prom_taken[iter].num_bytes =
-                                (unsigned long) prom_reg_memlist[iter].reg_size;
-                        prom_prom_taken[iter].theres_more =
-                                &prom_prom_taken[iter+1];
-                }
-                prom_prom_taken[iter-1].theres_more = NULL;
-
-                prom_sortmemlist(prom_prom_taken);
-
-                /* Finally, convert. */
-                for(iter=0; iter<num_regs; iter++) {
-                        prom_prom_taken[iter].start_adr =
-                                prom_prom_taken[iter].start_adr +
-                                        prom_prom_taken[iter].num_bytes;
-                        prom_prom_taken[iter].num_bytes =
-                                prom_prom_taken[iter+1].start_adr -
-                                        prom_prom_taken[iter].start_adr;
-                }
-                prom_prom_taken[iter-1].num_bytes =
-                        0xffffffff - (unsigned long) prom_prom_taken[iter-1].start_adr;
-
-                /* Sort the other two lists. */
-                prom_sortmemlist(prom_phys_total);
-                prom_sortmemlist(prom_phys_avail);
+                num_ents = prom_meminit_v2();
                 break;
 
         case PROM_SUN4:
-#ifdef CONFIG_SUN4      
-                /* how simple :) */
-                prom_phys_total[0].start_adr = NULL;
-                prom_phys_total[0].num_bytes = *(sun4_romvec->memorysize);
-                prom_phys_total[0].theres_more = NULL;
-                prom_prom_taken[0].start_adr = NULL; 
-                prom_prom_taken[0].num_bytes = 0x0;
-                prom_prom_taken[0].theres_more = NULL;
-                prom_phys_avail[0].start_adr = NULL;
-                prom_phys_avail[0].num_bytes = *(sun4_romvec->memoryavail);
-                prom_phys_avail[0].theres_more = NULL;
-#endif
+                num_ents = prom_meminit_sun4();
                 break;
 
         default:
                 break;
-        };
-
-        /* Link all the lists into the top-level descriptor. */
-        prom_memlist.v0_totphys=&prom_ptot_ptr;
-        prom_memlist.v0_prommap=&prom_ptak_ptr;
-        prom_memlist.v0_available=&prom_pavl_ptr;
+        }
+        sort(sp_banks, num_ents, sizeof(struct sparc_phys_banks),
+             sp_banks_cmp, NULL);
 
-        return;
-}
+        /* Sentinel.  */
+        sp_banks[num_ents].base_addr = 0xdeadbeef;
+        sp_banks[num_ents].num_bytes = 0;
 
-/* This returns a pointer to our libraries internal v0 format
- * memory descriptor.
- */
-struct linux_mem_v0 *
-prom_meminfo(void)
-{
-        return &prom_memlist;
+        for (i = 0; i < num_ents; i++)
+                sp_banks[i].num_bytes &= PAGE_MASK;
 }
diff --git a/arch/sparc64/Kconfig b/arch/sparc64/Kconfig
index edbe71e3fab9..eb36f3b746b8 100644
--- a/arch/sparc64/Kconfig
+++ b/arch/sparc64/Kconfig
@@ -13,6 +13,7 @@ config SPARC64
         default y
         select HAVE_IDE
         select HAVE_LMB
+        select HAVE_ARCH_KGDB
 
 config GENERIC_TIME
         bool
diff --git a/arch/sparc64/kernel/Makefile b/arch/sparc64/kernel/Makefile
index 2bd0340b743d..ec4f5ebb1ca6 100644
--- a/arch/sparc64/kernel/Makefile
+++ b/arch/sparc64/kernel/Makefile
@@ -29,3 +29,4 @@ obj-$(CONFIG_SUN_LDOMS) += ldc.o vio.o viohs.o ds.o
 obj-$(CONFIG_AUDIT) += audit.o
 obj-$(CONFIG_AUDIT)$(CONFIG_COMPAT) += compat_audit.o
 obj-y += $(obj-yy)
+obj-$(CONFIG_KGDB) += kgdb.o
diff --git a/arch/sparc64/kernel/cherrs.S b/arch/sparc64/kernel/cherrs.S
new file mode 100644
index 000000000000..89afebd7eca0
--- /dev/null
+++ b/arch/sparc64/kernel/cherrs.S
@@ -0,0 +1,579 @@
+        /* These get patched into the trap table at boot time
+         * once we know we have a cheetah processor.
+         */
+        .globl          cheetah_fecc_trap_vector
+        .type           cheetah_fecc_trap_vector,#function
+cheetah_fecc_trap_vector:
+        membar          #Sync
+        ldxa            [%g0] ASI_DCU_CONTROL_REG, %g1
+        andn            %g1, DCU_DC | DCU_IC, %g1
+        stxa            %g1, [%g0] ASI_DCU_CONTROL_REG
+        membar          #Sync
+        sethi           %hi(cheetah_fast_ecc), %g2
+        jmpl            %g2 + %lo(cheetah_fast_ecc), %g0
+         mov            0, %g1
+        .size           cheetah_fecc_trap_vector,.-cheetah_fecc_trap_vector
+
+        .globl          cheetah_fecc_trap_vector_tl1
+        .type           cheetah_fecc_trap_vector_tl1,#function
+cheetah_fecc_trap_vector_tl1:
+        membar          #Sync
+        ldxa            [%g0] ASI_DCU_CONTROL_REG, %g1
+        andn            %g1, DCU_DC | DCU_IC, %g1
+        stxa            %g1, [%g0] ASI_DCU_CONTROL_REG
+        membar          #Sync
+        sethi           %hi(cheetah_fast_ecc), %g2
+        jmpl            %g2 + %lo(cheetah_fast_ecc), %g0
+         mov            1, %g1
+        .size           cheetah_fecc_trap_vector_tl1,.-cheetah_fecc_trap_vector_tl1
+
+        .globl  cheetah_cee_trap_vector
+        .type   cheetah_cee_trap_vector,#function
+cheetah_cee_trap_vector:
+        membar          #Sync
+        ldxa            [%g0] ASI_DCU_CONTROL_REG, %g1
+        andn            %g1, DCU_IC, %g1
+        stxa            %g1, [%g0] ASI_DCU_CONTROL_REG
+        membar          #Sync
+        sethi           %hi(cheetah_cee), %g2
+        jmpl            %g2 + %lo(cheetah_cee), %g0
+         mov            0, %g1
+        .size           cheetah_cee_trap_vector,.-cheetah_cee_trap_vector
+
+        .globl          cheetah_cee_trap_vector_tl1
+        .type           cheetah_cee_trap_vector_tl1,#function
+cheetah_cee_trap_vector_tl1:
+        membar          #Sync
+        ldxa            [%g0] ASI_DCU_CONTROL_REG, %g1
+        andn            %g1, DCU_IC, %g1
+        stxa            %g1, [%g0] ASI_DCU_CONTROL_REG
+        membar          #Sync
+        sethi           %hi(cheetah_cee), %g2
+        jmpl            %g2 + %lo(cheetah_cee), %g0
+         mov            1, %g1
+        .size           cheetah_cee_trap_vector_tl1,.-cheetah_cee_trap_vector_tl1
+
+        .globl  cheetah_deferred_trap_vector
+        .type   cheetah_deferred_trap_vector,#function
+cheetah_deferred_trap_vector:
+        membar          #Sync
+        ldxa            [%g0] ASI_DCU_CONTROL_REG, %g1;
+        andn            %g1, DCU_DC | DCU_IC, %g1;
+        stxa            %g1, [%g0] ASI_DCU_CONTROL_REG;
+        membar          #Sync;
+        sethi           %hi(cheetah_deferred_trap), %g2
+        jmpl            %g2 + %lo(cheetah_deferred_trap), %g0
+         mov            0, %g1
+        .size           cheetah_deferred_trap_vector,.-cheetah_deferred_trap_vector
+
+        .globl          cheetah_deferred_trap_vector_tl1
+        .type           cheetah_deferred_trap_vector_tl1,#function
+cheetah_deferred_trap_vector_tl1:
+        membar          #Sync;
+        ldxa            [%g0] ASI_DCU_CONTROL_REG, %g1;
+        andn            %g1, DCU_DC | DCU_IC, %g1;
+        stxa            %g1, [%g0] ASI_DCU_CONTROL_REG;
+        membar          #Sync;
+        sethi           %hi(cheetah_deferred_trap), %g2
+        jmpl            %g2 + %lo(cheetah_deferred_trap), %g0
+         mov            1, %g1
+        .size           cheetah_deferred_trap_vector_tl1,.-cheetah_deferred_trap_vector_tl1
+
+        /* Cheetah+ specific traps. These are for the new I/D cache parity
+         * error traps.  The first argument to cheetah_plus_parity_handler
+         * is encoded as follows:
+         *
+         * Bit0:        0=dcache,1=icache
+         * Bit1:        0=recoverable,1=unrecoverable
+         */
+        .globl          cheetah_plus_dcpe_trap_vector
+        .type           cheetah_plus_dcpe_trap_vector,#function
+cheetah_plus_dcpe_trap_vector:
+        membar          #Sync
+        sethi           %hi(do_cheetah_plus_data_parity), %g7
+        jmpl            %g7 + %lo(do_cheetah_plus_data_parity), %g0
+         nop
+        nop
+        nop
+        nop
+        nop
+        .size           cheetah_plus_dcpe_trap_vector,.-cheetah_plus_dcpe_trap_vector
+
+        .type           do_cheetah_plus_data_parity,#function
+do_cheetah_plus_data_parity:
+        rdpr            %pil, %g2
+        wrpr            %g0, 15, %pil
+        ba,pt           %xcc, etrap_irq
+         rd             %pc, %g7
+#ifdef CONFIG_TRACE_IRQFLAGS
+        call            trace_hardirqs_off
+         nop
+#endif
+        mov             0x0, %o0
+        call            cheetah_plus_parity_error
+         add            %sp, PTREGS_OFF, %o1
+        ba,a,pt         %xcc, rtrap_irq
+        .size           do_cheetah_plus_data_parity,.-do_cheetah_plus_data_parity
+
+        .globl          cheetah_plus_dcpe_trap_vector_tl1
+        .type           cheetah_plus_dcpe_trap_vector_tl1,#function
+cheetah_plus_dcpe_trap_vector_tl1:
+        membar          #Sync
+        wrpr            PSTATE_IG | PSTATE_PEF | PSTATE_PRIV, %pstate
+        sethi           %hi(do_dcpe_tl1), %g3
+        jmpl            %g3 + %lo(do_dcpe_tl1), %g0
+         nop
+        nop
+        nop
+        nop
+        .size           cheetah_plus_dcpe_trap_vector_tl1,.-cheetah_plus_dcpe_trap_vector_tl1
+
+        .globl          cheetah_plus_icpe_trap_vector
+        .type           cheetah_plus_icpe_trap_vector,#function
+cheetah_plus_icpe_trap_vector:
+        membar          #Sync
+        sethi           %hi(do_cheetah_plus_insn_parity), %g7
+        jmpl            %g7 + %lo(do_cheetah_plus_insn_parity), %g0
+         nop
+        nop
+        nop
+        nop
+        nop
+        .size           cheetah_plus_icpe_trap_vector,.-cheetah_plus_icpe_trap_vector
+
+        .type           do_cheetah_plus_insn_parity,#function
+do_cheetah_plus_insn_parity:
+        rdpr            %pil, %g2
+        wrpr            %g0, 15, %pil
+        ba,pt           %xcc, etrap_irq
+         rd             %pc, %g7
+#ifdef CONFIG_TRACE_IRQFLAGS
+        call            trace_hardirqs_off
+         nop
+#endif
+        mov             0x1, %o0
+        call            cheetah_plus_parity_error
+         add            %sp, PTREGS_OFF, %o1
+        ba,a,pt         %xcc, rtrap_irq
+        .size           do_cheetah_plus_insn_parity,.-do_cheetah_plus_insn_parity
+
+        .globl          cheetah_plus_icpe_trap_vector_tl1
+        .type           cheetah_plus_icpe_trap_vector_tl1,#function
+cheetah_plus_icpe_trap_vector_tl1:
+        membar          #Sync
+        wrpr            PSTATE_IG | PSTATE_PEF | PSTATE_PRIV, %pstate
+        sethi           %hi(do_icpe_tl1), %g3
+        jmpl            %g3 + %lo(do_icpe_tl1), %g0
+         nop
+        nop
+        nop
+        nop
+        .size           cheetah_plus_icpe_trap_vector_tl1,.-cheetah_plus_icpe_trap_vector_tl1
+
+        /* If we take one of these traps when tl >= 1, then we
+         * jump to interrupt globals.  If some trap level above us
+         * was also using interrupt globals, we cannot recover.
+         * We may use all interrupt global registers except %g6.
+         */
+        .globl          do_dcpe_tl1
+        .type           do_dcpe_tl1,#function
+do_dcpe_tl1:
+        rdpr            %tl, %g1                ! Save original trap level
+        mov             1, %g2                  ! Setup TSTATE checking loop
+        sethi           %hi(TSTATE_IG), %g3     ! TSTATE mask bit
+1:      wrpr            %g2, %tl                ! Set trap level to check
+        rdpr            %tstate, %g4            ! Read TSTATE for this level
+        andcc           %g4, %g3, %g0           ! Interrupt globals in use?
+        bne,a,pn        %xcc, do_dcpe_tl1_fatal ! Yep, irrecoverable
+         wrpr           %g1, %tl                ! Restore original trap level
+        add             %g2, 1, %g2             ! Next trap level
+        cmp             %g2, %g1                ! Hit them all yet?
+        ble,pt          %icc, 1b                ! Not yet
+         nop
+        wrpr            %g1, %tl                ! Restore original trap level
+do_dcpe_tl1_nonfatal:   /* Ok we may use interrupt globals safely. */
+        sethi           %hi(dcache_parity_tl1_occurred), %g2
+        lduw            [%g2 + %lo(dcache_parity_tl1_occurred)], %g1
+        add             %g1, 1, %g1
+        stw             %g1, [%g2 + %lo(dcache_parity_tl1_occurred)]
+        /* Reset D-cache parity */
+        sethi           %hi(1 << 16), %g1       ! D-cache size
+        mov             (1 << 5), %g2           ! D-cache line size
+        sub             %g1, %g2, %g1           ! Move down 1 cacheline
+1:      srl             %g1, 14, %g3            ! Compute UTAG
+        membar          #Sync
+        stxa            %g3, [%g1] ASI_DCACHE_UTAG
+        membar          #Sync
+        sub             %g2, 8, %g3             ! 64-bit data word within line
+2:      membar          #Sync
+        stxa            %g0, [%g1 + %g3] ASI_DCACHE_DATA
+        membar          #Sync
+        subcc           %g3, 8, %g3             ! Next 64-bit data word
+        bge,pt          %icc, 2b
+         nop
+        subcc           %g1, %g2, %g1           ! Next cacheline
+        bge,pt          %icc, 1b
+         nop
+        ba,pt           %xcc, dcpe_icpe_tl1_common
+         nop
+
+do_dcpe_tl1_fatal:
+        sethi           %hi(1f), %g7
+        ba,pt           %xcc, etraptl1
+1:      or              %g7, %lo(1b), %g7
+        mov             0x2, %o0
+        call            cheetah_plus_parity_error
+         add            %sp, PTREGS_OFF, %o1
+        ba,pt           %xcc, rtrap
+         nop
+        .size           do_dcpe_tl1,.-do_dcpe_tl1
+
+        .globl          do_icpe_tl1
+        .type           do_icpe_tl1,#function
+do_icpe_tl1:
+        rdpr            %tl, %g1                ! Save original trap level
+        mov             1, %g2                  ! Setup TSTATE checking loop
+        sethi           %hi(TSTATE_IG), %g3     ! TSTATE mask bit
+1:      wrpr            %g2, %tl                ! Set trap level to check
+        rdpr            %tstate, %g4            ! Read TSTATE for this level
+        andcc           %g4, %g3, %g0           ! Interrupt globals in use?
+        bne,a,pn        %xcc, do_icpe_tl1_fatal ! Yep, irrecoverable
+         wrpr           %g1, %tl                ! Restore original trap level
+        add             %g2, 1, %g2             ! Next trap level
+        cmp             %g2, %g1                ! Hit them all yet?
+        ble,pt          %icc, 1b                ! Not yet
+         nop
+        wrpr            %g1, %tl                ! Restore original trap level
+do_icpe_tl1_nonfatal:   /* Ok we may use interrupt globals safely. */
+        sethi           %hi(icache_parity_tl1_occurred), %g2
+        lduw            [%g2 + %lo(icache_parity_tl1_occurred)], %g1
+        add             %g1, 1, %g1
+        stw             %g1, [%g2 + %lo(icache_parity_tl1_occurred)]
+        /* Flush I-cache */
+        sethi           %hi(1 << 15), %g1       ! I-cache size
+        mov             (1 << 5), %g2           ! I-cache line size
+        sub             %g1, %g2, %g1
+1:      or              %g1, (2 << 3), %g3
+        stxa            %g0, [%g3] ASI_IC_TAG
+        membar          #Sync
+        subcc           %g1, %g2, %g1
+        bge,pt          %icc, 1b
+         nop
+        ba,pt           %xcc, dcpe_icpe_tl1_common
+         nop
+
+do_icpe_tl1_fatal:
+        sethi           %hi(1f), %g7
+        ba,pt           %xcc, etraptl1
+1:      or              %g7, %lo(1b), %g7
+        mov             0x3, %o0
+        call            cheetah_plus_parity_error
+         add            %sp, PTREGS_OFF, %o1
+        ba,pt           %xcc, rtrap
+         nop
+        .size           do_icpe_tl1,.-do_icpe_tl1
+        
+        .type           dcpe_icpe_tl1_common,#function
+dcpe_icpe_tl1_common:
+        /* Flush D-cache, re-enable D/I caches in DCU and finally
+         * retry the trapping instruction.
+         */
+        sethi           %hi(1 << 16), %g1       ! D-cache size
+        mov             (1 << 5), %g2           ! D-cache line size
+        sub             %g1, %g2, %g1
+1:      stxa            %g0, [%g1] ASI_DCACHE_TAG
+        membar          #Sync
+        subcc           %g1, %g2, %g1
+        bge,pt          %icc, 1b
+         nop
+        ldxa            [%g0] ASI_DCU_CONTROL_REG, %g1
+        or              %g1, (DCU_DC | DCU_IC), %g1
+        stxa            %g1, [%g0] ASI_DCU_CONTROL_REG
+        membar          #Sync
+        retry
+        .size           dcpe_icpe_tl1_common,.-dcpe_icpe_tl1_common
+
+        /* Capture I/D/E-cache state into per-cpu error scoreboard.
+         *
+         * %g1:         (TL>=0) ? 1 : 0
+         * %g2:         scratch
+         * %g3:         scratch
+         * %g4:         AFSR
+         * %g5:         AFAR
+         * %g6:         unused, will have current thread ptr after etrap
+         * %g7:         scratch
+         */
+        .type           __cheetah_log_error,#function
+__cheetah_log_error:
+        /* Put "TL1" software bit into AFSR. */
+        and             %g1, 0x1, %g1
+        sllx            %g1, 63, %g2
+        or              %g4, %g2, %g4
+
+        /* Get log entry pointer for this cpu at this trap level. */
+        BRANCH_IF_JALAPENO(g2,g3,50f)
+        ldxa            [%g0] ASI_SAFARI_CONFIG, %g2
+        srlx            %g2, 17, %g2
+        ba,pt           %xcc, 60f
+         and            %g2, 0x3ff, %g2
+
+50:     ldxa            [%g0] ASI_JBUS_CONFIG, %g2
+        srlx            %g2, 17, %g2
+        and             %g2, 0x1f, %g2
+
+60:     sllx            %g2, 9, %g2
+        sethi           %hi(cheetah_error_log), %g3
+        ldx             [%g3 + %lo(cheetah_error_log)], %g3
+        brz,pn          %g3, 80f
+         nop
+
+        add             %g3, %g2, %g3
+        sllx            %g1, 8, %g1
+        add             %g3, %g1, %g1
+
+        /* %g1 holds pointer to the top of the logging scoreboard */
+        ldx             [%g1 + 0x0], %g7
+        cmp             %g7, -1
+        bne,pn          %xcc, 80f
+         nop
+
+        stx             %g4, [%g1 + 0x0]
+        stx             %g5, [%g1 + 0x8]
+        add             %g1, 0x10, %g1
+
+        /* %g1 now points to D-cache logging area */
+        set             0x3ff8, %g2     /* DC_addr mask         */
+        and             %g5, %g2, %g2   /* DC_addr bits of AFAR */
+        srlx            %g5, 12, %g3
+        or              %g3, 1, %g3     /* PHYS tag + valid     */
+
+10:     ldxa            [%g2] ASI_DCACHE_TAG, %g7
+        cmp             %g3, %g7        /* TAG match?           */
+        bne,pt          %xcc, 13f
+         nop
+
+        /* Yep, what we want, capture state. */
+        stx             %g2, [%g1 + 0x20]
+        stx             %g7, [%g1 + 0x28]
+
+        /* A membar Sync is required before and after utag access. */
+        membar          #Sync
+        ldxa            [%g2] ASI_DCACHE_UTAG, %g7
+        membar          #Sync
+        stx             %g7, [%g1 + 0x30]
+        ldxa            [%g2] ASI_DCACHE_SNOOP_TAG, %g7
+        stx             %g7, [%g1 + 0x38]
+        clr             %g3
+
+12:     ldxa            [%g2 + %g3] ASI_DCACHE_DATA, %g7
+        stx             %g7, [%g1]
+        add             %g3, (1 << 5), %g3
+        cmp             %g3, (4 << 5)
+        bl,pt           %xcc, 12b
+         add            %g1, 0x8, %g1
+
+        ba,pt           %xcc, 20f
+         add            %g1, 0x20, %g1
+
+13:     sethi           %hi(1 << 14), %g7
+        add             %g2, %g7, %g2
+        srlx            %g2, 14, %g7
+        cmp             %g7, 4
+        bl,pt           %xcc, 10b
+         nop
+
+        add             %g1, 0x40, %g1
+
+        /* %g1 now points to I-cache logging area */
+20:     set             0x1fe0, %g2     /* IC_addr mask         */
+        and             %g5, %g2, %g2   /* IC_addr bits of AFAR */
+        sllx            %g2, 1, %g2     /* IC_addr[13:6]==VA[12:5] */
+        srlx            %g5, (13 - 8), %g3 /* Make PTAG */
+        andn            %g3, 0xff, %g3  /* Mask off undefined bits */
+
+21:     ldxa            [%g2] ASI_IC_TAG, %g7
+        andn            %g7, 0xff, %g7
+        cmp             %g3, %g7
+        bne,pt          %xcc, 23f
+         nop
+
+        /* Yep, what we want, capture state. */
+        stx             %g2, [%g1 + 0x40]
+        stx             %g7, [%g1 + 0x48]
+        add             %g2, (1 << 3), %g2
+        ldxa            [%g2] ASI_IC_TAG, %g7
+        add             %g2, (1 << 3), %g2
+        stx             %g7, [%g1 + 0x50]
+        ldxa            [%g2] ASI_IC_TAG, %g7
+        add             %g2, (1 << 3), %g2
+        stx             %g7, [%g1 + 0x60]
+        ldxa            [%g2] ASI_IC_TAG, %g7
+        stx             %g7, [%g1 + 0x68]
+        sub             %g2, (3 << 3), %g2
+        ldxa            [%g2] ASI_IC_STAG, %g7
+        stx             %g7, [%g1 + 0x58]
+        clr             %g3
+        srlx            %g2, 2, %g2
+
+22:     ldxa            [%g2 + %g3] ASI_IC_INSTR, %g7
+        stx             %g7, [%g1]
+        add             %g3, (1 << 3), %g3
+        cmp             %g3, (8 << 3)
+        bl,pt           %xcc, 22b
+         add            %g1, 0x8, %g1
+
+        ba,pt           %xcc, 30f
+         add            %g1, 0x30, %g1
+
+23:     sethi           %hi(1 << 14), %g7
+        add             %g2, %g7, %g2
+        srlx            %g2, 14, %g7
+        cmp             %g7, 4
+        bl,pt           %xcc, 21b
+         nop
+
+        add             %g1, 0x70, %g1
+
+        /* %g1 now points to E-cache logging area */
+30:     andn            %g5, (32 - 1), %g2
+        stx             %g2, [%g1 + 0x20]
+        ldxa            [%g2] ASI_EC_TAG_DATA, %g7
+        stx             %g7, [%g1 + 0x28]
+        ldxa            [%g2] ASI_EC_R, %g0
+        clr             %g3
+
+31:     ldxa            [%g3] ASI_EC_DATA, %g7
+        stx             %g7, [%g1 + %g3]
+        add             %g3, 0x8, %g3
+        cmp             %g3, 0x20
+
+        bl,pt           %xcc, 31b
+         nop
+80:
+        rdpr            %tt, %g2
+        cmp             %g2, 0x70
+        be              c_fast_ecc
+         cmp            %g2, 0x63
+        be              c_cee
+         nop
+        ba,pt           %xcc, c_deferred
+        .size           __cheetah_log_error,.-__cheetah_log_error
+
+        /* Cheetah FECC trap handling, we get here from tl{0,1}_fecc
+         * in the trap table.  That code has done a memory barrier
+         * and has disabled both the I-cache and D-cache in the DCU
+         * control register.  The I-cache is disabled so that we may
+         * capture the corrupted cache line, and the D-cache is disabled
+         * because corrupt data may have been placed there and we don't
+         * want to reference it.
+         *
+         * %g1 is one if this trap occurred at %tl >= 1.
+         *
+         * Next, we turn off error reporting so that we don't recurse.
+         */
+        .globl          cheetah_fast_ecc
+        .type           cheetah_fast_ecc,#function
+cheetah_fast_ecc:
+        ldxa            [%g0] ASI_ESTATE_ERROR_EN, %g2
+        andn            %g2, ESTATE_ERROR_NCEEN | ESTATE_ERROR_CEEN, %g2
+        stxa            %g2, [%g0] ASI_ESTATE_ERROR_EN
+        membar          #Sync
+
+        /* Fetch and clear AFSR/AFAR */
+        ldxa            [%g0] ASI_AFSR, %g4
+        ldxa            [%g0] ASI_AFAR, %g5
+        stxa            %g4, [%g0] ASI_AFSR
+        membar          #Sync
+
+        ba,pt           %xcc, __cheetah_log_error
+         nop
+        .size           cheetah_fast_ecc,.-cheetah_fast_ecc
+
+        .type           c_fast_ecc,#function
+c_fast_ecc:
+        rdpr            %pil, %g2
+        wrpr            %g0, 15, %pil
+        ba,pt           %xcc, etrap_irq
+         rd             %pc, %g7
+#ifdef CONFIG_TRACE_IRQFLAGS
+        call            trace_hardirqs_off
+         nop
+#endif
+        mov             %l4, %o1
+        mov             %l5, %o2
+        call            cheetah_fecc_handler
+         add            %sp, PTREGS_OFF, %o0
+        ba,a,pt         %xcc, rtrap_irq
+        .size           c_fast_ecc,.-c_fast_ecc
+
+        /* Our caller has disabled I-cache and performed membar Sync. */
+        .globl          cheetah_cee
+        .type           cheetah_cee,#function
+cheetah_cee:
+        ldxa            [%g0] ASI_ESTATE_ERROR_EN, %g2
+        andn            %g2, ESTATE_ERROR_CEEN, %g2
+        stxa            %g2, [%g0] ASI_ESTATE_ERROR_EN
+        membar          #Sync
+
+        /* Fetch and clear AFSR/AFAR */
+        ldxa            [%g0] ASI_AFSR, %g4
+        ldxa            [%g0] ASI_AFAR, %g5
+        stxa            %g4, [%g0] ASI_AFSR
+        membar          #Sync
+
+        ba,pt           %xcc, __cheetah_log_error
+         nop
+        .size           cheetah_cee,.-cheetah_cee
+
+        .type           c_cee,#function
+c_cee:
+        rdpr            %pil, %g2
+        wrpr            %g0, 15, %pil
+        ba,pt           %xcc, etrap_irq
+         rd             %pc, %g7
+#ifdef CONFIG_TRACE_IRQFLAGS
+        call            trace_hardirqs_off
+         nop
+#endif
+        mov             %l4, %o1
+        mov             %l5, %o2
+        call            cheetah_cee_handler
+         add            %sp, PTREGS_OFF, %o0
+        ba,a,pt         %xcc, rtrap_irq
+        .size           c_cee,.-c_cee
+
+        /* Our caller has disabled I-cache+D-cache and performed membar Sync. */
+        .globl          cheetah_deferred_trap
+        .type           cheetah_deferred_trap,#function
+cheetah_deferred_trap:
+        ldxa            [%g0] ASI_ESTATE_ERROR_EN, %g2
+        andn            %g2, ESTATE_ERROR_NCEEN | ESTATE_ERROR_CEEN, %g2
+        stxa            %g2, [%g0] ASI_ESTATE_ERROR_EN
+        membar          #Sync
+
+        /* Fetch and clear AFSR/AFAR */
+        ldxa            [%g0] ASI_AFSR, %g4
+        ldxa            [%g0] ASI_AFAR, %g5
+        stxa            %g4, [%g0] ASI_AFSR
+        membar          #Sync
+
+        ba,pt           %xcc, __cheetah_log_error
+         nop
+        .size           cheetah_deferred_trap,.-cheetah_deferred_trap
+
+        .type           c_deferred,#function
+c_deferred:
+        rdpr            %pil, %g2
+        wrpr            %g0, 15, %pil
+        ba,pt           %xcc, etrap_irq
+         rd             %pc, %g7
+#ifdef CONFIG_TRACE_IRQFLAGS
+        call            trace_hardirqs_off
+         nop
+#endif
+        mov             %l4, %o1
+        mov             %l5, %o2
+        call            cheetah_deferred_handler
+         add            %sp, PTREGS_OFF, %o0
+        ba,a,pt         %xcc, rtrap_irq
+        .size           c_deferred,.-c_deferred
diff --git a/arch/sparc64/kernel/entry.S b/arch/sparc64/kernel/entry.S
deleted file mode 100644
index fd06e937ae1e..000000000000
--- a/arch/sparc64/kernel/entry.S
+++ /dev/null
@@ -1,2575 +0,0 @@
-/* $Id: entry.S,v 1.144 2002/02/09 19:49:30 davem Exp $
- * arch/sparc64/kernel/entry.S:  Sparc64 trap low-level entry points.
- *
- * Copyright (C) 1995,1997 David S. Miller (davem@caip.rutgers.edu)
- * Copyright (C) 1996 Eddie C. Dost        (ecd@skynet.be)
- * Copyright (C) 1996 Miguel de Icaza      (miguel@nuclecu.unam.mx)
- * Copyright (C) 1996,98,99 Jakub Jelinek  (jj@sunsite.mff.cuni.cz)
- */
-
-#include <linux/errno.h>
-
-#include <asm/head.h>
-#include <asm/asi.h>
-#include <asm/smp.h>
-#include <asm/ptrace.h>
-#include <asm/page.h>
-#include <asm/signal.h>
-#include <asm/pgtable.h>
-#include <asm/processor.h>
-#include <asm/visasm.h>
-#include <asm/estate.h>
-#include <asm/auxio.h>
-#include <asm/sfafsr.h>
-#include <asm/pil.h>
-#include <asm/unistd.h>
-
-#define curptr      g6
-
-        .text
-        .align          32
-
-        /* This is trivial with the new code... */
-        .globl          do_fpdis
-do_fpdis:
-        sethi           %hi(TSTATE_PEF), %g4
-        rdpr            %tstate, %g5
-        andcc           %g5, %g4, %g0
-        be,pt           %xcc, 1f
-         nop
-        rd              %fprs, %g5
-        andcc           %g5, FPRS_FEF, %g0
-        be,pt           %xcc, 1f
-         nop
-
-        /* Legal state when DCR_IFPOE is set in Cheetah %dcr. */
-        sethi           %hi(109f), %g7
-        ba,pt           %xcc, etrap
-109:     or             %g7, %lo(109b), %g7
-        add             %g0, %g0, %g0
-        ba,a,pt         %xcc, rtrap
-
-1:      TRAP_LOAD_THREAD_REG(%g6, %g1)
-        ldub            [%g6 + TI_FPSAVED], %g5
-        wr              %g0, FPRS_FEF, %fprs
-        andcc           %g5, FPRS_FEF, %g0
-        be,a,pt         %icc, 1f
-         clr            %g7
-        ldx             [%g6 + TI_GSR], %g7
-1:      andcc           %g5, FPRS_DL, %g0
-        bne,pn          %icc, 2f
-         fzero          %f0
-        andcc           %g5, FPRS_DU, %g0
-        bne,pn          %icc, 1f
-         fzero          %f2
-        faddd           %f0, %f2, %f4
-        fmuld           %f0, %f2, %f6
-        faddd           %f0, %f2, %f8
-        fmuld           %f0, %f2, %f10
-        faddd           %f0, %f2, %f12
-        fmuld           %f0, %f2, %f14
-        faddd           %f0, %f2, %f16
-        fmuld           %f0, %f2, %f18
-        faddd           %f0, %f2, %f20
-        fmuld           %f0, %f2, %f22
-        faddd           %f0, %f2, %f24
-        fmuld           %f0, %f2, %f26
-        faddd           %f0, %f2, %f28
-        fmuld           %f0, %f2, %f30
-        faddd           %f0, %f2, %f32
-        fmuld           %f0, %f2, %f34
-        faddd           %f0, %f2, %f36
-        fmuld           %f0, %f2, %f38
-        faddd           %f0, %f2, %f40
-        fmuld           %f0, %f2, %f42
-        faddd           %f0, %f2, %f44
-        fmuld           %f0, %f2, %f46
-        faddd           %f0, %f2, %f48
-        fmuld           %f0, %f2, %f50
-        faddd           %f0, %f2, %f52
-        fmuld           %f0, %f2, %f54
-        faddd           %f0, %f2, %f56
-        fmuld           %f0, %f2, %f58
-        b,pt            %xcc, fpdis_exit2
-         faddd          %f0, %f2, %f60
-1:      mov             SECONDARY_CONTEXT, %g3
-        add             %g6, TI_FPREGS + 0x80, %g1
-        faddd           %f0, %f2, %f4
-        fmuld           %f0, %f2, %f6
-
-661:    ldxa            [%g3] ASI_DMMU, %g5
-        .section        .sun4v_1insn_patch, "ax"
-        .word           661b
-        ldxa            [%g3] ASI_MMU, %g5
-        .previous
-
-        sethi           %hi(sparc64_kern_sec_context), %g2
-        ldx             [%g2 + %lo(sparc64_kern_sec_context)], %g2
-
-661:    stxa            %g2, [%g3] ASI_DMMU
-        .section        .sun4v_1insn_patch, "ax"
-        .word           661b
-        stxa            %g2, [%g3] ASI_MMU
-        .previous
-
-        membar          #Sync
-        add             %g6, TI_FPREGS + 0xc0, %g2
-        faddd           %f0, %f2, %f8
-        fmuld           %f0, %f2, %f10
-        membar          #Sync
-        ldda            [%g1] ASI_BLK_S, %f32
-        ldda            [%g2] ASI_BLK_S, %f48
-        membar          #Sync
-        faddd           %f0, %f2, %f12
-        fmuld           %f0, %f2, %f14
-        faddd           %f0, %f2, %f16
-        fmuld           %f0, %f2, %f18
-        faddd           %f0, %f2, %f20
-        fmuld           %f0, %f2, %f22
-        faddd           %f0, %f2, %f24
-        fmuld           %f0, %f2, %f26
-        faddd           %f0, %f2, %f28
-        fmuld           %f0, %f2, %f30
-        b,pt            %xcc, fpdis_exit
-         nop
-2:      andcc           %g5, FPRS_DU, %g0
-        bne,pt          %icc, 3f
-         fzero          %f32
-        mov             SECONDARY_CONTEXT, %g3
-        fzero           %f34
-
-661:    ldxa            [%g3] ASI_DMMU, %g5
-        .section        .sun4v_1insn_patch, "ax"
-        .word           661b
-        ldxa            [%g3] ASI_MMU, %g5
-        .previous
-
-        add             %g6, TI_FPREGS, %g1
-        sethi           %hi(sparc64_kern_sec_context), %g2
-        ldx             [%g2 + %lo(sparc64_kern_sec_context)], %g2
-
-661:    stxa            %g2, [%g3] ASI_DMMU
-        .section        .sun4v_1insn_patch, "ax"
-        .word           661b
-        stxa            %g2, [%g3] ASI_MMU
-        .previous
-
-        membar          #Sync
-        add             %g6, TI_FPREGS + 0x40, %g2
-        faddd           %f32, %f34, %f36
-        fmuld           %f32, %f34, %f38
-        membar          #Sync
-        ldda            [%g1] ASI_BLK_S, %f0
-        ldda            [%g2] ASI_BLK_S, %f16
-        membar          #Sync
-        faddd           %f32, %f34, %f40
-        fmuld           %f32, %f34, %f42
-        faddd           %f32, %f34, %f44
-        fmuld           %f32, %f34, %f46
-        faddd           %f32, %f34, %f48
-        fmuld           %f32, %f34, %f50
-        faddd           %f32, %f34, %f52
-        fmuld           %f32, %f34, %f54
-        faddd           %f32, %f34, %f56
-        fmuld           %f32, %f34, %f58
-        faddd           %f32, %f34, %f60
-        fmuld           %f32, %f34, %f62
-        ba,pt           %xcc, fpdis_exit
-         nop
-3:      mov             SECONDARY_CONTEXT, %g3
-        add             %g6, TI_FPREGS, %g1
-
-661:    ldxa            [%g3] ASI_DMMU, %g5
-        .section        .sun4v_1insn_patch, "ax"
-        .word           661b
-        ldxa            [%g3] ASI_MMU, %g5
-        .previous
-
-        sethi           %hi(sparc64_kern_sec_context), %g2
-        ldx             [%g2 + %lo(sparc64_kern_sec_context)], %g2
-
-661:    stxa            %g2, [%g3] ASI_DMMU
-        .section        .sun4v_1insn_patch, "ax"
-        .word           661b
-        stxa            %g2, [%g3] ASI_MMU
-        .previous
-
-        membar          #Sync
-        mov             0x40, %g2
-        membar          #Sync
-        ldda            [%g1] ASI_BLK_S, %f0
-        ldda            [%g1 + %g2] ASI_BLK_S, %f16
-        add             %g1, 0x80, %g1
-        ldda            [%g1] ASI_BLK_S, %f32
-        ldda            [%g1 + %g2] ASI_BLK_S, %f48
-        membar          #Sync
-fpdis_exit:
-
-661:    stxa            %g5, [%g3] ASI_DMMU
-        .section        .sun4v_1insn_patch, "ax"
-        .word           661b
-        stxa            %g5, [%g3] ASI_MMU
-        .previous
-
-        membar          #Sync
-fpdis_exit2:
-        wr              %g7, 0, %gsr
-        ldx             [%g6 + TI_XFSR], %fsr
-        rdpr            %tstate, %g3
-        or              %g3, %g4, %g3           ! anal...
-        wrpr            %g3, %tstate
-        wr              %g0, FPRS_FEF, %fprs    ! clean DU/DL bits
-        retry
-
-        .align          32
-fp_other_bounce:
-        call            do_fpother
-         add            %sp, PTREGS_OFF, %o0
-        ba,pt           %xcc, rtrap
-         nop
-
-        .globl          do_fpother_check_fitos
-        .align          32
-do_fpother_check_fitos:
-        TRAP_LOAD_THREAD_REG(%g6, %g1)
-        sethi           %hi(fp_other_bounce - 4), %g7
-        or              %g7, %lo(fp_other_bounce - 4), %g7
-
-        /* NOTE: Need to preserve %g7 until we fully commit
-         *       to the fitos fixup.
-         */
-        stx             %fsr, [%g6 + TI_XFSR]
-        rdpr            %tstate, %g3
-        andcc           %g3, TSTATE_PRIV, %g0
-        bne,pn          %xcc, do_fptrap_after_fsr
-         nop
-        ldx             [%g6 + TI_XFSR], %g3
-        srlx            %g3, 14, %g1
-        and             %g1, 7, %g1
-        cmp             %g1, 2                  ! Unfinished FP-OP
-        bne,pn          %xcc, do_fptrap_after_fsr
-         sethi          %hi(1 << 23), %g1       ! Inexact
-        andcc           %g3, %g1, %g0
-        bne,pn          %xcc, do_fptrap_after_fsr
-         rdpr           %tpc, %g1
-        lduwa           [%g1] ASI_AIUP, %g3     ! This cannot ever fail
-#define FITOS_MASK      0xc1f83fe0
-#define FITOS_COMPARE   0x81a01880
-        sethi           %hi(FITOS_MASK), %g1
-        or              %g1, %lo(FITOS_MASK), %g1
-        and             %g3, %g1, %g1
-        sethi           %hi(FITOS_COMPARE), %g2
-        or              %g2, %lo(FITOS_COMPARE), %g2
-        cmp             %g1, %g2
-        bne,pn          %xcc, do_fptrap_after_fsr
-         nop
-        std             %f62, [%g6 + TI_FPREGS + (62 * 4)]
-        sethi           %hi(fitos_table_1), %g1
-        and             %g3, 0x1f, %g2
-        or              %g1, %lo(fitos_table_1),  %g1
-        sllx            %g2, 2, %g2
-        jmpl            %g1 + %g2, %g0
-         ba,pt          %xcc, fitos_emul_continue
-
-fitos_table_1:
-        fitod           %f0, %f62
-        fitod           %f1, %f62
-        fitod           %f2, %f62
-        fitod           %f3, %f62
-        fitod           %f4, %f62
-        fitod           %f5, %f62
-        fitod           %f6, %f62
-        fitod           %f7, %f62
-        fitod           %f8, %f62
-        fitod           %f9, %f62
-        fitod           %f10, %f62
-        fitod           %f11, %f62
-        fitod           %f12, %f62
-        fitod           %f13, %f62
-        fitod           %f14, %f62
-        fitod           %f15, %f62
-        fitod           %f16, %f62
-        fitod           %f17, %f62
-        fitod           %f18, %f62
-        fitod           %f19, %f62
-        fitod           %f20, %f62
-        fitod           %f21, %f62
-        fitod           %f22, %f62
-        fitod           %f23, %f62
-        fitod           %f24, %f62
-        fitod           %f25, %f62
-        fitod           %f26, %f62
-        fitod           %f27, %f62
-        fitod           %f28, %f62
-        fitod           %f29, %f62
-        fitod           %f30, %f62
-        fitod           %f31, %f62
-
-fitos_emul_continue:
-        sethi           %hi(fitos_table_2), %g1
-        srl             %g3, 25, %g2
-        or              %g1, %lo(fitos_table_2), %g1
-        and             %g2, 0x1f, %g2
-        sllx            %g2, 2, %g2
-        jmpl            %g1 + %g2, %g0
-         ba,pt          %xcc, fitos_emul_fini
-
-fitos_table_2:
-        fdtos           %f62, %f0
-        fdtos           %f62, %f1
-        fdtos           %f62, %f2
-        fdtos           %f62, %f3
-        fdtos           %f62, %f4
-        fdtos           %f62, %f5
-        fdtos           %f62, %f6
-        fdtos           %f62, %f7
-        fdtos           %f62, %f8
-        fdtos           %f62, %f9
-        fdtos           %f62, %f10
-        fdtos           %f62, %f11
-        fdtos           %f62, %f12
-        fdtos           %f62, %f13
-        fdtos           %f62, %f14
-        fdtos           %f62, %f15
-        fdtos           %f62, %f16
-        fdtos           %f62, %f17
-        fdtos           %f62, %f18
-        fdtos           %f62, %f19
-        fdtos           %f62, %f20
-        fdtos           %f62, %f21
-        fdtos           %f62, %f22
-        fdtos           %f62, %f23
-        fdtos           %f62, %f24
-        fdtos           %f62, %f25
-        fdtos           %f62, %f26
-        fdtos           %f62, %f27
-        fdtos           %f62, %f28
-        fdtos           %f62, %f29
-        fdtos           %f62, %f30
-        fdtos           %f62, %f31
-
-fitos_emul_fini:
-        ldd             [%g6 + TI_FPREGS + (62 * 4)], %f62
-        done
-
-        .globl          do_fptrap
-        .align          32
-do_fptrap:
-        TRAP_LOAD_THREAD_REG(%g6, %g1)
-        stx             %fsr, [%g6 + TI_XFSR]
-do_fptrap_after_fsr:
-        ldub            [%g6 + TI_FPSAVED], %g3
-        rd              %fprs, %g1
-        or              %g3, %g1, %g3
-        stb             %g3, [%g6 + TI_FPSAVED]
-        rd              %gsr, %g3
-        stx             %g3, [%g6 + TI_GSR]
-        mov             SECONDARY_CONTEXT, %g3
-
-661:    ldxa            [%g3] ASI_DMMU, %g5
-        .section        .sun4v_1insn_patch, "ax"
-        .word           661b
-        ldxa            [%g3] ASI_MMU, %g5
-        .previous
-
-        sethi           %hi(sparc64_kern_sec_context), %g2
-        ldx             [%g2 + %lo(sparc64_kern_sec_context)], %g2
-
-661:    stxa            %g2, [%g3] ASI_DMMU
-        .section        .sun4v_1insn_patch, "ax"
-        .word           661b
-        stxa            %g2, [%g3] ASI_MMU
-        .previous
-
-        membar          #Sync
-        add             %g6, TI_FPREGS, %g2
-        andcc           %g1, FPRS_DL, %g0
-        be,pn           %icc, 4f
-         mov            0x40, %g3
-        stda            %f0, [%g2] ASI_BLK_S
-        stda            %f16, [%g2 + %g3] ASI_BLK_S
-        andcc           %g1, FPRS_DU, %g0
-        be,pn           %icc, 5f
-4:       add            %g2, 128, %g2
-        stda            %f32, [%g2] ASI_BLK_S
-        stda            %f48, [%g2 + %g3] ASI_BLK_S
-5:      mov             SECONDARY_CONTEXT, %g1
-        membar          #Sync
-
-661:    stxa            %g5, [%g1] ASI_DMMU
-        .section        .sun4v_1insn_patch, "ax"
-        .word           661b
-        stxa            %g5, [%g1] ASI_MMU
-        .previous
-
-        membar          #Sync
-        ba,pt           %xcc, etrap
-         wr             %g0, 0, %fprs
-
-        /* The registers for cross calls will be:
-         *
-         * DATA 0: [low 32-bits]  Address of function to call, jmp to this
-         *         [high 32-bits] MMU Context Argument 0, place in %g5
-         * DATA 1: Address Argument 1, place in %g1
-         * DATA 2: Address Argument 2, place in %g7
-         *
-         * With this method we can do most of the cross-call tlb/cache
-         * flushing very quickly.
-         */
-        .text
-        .align          32
-        .globl          do_ivec
-do_ivec:
-        mov             0x40, %g3
-        ldxa            [%g3 + %g0] ASI_INTR_R, %g3
-        sethi           %hi(KERNBASE), %g4
-        cmp             %g3, %g4
-        bgeu,pn         %xcc, do_ivec_xcall
-         srlx           %g3, 32, %g5
-        stxa            %g0, [%g0] ASI_INTR_RECEIVE
-        membar          #Sync
-
-        sethi           %hi(ivector_table_pa), %g2
-        ldx             [%g2 + %lo(ivector_table_pa)], %g2
-        sllx            %g3, 4, %g3
-        add             %g2, %g3, %g3
-
-        TRAP_LOAD_IRQ_WORK_PA(%g6, %g1)
-
-        ldx             [%g6], %g5
-        stxa            %g5, [%g3] ASI_PHYS_USE_EC
-        stx             %g3, [%g6]
-        wr              %g0, 1 << PIL_DEVICE_IRQ, %set_softint
-        retry
-do_ivec_xcall:
-        mov             0x50, %g1
-        ldxa            [%g1 + %g0] ASI_INTR_R, %g1
-        srl             %g3, 0, %g3
-
-        mov             0x60, %g7
-        ldxa            [%g7 + %g0] ASI_INTR_R, %g7
-        stxa            %g0, [%g0] ASI_INTR_RECEIVE
-        membar          #Sync
-        ba,pt           %xcc, 1f
-         nop
-
-        .align          32
-1:      jmpl            %g3, %g0
-         nop
-
-        .globl          getcc, setcc
-getcc:
-        ldx             [%o0 + PT_V9_TSTATE], %o1
-        srlx            %o1, 32, %o1
-        and             %o1, 0xf, %o1
-        retl
-         stx            %o1, [%o0 + PT_V9_G1]
-setcc:
-        ldx             [%o0 + PT_V9_TSTATE], %o1
-        ldx             [%o0 + PT_V9_G1], %o2
-        or              %g0, %ulo(TSTATE_ICC), %o3
-        sllx            %o3, 32, %o3
-        andn            %o1, %o3, %o1
-        sllx            %o2, 32, %o2
-        and             %o2, %o3, %o2
-        or              %o1, %o2, %o1
-        retl
-         stx            %o1, [%o0 + PT_V9_TSTATE]
-
-        .globl          utrap_trap
-utrap_trap:             /* %g3=handler,%g4=level */
-        TRAP_LOAD_THREAD_REG(%g6, %g1)
-        ldx             [%g6 + TI_UTRAPS], %g1
-        brnz,pt         %g1, invoke_utrap
-         nop
-
-        ba,pt           %xcc, etrap
-         rd             %pc, %g7
-        mov             %l4, %o1
-        call            bad_trap
-         add            %sp, PTREGS_OFF, %o0
-        ba,pt           %xcc, rtrap
-         nop
-
-invoke_utrap:
-        sllx            %g3, 3, %g3
-        ldx             [%g1 + %g3], %g1
-        save            %sp, -128, %sp
-        rdpr            %tstate, %l6
-        rdpr            %cwp, %l7
-        andn            %l6, TSTATE_CWP, %l6
-        wrpr            %l6, %l7, %tstate
-        rdpr            %tpc, %l6
-        rdpr            %tnpc, %l7
-        wrpr            %g1, 0, %tnpc
-        done
-
-        /* We need to carefully read the error status, ACK
-         * the errors, prevent recursive traps, and pass the
-         * information on to C code for logging.
-         *
-         * We pass the AFAR in as-is, and we encode the status
-         * information as described in asm-sparc64/sfafsr.h
-         */
-        .globl          __spitfire_access_error
-__spitfire_access_error:
-        /* Disable ESTATE error reporting so that we do not
-         * take recursive traps and RED state the processor.
-         */
-        stxa            %g0, [%g0] ASI_ESTATE_ERROR_EN
-        membar          #Sync
-
-        mov             UDBE_UE, %g1
-        ldxa            [%g0] ASI_AFSR, %g4     ! Get AFSR
-
-        /* __spitfire_cee_trap branches here with AFSR in %g4 and
-         * UDBE_CE in %g1.  It only clears ESTATE_ERR_CE in the
-         * ESTATE Error Enable register.
-         */
-__spitfire_cee_trap_continue:
-        ldxa            [%g0] ASI_AFAR, %g5     ! Get AFAR
-
-        rdpr            %tt, %g3
-        and             %g3, 0x1ff, %g3         ! Paranoia
-        sllx            %g3, SFSTAT_TRAP_TYPE_SHIFT, %g3
-        or              %g4, %g3, %g4
-        rdpr            %tl, %g3
-        cmp             %g3, 1
-        mov             1, %g3
-        bleu            %xcc, 1f
-         sllx           %g3, SFSTAT_TL_GT_ONE_SHIFT, %g3
-
-        or              %g4, %g3, %g4
-
-        /* Read in the UDB error register state, clearing the
-         * sticky error bits as-needed.  We only clear them if
-         * the UE bit is set.  Likewise, __spitfire_cee_trap
-         * below will only do so if the CE bit is set.
-         *
-         * NOTE: UltraSparc-I/II have high and low UDB error
-         *       registers, corresponding to the two UDB units
-         *       present on those chips.  UltraSparc-IIi only
-         *       has a single UDB, called "SDB" in the manual.
-         *       For IIi the upper UDB register always reads
-         *       as zero so for our purposes things will just
-         *       work with the checks below.
-         */
-1:      ldxa            [%g0] ASI_UDBH_ERROR_R, %g3
-        and             %g3, 0x3ff, %g7         ! Paranoia
-        sllx            %g7, SFSTAT_UDBH_SHIFT, %g7
-        or              %g4, %g7, %g4
-        andcc           %g3, %g1, %g3           ! UDBE_UE or UDBE_CE
-        be,pn           %xcc, 1f
-         nop
-        stxa            %g3, [%g0] ASI_UDB_ERROR_W
-        membar          #Sync
-
-1:      mov             0x18, %g3
-        ldxa            [%g3] ASI_UDBL_ERROR_R, %g3
-        and             %g3, 0x3ff, %g7         ! Paranoia
-        sllx            %g7, SFSTAT_UDBL_SHIFT, %g7
-        or              %g4, %g7, %g4
-        andcc           %g3, %g1, %g3           ! UDBE_UE or UDBE_CE
-        be,pn           %xcc, 1f
-         nop
-        mov             0x18, %g7
-        stxa            %g3, [%g7] ASI_UDB_ERROR_W
-        membar          #Sync
-
-1:      /* Ok, now that we've latched the error state,
-         * clear the sticky bits in the AFSR.
-         */
-        stxa            %g4, [%g0] ASI_AFSR
-        membar          #Sync
-
-        rdpr            %tl, %g2
-        cmp             %g2, 1
-        rdpr            %pil, %g2
-        bleu,pt         %xcc, 1f
-         wrpr           %g0, 15, %pil
-
-        ba,pt           %xcc, etraptl1
-         rd             %pc, %g7
-
-        ba,pt           %xcc, 2f
-         nop
-
-1:      ba,pt           %xcc, etrap_irq
-         rd             %pc, %g7
-
-2:
-#ifdef CONFIG_TRACE_IRQFLAGS
-        call    trace_hardirqs_off
-         nop
-#endif
-        mov             %l4, %o1
-        mov             %l5, %o2
-        call            spitfire_access_error
-         add            %sp, PTREGS_OFF, %o0
-        ba,pt           %xcc, rtrap
-         nop
-
-        /* This is the trap handler entry point for ECC correctable
-         * errors.  They are corrected, but we listen for the trap
-         * so that the event can be logged.
-         *
-         * Disrupting errors are either:
-         * 1) single-bit ECC errors during UDB reads to system
-         *    memory
-         * 2) data parity errors during write-back events
-         *
-         * As far as I can make out from the manual, the CEE trap
-         * is only for correctable errors during memory read
-         * accesses by the front-end of the processor.
-         *
-         * The code below is only for trap level 1 CEE events,
-         * as it is the only situation where we can safely record
-         * and log.  For trap level >1 we just clear the CE bit
-         * in the AFSR and return.
-         *
-         * This is just like __spiftire_access_error above, but it
-         * specifically handles correctable errors.  If an
-         * uncorrectable error is indicated in the AFSR we
-         * will branch directly above to __spitfire_access_error
-         * to handle it instead.  Uncorrectable therefore takes
-         * priority over correctable, and the error logging
-         * C code will notice this case by inspecting the
-         * trap type.
-         */
-        .globl          __spitfire_cee_trap
-__spitfire_cee_trap:
-        ldxa            [%g0] ASI_AFSR, %g4     ! Get AFSR
-        mov             1, %g3
-        sllx            %g3, SFAFSR_UE_SHIFT, %g3
-        andcc           %g4, %g3, %g0           ! Check for UE
-        bne,pn          %xcc, __spitfire_access_error
-         nop
-
-        /* Ok, in this case we only have a correctable error.
-         * Indicate we only wish to capture that state in register
-         * %g1, and we only disable CE error reporting unlike UE
-         * handling which disables all errors.
-         */
-        ldxa            [%g0] ASI_ESTATE_ERROR_EN, %g3
-        andn            %g3, ESTATE_ERR_CE, %g3
-        stxa            %g3, [%g0] ASI_ESTATE_ERROR_EN
-        membar          #Sync
-
-        /* Preserve AFSR in %g4, indicate UDB state to capture in %g1 */
-        ba,pt           %xcc, __spitfire_cee_trap_continue
-         mov            UDBE_CE, %g1
-
-        .globl          __spitfire_data_access_exception
-        .globl          __spitfire_data_access_exception_tl1
-__spitfire_data_access_exception_tl1:
-        rdpr            %pstate, %g4
-        wrpr            %g4, PSTATE_MG|PSTATE_AG, %pstate
-        mov             TLB_SFSR, %g3
-        mov             DMMU_SFAR, %g5
-        ldxa            [%g3] ASI_DMMU, %g4     ! Get SFSR
-        ldxa            [%g5] ASI_DMMU, %g5     ! Get SFAR
-        stxa            %g0, [%g3] ASI_DMMU     ! Clear SFSR.FaultValid bit
-        membar          #Sync
-        rdpr            %tt, %g3
-        cmp             %g3, 0x80               ! first win spill/fill trap
-        blu,pn          %xcc, 1f
-         cmp            %g3, 0xff               ! last win spill/fill trap
-        bgu,pn          %xcc, 1f
-         nop
-        ba,pt           %xcc, winfix_dax
-         rdpr           %tpc, %g3
-1:      sethi           %hi(109f), %g7
-        ba,pt           %xcc, etraptl1
-109:     or             %g7, %lo(109b), %g7
-        mov             %l4, %o1
-        mov             %l5, %o2
-        call            spitfire_data_access_exception_tl1
-         add            %sp, PTREGS_OFF, %o0
-        ba,pt           %xcc, rtrap
-         nop
-
-__spitfire_data_access_exception:
-        rdpr            %pstate, %g4
-        wrpr            %g4, PSTATE_MG|PSTATE_AG, %pstate
-        mov             TLB_SFSR, %g3
-        mov             DMMU_SFAR, %g5
-        ldxa            [%g3] ASI_DMMU, %g4     ! Get SFSR
-        ldxa            [%g5] ASI_DMMU, %g5     ! Get SFAR
-        stxa            %g0, [%g3] ASI_DMMU     ! Clear SFSR.FaultValid bit
-        membar          #Sync
-        sethi           %hi(109f), %g7
-        ba,pt           %xcc, etrap
-109:     or             %g7, %lo(109b), %g7
-        mov             %l4, %o1
-        mov             %l5, %o2
-        call            spitfire_data_access_exception
-         add            %sp, PTREGS_OFF, %o0
-        ba,pt           %xcc, rtrap
-         nop
-
-        .globl          __spitfire_insn_access_exception
-        .globl          __spitfire_insn_access_exception_tl1
-__spitfire_insn_access_exception_tl1:
-        rdpr            %pstate, %g4
-        wrpr            %g4, PSTATE_MG|PSTATE_AG, %pstate
-        mov             TLB_SFSR, %g3
-        ldxa            [%g3] ASI_IMMU, %g4     ! Get SFSR
-        rdpr            %tpc, %g5               ! IMMU has no SFAR, use TPC
-        stxa            %g0, [%g3] ASI_IMMU     ! Clear FaultValid bit
-        membar          #Sync
-        sethi           %hi(109f), %g7
-        ba,pt           %xcc, etraptl1
-109:     or             %g7, %lo(109b), %g7
-        mov             %l4, %o1
-        mov             %l5, %o2
-        call            spitfire_insn_access_exception_tl1
-         add            %sp, PTREGS_OFF, %o0
-        ba,pt           %xcc, rtrap
-         nop
-
-__spitfire_insn_access_exception:
-        rdpr            %pstate, %g4
-        wrpr            %g4, PSTATE_MG|PSTATE_AG, %pstate
-        mov             TLB_SFSR, %g3
-        ldxa            [%g3] ASI_IMMU, %g4     ! Get SFSR
-        rdpr            %tpc, %g5               ! IMMU has no SFAR, use TPC
-        stxa            %g0, [%g3] ASI_IMMU     ! Clear FaultValid bit
-        membar          #Sync
-        sethi           %hi(109f), %g7
-        ba,pt           %xcc, etrap
-109:     or             %g7, %lo(109b), %g7
-        mov             %l4, %o1
-        mov             %l5, %o2
-        call            spitfire_insn_access_exception
-         add            %sp, PTREGS_OFF, %o0
-        ba,pt           %xcc, rtrap
-         nop
-
-        /* These get patched into the trap table at boot time
-         * once we know we have a cheetah processor.
-         */
-        .globl          cheetah_fecc_trap_vector, cheetah_fecc_trap_vector_tl1
-cheetah_fecc_trap_vector:
-        membar          #Sync
-        ldxa            [%g0] ASI_DCU_CONTROL_REG, %g1
-        andn            %g1, DCU_DC | DCU_IC, %g1
-        stxa            %g1, [%g0] ASI_DCU_CONTROL_REG
-        membar          #Sync
-        sethi           %hi(cheetah_fast_ecc), %g2
-        jmpl            %g2 + %lo(cheetah_fast_ecc), %g0
-         mov            0, %g1
-cheetah_fecc_trap_vector_tl1:
-        membar          #Sync
-        ldxa            [%g0] ASI_DCU_CONTROL_REG, %g1
-        andn            %g1, DCU_DC | DCU_IC, %g1
-        stxa            %g1, [%g0] ASI_DCU_CONTROL_REG
-        membar          #Sync
-        sethi           %hi(cheetah_fast_ecc), %g2
-        jmpl            %g2 + %lo(cheetah_fast_ecc), %g0
-         mov            1, %g1
-        .globl  cheetah_cee_trap_vector, cheetah_cee_trap_vector_tl1
-cheetah_cee_trap_vector:
-        membar          #Sync
-        ldxa            [%g0] ASI_DCU_CONTROL_REG, %g1
-        andn            %g1, DCU_IC, %g1
-        stxa            %g1, [%g0] ASI_DCU_CONTROL_REG
-        membar          #Sync
-        sethi           %hi(cheetah_cee), %g2
-        jmpl            %g2 + %lo(cheetah_cee), %g0
-         mov            0, %g1
-cheetah_cee_trap_vector_tl1:
-        membar          #Sync
-        ldxa            [%g0] ASI_DCU_CONTROL_REG, %g1
-        andn            %g1, DCU_IC, %g1
-        stxa            %g1, [%g0] ASI_DCU_CONTROL_REG
-        membar          #Sync
-        sethi           %hi(cheetah_cee), %g2
-        jmpl            %g2 + %lo(cheetah_cee), %g0
-         mov            1, %g1
-        .globl  cheetah_deferred_trap_vector, cheetah_deferred_trap_vector_tl1
-cheetah_deferred_trap_vector:
-        membar          #Sync
-        ldxa            [%g0] ASI_DCU_CONTROL_REG, %g1;
-        andn            %g1, DCU_DC | DCU_IC, %g1;
-        stxa            %g1, [%g0] ASI_DCU_CONTROL_REG;
-        membar          #Sync;
-        sethi           %hi(cheetah_deferred_trap), %g2
-        jmpl            %g2 + %lo(cheetah_deferred_trap), %g0
-         mov            0, %g1
-cheetah_deferred_trap_vector_tl1:
-        membar          #Sync;
-        ldxa            [%g0] ASI_DCU_CONTROL_REG, %g1;
-        andn            %g1, DCU_DC | DCU_IC, %g1;
-        stxa            %g1, [%g0] ASI_DCU_CONTROL_REG;
-        membar          #Sync;
-        sethi           %hi(cheetah_deferred_trap), %g2
-        jmpl            %g2 + %lo(cheetah_deferred_trap), %g0
-         mov            1, %g1
-
-        /* Cheetah+ specific traps. These are for the new I/D cache parity
-         * error traps.  The first argument to cheetah_plus_parity_handler
-         * is encoded as follows:
-         *
-         * Bit0:        0=dcache,1=icache
-         * Bit1:        0=recoverable,1=unrecoverable
-         */
-        .globl          cheetah_plus_dcpe_trap_vector, cheetah_plus_dcpe_trap_vector_tl1
-cheetah_plus_dcpe_trap_vector:
-        membar          #Sync
-        sethi           %hi(do_cheetah_plus_data_parity), %g7
-        jmpl            %g7 + %lo(do_cheetah_plus_data_parity), %g0
-         nop
-        nop
-        nop
-        nop
-        nop
-
-do_cheetah_plus_data_parity:
-        rdpr            %pil, %g2
-        wrpr            %g0, 15, %pil
-        ba,pt           %xcc, etrap_irq
-         rd             %pc, %g7
-#ifdef CONFIG_TRACE_IRQFLAGS
-        call            trace_hardirqs_off
-         nop
-#endif
-        mov             0x0, %o0
-        call            cheetah_plus_parity_error
-         add            %sp, PTREGS_OFF, %o1
-        ba,a,pt         %xcc, rtrap_irq
-
-cheetah_plus_dcpe_trap_vector_tl1:
-        membar          #Sync
-        wrpr            PSTATE_IG | PSTATE_PEF | PSTATE_PRIV, %pstate
-        sethi           %hi(do_dcpe_tl1), %g3
-        jmpl            %g3 + %lo(do_dcpe_tl1), %g0
-         nop
-        nop
-        nop
-        nop
-
-        .globl          cheetah_plus_icpe_trap_vector, cheetah_plus_icpe_trap_vector_tl1
-cheetah_plus_icpe_trap_vector:
-        membar          #Sync
-        sethi           %hi(do_cheetah_plus_insn_parity), %g7
-        jmpl            %g7 + %lo(do_cheetah_plus_insn_parity), %g0
-         nop
-        nop
-        nop
-        nop
-        nop
-
-do_cheetah_plus_insn_parity:
-        rdpr            %pil, %g2
-        wrpr            %g0, 15, %pil
-        ba,pt           %xcc, etrap_irq
-         rd             %pc, %g7
-#ifdef CONFIG_TRACE_IRQFLAGS
-        call            trace_hardirqs_off
-         nop
-#endif
-        mov             0x1, %o0
-        call            cheetah_plus_parity_error
-         add            %sp, PTREGS_OFF, %o1
-        ba,a,pt         %xcc, rtrap_irq
-
-cheetah_plus_icpe_trap_vector_tl1:
-        membar          #Sync
-        wrpr            PSTATE_IG | PSTATE_PEF | PSTATE_PRIV, %pstate
-        sethi           %hi(do_icpe_tl1), %g3
-        jmpl            %g3 + %lo(do_icpe_tl1), %g0
-         nop
-        nop
-        nop
-        nop
-
-        /* If we take one of these traps when tl >= 1, then we
-         * jump to interrupt globals.  If some trap level above us
-         * was also using interrupt globals, we cannot recover.
-         * We may use all interrupt global registers except %g6.
-         */
-        .globl          do_dcpe_tl1, do_icpe_tl1
-do_dcpe_tl1:
-        rdpr            %tl, %g1                ! Save original trap level
-        mov             1, %g2                  ! Setup TSTATE checking loop
-        sethi           %hi(TSTATE_IG), %g3     ! TSTATE mask bit
-1:      wrpr            %g2, %tl                ! Set trap level to check
-        rdpr            %tstate, %g4            ! Read TSTATE for this level
-        andcc           %g4, %g3, %g0           ! Interrupt globals in use?
-        bne,a,pn        %xcc, do_dcpe_tl1_fatal ! Yep, irrecoverable
-         wrpr           %g1, %tl                ! Restore original trap level
-        add             %g2, 1, %g2             ! Next trap level
-        cmp             %g2, %g1                ! Hit them all yet?
-        ble,pt          %icc, 1b                ! Not yet
-         nop
-        wrpr            %g1, %tl                ! Restore original trap level
-do_dcpe_tl1_nonfatal:   /* Ok we may use interrupt globals safely. */
-        sethi           %hi(dcache_parity_tl1_occurred), %g2
-        lduw            [%g2 + %lo(dcache_parity_tl1_occurred)], %g1
-        add             %g1, 1, %g1
-        stw             %g1, [%g2 + %lo(dcache_parity_tl1_occurred)]
-        /* Reset D-cache parity */
-        sethi           %hi(1 << 16), %g1       ! D-cache size
-        mov             (1 << 5), %g2           ! D-cache line size
-        sub             %g1, %g2, %g1           ! Move down 1 cacheline
-1:      srl             %g1, 14, %g3            ! Compute UTAG
-        membar          #Sync
-        stxa            %g3, [%g1] ASI_DCACHE_UTAG
-        membar          #Sync
-        sub             %g2, 8, %g3             ! 64-bit data word within line
-2:      membar          #Sync
-        stxa            %g0, [%g1 + %g3] ASI_DCACHE_DATA
-        membar          #Sync
-        subcc           %g3, 8, %g3             ! Next 64-bit data word
-        bge,pt          %icc, 2b
-         nop
-        subcc           %g1, %g2, %g1           ! Next cacheline
-        bge,pt          %icc, 1b
-         nop
-        ba,pt           %xcc, dcpe_icpe_tl1_common
-         nop
-
-do_dcpe_tl1_fatal:
-        sethi           %hi(1f), %g7
-        ba,pt           %xcc, etraptl1
-1:      or              %g7, %lo(1b), %g7
-        mov             0x2, %o0
-        call            cheetah_plus_parity_error
-         add            %sp, PTREGS_OFF, %o1
-        ba,pt           %xcc, rtrap
-         nop
-
-do_icpe_tl1:
-        rdpr            %tl, %g1                ! Save original trap level
-        mov             1, %g2                  ! Setup TSTATE checking loop
-        sethi           %hi(TSTATE_IG), %g3     ! TSTATE mask bit
-1:      wrpr            %g2, %tl                ! Set trap level to check
-        rdpr            %tstate, %g4            ! Read TSTATE for this level
-        andcc           %g4, %g3, %g0           ! Interrupt globals in use?
-        bne,a,pn        %xcc, do_icpe_tl1_fatal ! Yep, irrecoverable
-         wrpr           %g1, %tl                ! Restore original trap level
-        add             %g2, 1, %g2             ! Next trap level
-        cmp             %g2, %g1                ! Hit them all yet?
-        ble,pt          %icc, 1b                ! Not yet
-         nop
-        wrpr            %g1, %tl                ! Restore original trap level
-do_icpe_tl1_nonfatal:   /* Ok we may use interrupt globals safely. */
-        sethi           %hi(icache_parity_tl1_occurred), %g2
-        lduw            [%g2 + %lo(icache_parity_tl1_occurred)], %g1
-        add             %g1, 1, %g1
-        stw             %g1, [%g2 + %lo(icache_parity_tl1_occurred)]
-        /* Flush I-cache */
-        sethi           %hi(1 << 15), %g1       ! I-cache size
-        mov             (1 << 5), %g2           ! I-cache line size
-        sub             %g1, %g2, %g1
-1:      or              %g1, (2 << 3), %g3
-        stxa            %g0, [%g3] ASI_IC_TAG
-        membar          #Sync
-        subcc           %g1, %g2, %g1
-        bge,pt          %icc, 1b
-         nop
-        ba,pt           %xcc, dcpe_icpe_tl1_common
-         nop
-
-do_icpe_tl1_fatal:
-        sethi           %hi(1f), %g7
-        ba,pt           %xcc, etraptl1
-1:      or              %g7, %lo(1b), %g7
-        mov             0x3, %o0
-        call            cheetah_plus_parity_error
-         add            %sp, PTREGS_OFF, %o1
-        ba,pt           %xcc, rtrap
-         nop
-        
-dcpe_icpe_tl1_common:
-        /* Flush D-cache, re-enable D/I caches in DCU and finally
-         * retry the trapping instruction.
-         */
-        sethi           %hi(1 << 16), %g1       ! D-cache size
-        mov             (1 << 5), %g2           ! D-cache line size
-        sub             %g1, %g2, %g1
-1:      stxa            %g0, [%g1] ASI_DCACHE_TAG
-        membar          #Sync
-        subcc           %g1, %g2, %g1
-        bge,pt          %icc, 1b
-         nop
-        ldxa            [%g0] ASI_DCU_CONTROL_REG, %g1
-        or              %g1, (DCU_DC | DCU_IC), %g1
-        stxa            %g1, [%g0] ASI_DCU_CONTROL_REG
-        membar          #Sync
-        retry
-
-        /* Capture I/D/E-cache state into per-cpu error scoreboard.
-         *
-         * %g1:         (TL>=0) ? 1 : 0
-         * %g2:         scratch
-         * %g3:         scratch
-         * %g4:         AFSR
-         * %g5:         AFAR
-         * %g6:         unused, will have current thread ptr after etrap
-         * %g7:         scratch
-         */
-__cheetah_log_error:
-        /* Put "TL1" software bit into AFSR. */
-        and             %g1, 0x1, %g1
-        sllx            %g1, 63, %g2
-        or              %g4, %g2, %g4
-
-        /* Get log entry pointer for this cpu at this trap level. */
-        BRANCH_IF_JALAPENO(g2,g3,50f)
-        ldxa            [%g0] ASI_SAFARI_CONFIG, %g2
-        srlx            %g2, 17, %g2
-        ba,pt           %xcc, 60f
-         and            %g2, 0x3ff, %g2
-
-50:     ldxa            [%g0] ASI_JBUS_CONFIG, %g2
-        srlx            %g2, 17, %g2
-        and             %g2, 0x1f, %g2
-
-60:     sllx            %g2, 9, %g2
-        sethi           %hi(cheetah_error_log), %g3
-        ldx             [%g3 + %lo(cheetah_error_log)], %g3
-        brz,pn          %g3, 80f
-         nop
-
-        add             %g3, %g2, %g3
-        sllx            %g1, 8, %g1
-        add             %g3, %g1, %g1
-
-        /* %g1 holds pointer to the top of the logging scoreboard */
-        ldx             [%g1 + 0x0], %g7
-        cmp             %g7, -1
-        bne,pn          %xcc, 80f
-         nop
-
-        stx             %g4, [%g1 + 0x0]
-        stx             %g5, [%g1 + 0x8]
-        add             %g1, 0x10, %g1
-
-        /* %g1 now points to D-cache logging area */
-        set             0x3ff8, %g2     /* DC_addr mask         */
-        and             %g5, %g2, %g2   /* DC_addr bits of AFAR */
-        srlx            %g5, 12, %g3
-        or              %g3, 1, %g3     /* PHYS tag + valid     */
-
-10:     ldxa            [%g2] ASI_DCACHE_TAG, %g7
-        cmp             %g3, %g7        /* TAG match?           */
-        bne,pt          %xcc, 13f
-         nop
-
-        /* Yep, what we want, capture state. */
-        stx             %g2, [%g1 + 0x20]
-        stx             %g7, [%g1 + 0x28]
-
-        /* A membar Sync is required before and after utag access. */
-        membar          #Sync
-        ldxa            [%g2] ASI_DCACHE_UTAG, %g7
-        membar          #Sync
-        stx             %g7, [%g1 + 0x30]
-        ldxa            [%g2] ASI_DCACHE_SNOOP_TAG, %g7
-        stx             %g7, [%g1 + 0x38]
-        clr             %g3
-
-12:     ldxa            [%g2 + %g3] ASI_DCACHE_DATA, %g7
-        stx             %g7, [%g1]
-        add             %g3, (1 << 5), %g3
-        cmp             %g3, (4 << 5)
-        bl,pt           %xcc, 12b
-         add            %g1, 0x8, %g1
-
-        ba,pt           %xcc, 20f
-         add            %g1, 0x20, %g1
-
-13:     sethi           %hi(1 << 14), %g7
-        add             %g2, %g7, %g2
-        srlx            %g2, 14, %g7
-        cmp             %g7, 4
-        bl,pt           %xcc, 10b
-         nop
-
-        add             %g1, 0x40, %g1
-
-        /* %g1 now points to I-cache logging area */
-20:     set             0x1fe0, %g2     /* IC_addr mask         */
-        and             %g5, %g2, %g2   /* IC_addr bits of AFAR */
-        sllx            %g2, 1, %g2     /* IC_addr[13:6]==VA[12:5] */
-        srlx            %g5, (13 - 8), %g3 /* Make PTAG */
-        andn            %g3, 0xff, %g3  /* Mask off undefined bits */
-
-21:     ldxa            [%g2] ASI_IC_TAG, %g7
-        andn            %g7, 0xff, %g7
-        cmp             %g3, %g7
-        bne,pt          %xcc, 23f
-         nop
-
-        /* Yep, what we want, capture state. */
-        stx             %g2, [%g1 + 0x40]
-        stx             %g7, [%g1 + 0x48]
-        add             %g2, (1 << 3), %g2
-        ldxa            [%g2] ASI_IC_TAG, %g7
-        add             %g2, (1 << 3), %g2
-        stx             %g7, [%g1 + 0x50]
-        ldxa            [%g2] ASI_IC_TAG, %g7
-        add             %g2, (1 << 3), %g2
-        stx             %g7, [%g1 + 0x60]
-        ldxa            [%g2] ASI_IC_TAG, %g7
-        stx             %g7, [%g1 + 0x68]
-        sub             %g2, (3 << 3), %g2
-        ldxa            [%g2] ASI_IC_STAG, %g7
-        stx             %g7, [%g1 + 0x58]
-        clr             %g3
-        srlx            %g2, 2, %g2
-
-22:     ldxa            [%g2 + %g3] ASI_IC_INSTR, %g7
-        stx             %g7, [%g1]
-        add             %g3, (1 << 3), %g3
-        cmp             %g3, (8 << 3)
-        bl,pt           %xcc, 22b
-         add            %g1, 0x8, %g1
-
-        ba,pt           %xcc, 30f
-         add            %g1, 0x30, %g1
-
-23:     sethi           %hi(1 << 14), %g7
-        add             %g2, %g7, %g2
-        srlx            %g2, 14, %g7
-        cmp             %g7, 4
-        bl,pt           %xcc, 21b
-         nop
-
-        add             %g1, 0x70, %g1
-
-        /* %g1 now points to E-cache logging area */
-30:     andn            %g5, (32 - 1), %g2
-        stx             %g2, [%g1 + 0x20]
-        ldxa            [%g2] ASI_EC_TAG_DATA, %g7
-        stx             %g7, [%g1 + 0x28]
-        ldxa            [%g2] ASI_EC_R, %g0
-        clr             %g3
-
-31:     ldxa            [%g3] ASI_EC_DATA, %g7
-        stx             %g7, [%g1 + %g3]
-        add             %g3, 0x8, %g3
-        cmp             %g3, 0x20
-
-        bl,pt           %xcc, 31b
-         nop
-80:
-        rdpr            %tt, %g2
-        cmp             %g2, 0x70
-        be              c_fast_ecc
-         cmp            %g2, 0x63
-        be              c_cee
-         nop
-        ba,pt           %xcc, c_deferred
-
-        /* Cheetah FECC trap handling, we get here from tl{0,1}_fecc
-         * in the trap table.  That code has done a memory barrier
-         * and has disabled both the I-cache and D-cache in the DCU
-         * control register.  The I-cache is disabled so that we may
-         * capture the corrupted cache line, and the D-cache is disabled
-         * because corrupt data may have been placed there and we don't
-         * want to reference it.
-         *
-         * %g1 is one if this trap occurred at %tl >= 1.
-         *
-         * Next, we turn off error reporting so that we don't recurse.
-         */
-        .globl          cheetah_fast_ecc
-cheetah_fast_ecc:
-        ldxa            [%g0] ASI_ESTATE_ERROR_EN, %g2
-        andn            %g2, ESTATE_ERROR_NCEEN | ESTATE_ERROR_CEEN, %g2
-        stxa            %g2, [%g0] ASI_ESTATE_ERROR_EN
-        membar          #Sync
-
-        /* Fetch and clear AFSR/AFAR */
-        ldxa            [%g0] ASI_AFSR, %g4
-        ldxa            [%g0] ASI_AFAR, %g5
-        stxa            %g4, [%g0] ASI_AFSR
-        membar          #Sync
-
-        ba,pt           %xcc, __cheetah_log_error
-         nop
-
-c_fast_ecc:
-        rdpr            %pil, %g2
-        wrpr            %g0, 15, %pil
-        ba,pt           %xcc, etrap_irq
-         rd             %pc, %g7
-#ifdef CONFIG_TRACE_IRQFLAGS
-        call            trace_hardirqs_off
-         nop
-#endif
-        mov             %l4, %o1
-        mov             %l5, %o2
-        call            cheetah_fecc_handler
-         add            %sp, PTREGS_OFF, %o0
-        ba,a,pt         %xcc, rtrap_irq
-
-        /* Our caller has disabled I-cache and performed membar Sync. */
-        .globl          cheetah_cee
-cheetah_cee:
-        ldxa            [%g0] ASI_ESTATE_ERROR_EN, %g2
-        andn            %g2, ESTATE_ERROR_CEEN, %g2
-        stxa            %g2, [%g0] ASI_ESTATE_ERROR_EN
-        membar          #Sync
-
-        /* Fetch and clear AFSR/AFAR */
-        ldxa            [%g0] ASI_AFSR, %g4
-        ldxa            [%g0] ASI_AFAR, %g5
-        stxa            %g4, [%g0] ASI_AFSR
-        membar          #Sync
-
-        ba,pt           %xcc, __cheetah_log_error
-         nop
-
-c_cee:
-        rdpr            %pil, %g2
-        wrpr            %g0, 15, %pil
-        ba,pt           %xcc, etrap_irq
-         rd             %pc, %g7
-#ifdef CONFIG_TRACE_IRQFLAGS
-        call            trace_hardirqs_off
-         nop
-#endif
-        mov             %l4, %o1
-        mov             %l5, %o2
-        call            cheetah_cee_handler
-         add            %sp, PTREGS_OFF, %o0
-        ba,a,pt         %xcc, rtrap_irq
-
-        /* Our caller has disabled I-cache+D-cache and performed membar Sync. */
-        .globl          cheetah_deferred_trap
-cheetah_deferred_trap:
-        ldxa            [%g0] ASI_ESTATE_ERROR_EN, %g2
-        andn            %g2, ESTATE_ERROR_NCEEN | ESTATE_ERROR_CEEN, %g2
-        stxa            %g2, [%g0] ASI_ESTATE_ERROR_EN
-        membar          #Sync
-
-        /* Fetch and clear AFSR/AFAR */
-        ldxa            [%g0] ASI_AFSR, %g4
-        ldxa            [%g0] ASI_AFAR, %g5
-        stxa            %g4, [%g0] ASI_AFSR
-        membar          #Sync
-
-        ba,pt           %xcc, __cheetah_log_error
-         nop
-
-c_deferred:
-        rdpr            %pil, %g2
-        wrpr            %g0, 15, %pil
-        ba,pt           %xcc, etrap_irq
-         rd             %pc, %g7
-#ifdef CONFIG_TRACE_IRQFLAGS
-        call            trace_hardirqs_off
-         nop
-#endif
-        mov             %l4, %o1
-        mov             %l5, %o2
-        call            cheetah_deferred_handler
-         add            %sp, PTREGS_OFF, %o0
-        ba,a,pt         %xcc, rtrap_irq
-
-        .globl          __do_privact
-__do_privact:
-        mov             TLB_SFSR, %g3
-        stxa            %g0, [%g3] ASI_DMMU     ! Clear FaultValid bit
-        membar          #Sync
-        sethi           %hi(109f), %g7
-        ba,pt           %xcc, etrap
-109:    or              %g7, %lo(109b), %g7
-        call            do_privact
-         add            %sp, PTREGS_OFF, %o0
-        ba,pt           %xcc, rtrap
-         nop
-
-        .globl          do_mna
-do_mna:
-        rdpr            %tl, %g3
-        cmp             %g3, 1
-
-        /* Setup %g4/%g5 now as they are used in the
-         * winfixup code.
-         */
-        mov             TLB_SFSR, %g3
-        mov             DMMU_SFAR, %g4
-        ldxa            [%g4] ASI_DMMU, %g4
-        ldxa            [%g3] ASI_DMMU, %g5
-        stxa            %g0, [%g3] ASI_DMMU     ! Clear FaultValid bit
-        membar          #Sync
-        bgu,pn          %icc, winfix_mna
-         rdpr           %tpc, %g3
-
-1:      sethi           %hi(109f), %g7
-        ba,pt           %xcc, etrap
-109:     or             %g7, %lo(109b), %g7
-        mov             %l4, %o1
-        mov             %l5, %o2
-        call            mem_address_unaligned
-         add            %sp, PTREGS_OFF, %o0
-        ba,pt           %xcc, rtrap
-         nop
-
-        .globl          do_lddfmna
-do_lddfmna:
-        sethi           %hi(109f), %g7
-        mov             TLB_SFSR, %g4
-        ldxa            [%g4] ASI_DMMU, %g5
-        stxa            %g0, [%g4] ASI_DMMU     ! Clear FaultValid bit
-        membar          #Sync
-        mov             DMMU_SFAR, %g4
-        ldxa            [%g4] ASI_DMMU, %g4
-        ba,pt           %xcc, etrap
-109:     or             %g7, %lo(109b), %g7
-        mov             %l4, %o1
-        mov             %l5, %o2
-        call            handle_lddfmna
-         add            %sp, PTREGS_OFF, %o0
-        ba,pt           %xcc, rtrap
-         nop
-
-        .globl          do_stdfmna
-do_stdfmna:
-        sethi           %hi(109f), %g7
-        mov             TLB_SFSR, %g4
-        ldxa            [%g4] ASI_DMMU, %g5
-        stxa            %g0, [%g4] ASI_DMMU     ! Clear FaultValid bit
-        membar          #Sync
-        mov             DMMU_SFAR, %g4
-        ldxa            [%g4] ASI_DMMU, %g4
-        ba,pt           %xcc, etrap
-109:     or             %g7, %lo(109b), %g7
-        mov             %l4, %o1
-        mov             %l5, %o2
-        call            handle_stdfmna
-         add            %sp, PTREGS_OFF, %o0
-        ba,pt           %xcc, rtrap
-         nop
-
-        .globl  breakpoint_trap
-breakpoint_trap:
-        call            sparc_breakpoint
-         add            %sp, PTREGS_OFF, %o0
-        ba,pt           %xcc, rtrap
-         nop
-
-        /* SunOS's execv() call only specifies the argv argument, the
-         * environment settings are the same as the calling processes.
-         */
-        .globl  sunos_execv
-sys_execve:
-        sethi           %hi(sparc_execve), %g1
-        ba,pt           %xcc, execve_merge
-         or             %g1, %lo(sparc_execve), %g1
-#ifdef CONFIG_COMPAT
-        .globl  sys_execve
-sunos_execv:
-        stx             %g0, [%sp + PTREGS_OFF + PT_V9_I2]
-        .globl  sys32_execve
-sys32_execve:
-        sethi           %hi(sparc32_execve), %g1
-        or              %g1, %lo(sparc32_execve), %g1
-#endif
-execve_merge:
-        flushw
-        jmpl            %g1, %g0
-         add            %sp, PTREGS_OFF, %o0
-
-        .globl  sys_pipe, sys_sigpause, sys_nis_syscall
-        .globl  sys_rt_sigreturn
-        .globl  sys_ptrace
-        .globl  sys_sigaltstack
-        .align  32
-sys_pipe:       ba,pt           %xcc, sparc_pipe
-                 add            %sp, PTREGS_OFF, %o0
-sys_nis_syscall:ba,pt           %xcc, c_sys_nis_syscall
-                 add            %sp, PTREGS_OFF, %o0
-sys_memory_ordering:
-                ba,pt           %xcc, sparc_memory_ordering
-                 add            %sp, PTREGS_OFF, %o1
-sys_sigaltstack:ba,pt           %xcc, do_sigaltstack
-                 add            %i6, STACK_BIAS, %o2
-#ifdef CONFIG_COMPAT
-        .globl  sys32_sigstack
-sys32_sigstack: ba,pt           %xcc, do_sys32_sigstack
-                 mov            %i6, %o2
-        .globl  sys32_sigaltstack
-sys32_sigaltstack:
-                ba,pt           %xcc, do_sys32_sigaltstack
-                 mov            %i6, %o2
-#endif
-                .align          32
-#ifdef CONFIG_COMPAT
-        .globl  sys32_sigreturn
-sys32_sigreturn:
-                add             %sp, PTREGS_OFF, %o0
-                call            do_sigreturn32
-                 add            %o7, 1f-.-4, %o7
-                nop
-#endif
-sys_rt_sigreturn:
-                add             %sp, PTREGS_OFF, %o0
-                call            do_rt_sigreturn
-                 add            %o7, 1f-.-4, %o7
-                nop
-#ifdef CONFIG_COMPAT
-        .globl  sys32_rt_sigreturn
-sys32_rt_sigreturn:
-                add             %sp, PTREGS_OFF, %o0
-                call            do_rt_sigreturn32
-                 add            %o7, 1f-.-4, %o7
-                nop
-#endif
-                .align          32
-1:              ldx             [%curptr + TI_FLAGS], %l5
-                andcc           %l5, (_TIF_SYSCALL_TRACE|_TIF_SECCOMP|_TIF_SYSCALL_AUDIT), %g0
-                be,pt           %icc, rtrap
-                 nop
-                add             %sp, PTREGS_OFF, %o0
-                call            syscall_trace
-                 mov            1, %o1
-
-                ba,pt           %xcc, rtrap
-                 nop
-
-        /* This is how fork() was meant to be done, 8 instruction entry.
-         *
-         * I questioned the following code briefly, let me clear things
-         * up so you must not reason on it like I did.
-         *
-         * Know the fork_kpsr etc. we use in the sparc32 port?  We don't
-         * need it here because the only piece of window state we copy to
-         * the child is the CWP register.  Even if the parent sleeps,
-         * we are safe because we stuck it into pt_regs of the parent
-         * so it will not change.
-         *
-         * XXX This raises the question, whether we can do the same on
-         * XXX sparc32 to get rid of fork_kpsr _and_ fork_kwim.  The
-         * XXX answer is yes.  We stick fork_kpsr in UREG_G0 and
-         * XXX fork_kwim in UREG_G1 (global registers are considered
-         * XXX volatile across a system call in the sparc ABI I think
-         * XXX if it isn't we can use regs->y instead, anyone who depends
-         * XXX upon the Y register being preserved across a fork deserves
-         * XXX to lose).
-         *
-         * In fact we should take advantage of that fact for other things
-         * during system calls...
-         */
-        .globl  sys_fork, sys_vfork, sys_clone, sparc_exit
-        .globl  ret_from_syscall
-        .align  32
-sys_vfork:      /* Under Linux, vfork and fork are just special cases of clone. */
-                sethi           %hi(0x4000 | 0x0100 | SIGCHLD), %o0
-                or              %o0, %lo(0x4000 | 0x0100 | SIGCHLD), %o0
-                ba,pt           %xcc, sys_clone
-sys_fork:        clr            %o1
-                mov             SIGCHLD, %o0
-sys_clone:      flushw
-                movrz           %o1, %fp, %o1
-                mov             0, %o3
-                ba,pt           %xcc, sparc_do_fork
-                 add            %sp, PTREGS_OFF, %o2
-ret_from_syscall:
-                /* Clear current_thread_info()->new_child, and
-                 * check performance counter stuff too.
-                 */
-                stb             %g0, [%g6 + TI_NEW_CHILD]
-                ldx             [%g6 + TI_FLAGS], %l0
-                call            schedule_tail
-                 mov            %g7, %o0
-                andcc           %l0, _TIF_PERFCTR, %g0
-                be,pt           %icc, 1f
-                 nop
-                ldx             [%g6 + TI_PCR], %o7
-                wr              %g0, %o7, %pcr
-
-                /* Blackbird errata workaround.  See commentary in
-                 * smp.c:smp_percpu_timer_interrupt() for more
-                 * information.
-                 */
-                ba,pt           %xcc, 99f
-                 nop
-                .align          64
-99:             wr              %g0, %g0, %pic
-                rd              %pic, %g0
-
-1:              b,pt            %xcc, ret_sys_call
-                 ldx            [%sp + PTREGS_OFF + PT_V9_I0], %o0
-sparc_exit:     rdpr            %pstate, %g2
-                wrpr            %g2, PSTATE_IE, %pstate
-                rdpr            %otherwin, %g1
-                rdpr            %cansave, %g3
-                add             %g3, %g1, %g3
-                wrpr            %g3, 0x0, %cansave
-                wrpr            %g0, 0x0, %otherwin
-                wrpr            %g2, 0x0, %pstate
-                ba,pt           %xcc, sys_exit
-                 stb            %g0, [%g6 + TI_WSAVED]
-
-linux_sparc_ni_syscall:
-        sethi           %hi(sys_ni_syscall), %l7
-        b,pt            %xcc, 4f
-         or             %l7, %lo(sys_ni_syscall), %l7
-
-linux_syscall_trace32:
-        add             %sp, PTREGS_OFF, %o0
-        call            syscall_trace
-         clr            %o1
-        srl             %i0, 0, %o0
-        srl             %i4, 0, %o4
-        srl             %i1, 0, %o1
-        srl             %i2, 0, %o2
-        b,pt            %xcc, 2f
-         srl            %i3, 0, %o3
-
-linux_syscall_trace:
-        add             %sp, PTREGS_OFF, %o0
-        call            syscall_trace
-         clr            %o1
-        mov             %i0, %o0
-        mov             %i1, %o1
-        mov             %i2, %o2
-        mov             %i3, %o3
-        b,pt            %xcc, 2f
-         mov            %i4, %o4
-
-
-        /* Linux 32-bit system calls enter here... */
-        .align  32
-        .globl  linux_sparc_syscall32
-linux_sparc_syscall32:
-        /* Direct access to user regs, much faster. */
-        cmp             %g1, NR_SYSCALLS                        ! IEU1  Group
-        bgeu,pn         %xcc, linux_sparc_ni_syscall            ! CTI
-         srl            %i0, 0, %o0                             ! IEU0
-        sll             %g1, 2, %l4                             ! IEU0  Group
-        srl             %i4, 0, %o4                             ! IEU1
-        lduw            [%l7 + %l4], %l7                        ! Load
-        srl             %i1, 0, %o1                             ! IEU0  Group
-        ldx             [%curptr + TI_FLAGS], %l0               ! Load
-
-        srl             %i5, 0, %o5                             ! IEU1
-        srl             %i2, 0, %o2                             ! IEU0  Group
-        andcc           %l0, (_TIF_SYSCALL_TRACE|_TIF_SECCOMP|_TIF_SYSCALL_AUDIT), %g0
-        bne,pn          %icc, linux_syscall_trace32             ! CTI
-         mov            %i0, %l5                                ! IEU1
-        call            %l7                                     ! CTI   Group brk forced
-         srl            %i3, 0, %o3                             ! IEU0
-        ba,a,pt         %xcc, 3f
-
-        /* Linux native system calls enter here... */
-        .align  32
-        .globl  linux_sparc_syscall
-linux_sparc_syscall:
-        /* Direct access to user regs, much faster. */
-        cmp             %g1, NR_SYSCALLS                        ! IEU1  Group
-        bgeu,pn         %xcc, linux_sparc_ni_syscall            ! CTI
-         mov            %i0, %o0                                ! IEU0
-        sll             %g1, 2, %l4                             ! IEU0  Group
-        mov             %i1, %o1                                ! IEU1
-        lduw            [%l7 + %l4], %l7                        ! Load
-4:      mov             %i2, %o2                                ! IEU0  Group
-        ldx             [%curptr + TI_FLAGS], %l0               ! Load
-
-        mov             %i3, %o3                                ! IEU1
-        mov             %i4, %o4                                ! IEU0  Group
-        andcc           %l0, (_TIF_SYSCALL_TRACE|_TIF_SECCOMP|_TIF_SYSCALL_AUDIT), %g0
-        bne,pn          %icc, linux_syscall_trace               ! CTI   Group
-         mov            %i0, %l5                                ! IEU0
-2:      call            %l7                                     ! CTI   Group brk forced
-         mov            %i5, %o5                                ! IEU0
-        nop
-
-3:      stx             %o0, [%sp + PTREGS_OFF + PT_V9_I0]
-ret_sys_call:
-        ldx             [%sp + PTREGS_OFF + PT_V9_TSTATE], %g3
-        ldx             [%sp + PTREGS_OFF + PT_V9_TNPC], %l1 ! pc = npc
-        sra             %o0, 0, %o0
-        mov             %ulo(TSTATE_XCARRY | TSTATE_ICARRY), %g2
-        sllx            %g2, 32, %g2
-
-        /* Check if force_successful_syscall_return()
-         * was invoked.
-         */
-        ldub            [%curptr + TI_SYS_NOERROR], %l2
-        brnz,a,pn       %l2, 80f
-         stb            %g0, [%curptr + TI_SYS_NOERROR]
-
-        cmp             %o0, -ERESTART_RESTARTBLOCK
-        bgeu,pn         %xcc, 1f
-         andcc          %l0, (_TIF_SYSCALL_TRACE|_TIF_SECCOMP|_TIF_SYSCALL_AUDIT), %l6
-80:
-        /* System call success, clear Carry condition code. */
-        andn            %g3, %g2, %g3
-        stx             %g3, [%sp + PTREGS_OFF + PT_V9_TSTATE]  
-        bne,pn          %icc, linux_syscall_trace2
-         add            %l1, 0x4, %l2                   ! npc = npc+4
-        stx             %l1, [%sp + PTREGS_OFF + PT_V9_TPC]
-        ba,pt           %xcc, rtrap
-         stx            %l2, [%sp + PTREGS_OFF + PT_V9_TNPC]
-
-1:
-        /* System call failure, set Carry condition code.
-         * Also, get abs(errno) to return to the process.
-         */
-        andcc           %l0, (_TIF_SYSCALL_TRACE|_TIF_SECCOMP|_TIF_SYSCALL_AUDIT), %l6  
-        sub             %g0, %o0, %o0
-        or              %g3, %g2, %g3
-        stx             %o0, [%sp + PTREGS_OFF + PT_V9_I0]
-        stx             %g3, [%sp + PTREGS_OFF + PT_V9_TSTATE]
-        bne,pn          %icc, linux_syscall_trace2
-         add            %l1, 0x4, %l2                   ! npc = npc+4
-        stx             %l1, [%sp + PTREGS_OFF + PT_V9_TPC]
-
-        b,pt            %xcc, rtrap
-         stx            %l2, [%sp + PTREGS_OFF + PT_V9_TNPC]
-linux_syscall_trace2:
-        add             %sp, PTREGS_OFF, %o0
-        call            syscall_trace
-         mov            1, %o1
-        stx             %l1, [%sp + PTREGS_OFF + PT_V9_TPC]
-        ba,pt           %xcc, rtrap
-         stx            %l2, [%sp + PTREGS_OFF + PT_V9_TNPC]
-
-        .align          32
-        .globl          __flushw_user
-__flushw_user:
-        rdpr            %otherwin, %g1
-        brz,pn          %g1, 2f
-         clr            %g2
-1:      save            %sp, -128, %sp
-        rdpr            %otherwin, %g1
-        brnz,pt         %g1, 1b
-         add            %g2, 1, %g2
-1:      sub             %g2, 1, %g2
-        brnz,pt         %g2, 1b
-         restore        %g0, %g0, %g0
-2:      retl
-         nop
-
-        /* Flush %fp and %i7 to the stack for all register
-         * windows active inside of the cpu.  This allows
-         * show_stack_trace() to avoid using an expensive
-         * 'flushw'.
-         */
-        .globl          stack_trace_flush
-        .type           stack_trace_flush,#function
-stack_trace_flush:
-        rdpr            %pstate, %o0
-        wrpr            %o0, PSTATE_IE, %pstate
-
-        rdpr            %cwp, %g1
-        rdpr            %canrestore, %g2
-        sub             %g1, 1, %g3
-
-1:      brz,pn          %g2, 2f
-         sub            %g2, 1, %g2
-        wrpr            %g3, %cwp
-        stx             %fp, [%sp + STACK_BIAS + RW_V9_I6]
-        stx             %i7, [%sp + STACK_BIAS + RW_V9_I7]
-        ba,pt           %xcc, 1b
-         sub            %g3, 1, %g3
-
-2:      wrpr            %g1, %cwp
-        wrpr            %o0, %pstate
-
-        retl
-         nop
-        .size           stack_trace_flush,.-stack_trace_flush
-
-#ifdef CONFIG_SMP
-        .globl          hard_smp_processor_id
-hard_smp_processor_id:
-#endif
-        .globl          real_hard_smp_processor_id
-real_hard_smp_processor_id:
-        __GET_CPUID(%o0)
-        retl
-         nop
-
-        /* %o0: devhandle
-         * %o1: devino
-         *
-         * returns %o0: sysino
-         */
-        .globl  sun4v_devino_to_sysino
-        .type   sun4v_devino_to_sysino,#function
-sun4v_devino_to_sysino:
-        mov     HV_FAST_INTR_DEVINO2SYSINO, %o5
-        ta      HV_FAST_TRAP
-        retl
-         mov    %o1, %o0
-        .size   sun4v_devino_to_sysino, .-sun4v_devino_to_sysino
-
-        /* %o0: sysino
-         *
-         * returns %o0: intr_enabled (HV_INTR_{DISABLED,ENABLED})
-         */
-        .globl  sun4v_intr_getenabled
-        .type   sun4v_intr_getenabled,#function
-sun4v_intr_getenabled:
-        mov     HV_FAST_INTR_GETENABLED, %o5
-        ta      HV_FAST_TRAP
-        retl
-         mov    %o1, %o0
-        .size   sun4v_intr_getenabled, .-sun4v_intr_getenabled
-
-        /* %o0: sysino
-         * %o1: intr_enabled (HV_INTR_{DISABLED,ENABLED})
-         */
-        .globl  sun4v_intr_setenabled
-        .type   sun4v_intr_setenabled,#function
-sun4v_intr_setenabled:
-        mov     HV_FAST_INTR_SETENABLED, %o5
-        ta      HV_FAST_TRAP
-        retl
-         nop
-        .size   sun4v_intr_setenabled, .-sun4v_intr_setenabled
-
-        /* %o0: sysino
-         *
-         * returns %o0: intr_state (HV_INTR_STATE_*)
-         */
-        .globl  sun4v_intr_getstate
-        .type   sun4v_intr_getstate,#function
-sun4v_intr_getstate:
-        mov     HV_FAST_INTR_GETSTATE, %o5
-        ta      HV_FAST_TRAP
-        retl
-         mov    %o1, %o0
-        .size   sun4v_intr_getstate, .-sun4v_intr_getstate
-
-        /* %o0: sysino
-         * %o1: intr_state (HV_INTR_STATE_*)
-         */
-        .globl  sun4v_intr_setstate
-        .type   sun4v_intr_setstate,#function
-sun4v_intr_setstate:
-        mov     HV_FAST_INTR_SETSTATE, %o5
-        ta      HV_FAST_TRAP
-        retl
-         nop
-        .size   sun4v_intr_setstate, .-sun4v_intr_setstate
-
-        /* %o0: sysino
-         *
-         * returns %o0: cpuid
-         */
-        .globl  sun4v_intr_gettarget
-        .type   sun4v_intr_gettarget,#function
-sun4v_intr_gettarget:
-        mov     HV_FAST_INTR_GETTARGET, %o5
-        ta      HV_FAST_TRAP
-        retl
-         mov    %o1, %o0
-        .size   sun4v_intr_gettarget, .-sun4v_intr_gettarget
-
-        /* %o0: sysino
-         * %o1: cpuid
-         */
-        .globl  sun4v_intr_settarget
-        .type   sun4v_intr_settarget,#function
-sun4v_intr_settarget:
-        mov     HV_FAST_INTR_SETTARGET, %o5
-        ta      HV_FAST_TRAP
-        retl
-         nop
-        .size   sun4v_intr_settarget, .-sun4v_intr_settarget
-
-        /* %o0: cpuid
-         * %o1: pc
-         * %o2: rtba
-         * %o3: arg0
-         *
-         * returns %o0: status
-         */
-        .globl  sun4v_cpu_start
-        .type   sun4v_cpu_start,#function
-sun4v_cpu_start:
-        mov     HV_FAST_CPU_START, %o5
-        ta      HV_FAST_TRAP
-        retl
-         nop
-        .size   sun4v_cpu_start, .-sun4v_cpu_start
-
-        /* %o0: cpuid
-         *
-         * returns %o0: status
-         */
-        .globl  sun4v_cpu_stop
-        .type   sun4v_cpu_stop,#function
-sun4v_cpu_stop:
-        mov     HV_FAST_CPU_STOP, %o5
-        ta      HV_FAST_TRAP
-        retl
-         nop
-        .size   sun4v_cpu_stop, .-sun4v_cpu_stop
-
-        /* returns %o0: status  */
-        .globl  sun4v_cpu_yield
-        .type   sun4v_cpu_yield, #function
-sun4v_cpu_yield:
-        mov     HV_FAST_CPU_YIELD, %o5
-        ta      HV_FAST_TRAP
-        retl
-         nop
-        .size   sun4v_cpu_yield, .-sun4v_cpu_yield
-
-        /* %o0: type
-         * %o1: queue paddr
-         * %o2: num queue entries
-         *
-         * returns %o0: status
-         */
-        .globl  sun4v_cpu_qconf
-        .type   sun4v_cpu_qconf,#function
-sun4v_cpu_qconf:
-        mov     HV_FAST_CPU_QCONF, %o5
-        ta      HV_FAST_TRAP
-        retl
-         nop
-        .size   sun4v_cpu_qconf, .-sun4v_cpu_qconf
-
-        /* %o0: num cpus in cpu list
-         * %o1: cpu list paddr
-         * %o2: mondo block paddr
-         *
-         * returns %o0: status
-         */
-        .globl  sun4v_cpu_mondo_send
-        .type   sun4v_cpu_mondo_send,#function
-sun4v_cpu_mondo_send:
-        mov     HV_FAST_CPU_MONDO_SEND, %o5
-        ta      HV_FAST_TRAP
-        retl
-         nop
-        .size   sun4v_cpu_mondo_send, .-sun4v_cpu_mondo_send
-
-        /* %o0: CPU ID
-         *
-         * returns %o0: -status if status non-zero, else
-         *         %o0: cpu state as HV_CPU_STATE_*
-         */
-        .globl  sun4v_cpu_state
-        .type   sun4v_cpu_state,#function
-sun4v_cpu_state:
-        mov     HV_FAST_CPU_STATE, %o5
-        ta      HV_FAST_TRAP
-        brnz,pn %o0, 1f
-         sub    %g0, %o0, %o0
-        mov     %o1, %o0
-1:      retl
-         nop
-        .size   sun4v_cpu_state, .-sun4v_cpu_state
-
-        /* %o0: virtual address
-         * %o1: must be zero
-         * %o2: TTE
-         * %o3: HV_MMU_* flags
-         *
-         * returns %o0: status
-         */
-        .globl  sun4v_mmu_map_perm_addr
-        .type   sun4v_mmu_map_perm_addr,#function
-sun4v_mmu_map_perm_addr:
-        mov     HV_FAST_MMU_MAP_PERM_ADDR, %o5
-        ta      HV_FAST_TRAP
-        retl
-         nop
-        .size   sun4v_mmu_map_perm_addr, .-sun4v_mmu_map_perm_addr
-
-        /* %o0: number of TSB descriptions
-         * %o1: TSB descriptions real address
-         *
-         * returns %o0: status
-         */
-        .globl  sun4v_mmu_tsb_ctx0
-        .type   sun4v_mmu_tsb_ctx0,#function
-sun4v_mmu_tsb_ctx0:
-        mov     HV_FAST_MMU_TSB_CTX0, %o5
-        ta      HV_FAST_TRAP
-        retl
-         nop
-        .size   sun4v_mmu_tsb_ctx0, .-sun4v_mmu_tsb_ctx0
-
-        /* %o0: API group number
-         * %o1: pointer to unsigned long major number storage
-         * %o2: pointer to unsigned long minor number storage
-         *
-         * returns %o0: status
-         */
-        .globl  sun4v_get_version
-        .type   sun4v_get_version,#function
-sun4v_get_version:
-        mov     HV_CORE_GET_VER, %o5
-        mov     %o1, %o3
-        mov     %o2, %o4
-        ta      HV_CORE_TRAP
-        stx     %o1, [%o3]
-        retl
-         stx    %o2, [%o4]
-        .size   sun4v_get_version, .-sun4v_get_version
-
-        /* %o0: API group number
-         * %o1: desired major number
-         * %o2: desired minor number
-         * %o3: pointer to unsigned long actual minor number storage
-         *
-         * returns %o0: status
-         */
-        .globl  sun4v_set_version
-        .type   sun4v_set_version,#function
-sun4v_set_version:
-        mov     HV_CORE_SET_VER, %o5
-        mov     %o3, %o4
-        ta      HV_CORE_TRAP
-        retl
-         stx    %o1, [%o4]
-        .size   sun4v_set_version, .-sun4v_set_version
-
-        /* %o0: pointer to unsigned long time
-         *
-         * returns %o0: status
-         */
-        .globl  sun4v_tod_get
-        .type   sun4v_tod_get,#function
-sun4v_tod_get:
-        mov     %o0, %o4
-        mov     HV_FAST_TOD_GET, %o5
-        ta      HV_FAST_TRAP
-        stx     %o1, [%o4]
-        retl
-         nop
-        .size   sun4v_tod_get, .-sun4v_tod_get
-
-        /* %o0: time
-         *
-         * returns %o0: status
-         */
-        .globl  sun4v_tod_set
-        .type   sun4v_tod_set,#function
-sun4v_tod_set:
-        mov     HV_FAST_TOD_SET, %o5
-        ta      HV_FAST_TRAP
-        retl
-         nop
-        .size   sun4v_tod_set, .-sun4v_tod_set
-
-        /* %o0: pointer to unsigned long status
-         *
-         * returns %o0: signed character
-         */
-        .globl  sun4v_con_getchar
-        .type   sun4v_con_getchar,#function
-sun4v_con_getchar:
-        mov     %o0, %o4
-        mov     HV_FAST_CONS_GETCHAR, %o5
-        clr     %o0
-        clr     %o1
-        ta      HV_FAST_TRAP
-        stx     %o0, [%o4]
-        retl
-         sra    %o1, 0, %o0
-        .size   sun4v_con_getchar, .-sun4v_con_getchar
-
-        /* %o0: signed long character
-         *
-         * returns %o0: status
-         */
-        .globl  sun4v_con_putchar
-        .type   sun4v_con_putchar,#function
-sun4v_con_putchar:
-        mov     HV_FAST_CONS_PUTCHAR, %o5
-        ta      HV_FAST_TRAP
-        retl
-         sra    %o0, 0, %o0
-        .size   sun4v_con_putchar, .-sun4v_con_putchar
-
-        /* %o0: buffer real address
-         * %o1: buffer size
-         * %o2: pointer to unsigned long bytes_read
-         *
-         * returns %o0: status
-         */
-        .globl  sun4v_con_read
-        .type   sun4v_con_read,#function
-sun4v_con_read:
-        mov     %o2, %o4
-        mov     HV_FAST_CONS_READ, %o5
-        ta      HV_FAST_TRAP
-        brnz    %o0, 1f
-         cmp    %o1, -1         /* break */
-        be,a,pn %icc, 1f
-         mov    %o1, %o0
-        cmp     %o1, -2         /* hup */
-        be,a,pn %icc, 1f
-         mov    %o1, %o0
-        stx     %o1, [%o4]
-1:      retl
-         nop
-        .size   sun4v_con_read, .-sun4v_con_read
-
-        /* %o0: buffer real address
-         * %o1: buffer size
-         * %o2: pointer to unsigned long bytes_written
-         *
-         * returns %o0: status
-         */
-        .globl  sun4v_con_write
-        .type   sun4v_con_write,#function
-sun4v_con_write:
-        mov     %o2, %o4
-        mov     HV_FAST_CONS_WRITE, %o5
-        ta      HV_FAST_TRAP
-        stx     %o1, [%o4]
-        retl
-         nop
-        .size   sun4v_con_write, .-sun4v_con_write
-
-        /* %o0: soft state
-         * %o1: address of description string
-         *
-         * returns %o0: status
-         */
-        .globl  sun4v_mach_set_soft_state
-        .type   sun4v_mach_set_soft_state,#function
-sun4v_mach_set_soft_state:
-        mov     HV_FAST_MACH_SET_SOFT_STATE, %o5
-        ta      HV_FAST_TRAP
-        retl
-         nop
-        .size   sun4v_mach_set_soft_state, .-sun4v_mach_set_soft_state
-
-        /* %o0: exit code
-         *
-         * Does not return.
-         */
-        .globl  sun4v_mach_exit
-        .type   sun4v_mach_exit,#function
-sun4v_mach_exit:
-        mov     HV_FAST_MACH_EXIT, %o5
-        ta      HV_FAST_TRAP
-        retl
-         nop
-        .size   sun4v_mach_exit, .-sun4v_mach_exit
-
-        /* %o0: buffer real address
-         * %o1: buffer length
-         * %o2: pointer to unsigned long real_buf_len
-         *
-         * returns %o0: status
-         */
-        .globl  sun4v_mach_desc
-        .type   sun4v_mach_desc,#function
-sun4v_mach_desc:
-        mov     %o2, %o4
-        mov     HV_FAST_MACH_DESC, %o5
-        ta      HV_FAST_TRAP
-        stx     %o1, [%o4]
-        retl
-         nop
-        .size   sun4v_mach_desc, .-sun4v_mach_desc
-
-        /* %o0: new timeout in milliseconds
-         * %o1: pointer to unsigned long orig_timeout
-         *
-         * returns %o0: status
-         */
-        .globl  sun4v_mach_set_watchdog
-        .type   sun4v_mach_set_watchdog,#function
-sun4v_mach_set_watchdog:
-        mov     %o1, %o4
-        mov     HV_FAST_MACH_SET_WATCHDOG, %o5
-        ta      HV_FAST_TRAP
-        stx     %o1, [%o4]
-        retl
-         nop
-        .size   sun4v_mach_set_watchdog, .-sun4v_mach_set_watchdog
-
-        /* No inputs and does not return.  */
-        .globl  sun4v_mach_sir
-        .type   sun4v_mach_sir,#function
-sun4v_mach_sir:
-        mov     %o1, %o4
-        mov     HV_FAST_MACH_SIR, %o5
-        ta      HV_FAST_TRAP
-        stx     %o1, [%o4]
-        retl
-         nop
-        .size   sun4v_mach_sir, .-sun4v_mach_sir
-
-        /* %o0: channel
-         * %o1: ra
-         * %o2: num_entries
-         *
-         * returns %o0: status
-         */
-        .globl  sun4v_ldc_tx_qconf
-        .type   sun4v_ldc_tx_qconf,#function
-sun4v_ldc_tx_qconf:
-        mov     HV_FAST_LDC_TX_QCONF, %o5
-        ta      HV_FAST_TRAP
-        retl
-         nop
-        .size   sun4v_ldc_tx_qconf, .-sun4v_ldc_tx_qconf
-
-        /* %o0: channel
-         * %o1: pointer to unsigned long ra
-         * %o2: pointer to unsigned long num_entries
-         *
-         * returns %o0: status
-         */
-        .globl  sun4v_ldc_tx_qinfo
-        .type   sun4v_ldc_tx_qinfo,#function
-sun4v_ldc_tx_qinfo:
-        mov     %o1, %g1
-        mov     %o2, %g2
-        mov     HV_FAST_LDC_TX_QINFO, %o5
-        ta      HV_FAST_TRAP
-        stx     %o1, [%g1]
-        stx     %o2, [%g2]
-        retl
-         nop
-        .size   sun4v_ldc_tx_qinfo, .-sun4v_ldc_tx_qinfo
-
-        /* %o0: channel
-         * %o1: pointer to unsigned long head_off
-         * %o2: pointer to unsigned long tail_off
-         * %o2: pointer to unsigned long chan_state
-         *
-         * returns %o0: status
-         */
-        .globl  sun4v_ldc_tx_get_state
-        .type   sun4v_ldc_tx_get_state,#function
-sun4v_ldc_tx_get_state:
-        mov     %o1, %g1
-        mov     %o2, %g2
-        mov     %o3, %g3
-        mov     HV_FAST_LDC_TX_GET_STATE, %o5
-        ta      HV_FAST_TRAP
-        stx     %o1, [%g1]
-        stx     %o2, [%g2]
-        stx     %o3, [%g3]
-        retl
-         nop
-        .size   sun4v_ldc_tx_get_state, .-sun4v_ldc_tx_get_state
-
-        /* %o0: channel
-         * %o1: tail_off
-         *
-         * returns %o0: status
-         */
-        .globl  sun4v_ldc_tx_set_qtail
-        .type   sun4v_ldc_tx_set_qtail,#function
-sun4v_ldc_tx_set_qtail:
-        mov     HV_FAST_LDC_TX_SET_QTAIL, %o5
-        ta      HV_FAST_TRAP
-        retl
-         nop
-        .size   sun4v_ldc_tx_set_qtail, .-sun4v_ldc_tx_set_qtail
-
-        /* %o0: channel
-         * %o1: ra
-         * %o2: num_entries
-         *
-         * returns %o0: status
-         */
-        .globl  sun4v_ldc_rx_qconf
-        .type   sun4v_ldc_rx_qconf,#function
-sun4v_ldc_rx_qconf:
-        mov     HV_FAST_LDC_RX_QCONF, %o5
-        ta      HV_FAST_TRAP
-        retl
-         nop
-        .size   sun4v_ldc_rx_qconf, .-sun4v_ldc_rx_qconf
-
-        /* %o0: channel
-         * %o1: pointer to unsigned long ra
-         * %o2: pointer to unsigned long num_entries
-         *
-         * returns %o0: status
-         */
-        .globl  sun4v_ldc_rx_qinfo
-        .type   sun4v_ldc_rx_qinfo,#function
-sun4v_ldc_rx_qinfo:
-        mov     %o1, %g1
-        mov     %o2, %g2
-        mov     HV_FAST_LDC_RX_QINFO, %o5
-        ta      HV_FAST_TRAP
-        stx     %o1, [%g1]
-        stx     %o2, [%g2]
-        retl
-         nop
-        .size   sun4v_ldc_rx_qinfo, .-sun4v_ldc_rx_qinfo
-
-        /* %o0: channel
-         * %o1: pointer to unsigned long head_off
-         * %o2: pointer to unsigned long tail_off
-         * %o2: pointer to unsigned long chan_state
-         *
-         * returns %o0: status
-         */
-        .globl  sun4v_ldc_rx_get_state
-        .type   sun4v_ldc_rx_get_state,#function
-sun4v_ldc_rx_get_state:
-        mov     %o1, %g1
-        mov     %o2, %g2
-        mov     %o3, %g3
-        mov     HV_FAST_LDC_RX_GET_STATE, %o5
-        ta      HV_FAST_TRAP
-        stx     %o1, [%g1]
-        stx     %o2, [%g2]
-        stx     %o3, [%g3]
-        retl
-         nop
-        .size   sun4v_ldc_rx_get_state, .-sun4v_ldc_rx_get_state
-
-        /* %o0: channel
-         * %o1: head_off
-         *
-         * returns %o0: status
-         */
-        .globl  sun4v_ldc_rx_set_qhead
-        .type   sun4v_ldc_rx_set_qhead,#function
-sun4v_ldc_rx_set_qhead:
-        mov     HV_FAST_LDC_RX_SET_QHEAD, %o5
-        ta      HV_FAST_TRAP
-        retl
-         nop
-        .size   sun4v_ldc_rx_set_qhead, .-sun4v_ldc_rx_set_qhead
-
-        /* %o0: channel
-         * %o1: ra
-         * %o2: num_entries
-         *
-         * returns %o0: status
-         */
-        .globl  sun4v_ldc_set_map_table
-        .type   sun4v_ldc_set_map_table,#function
-sun4v_ldc_set_map_table:
-        mov     HV_FAST_LDC_SET_MAP_TABLE, %o5
-        ta      HV_FAST_TRAP
-        retl
-         nop
-        .size   sun4v_ldc_set_map_table, .-sun4v_ldc_set_map_table
-
-        /* %o0: channel
-         * %o1: pointer to unsigned long ra
-         * %o2: pointer to unsigned long num_entries
-         *
-         * returns %o0: status
-         */
-        .globl  sun4v_ldc_get_map_table
-        .type   sun4v_ldc_get_map_table,#function
-sun4v_ldc_get_map_table:
-        mov     %o1, %g1
-        mov     %o2, %g2
-        mov     HV_FAST_LDC_GET_MAP_TABLE, %o5
-        ta      HV_FAST_TRAP
-        stx     %o1, [%g1]
-        stx     %o2, [%g2]
-        retl
-         nop
-        .size   sun4v_ldc_get_map_table, .-sun4v_ldc_get_map_table
-
-        /* %o0: channel
-         * %o1: dir_code
-         * %o2: tgt_raddr
-         * %o3: lcl_raddr
-         * %o4: len
-         * %o5: pointer to unsigned long actual_len
-         *
-         * returns %o0: status
-         */
-        .globl  sun4v_ldc_copy
-        .type   sun4v_ldc_copy,#function
-sun4v_ldc_copy:
-        mov     %o5, %g1
-        mov     HV_FAST_LDC_COPY, %o5
-        ta      HV_FAST_TRAP
-        stx     %o1, [%g1]
-        retl
-         nop
-        .size   sun4v_ldc_copy, .-sun4v_ldc_copy
-
-        /* %o0: channel
-         * %o1: cookie
-         * %o2: pointer to unsigned long ra
-         * %o3: pointer to unsigned long perm
-         *
-         * returns %o0: status
-         */
-        .globl  sun4v_ldc_mapin
-        .type   sun4v_ldc_mapin,#function
-sun4v_ldc_mapin:
-        mov     %o2, %g1
-        mov     %o3, %g2
-        mov     HV_FAST_LDC_MAPIN, %o5
-        ta      HV_FAST_TRAP
-        stx     %o1, [%g1]
-        stx     %o2, [%g2]
-        retl
-         nop
-        .size   sun4v_ldc_mapin, .-sun4v_ldc_mapin
-
-        /* %o0: ra
-         *
-         * returns %o0: status
-         */
-        .globl  sun4v_ldc_unmap
-        .type   sun4v_ldc_unmap,#function
-sun4v_ldc_unmap:
-        mov     HV_FAST_LDC_UNMAP, %o5
-        ta      HV_FAST_TRAP
-        retl
-         nop
-        .size   sun4v_ldc_unmap, .-sun4v_ldc_unmap
-
-        /* %o0: channel
-         * %o1: cookie
-         * %o2: mte_cookie
-         *
-         * returns %o0: status
-         */
-        .globl  sun4v_ldc_revoke
-        .type   sun4v_ldc_revoke,#function
-sun4v_ldc_revoke:
-        mov     HV_FAST_LDC_REVOKE, %o5
-        ta      HV_FAST_TRAP
-        retl
-         nop
-        .size   sun4v_ldc_revoke, .-sun4v_ldc_revoke
-
-        /* %o0: device handle
-         * %o1: device INO
-         * %o2: pointer to unsigned long cookie
-         *
-         * returns %o0: status
-         */
-        .globl  sun4v_vintr_get_cookie
-        .type   sun4v_vintr_get_cookie,#function
-sun4v_vintr_get_cookie:
-        mov     %o2, %g1
-        mov     HV_FAST_VINTR_GET_COOKIE, %o5
-        ta      HV_FAST_TRAP
-        stx     %o1, [%g1]
-        retl
-         nop
-        .size   sun4v_vintr_get_cookie, .-sun4v_vintr_get_cookie
-
-        /* %o0: device handle
-         * %o1: device INO
-         * %o2: cookie
-         *
-         * returns %o0: status
-         */
-        .globl  sun4v_vintr_set_cookie
-        .type   sun4v_vintr_set_cookie,#function
-sun4v_vintr_set_cookie:
-        mov     HV_FAST_VINTR_SET_COOKIE, %o5
-        ta      HV_FAST_TRAP
-        retl
-         nop
-        .size   sun4v_vintr_set_cookie, .-sun4v_vintr_set_cookie
-
-        /* %o0: device handle
-         * %o1: device INO
-         * %o2: pointer to unsigned long valid_state
-         *
-         * returns %o0: status
-         */
-        .globl  sun4v_vintr_get_valid
-        .type   sun4v_vintr_get_valid,#function
-sun4v_vintr_get_valid:
-        mov     %o2, %g1
-        mov     HV_FAST_VINTR_GET_VALID, %o5
-        ta      HV_FAST_TRAP
-        stx     %o1, [%g1]
-        retl
-         nop
-        .size   sun4v_vintr_get_valid, .-sun4v_vintr_get_valid
-
-        /* %o0: device handle
-         * %o1: device INO
-         * %o2: valid_state
-         *
-         * returns %o0: status
-         */
-        .globl  sun4v_vintr_set_valid
-        .type   sun4v_vintr_set_valid,#function
-sun4v_vintr_set_valid:
-        mov     HV_FAST_VINTR_SET_VALID, %o5
-        ta      HV_FAST_TRAP
-        retl
-         nop
-        .size   sun4v_vintr_set_valid, .-sun4v_vintr_set_valid
-
-        /* %o0: device handle
-         * %o1: device INO
-         * %o2: pointer to unsigned long state
-         *
-         * returns %o0: status
-         */
-        .globl  sun4v_vintr_get_state
-        .type   sun4v_vintr_get_state,#function
-sun4v_vintr_get_state:
-        mov     %o2, %g1
-        mov     HV_FAST_VINTR_GET_STATE, %o5
-        ta      HV_FAST_TRAP
-        stx     %o1, [%g1]
-        retl
-         nop
-        .size   sun4v_vintr_get_state, .-sun4v_vintr_get_state
-
-        /* %o0: device handle
-         * %o1: device INO
-         * %o2: state
-         *
-         * returns %o0: status
-         */
-        .globl  sun4v_vintr_set_state
-        .type   sun4v_vintr_set_state,#function
-sun4v_vintr_set_state:
-        mov     HV_FAST_VINTR_SET_STATE, %o5
-        ta      HV_FAST_TRAP
-        retl
-         nop
-        .size   sun4v_vintr_set_state, .-sun4v_vintr_set_state
-
-        /* %o0: device handle
-         * %o1: device INO
-         * %o2: pointer to unsigned long cpuid
-         *
-         * returns %o0: status
-         */
-        .globl  sun4v_vintr_get_target
-        .type   sun4v_vintr_get_target,#function
-sun4v_vintr_get_target:
-        mov     %o2, %g1
-        mov     HV_FAST_VINTR_GET_TARGET, %o5
-        ta      HV_FAST_TRAP
-        stx     %o1, [%g1]
-        retl
-         nop
-        .size   sun4v_vintr_get_target, .-sun4v_vintr_get_target
-
-        /* %o0: device handle
-         * %o1: device INO
-         * %o2: cpuid
-         *
-         * returns %o0: status
-         */
-        .globl  sun4v_vintr_set_target
-        .type   sun4v_vintr_set_target,#function
-sun4v_vintr_set_target:
-        mov     HV_FAST_VINTR_SET_TARGET, %o5
-        ta      HV_FAST_TRAP
-        retl
-         nop
-        .size   sun4v_vintr_set_target, .-sun4v_vintr_set_target
-
-        /* %o0: NCS sub-function
-         * %o1: sub-function arg real-address
-         * %o2: sub-function arg size
-         *
-         * returns %o0: status
-         */
-        .globl  sun4v_ncs_request
-        .type   sun4v_ncs_request,#function
-sun4v_ncs_request:
-        mov     HV_FAST_NCS_REQUEST, %o5
-        ta      HV_FAST_TRAP
-        retl
-         nop
-        .size   sun4v_ncs_request, .-sun4v_ncs_request
-
-        .globl  sun4v_svc_send
-        .type   sun4v_svc_send,#function
-sun4v_svc_send:
-        save    %sp, -192, %sp
-        mov     %i0, %o0
-        mov     %i1, %o1
-        mov     %i2, %o2
-        mov     HV_FAST_SVC_SEND, %o5
-        ta      HV_FAST_TRAP
-        stx     %o1, [%i3]
-        ret
-        restore
-        .size   sun4v_svc_send, .-sun4v_svc_send
-
-        .globl  sun4v_svc_recv
-        .type   sun4v_svc_recv,#function
-sun4v_svc_recv:
-        save    %sp, -192, %sp
-        mov     %i0, %o0
-        mov     %i1, %o1
-        mov     %i2, %o2
-        mov     HV_FAST_SVC_RECV, %o5
-        ta      HV_FAST_TRAP
-        stx     %o1, [%i3]
-        ret
-        restore
-        .size   sun4v_svc_recv, .-sun4v_svc_recv
-
-        .globl  sun4v_svc_getstatus
-        .type   sun4v_svc_getstatus,#function
-sun4v_svc_getstatus:
-        mov     HV_FAST_SVC_GETSTATUS, %o5
-        mov     %o1, %o4
-        ta      HV_FAST_TRAP
-        stx     %o1, [%o4]
-        retl
-         nop
-        .size   sun4v_svc_getstatus, .-sun4v_svc_getstatus
-
-        .globl  sun4v_svc_setstatus
-        .type   sun4v_svc_setstatus,#function
-sun4v_svc_setstatus:
-        mov     HV_FAST_SVC_SETSTATUS, %o5
-        ta      HV_FAST_TRAP
-        retl
-         nop
-        .size   sun4v_svc_setstatus, .-sun4v_svc_setstatus
-
-        .globl  sun4v_svc_clrstatus
-        .type   sun4v_svc_clrstatus,#function
-sun4v_svc_clrstatus:
-        mov     HV_FAST_SVC_CLRSTATUS, %o5
-        ta      HV_FAST_TRAP
-        retl
-         nop
-        .size   sun4v_svc_clrstatus, .-sun4v_svc_clrstatus
-
-        .globl  sun4v_mmustat_conf
-        .type   sun4v_mmustat_conf,#function
-sun4v_mmustat_conf:
-        mov     %o1, %o4
-        mov     HV_FAST_MMUSTAT_CONF, %o5
-        ta      HV_FAST_TRAP
-        stx     %o1, [%o4]
-        retl
-         nop
-        .size   sun4v_mmustat_conf, .-sun4v_mmustat_conf
-
-        .globl  sun4v_mmustat_info
-        .type   sun4v_mmustat_info,#function
-sun4v_mmustat_info:
-        mov     %o0, %o4
-        mov     HV_FAST_MMUSTAT_INFO, %o5
-        ta      HV_FAST_TRAP
-        stx     %o1, [%o4]
-        retl
-         nop
-        .size   sun4v_mmustat_info, .-sun4v_mmustat_info
-
-        .globl  sun4v_mmu_demap_all
-        .type   sun4v_mmu_demap_all,#function
-sun4v_mmu_demap_all:
-        clr     %o0
-        clr     %o1
-        mov     HV_MMU_ALL, %o2
-        mov     HV_FAST_MMU_DEMAP_ALL, %o5
-        ta      HV_FAST_TRAP
-        retl
-         nop
-        .size   sun4v_mmu_demap_all, .-sun4v_mmu_demap_all
diff --git a/arch/sparc64/kernel/fpu_traps.S b/arch/sparc64/kernel/fpu_traps.S
new file mode 100644
index 000000000000..a6864826a4bd
--- /dev/null
+++ b/arch/sparc64/kernel/fpu_traps.S
@@ -0,0 +1,384 @@
+        /* This is trivial with the new code... */
+        .globl          do_fpdis
+        .type           do_fpdis,#function
+do_fpdis:
+        sethi           %hi(TSTATE_PEF), %g4
+        rdpr            %tstate, %g5
+        andcc           %g5, %g4, %g0
+        be,pt           %xcc, 1f
+         nop
+        rd              %fprs, %g5
+        andcc           %g5, FPRS_FEF, %g0
+        be,pt           %xcc, 1f
+         nop
+
+        /* Legal state when DCR_IFPOE is set in Cheetah %dcr. */
+        sethi           %hi(109f), %g7
+        ba,pt           %xcc, etrap
+109:     or             %g7, %lo(109b), %g7
+        add             %g0, %g0, %g0
+        ba,a,pt         %xcc, rtrap
+
+1:      TRAP_LOAD_THREAD_REG(%g6, %g1)
+        ldub            [%g6 + TI_FPSAVED], %g5
+        wr              %g0, FPRS_FEF, %fprs
+        andcc           %g5, FPRS_FEF, %g0
+        be,a,pt         %icc, 1f
+         clr            %g7
+        ldx             [%g6 + TI_GSR], %g7
+1:      andcc           %g5, FPRS_DL, %g0
+        bne,pn          %icc, 2f
+         fzero          %f0
+        andcc           %g5, FPRS_DU, %g0
+        bne,pn          %icc, 1f
+         fzero          %f2
+        faddd           %f0, %f2, %f4
+        fmuld           %f0, %f2, %f6
+        faddd           %f0, %f2, %f8
+        fmuld           %f0, %f2, %f10
+        faddd           %f0, %f2, %f12
+        fmuld           %f0, %f2, %f14
+        faddd           %f0, %f2, %f16
+        fmuld           %f0, %f2, %f18
+        faddd           %f0, %f2, %f20
+        fmuld           %f0, %f2, %f22
+        faddd           %f0, %f2, %f24
+        fmuld           %f0, %f2, %f26
+        faddd           %f0, %f2, %f28
+        fmuld           %f0, %f2, %f30
+        faddd           %f0, %f2, %f32
+        fmuld           %f0, %f2, %f34
+        faddd           %f0, %f2, %f36
+        fmuld           %f0, %f2, %f38
+        faddd           %f0, %f2, %f40
+        fmuld           %f0, %f2, %f42
+        faddd           %f0, %f2, %f44
+        fmuld           %f0, %f2, %f46
+        faddd           %f0, %f2, %f48
+        fmuld           %f0, %f2, %f50
+        faddd           %f0, %f2, %f52
+        fmuld           %f0, %f2, %f54
+        faddd           %f0, %f2, %f56
+        fmuld           %f0, %f2, %f58
+        b,pt            %xcc, fpdis_exit2
+         faddd          %f0, %f2, %f60
+1:      mov             SECONDARY_CONTEXT, %g3
+        add             %g6, TI_FPREGS + 0x80, %g1
+        faddd           %f0, %f2, %f4
+        fmuld           %f0, %f2, %f6
+
+661:    ldxa            [%g3] ASI_DMMU, %g5
+        .section        .sun4v_1insn_patch, "ax"
+        .word           661b
+        ldxa            [%g3] ASI_MMU, %g5
+        .previous
+
+        sethi           %hi(sparc64_kern_sec_context), %g2
+        ldx             [%g2 + %lo(sparc64_kern_sec_context)], %g2
+
+661:    stxa            %g2, [%g3] ASI_DMMU
+        .section        .sun4v_1insn_patch, "ax"
+        .word           661b
+        stxa            %g2, [%g3] ASI_MMU
+        .previous
+
+        membar          #Sync
+        add             %g6, TI_FPREGS + 0xc0, %g2
+        faddd           %f0, %f2, %f8
+        fmuld           %f0, %f2, %f10
+        membar          #Sync
+        ldda            [%g1] ASI_BLK_S, %f32
+        ldda            [%g2] ASI_BLK_S, %f48
+        membar          #Sync
+        faddd           %f0, %f2, %f12
+        fmuld           %f0, %f2, %f14
+        faddd           %f0, %f2, %f16
+        fmuld           %f0, %f2, %f18
+        faddd           %f0, %f2, %f20
+        fmuld           %f0, %f2, %f22
+        faddd           %f0, %f2, %f24
+        fmuld           %f0, %f2, %f26
+        faddd           %f0, %f2, %f28
+        fmuld           %f0, %f2, %f30
+        b,pt            %xcc, fpdis_exit
+         nop
+2:      andcc           %g5, FPRS_DU, %g0
+        bne,pt          %icc, 3f
+         fzero          %f32
+        mov             SECONDARY_CONTEXT, %g3
+        fzero           %f34
+
+661:    ldxa            [%g3] ASI_DMMU, %g5
+        .section        .sun4v_1insn_patch, "ax"
+        .word           661b
+        ldxa            [%g3] ASI_MMU, %g5
+        .previous
+
+        add             %g6, TI_FPREGS, %g1
+        sethi           %hi(sparc64_kern_sec_context), %g2
+        ldx             [%g2 + %lo(sparc64_kern_sec_context)], %g2
+
+661:    stxa            %g2, [%g3] ASI_DMMU
+        .section        .sun4v_1insn_patch, "ax"
+        .word           661b
+        stxa            %g2, [%g3] ASI_MMU
+        .previous
+
+        membar          #Sync
+        add             %g6, TI_FPREGS + 0x40, %g2
+        faddd           %f32, %f34, %f36
+        fmuld           %f32, %f34, %f38
+        membar          #Sync
+        ldda            [%g1] ASI_BLK_S, %f0
+        ldda            [%g2] ASI_BLK_S, %f16
+        membar          #Sync
+        faddd           %f32, %f34, %f40
+        fmuld           %f32, %f34, %f42
+        faddd           %f32, %f34, %f44
+        fmuld           %f32, %f34, %f46
+        faddd           %f32, %f34, %f48
+        fmuld           %f32, %f34, %f50
+        faddd           %f32, %f34, %f52
+        fmuld           %f32, %f34, %f54
+        faddd           %f32, %f34, %f56
+        fmuld           %f32, %f34, %f58
+        faddd           %f32, %f34, %f60
+        fmuld           %f32, %f34, %f62
+        ba,pt           %xcc, fpdis_exit
+         nop
+3:      mov             SECONDARY_CONTEXT, %g3
+        add             %g6, TI_FPREGS, %g1
+
+661:    ldxa            [%g3] ASI_DMMU, %g5
+        .section        .sun4v_1insn_patch, "ax"
+        .word           661b
+        ldxa            [%g3] ASI_MMU, %g5
+        .previous
+
+        sethi           %hi(sparc64_kern_sec_context), %g2
+        ldx             [%g2 + %lo(sparc64_kern_sec_context)], %g2
+
+661:    stxa            %g2, [%g3] ASI_DMMU
+        .section        .sun4v_1insn_patch, "ax"
+        .word           661b
+        stxa            %g2, [%g3] ASI_MMU
+        .previous
+
+        membar          #Sync
+        mov             0x40, %g2
+        membar          #Sync
+        ldda            [%g1] ASI_BLK_S, %f0
+        ldda            [%g1 + %g2] ASI_BLK_S, %f16
+        add             %g1, 0x80, %g1
+        ldda            [%g1] ASI_BLK_S, %f32
+        ldda            [%g1 + %g2] ASI_BLK_S, %f48
+        membar          #Sync
+fpdis_exit:
+
+661:    stxa            %g5, [%g3] ASI_DMMU
+        .section        .sun4v_1insn_patch, "ax"
+        .word           661b
+        stxa            %g5, [%g3] ASI_MMU
+        .previous
+
+        membar          #Sync
+fpdis_exit2:
+        wr              %g7, 0, %gsr
+        ldx             [%g6 + TI_XFSR], %fsr
+        rdpr            %tstate, %g3
+        or              %g3, %g4, %g3           ! anal...
+        wrpr            %g3, %tstate
+        wr              %g0, FPRS_FEF, %fprs    ! clean DU/DL bits
+        retry
+        .size           do_fpdis,.-do_fpdis
+
+        .align          32
+        .type           fp_other_bounce,#function
+fp_other_bounce:
+        call            do_fpother
+         add            %sp, PTREGS_OFF, %o0
+        ba,pt           %xcc, rtrap
+         nop
+        .size           fp_other_bounce,.-fp_other_bounce
+
+        .align          32
+        .globl          do_fpother_check_fitos
+        .type           do_fpother_check_fitos,#function
+do_fpother_check_fitos:
+        TRAP_LOAD_THREAD_REG(%g6, %g1)
+        sethi           %hi(fp_other_bounce - 4), %g7
+        or              %g7, %lo(fp_other_bounce - 4), %g7
+
+        /* NOTE: Need to preserve %g7 until we fully commit
+         *       to the fitos fixup.
+         */
+        stx             %fsr, [%g6 + TI_XFSR]
+        rdpr            %tstate, %g3
+        andcc           %g3, TSTATE_PRIV, %g0
+        bne,pn          %xcc, do_fptrap_after_fsr
+         nop
+        ldx             [%g6 + TI_XFSR], %g3
+        srlx            %g3, 14, %g1
+        and             %g1, 7, %g1
+        cmp             %g1, 2                  ! Unfinished FP-OP
+        bne,pn          %xcc, do_fptrap_after_fsr
+         sethi          %hi(1 << 23), %g1       ! Inexact
+        andcc           %g3, %g1, %g0
+        bne,pn          %xcc, do_fptrap_after_fsr
+         rdpr           %tpc, %g1
+        lduwa           [%g1] ASI_AIUP, %g3     ! This cannot ever fail
+#define FITOS_MASK      0xc1f83fe0
+#define FITOS_COMPARE   0x81a01880
+        sethi           %hi(FITOS_MASK), %g1
+        or              %g1, %lo(FITOS_MASK), %g1
+        and             %g3, %g1, %g1
+        sethi           %hi(FITOS_COMPARE), %g2
+        or              %g2, %lo(FITOS_COMPARE), %g2
+        cmp             %g1, %g2
+        bne,pn          %xcc, do_fptrap_after_fsr
+         nop
+        std             %f62, [%g6 + TI_FPREGS + (62 * 4)]
+        sethi           %hi(fitos_table_1), %g1
+        and             %g3, 0x1f, %g2
+        or              %g1, %lo(fitos_table_1),  %g1
+        sllx            %g2, 2, %g2
+        jmpl            %g1 + %g2, %g0
+         ba,pt          %xcc, fitos_emul_continue
+
+fitos_table_1:
+        fitod           %f0, %f62
+        fitod           %f1, %f62
+        fitod           %f2, %f62
+        fitod           %f3, %f62
+        fitod           %f4, %f62
+        fitod           %f5, %f62
+        fitod           %f6, %f62
+        fitod           %f7, %f62
+        fitod           %f8, %f62
+        fitod           %f9, %f62
+        fitod           %f10, %f62
+        fitod           %f11, %f62
+        fitod           %f12, %f62
+        fitod           %f13, %f62
+        fitod           %f14, %f62
+        fitod           %f15, %f62
+        fitod           %f16, %f62
+        fitod           %f17, %f62
+        fitod           %f18, %f62
+        fitod           %f19, %f62
+        fitod           %f20, %f62
+        fitod           %f21, %f62
+        fitod           %f22, %f62
+        fitod           %f23, %f62
+        fitod           %f24, %f62
+        fitod           %f25, %f62
+        fitod           %f26, %f62
+        fitod           %f27, %f62
+        fitod           %f28, %f62
+        fitod           %f29, %f62
+        fitod           %f30, %f62
+        fitod           %f31, %f62
+
+fitos_emul_continue:
+        sethi           %hi(fitos_table_2), %g1
+        srl             %g3, 25, %g2
+        or              %g1, %lo(fitos_table_2), %g1
+        and             %g2, 0x1f, %g2
+        sllx            %g2, 2, %g2
+        jmpl            %g1 + %g2, %g0
+         ba,pt          %xcc, fitos_emul_fini
+
+fitos_table_2:
+        fdtos           %f62, %f0
+        fdtos           %f62, %f1
+        fdtos           %f62, %f2
+        fdtos           %f62, %f3
+        fdtos           %f62, %f4
+        fdtos           %f62, %f5
+        fdtos           %f62, %f6
+        fdtos           %f62, %f7
+        fdtos           %f62, %f8
+        fdtos           %f62, %f9
+        fdtos           %f62, %f10
+        fdtos           %f62, %f11
+        fdtos           %f62, %f12
+        fdtos           %f62, %f13
+        fdtos           %f62, %f14
+        fdtos           %f62, %f15
+        fdtos           %f62, %f16
+        fdtos           %f62, %f17
+        fdtos           %f62, %f18
+        fdtos           %f62, %f19
+        fdtos           %f62, %f20
+        fdtos           %f62, %f21
+        fdtos           %f62, %f22
+        fdtos           %f62, %f23
+        fdtos           %f62, %f24
+        fdtos           %f62, %f25
+        fdtos           %f62, %f26
+        fdtos           %f62, %f27
+        fdtos           %f62, %f28
+        fdtos           %f62, %f29
+        fdtos           %f62, %f30
+        fdtos           %f62, %f31
+
+fitos_emul_fini:
+        ldd             [%g6 + TI_FPREGS + (62 * 4)], %f62
+        done
+        .size           do_fpother_check_fitos,.-do_fpother_check_fitos
+
+        .align          32
+        .globl          do_fptrap
+        .type           do_fptrap,#function
+do_fptrap:
+        TRAP_LOAD_THREAD_REG(%g6, %g1)
+        stx             %fsr, [%g6 + TI_XFSR]
+do_fptrap_after_fsr:
+        ldub            [%g6 + TI_FPSAVED], %g3
+        rd              %fprs, %g1
+        or              %g3, %g1, %g3
+        stb             %g3, [%g6 + TI_FPSAVED]
+        rd              %gsr, %g3
+        stx             %g3, [%g6 + TI_GSR]
+        mov             SECONDARY_CONTEXT, %g3
+
+661:    ldxa            [%g3] ASI_DMMU, %g5
+        .section        .sun4v_1insn_patch, "ax"
+        .word           661b
+        ldxa            [%g3] ASI_MMU, %g5
+        .previous
+
+        sethi           %hi(sparc64_kern_sec_context), %g2
+        ldx             [%g2 + %lo(sparc64_kern_sec_context)], %g2
+
+661:    stxa            %g2, [%g3] ASI_DMMU
+        .section        .sun4v_1insn_patch, "ax"
+        .word           661b
+        stxa            %g2, [%g3] ASI_MMU
+        .previous
+
+        membar          #Sync
+        add             %g6, TI_FPREGS, %g2
+        andcc           %g1, FPRS_DL, %g0
+        be,pn           %icc, 4f
+         mov            0x40, %g3
+        stda            %f0, [%g2] ASI_BLK_S
+        stda            %f16, [%g2 + %g3] ASI_BLK_S
+        andcc           %g1, FPRS_DU, %g0
+        be,pn           %icc, 5f
+4:       add            %g2, 128, %g2
+        stda            %f32, [%g2] ASI_BLK_S
+        stda            %f48, [%g2 + %g3] ASI_BLK_S
+5:      mov             SECONDARY_CONTEXT, %g1
+        membar          #Sync
+
+661:    stxa            %g5, [%g1] ASI_DMMU
+        .section        .sun4v_1insn_patch, "ax"
+        .word           661b
+        stxa            %g5, [%g1] ASI_MMU
+        .previous
+
+        membar          #Sync
+        ba,pt           %xcc, etrap
+         wr             %g0, 0, %fprs
+        .size           do_fptrap,.-do_fptrap
diff --git a/arch/sparc64/kernel/getsetcc.S b/arch/sparc64/kernel/getsetcc.S
new file mode 100644
index 000000000000..a14d272d2061
--- /dev/null
+++ b/arch/sparc64/kernel/getsetcc.S
@@ -0,0 +1,24 @@
+        .globl          getcc
+        .type           getcc,#function
+getcc:
+        ldx             [%o0 + PT_V9_TSTATE], %o1
+        srlx            %o1, 32, %o1
+        and             %o1, 0xf, %o1
+        retl
+         stx            %o1, [%o0 + PT_V9_G1]
+        .size           getcc,.-getcc
+
+        .globl          setcc
+        .type           setcc,#function
+setcc:
+        ldx             [%o0 + PT_V9_TSTATE], %o1
+        ldx             [%o0 + PT_V9_G1], %o2
+        or              %g0, %ulo(TSTATE_ICC), %o3
+        sllx            %o3, 32, %o3
+        andn            %o1, %o3, %o1
+        sllx            %o2, 32, %o2
+        and             %o2, %o3, %o2
+        or              %o1, %o2, %o1
+        retl
+         stx            %o1, [%o0 + PT_V9_TSTATE]
+        .size           setcc,.-setcc
diff --git a/arch/sparc64/kernel/head.S b/arch/sparc64/kernel/head.S
index 34f8ff57c56b..c9afef093d51 100644
--- a/arch/sparc64/kernel/head.S
+++ b/arch/sparc64/kernel/head.S
@@ -27,6 +27,10 @@
 #include <asm/ttable.h>
 #include <asm/mmu.h>
 #include <asm/cpudata.h>
+#include <asm/pil.h>
+#include <asm/estate.h>
+#include <asm/sfafsr.h>
+#include <asm/unistd.h>
         
 /* This section from from _start to sparc64_boot_end should fit into
  * 0x0000000000404000 to 0x0000000000408000.
@@ -823,7 +827,16 @@ sparc64_boot_end:
 #include "etrap.S"
 #include "rtrap.S"
 #include "winfixup.S"
-#include "entry.S"
+#include "fpu_traps.S"
+#include "ivec.S"
+#include "getsetcc.S"
+#include "utrap.S"
+#include "spiterrs.S"
+#include "cherrs.S"
+#include "misctrap.S"
+#include "syscalls.S"
+#include "helpers.S"
+#include "hvcalls.S"
 #include "sun4v_tlb_miss.S"
 #include "sun4v_ivec.S"
 #include "ktlb.S"
diff --git a/arch/sparc64/kernel/helpers.S b/arch/sparc64/kernel/helpers.S
new file mode 100644
index 000000000000..314dd0c9fc5b
--- /dev/null
+++ b/arch/sparc64/kernel/helpers.S
@@ -0,0 +1,63 @@
+        .align  32
+        .globl  __flushw_user
+        .type   __flushw_user,#function
+__flushw_user:
+        rdpr    %otherwin, %g1
+        brz,pn  %g1, 2f
+         clr    %g2
+1:      save    %sp, -128, %sp
+        rdpr    %otherwin, %g1
+        brnz,pt %g1, 1b
+         add    %g2, 1, %g2
+1:      sub     %g2, 1, %g2
+        brnz,pt %g2, 1b
+         restore %g0, %g0, %g0
+2:      retl
+         nop
+        .size   __flushw_user,.-__flushw_user
+
+        /* Flush %fp and %i7 to the stack for all register
+         * windows active inside of the cpu.  This allows
+         * show_stack_trace() to avoid using an expensive
+         * 'flushw'.
+         */
+        .globl          stack_trace_flush
+        .type           stack_trace_flush,#function
+stack_trace_flush:
+        rdpr            %pstate, %o0
+        wrpr            %o0, PSTATE_IE, %pstate
+
+        rdpr            %cwp, %g1
+        rdpr            %canrestore, %g2
+        sub             %g1, 1, %g3
+
+1:      brz,pn          %g2, 2f
+         sub            %g2, 1, %g2
+        wrpr            %g3, %cwp
+        stx             %fp, [%sp + STACK_BIAS + RW_V9_I6]
+        stx             %i7, [%sp + STACK_BIAS + RW_V9_I7]
+        ba,pt           %xcc, 1b
+         sub            %g3, 1, %g3
+
+2:      wrpr            %g1, %cwp
+        wrpr            %o0, %pstate
+
+        retl
+         nop
+        .size           stack_trace_flush,.-stack_trace_flush
+
+#ifdef CONFIG_SMP
+        .globl          hard_smp_processor_id
+        .type           hard_smp_processor_id,#function
+hard_smp_processor_id:
+#endif
+        .globl          real_hard_smp_processor_id
+        .type           real_hard_smp_processor_id,#function
+real_hard_smp_processor_id:
+        __GET_CPUID(%o0)
+        retl
+         nop
+#ifdef CONFIG_SMP
+        .size           hard_smp_processor_id,.-hard_smp_processor_id
+#endif
+        .size           real_hard_smp_processor_id,.-real_hard_smp_processor_id
diff --git a/arch/sparc64/kernel/hvcalls.S b/arch/sparc64/kernel/hvcalls.S
new file mode 100644
index 000000000000..a2810f3ac70f
--- /dev/null
+++ b/arch/sparc64/kernel/hvcalls.S
@@ -0,0 +1,886 @@
+        /* %o0: devhandle
+         * %o1: devino
+         *
+         * returns %o0: sysino
+         */
+        .globl  sun4v_devino_to_sysino
+        .type   sun4v_devino_to_sysino,#function
+sun4v_devino_to_sysino:
+        mov     HV_FAST_INTR_DEVINO2SYSINO, %o5
+        ta      HV_FAST_TRAP
+        retl
+         mov    %o1, %o0
+        .size   sun4v_devino_to_sysino, .-sun4v_devino_to_sysino
+
+        /* %o0: sysino
+         *
+         * returns %o0: intr_enabled (HV_INTR_{DISABLED,ENABLED})
+         */
+        .globl  sun4v_intr_getenabled
+        .type   sun4v_intr_getenabled,#function
+sun4v_intr_getenabled:
+        mov     HV_FAST_INTR_GETENABLED, %o5
+        ta      HV_FAST_TRAP
+        retl
+         mov    %o1, %o0
+        .size   sun4v_intr_getenabled, .-sun4v_intr_getenabled
+
+        /* %o0: sysino
+         * %o1: intr_enabled (HV_INTR_{DISABLED,ENABLED})
+         */
+        .globl  sun4v_intr_setenabled
+        .type   sun4v_intr_setenabled,#function
+sun4v_intr_setenabled:
+        mov     HV_FAST_INTR_SETENABLED, %o5
+        ta      HV_FAST_TRAP
+        retl
+         nop
+        .size   sun4v_intr_setenabled, .-sun4v_intr_setenabled
+
+        /* %o0: sysino
+         *
+         * returns %o0: intr_state (HV_INTR_STATE_*)
+         */
+        .globl  sun4v_intr_getstate
+        .type   sun4v_intr_getstate,#function
+sun4v_intr_getstate:
+        mov     HV_FAST_INTR_GETSTATE, %o5
+        ta      HV_FAST_TRAP
+        retl
+         mov    %o1, %o0
+        .size   sun4v_intr_getstate, .-sun4v_intr_getstate
+
+        /* %o0: sysino
+         * %o1: intr_state (HV_INTR_STATE_*)
+         */
+        .globl  sun4v_intr_setstate
+        .type   sun4v_intr_setstate,#function
+sun4v_intr_setstate:
+        mov     HV_FAST_INTR_SETSTATE, %o5
+        ta      HV_FAST_TRAP
+        retl
+         nop
+        .size   sun4v_intr_setstate, .-sun4v_intr_setstate
+
+        /* %o0: sysino
+         *
+         * returns %o0: cpuid
+         */
+        .globl  sun4v_intr_gettarget
+        .type   sun4v_intr_gettarget,#function
+sun4v_intr_gettarget:
+        mov     HV_FAST_INTR_GETTARGET, %o5
+        ta      HV_FAST_TRAP
+        retl
+         mov    %o1, %o0
+        .size   sun4v_intr_gettarget, .-sun4v_intr_gettarget
+
+        /* %o0: sysino
+         * %o1: cpuid
+         */
+        .globl  sun4v_intr_settarget
+        .type   sun4v_intr_settarget,#function
+sun4v_intr_settarget:
+        mov     HV_FAST_INTR_SETTARGET, %o5
+        ta      HV_FAST_TRAP
+        retl
+         nop
+        .size   sun4v_intr_settarget, .-sun4v_intr_settarget
+
+        /* %o0: cpuid
+         * %o1: pc
+         * %o2: rtba
+         * %o3: arg0
+         *
+         * returns %o0: status
+         */
+        .globl  sun4v_cpu_start
+        .type   sun4v_cpu_start,#function
+sun4v_cpu_start:
+        mov     HV_FAST_CPU_START, %o5
+        ta      HV_FAST_TRAP
+        retl
+         nop
+        .size   sun4v_cpu_start, .-sun4v_cpu_start
+
+        /* %o0: cpuid
+         *
+         * returns %o0: status
+         */
+        .globl  sun4v_cpu_stop
+        .type   sun4v_cpu_stop,#function
+sun4v_cpu_stop:
+        mov     HV_FAST_CPU_STOP, %o5
+        ta      HV_FAST_TRAP
+        retl
+         nop
+        .size   sun4v_cpu_stop, .-sun4v_cpu_stop
+
+        /* returns %o0: status  */
+        .globl  sun4v_cpu_yield
+        .type   sun4v_cpu_yield, #function
+sun4v_cpu_yield:
+        mov     HV_FAST_CPU_YIELD, %o5
+        ta      HV_FAST_TRAP
+        retl
+         nop
+        .size   sun4v_cpu_yield, .-sun4v_cpu_yield
+
+        /* %o0: type
+         * %o1: queue paddr
+         * %o2: num queue entries
+         *
+         * returns %o0: status
+         */
+        .globl  sun4v_cpu_qconf
+        .type   sun4v_cpu_qconf,#function
+sun4v_cpu_qconf:
+        mov     HV_FAST_CPU_QCONF, %o5
+        ta      HV_FAST_TRAP
+        retl
+         nop
+        .size   sun4v_cpu_qconf, .-sun4v_cpu_qconf
+
+        /* %o0: num cpus in cpu list
+         * %o1: cpu list paddr
+         * %o2: mondo block paddr
+         *
+         * returns %o0: status
+         */
+        .globl  sun4v_cpu_mondo_send
+        .type   sun4v_cpu_mondo_send,#function
+sun4v_cpu_mondo_send:
+        mov     HV_FAST_CPU_MONDO_SEND, %o5
+        ta      HV_FAST_TRAP
+        retl
+         nop
+        .size   sun4v_cpu_mondo_send, .-sun4v_cpu_mondo_send
+
+        /* %o0: CPU ID
+         *
+         * returns %o0: -status if status non-zero, else
+         *         %o0: cpu state as HV_CPU_STATE_*
+         */
+        .globl  sun4v_cpu_state
+        .type   sun4v_cpu_state,#function
+sun4v_cpu_state:
+        mov     HV_FAST_CPU_STATE, %o5
+        ta      HV_FAST_TRAP
+        brnz,pn %o0, 1f
+         sub    %g0, %o0, %o0
+        mov     %o1, %o0
+1:      retl
+         nop
+        .size   sun4v_cpu_state, .-sun4v_cpu_state
+
+        /* %o0: virtual address
+         * %o1: must be zero
+         * %o2: TTE
+         * %o3: HV_MMU_* flags
+         *
+         * returns %o0: status
+         */
+        .globl  sun4v_mmu_map_perm_addr
+        .type   sun4v_mmu_map_perm_addr,#function
+sun4v_mmu_map_perm_addr:
+        mov     HV_FAST_MMU_MAP_PERM_ADDR, %o5
+        ta      HV_FAST_TRAP
+        retl
+         nop
+        .size   sun4v_mmu_map_perm_addr, .-sun4v_mmu_map_perm_addr
+
+        /* %o0: number of TSB descriptions
+         * %o1: TSB descriptions real address
+         *
+         * returns %o0: status
+         */
+        .globl  sun4v_mmu_tsb_ctx0
+        .type   sun4v_mmu_tsb_ctx0,#function
+sun4v_mmu_tsb_ctx0:
+        mov     HV_FAST_MMU_TSB_CTX0, %o5
+        ta      HV_FAST_TRAP
+        retl
+         nop
+        .size   sun4v_mmu_tsb_ctx0, .-sun4v_mmu_tsb_ctx0
+
+        /* %o0: API group number
+         * %o1: pointer to unsigned long major number storage
+         * %o2: pointer to unsigned long minor number storage
+         *
+         * returns %o0: status
+         */
+        .globl  sun4v_get_version
+        .type   sun4v_get_version,#function
+sun4v_get_version:
+        mov     HV_CORE_GET_VER, %o5
+        mov     %o1, %o3
+        mov     %o2, %o4
+        ta      HV_CORE_TRAP
+        stx     %o1, [%o3]
+        retl
+         stx    %o2, [%o4]
+        .size   sun4v_get_version, .-sun4v_get_version
+
+        /* %o0: API group number
+         * %o1: desired major number
+         * %o2: desired minor number
+         * %o3: pointer to unsigned long actual minor number storage
+         *
+         * returns %o0: status
+         */
+        .globl  sun4v_set_version
+        .type   sun4v_set_version,#function
+sun4v_set_version:
+        mov     HV_CORE_SET_VER, %o5
+        mov     %o3, %o4
+        ta      HV_CORE_TRAP
+        retl
+         stx    %o1, [%o4]
+        .size   sun4v_set_version, .-sun4v_set_version
+
+        /* %o0: pointer to unsigned long time
+         *
+         * returns %o0: status
+         */
+        .globl  sun4v_tod_get
+        .type   sun4v_tod_get,#function
+sun4v_tod_get:
+        mov     %o0, %o4
+        mov     HV_FAST_TOD_GET, %o5
+        ta      HV_FAST_TRAP
+        stx     %o1, [%o4]
+        retl
+         nop
+        .size   sun4v_tod_get, .-sun4v_tod_get
+
+        /* %o0: time
+         *
+         * returns %o0: status
+         */
+        .globl  sun4v_tod_set
+        .type   sun4v_tod_set,#function
+sun4v_tod_set:
+        mov     HV_FAST_TOD_SET, %o5
+        ta      HV_FAST_TRAP
+        retl
+         nop
+        .size   sun4v_tod_set, .-sun4v_tod_set
+
+        /* %o0: pointer to unsigned long status
+         *
+         * returns %o0: signed character
+         */
+        .globl  sun4v_con_getchar
+        .type   sun4v_con_getchar,#function
+sun4v_con_getchar:
+        mov     %o0, %o4
+        mov     HV_FAST_CONS_GETCHAR, %o5
+        clr     %o0
+        clr     %o1
+        ta      HV_FAST_TRAP
+        stx     %o0, [%o4]
+        retl
+         sra    %o1, 0, %o0
+        .size   sun4v_con_getchar, .-sun4v_con_getchar
+
+        /* %o0: signed long character
+         *
+         * returns %o0: status
+         */
+        .globl  sun4v_con_putchar
+        .type   sun4v_con_putchar,#function
+sun4v_con_putchar:
+        mov     HV_FAST_CONS_PUTCHAR, %o5
+        ta      HV_FAST_TRAP
+        retl
+         sra    %o0, 0, %o0
+        .size   sun4v_con_putchar, .-sun4v_con_putchar
+
+        /* %o0: buffer real address
+         * %o1: buffer size
+         * %o2: pointer to unsigned long bytes_read
+         *
+         * returns %o0: status
+         */
+        .globl  sun4v_con_read
+        .type   sun4v_con_read,#function
+sun4v_con_read:
+        mov     %o2, %o4
+        mov     HV_FAST_CONS_READ, %o5
+        ta      HV_FAST_TRAP
+        brnz    %o0, 1f
+         cmp    %o1, -1         /* break */
+        be,a,pn %icc, 1f
+         mov    %o1, %o0
+        cmp     %o1, -2         /* hup */
+        be,a,pn %icc, 1f
+         mov    %o1, %o0
+        stx     %o1, [%o4]
+1:      retl
+         nop
+        .size   sun4v_con_read, .-sun4v_con_read
+
+        /* %o0: buffer real address
+         * %o1: buffer size
+         * %o2: pointer to unsigned long bytes_written
+         *
+         * returns %o0: status
+         */
+        .globl  sun4v_con_write
+        .type   sun4v_con_write,#function
+sun4v_con_write:
+        mov     %o2, %o4
+        mov     HV_FAST_CONS_WRITE, %o5
+        ta      HV_FAST_TRAP
+        stx     %o1, [%o4]
+        retl
+         nop
+        .size   sun4v_con_write, .-sun4v_con_write
+
+        /* %o0: soft state
+         * %o1: address of description string
+         *
+         * returns %o0: status
+         */
+        .globl  sun4v_mach_set_soft_state
+        .type   sun4v_mach_set_soft_state,#function
+sun4v_mach_set_soft_state:
+        mov     HV_FAST_MACH_SET_SOFT_STATE, %o5
+        ta      HV_FAST_TRAP
+        retl
+         nop
+        .size   sun4v_mach_set_soft_state, .-sun4v_mach_set_soft_state
+
+        /* %o0: exit code
+         *
+         * Does not return.
+         */
+        .globl  sun4v_mach_exit
+        .type   sun4v_mach_exit,#function
+sun4v_mach_exit:
+        mov     HV_FAST_MACH_EXIT, %o5
+        ta      HV_FAST_TRAP
+        retl
+         nop
+        .size   sun4v_mach_exit, .-sun4v_mach_exit
+
+        /* %o0: buffer real address
+         * %o1: buffer length
+         * %o2: pointer to unsigned long real_buf_len
+         *
+         * returns %o0: status
+         */
+        .globl  sun4v_mach_desc
+        .type   sun4v_mach_desc,#function
+sun4v_mach_desc:
+        mov     %o2, %o4
+        mov     HV_FAST_MACH_DESC, %o5
+        ta      HV_FAST_TRAP
+        stx     %o1, [%o4]
+        retl
+         nop
+        .size   sun4v_mach_desc, .-sun4v_mach_desc
+
+        /* %o0: new timeout in milliseconds
+         * %o1: pointer to unsigned long orig_timeout
+         *
+         * returns %o0: status
+         */
+        .globl  sun4v_mach_set_watchdog
+        .type   sun4v_mach_set_watchdog,#function
+sun4v_mach_set_watchdog:
+        mov     %o1, %o4
+        mov     HV_FAST_MACH_SET_WATCHDOG, %o5
+        ta      HV_FAST_TRAP
+        stx     %o1, [%o4]
+        retl
+         nop
+        .size   sun4v_mach_set_watchdog, .-sun4v_mach_set_watchdog
+
+        /* No inputs and does not return.  */
+        .globl  sun4v_mach_sir
+        .type   sun4v_mach_sir,#function
+sun4v_mach_sir:
+        mov     %o1, %o4
+        mov     HV_FAST_MACH_SIR, %o5
+        ta      HV_FAST_TRAP
+        stx     %o1, [%o4]
+        retl
+         nop
+        .size   sun4v_mach_sir, .-sun4v_mach_sir
+
+        /* %o0: channel
+         * %o1: ra
+         * %o2: num_entries
+         *
+         * returns %o0: status
+         */
+        .globl  sun4v_ldc_tx_qconf
+        .type   sun4v_ldc_tx_qconf,#function
+sun4v_ldc_tx_qconf:
+        mov     HV_FAST_LDC_TX_QCONF, %o5
+        ta      HV_FAST_TRAP
+        retl
+         nop
+        .size   sun4v_ldc_tx_qconf, .-sun4v_ldc_tx_qconf
+
+        /* %o0: channel
+         * %o1: pointer to unsigned long ra
+         * %o2: pointer to unsigned long num_entries
+         *
+         * returns %o0: status
+         */
+        .globl  sun4v_ldc_tx_qinfo
+        .type   sun4v_ldc_tx_qinfo,#function
+sun4v_ldc_tx_qinfo:
+        mov     %o1, %g1
+        mov     %o2, %g2
+        mov     HV_FAST_LDC_TX_QINFO, %o5
+        ta      HV_FAST_TRAP
+        stx     %o1, [%g1]
+        stx     %o2, [%g2]
+        retl
+         nop
+        .size   sun4v_ldc_tx_qinfo, .-sun4v_ldc_tx_qinfo
+
+        /* %o0: channel
+         * %o1: pointer to unsigned long head_off
+         * %o2: pointer to unsigned long tail_off
+         * %o2: pointer to unsigned long chan_state
+         *
+         * returns %o0: status
+         */
+        .globl  sun4v_ldc_tx_get_state
+        .type   sun4v_ldc_tx_get_state,#function
+sun4v_ldc_tx_get_state:
+        mov     %o1, %g1
+        mov     %o2, %g2
+        mov     %o3, %g3
+        mov     HV_FAST_LDC_TX_GET_STATE, %o5
+        ta      HV_FAST_TRAP
+        stx     %o1, [%g1]
+        stx     %o2, [%g2]
+        stx     %o3, [%g3]
+        retl
+         nop
+        .size   sun4v_ldc_tx_get_state, .-sun4v_ldc_tx_get_state
+
+        /* %o0: channel
+         * %o1: tail_off
+         *
+         * returns %o0: status
+         */
+        .globl  sun4v_ldc_tx_set_qtail
+        .type   sun4v_ldc_tx_set_qtail,#function
+sun4v_ldc_tx_set_qtail:
+        mov     HV_FAST_LDC_TX_SET_QTAIL, %o5
+        ta      HV_FAST_TRAP
+        retl
+         nop
+        .size   sun4v_ldc_tx_set_qtail, .-sun4v_ldc_tx_set_qtail
+
+        /* %o0: channel
+         * %o1: ra
+         * %o2: num_entries
+         *
+         * returns %o0: status
+         */
+        .globl  sun4v_ldc_rx_qconf
+        .type   sun4v_ldc_rx_qconf,#function
+sun4v_ldc_rx_qconf:
+        mov     HV_FAST_LDC_RX_QCONF, %o5
+        ta      HV_FAST_TRAP
+        retl
+         nop
+        .size   sun4v_ldc_rx_qconf, .-sun4v_ldc_rx_qconf
+
+        /* %o0: channel
+         * %o1: pointer to unsigned long ra
+         * %o2: pointer to unsigned long num_entries
+         *
+         * returns %o0: status
+         */
+        .globl  sun4v_ldc_rx_qinfo
+        .type   sun4v_ldc_rx_qinfo,#function
+sun4v_ldc_rx_qinfo:
+        mov     %o1, %g1
+        mov     %o2, %g2
+        mov     HV_FAST_LDC_RX_QINFO, %o5
+        ta      HV_FAST_TRAP
+        stx     %o1, [%g1]
+        stx     %o2, [%g2]
+        retl
+         nop
+        .size   sun4v_ldc_rx_qinfo, .-sun4v_ldc_rx_qinfo
+
+        /* %o0: channel
+         * %o1: pointer to unsigned long head_off
+         * %o2: pointer to unsigned long tail_off
+         * %o2: pointer to unsigned long chan_state
+         *
+         * returns %o0: status
+         */
+        .globl  sun4v_ldc_rx_get_state
+        .type   sun4v_ldc_rx_get_state,#function
+sun4v_ldc_rx_get_state:
+        mov     %o1, %g1
+        mov     %o2, %g2
+        mov     %o3, %g3
+        mov     HV_FAST_LDC_RX_GET_STATE, %o5
+        ta      HV_FAST_TRAP
+        stx     %o1, [%g1]
+        stx     %o2, [%g2]
+        stx     %o3, [%g3]
+        retl
+         nop
+        .size   sun4v_ldc_rx_get_state, .-sun4v_ldc_rx_get_state
+
+        /* %o0: channel
+         * %o1: head_off
+         *
+         * returns %o0: status
+         */
+        .globl  sun4v_ldc_rx_set_qhead
+        .type   sun4v_ldc_rx_set_qhead,#function
+sun4v_ldc_rx_set_qhead:
+        mov     HV_FAST_LDC_RX_SET_QHEAD, %o5
+        ta      HV_FAST_TRAP
+        retl
+         nop
+        .size   sun4v_ldc_rx_set_qhead, .-sun4v_ldc_rx_set_qhead
+
+        /* %o0: channel
+         * %o1: ra
+         * %o2: num_entries
+         *
+         * returns %o0: status
+         */
+        .globl  sun4v_ldc_set_map_table
+        .type   sun4v_ldc_set_map_table,#function
+sun4v_ldc_set_map_table:
+        mov     HV_FAST_LDC_SET_MAP_TABLE, %o5
+        ta      HV_FAST_TRAP
+        retl
+         nop
+        .size   sun4v_ldc_set_map_table, .-sun4v_ldc_set_map_table
+
+        /* %o0: channel
+         * %o1: pointer to unsigned long ra
+         * %o2: pointer to unsigned long num_entries
+         *
+         * returns %o0: status
+         */
+        .globl  sun4v_ldc_get_map_table
+        .type   sun4v_ldc_get_map_table,#function
+sun4v_ldc_get_map_table:
+        mov     %o1, %g1
+        mov     %o2, %g2
+        mov     HV_FAST_LDC_GET_MAP_TABLE, %o5
+        ta      HV_FAST_TRAP
+        stx     %o1, [%g1]
+        stx     %o2, [%g2]
+        retl
+         nop
+        .size   sun4v_ldc_get_map_table, .-sun4v_ldc_get_map_table
+
+        /* %o0: channel
+         * %o1: dir_code
+         * %o2: tgt_raddr
+         * %o3: lcl_raddr
+         * %o4: len
+         * %o5: pointer to unsigned long actual_len
+         *
+         * returns %o0: status
+         */
+        .globl  sun4v_ldc_copy
+        .type   sun4v_ldc_copy,#function
+sun4v_ldc_copy:
+        mov     %o5, %g1
+        mov     HV_FAST_LDC_COPY, %o5
+        ta      HV_FAST_TRAP
+        stx     %o1, [%g1]
+        retl
+         nop
+        .size   sun4v_ldc_copy, .-sun4v_ldc_copy
+
+        /* %o0: channel
+         * %o1: cookie
+         * %o2: pointer to unsigned long ra
+         * %o3: pointer to unsigned long perm
+         *
+         * returns %o0: status
+         */
+        .globl  sun4v_ldc_mapin
+        .type   sun4v_ldc_mapin,#function
+sun4v_ldc_mapin:
+        mov     %o2, %g1
+        mov     %o3, %g2
+        mov     HV_FAST_LDC_MAPIN, %o5
+        ta      HV_FAST_TRAP
+        stx     %o1, [%g1]
+        stx     %o2, [%g2]
+        retl
+         nop
+        .size   sun4v_ldc_mapin, .-sun4v_ldc_mapin
+
+        /* %o0: ra
+         *
+         * returns %o0: status
+         */
+        .globl  sun4v_ldc_unmap
+        .type   sun4v_ldc_unmap,#function
+sun4v_ldc_unmap:
+        mov     HV_FAST_LDC_UNMAP, %o5
+        ta      HV_FAST_TRAP
+        retl
+         nop
+        .size   sun4v_ldc_unmap, .-sun4v_ldc_unmap
+
+        /* %o0: channel
+         * %o1: cookie
+         * %o2: mte_cookie
+         *
+         * returns %o0: status
+         */
+        .globl  sun4v_ldc_revoke
+        .type   sun4v_ldc_revoke,#function
+sun4v_ldc_revoke:
+        mov     HV_FAST_LDC_REVOKE, %o5
+        ta      HV_FAST_TRAP
+        retl
+         nop
+        .size   sun4v_ldc_revoke, .-sun4v_ldc_revoke
+
+        /* %o0: device handle
+         * %o1: device INO
+         * %o2: pointer to unsigned long cookie
+         *
+         * returns %o0: status
+         */
+        .globl  sun4v_vintr_get_cookie
+        .type   sun4v_vintr_get_cookie,#function
+sun4v_vintr_get_cookie:
+        mov     %o2, %g1
+        mov     HV_FAST_VINTR_GET_COOKIE, %o5
+        ta      HV_FAST_TRAP
+        stx     %o1, [%g1]
+        retl
+         nop
+        .size   sun4v_vintr_get_cookie, .-sun4v_vintr_get_cookie
+
+        /* %o0: device handle
+         * %o1: device INO
+         * %o2: cookie
+         *
+         * returns %o0: status
+         */
+        .globl  sun4v_vintr_set_cookie
+        .type   sun4v_vintr_set_cookie,#function
+sun4v_vintr_set_cookie:
+        mov     HV_FAST_VINTR_SET_COOKIE, %o5
+        ta      HV_FAST_TRAP
+        retl
+         nop
+        .size   sun4v_vintr_set_cookie, .-sun4v_vintr_set_cookie
+
+        /* %o0: device handle
+         * %o1: device INO
+         * %o2: pointer to unsigned long valid_state
+         *
+         * returns %o0: status
+         */
+        .globl  sun4v_vintr_get_valid
+        .type   sun4v_vintr_get_valid,#function
+sun4v_vintr_get_valid:
+        mov     %o2, %g1
+        mov     HV_FAST_VINTR_GET_VALID, %o5
+        ta      HV_FAST_TRAP
+        stx     %o1, [%g1]
+        retl
+         nop
+        .size   sun4v_vintr_get_valid, .-sun4v_vintr_get_valid
+
+        /* %o0: device handle
+         * %o1: device INO
+         * %o2: valid_state
+         *
+         * returns %o0: status
+         */
+        .globl  sun4v_vintr_set_valid
+        .type   sun4v_vintr_set_valid,#function
+sun4v_vintr_set_valid:
+        mov     HV_FAST_VINTR_SET_VALID, %o5
+        ta      HV_FAST_TRAP
+        retl
+         nop
+        .size   sun4v_vintr_set_valid, .-sun4v_vintr_set_valid
+
+        /* %o0: device handle
+         * %o1: device INO
+         * %o2: pointer to unsigned long state
+         *
+         * returns %o0: status
+         */
+        .globl  sun4v_vintr_get_state
+        .type   sun4v_vintr_get_state,#function
+sun4v_vintr_get_state:
+        mov     %o2, %g1
+        mov     HV_FAST_VINTR_GET_STATE, %o5
+        ta      HV_FAST_TRAP
+        stx     %o1, [%g1]
+        retl
+         nop
+        .size   sun4v_vintr_get_state, .-sun4v_vintr_get_state
+
+        /* %o0: device handle
+         * %o1: device INO
+         * %o2: state
+         *
+         * returns %o0: status
+         */
+        .globl  sun4v_vintr_set_state
+        .type   sun4v_vintr_set_state,#function
+sun4v_vintr_set_state:
+        mov     HV_FAST_VINTR_SET_STATE, %o5
+        ta      HV_FAST_TRAP
+        retl
+         nop
+        .size   sun4v_vintr_set_state, .-sun4v_vintr_set_state
+
+        /* %o0: device handle
+         * %o1: device INO
+         * %o2: pointer to unsigned long cpuid
+         *
+         * returns %o0: status
+         */
+        .globl  sun4v_vintr_get_target
+        .type   sun4v_vintr_get_target,#function
+sun4v_vintr_get_target:
+        mov     %o2, %g1
+        mov     HV_FAST_VINTR_GET_TARGET, %o5
+        ta      HV_FAST_TRAP
+        stx     %o1, [%g1]
+        retl
+         nop
+        .size   sun4v_vintr_get_target, .-sun4v_vintr_get_target
+
+        /* %o0: device handle
+         * %o1: device INO
+         * %o2: cpuid
+         *
+         * returns %o0: status
+         */
+        .globl  sun4v_vintr_set_target
+        .type   sun4v_vintr_set_target,#function
+sun4v_vintr_set_target:
+        mov     HV_FAST_VINTR_SET_TARGET, %o5
+        ta      HV_FAST_TRAP
+        retl
+         nop
+        .size   sun4v_vintr_set_target, .-sun4v_vintr_set_target
+
+        /* %o0: NCS sub-function
+         * %o1: sub-function arg real-address
+         * %o2: sub-function arg size
+         *
+         * returns %o0: status
+         */
+        .globl  sun4v_ncs_request
+        .type   sun4v_ncs_request,#function
+sun4v_ncs_request:
+        mov     HV_FAST_NCS_REQUEST, %o5
+        ta      HV_FAST_TRAP
+        retl
+         nop
+        .size   sun4v_ncs_request, .-sun4v_ncs_request
+
+        .globl  sun4v_svc_send
+        .type   sun4v_svc_send,#function
+sun4v_svc_send:
+        save    %sp, -192, %sp
+        mov     %i0, %o0
+        mov     %i1, %o1
+        mov     %i2, %o2
+        mov     HV_FAST_SVC_SEND, %o5
+        ta      HV_FAST_TRAP
+        stx     %o1, [%i3]
+        ret
+        restore
+        .size   sun4v_svc_send, .-sun4v_svc_send
+
+        .globl  sun4v_svc_recv
+        .type   sun4v_svc_recv,#function
+sun4v_svc_recv:
+        save    %sp, -192, %sp
+        mov     %i0, %o0
+        mov     %i1, %o1
+        mov     %i2, %o2
+        mov     HV_FAST_SVC_RECV, %o5
+        ta      HV_FAST_TRAP
+        stx     %o1, [%i3]
+        ret
+        restore
+        .size   sun4v_svc_recv, .-sun4v_svc_recv
+
+        .globl  sun4v_svc_getstatus
+        .type   sun4v_svc_getstatus,#function
+sun4v_svc_getstatus:
+        mov     HV_FAST_SVC_GETSTATUS, %o5
+        mov     %o1, %o4
+        ta      HV_FAST_TRAP
+        stx     %o1, [%o4]
+        retl
+         nop
+        .size   sun4v_svc_getstatus, .-sun4v_svc_getstatus
+
+        .globl  sun4v_svc_setstatus
+        .type   sun4v_svc_setstatus,#function
+sun4v_svc_setstatus:
+        mov     HV_FAST_SVC_SETSTATUS, %o5
+        ta      HV_FAST_TRAP
+        retl
+         nop
+        .size   sun4v_svc_setstatus, .-sun4v_svc_setstatus
+
+        .globl  sun4v_svc_clrstatus
+        .type   sun4v_svc_clrstatus,#function
+sun4v_svc_clrstatus:
+        mov     HV_FAST_SVC_CLRSTATUS, %o5
+        ta      HV_FAST_TRAP
+        retl
+         nop
+        .size   sun4v_svc_clrstatus, .-sun4v_svc_clrstatus
+
+        .globl  sun4v_mmustat_conf
+        .type   sun4v_mmustat_conf,#function
+sun4v_mmustat_conf:
+        mov     %o1, %o4
+        mov     HV_FAST_MMUSTAT_CONF, %o5
+        ta      HV_FAST_TRAP
+        stx     %o1, [%o4]
+        retl
+         nop
+        .size   sun4v_mmustat_conf, .-sun4v_mmustat_conf
+
+        .globl  sun4v_mmustat_info
+        .type   sun4v_mmustat_info,#function
+sun4v_mmustat_info:
+        mov     %o0, %o4
+        mov     HV_FAST_MMUSTAT_INFO, %o5
+        ta      HV_FAST_TRAP
+        stx     %o1, [%o4]
+        retl
+         nop
+        .size   sun4v_mmustat_info, .-sun4v_mmustat_info
+
+        .globl  sun4v_mmu_demap_all
+        .type   sun4v_mmu_demap_all,#function
+sun4v_mmu_demap_all:
+        clr     %o0
+        clr     %o1
+        mov     HV_MMU_ALL, %o2
+        mov     HV_FAST_MMU_DEMAP_ALL, %o5
+        ta      HV_FAST_TRAP
+        retl
+         nop
+        .size   sun4v_mmu_demap_all, .-sun4v_mmu_demap_all
diff --git a/arch/sparc64/kernel/ivec.S b/arch/sparc64/kernel/ivec.S
new file mode 100644
index 000000000000..d29f92ebca5e
--- /dev/null
+++ b/arch/sparc64/kernel/ivec.S
@@ -0,0 +1,51 @@
+        /* The registers for cross calls will be:
+         *
+         * DATA 0: [low 32-bits]  Address of function to call, jmp to this
+         *         [high 32-bits] MMU Context Argument 0, place in %g5
+         * DATA 1: Address Argument 1, place in %g1
+         * DATA 2: Address Argument 2, place in %g7
+         *
+         * With this method we can do most of the cross-call tlb/cache
+         * flushing very quickly.
+         */
+        .align          32
+        .globl          do_ivec
+        .type           do_ivec,#function
+do_ivec:
+        mov             0x40, %g3
+        ldxa            [%g3 + %g0] ASI_INTR_R, %g3
+        sethi           %hi(KERNBASE), %g4
+        cmp             %g3, %g4
+        bgeu,pn         %xcc, do_ivec_xcall
+         srlx           %g3, 32, %g5
+        stxa            %g0, [%g0] ASI_INTR_RECEIVE
+        membar          #Sync
+
+        sethi           %hi(ivector_table_pa), %g2
+        ldx             [%g2 + %lo(ivector_table_pa)], %g2
+        sllx            %g3, 4, %g3
+        add             %g2, %g3, %g3
+
+        TRAP_LOAD_IRQ_WORK_PA(%g6, %g1)
+
+        ldx             [%g6], %g5
+        stxa            %g5, [%g3] ASI_PHYS_USE_EC
+        stx             %g3, [%g6]
+        wr              %g0, 1 << PIL_DEVICE_IRQ, %set_softint
+        retry
+do_ivec_xcall:
+        mov             0x50, %g1
+        ldxa            [%g1 + %g0] ASI_INTR_R, %g1
+        srl             %g3, 0, %g3
+
+        mov             0x60, %g7
+        ldxa            [%g7 + %g0] ASI_INTR_R, %g7
+        stxa            %g0, [%g0] ASI_INTR_RECEIVE
+        membar          #Sync
+        ba,pt           %xcc, 1f
+         nop
+
+        .align          32
+1:      jmpl            %g3, %g0
+         nop
+        .size           do_ivec,.-do_ivec
diff --git a/arch/sparc64/kernel/kgdb.c b/arch/sparc64/kernel/kgdb.c
new file mode 100644
index 000000000000..fefbe6dc51be
--- /dev/null
+++ b/arch/sparc64/kernel/kgdb.c
@@ -0,0 +1,186 @@
+/* kgdb.c: KGDB support for 64-bit sparc.
+ *
+ * Copyright (C) 2008 David S. Miller <davem@davemloft.net>
+ */
+
+#include <linux/kgdb.h>
+#include <linux/kdebug.h>
+
+#include <asm/kdebug.h>
+#include <asm/ptrace.h>
+#include <asm/irq.h>
+
+void pt_regs_to_gdb_regs(unsigned long *gdb_regs, struct pt_regs *regs)
+{
+        struct reg_window *win;
+        int i;
+
+        gdb_regs[GDB_G0] = 0;
+        for (i = 0; i < 15; i++)
+                gdb_regs[GDB_G1 + i] = regs->u_regs[UREG_G1 + i];
+
+        win = (struct reg_window *) (regs->u_regs[UREG_FP] + STACK_BIAS);
+        for (i = 0; i < 8; i++)
+                gdb_regs[GDB_L0 + i] = win->locals[i];
+        for (i = 0; i < 8; i++)
+                gdb_regs[GDB_I0 + i] = win->ins[i];
+
+        for (i = GDB_F0; i <= GDB_F62; i++)
+                gdb_regs[i] = 0;
+
+        gdb_regs[GDB_PC] = regs->tpc;
+        gdb_regs[GDB_NPC] = regs->tnpc;
+        gdb_regs[GDB_STATE] = regs->tstate;
+        gdb_regs[GDB_FSR] = 0;
+        gdb_regs[GDB_FPRS] = 0;
+        gdb_regs[GDB_Y] = regs->y;
+}
+
+void sleeping_thread_to_gdb_regs(unsigned long *gdb_regs, struct task_struct *p)
+{
+        struct thread_info *t = task_thread_info(p);
+        extern unsigned int switch_to_pc;
+        extern unsigned int ret_from_syscall;
+        struct reg_window *win;
+        unsigned long pc, cwp;
+        int i;
+
+        for (i = GDB_G0; i < GDB_G6; i++)
+                gdb_regs[i] = 0;
+        gdb_regs[GDB_G6] = (unsigned long) t;
+        gdb_regs[GDB_G7] = (unsigned long) p;
+        for (i = GDB_O0; i < GDB_SP; i++)
+                gdb_regs[i] = 0;
+        gdb_regs[GDB_SP] = t->ksp;
+        gdb_regs[GDB_O7] = 0;
+
+        win = (struct reg_window *) (t->ksp + STACK_BIAS);
+        for (i = 0; i < 8; i++)
+                gdb_regs[GDB_L0 + i] = win->locals[i];
+        for (i = 0; i < 8; i++)
+                gdb_regs[GDB_I0 + i] = win->ins[i];
+
+        for (i = GDB_F0; i <= GDB_F62; i++)
+                gdb_regs[i] = 0;
+
+        if (t->new_child)
+                pc = (unsigned long) &ret_from_syscall;
+        else
+                pc = (unsigned long) &switch_to_pc;
+
+        gdb_regs[GDB_PC] = pc;
+        gdb_regs[GDB_NPC] = pc + 4;
+
+        cwp = __thread_flag_byte_ptr(t)[TI_FLAG_BYTE_CWP];
+
+        gdb_regs[GDB_STATE] = (TSTATE_PRIV | TSTATE_IE | cwp);
+        gdb_regs[GDB_FSR] = 0;
+        gdb_regs[GDB_FPRS] = 0;
+        gdb_regs[GDB_Y] = 0;
+}
+
+void gdb_regs_to_pt_regs(unsigned long *gdb_regs, struct pt_regs *regs)
+{
+        struct reg_window *win;
+        int i;
+
+        for (i = 0; i < 15; i++)
+                regs->u_regs[UREG_G1 + i] = gdb_regs[GDB_G1 + i];
+
+        /* If the TSTATE register is changing, we have to preserve
+         * the CWP field, otherwise window save/restore explodes.
+         */
+        if (regs->tstate != gdb_regs[GDB_STATE]) {
+                unsigned long cwp = regs->tstate & TSTATE_CWP;
+
+                regs->tstate = (gdb_regs[GDB_STATE] & ~TSTATE_CWP) | cwp;
+        }
+
+        regs->tpc = gdb_regs[GDB_PC];
+        regs->tnpc = gdb_regs[GDB_NPC];
+        regs->y = gdb_regs[GDB_Y];
+
+        win = (struct reg_window *) (regs->u_regs[UREG_FP] + STACK_BIAS);
+        for (i = 0; i < 8; i++)
+                win->locals[i] = gdb_regs[GDB_L0 + i];
+        for (i = 0; i < 8; i++)
+                win->ins[i] = gdb_regs[GDB_I0 + i];
+}
+
+#ifdef CONFIG_SMP
+void smp_kgdb_capture_client(struct pt_regs *regs)
+{
+        unsigned long flags;
+
+        __asm__ __volatile__("rdpr      %%pstate, %0\n\t"
+                             "wrpr      %0, %1, %%pstate"
+                             : "=r" (flags)
+                             : "i" (PSTATE_IE));
+
+        flushw_all();
+
+        if (atomic_read(&kgdb_active) != -1)
+                kgdb_nmicallback(raw_smp_processor_id(), regs);
+
+        __asm__ __volatile__("wrpr      %0, 0, %%pstate"
+                             : : "r" (flags));
+}
+#endif
+
+int kgdb_arch_handle_exception(int e_vector, int signo, int err_code,
+                               char *remcomInBuffer, char *remcomOutBuffer,
+                               struct pt_regs *linux_regs)
+{
+        unsigned long addr;
+        char *ptr;
+
+        switch (remcomInBuffer[0]) {
+        case 'c':
+                /* try to read optional parameter, pc unchanged if no parm */
+                ptr = &remcomInBuffer[1];
+                if (kgdb_hex2long(&ptr, &addr)) {
+                        linux_regs->tpc = addr;
+                        linux_regs->tnpc = addr + 4;
+                }
+                /* fallthru */
+
+        case 'D':
+        case 'k':
+                if (linux_regs->tpc == (unsigned long) arch_kgdb_breakpoint) {
+                        linux_regs->tpc = linux_regs->tnpc;
+                        linux_regs->tnpc += 4;
+                }
+                return 0;
+        }
+        return -1;
+}
+
+asmlinkage void kgdb_trap(unsigned long trap_level, struct pt_regs *regs)
+{
+        unsigned long flags;
+
+        if (user_mode(regs)) {
+                bad_trap(regs, trap_level);
+                return;
+        }
+
+        flushw_all();
+
+        local_irq_save(flags);
+        kgdb_handle_exception(0x172, SIGTRAP, 0, regs);
+        local_irq_restore(flags);
+}
+
+int kgdb_arch_init(void)
+{
+        return 0;
+}
+
+void kgdb_arch_exit(void)
+{
+}
+
+struct kgdb_arch arch_kgdb_ops = {
+        /* Breakpoint instruction: ta 0x72 */
+        .gdb_bpt_instr          = { 0x91, 0xd0, 0x20, 0x72 },
+};
diff --git a/arch/sparc64/kernel/misctrap.S b/arch/sparc64/kernel/misctrap.S
new file mode 100644
index 000000000000..753b4f031bfb
--- /dev/null
+++ b/arch/sparc64/kernel/misctrap.S
@@ -0,0 +1,97 @@
+#ifdef CONFIG_KGDB
+        .globl          arch_kgdb_breakpoint
+        .type           arch_kgdb_breakpoint,#function
+arch_kgdb_breakpoint:
+        ta              0x72
+        retl
+         nop
+        .size           arch_kgdb_breakpoint,.-arch_kgdb_breakpoint
+#endif
+
+        .type           __do_privact,#function
+__do_privact:
+        mov             TLB_SFSR, %g3
+        stxa            %g0, [%g3] ASI_DMMU     ! Clear FaultValid bit
+        membar          #Sync
+        sethi           %hi(109f), %g7
+        ba,pt           %xcc, etrap
+109:    or              %g7, %lo(109b), %g7
+        call            do_privact
+         add            %sp, PTREGS_OFF, %o0
+        ba,pt           %xcc, rtrap
+         nop
+        .size           __do_privact,.-__do_privact
+
+        .type           do_mna,#function
+do_mna:
+        rdpr            %tl, %g3
+        cmp             %g3, 1
+
+        /* Setup %g4/%g5 now as they are used in the
+         * winfixup code.
+         */
+        mov             TLB_SFSR, %g3
+        mov             DMMU_SFAR, %g4
+        ldxa            [%g4] ASI_DMMU, %g4
+        ldxa            [%g3] ASI_DMMU, %g5
+        stxa            %g0, [%g3] ASI_DMMU     ! Clear FaultValid bit
+        membar          #Sync
+        bgu,pn          %icc, winfix_mna
+         rdpr           %tpc, %g3
+
+1:      sethi           %hi(109f), %g7
+        ba,pt           %xcc, etrap
+109:     or             %g7, %lo(109b), %g7
+        mov             %l4, %o1
+        mov             %l5, %o2
+        call            mem_address_unaligned
+         add            %sp, PTREGS_OFF, %o0
+        ba,pt           %xcc, rtrap
+         nop
+        .size           do_mna,.-do_mna
+
+        .type           do_lddfmna,#function
+do_lddfmna:
+        sethi           %hi(109f), %g7
+        mov             TLB_SFSR, %g4
+        ldxa            [%g4] ASI_DMMU, %g5
+        stxa            %g0, [%g4] ASI_DMMU     ! Clear FaultValid bit
+        membar          #Sync
+        mov             DMMU_SFAR, %g4
+        ldxa            [%g4] ASI_DMMU, %g4
+        ba,pt           %xcc, etrap
+109:     or             %g7, %lo(109b), %g7
+        mov             %l4, %o1
+        mov             %l5, %o2
+        call            handle_lddfmna
+         add            %sp, PTREGS_OFF, %o0
+        ba,pt           %xcc, rtrap
+         nop
+        .size           do_lddfmna,.-do_lddfmna
+
+        .type           do_stdfmna,#function
+do_stdfmna:
+        sethi           %hi(109f), %g7
+        mov             TLB_SFSR, %g4
+        ldxa            [%g4] ASI_DMMU, %g5
+        stxa            %g0, [%g4] ASI_DMMU     ! Clear FaultValid bit
+        membar          #Sync
+        mov             DMMU_SFAR, %g4
+        ldxa            [%g4] ASI_DMMU, %g4
+        ba,pt           %xcc, etrap
+109:     or             %g7, %lo(109b), %g7
+        mov             %l4, %o1
+        mov             %l5, %o2
+        call            handle_stdfmna
+         add            %sp, PTREGS_OFF, %o0
+        ba,pt           %xcc, rtrap
+         nop
+        .size           do_stdfmna,.-do_stdfmna
+
+        .type           breakpoint_trap,#function
+breakpoint_trap:
+        call            sparc_breakpoint
+         add            %sp, PTREGS_OFF, %o0
+        ba,pt           %xcc, rtrap
+         nop
+        .size           breakpoint_trap,.-breakpoint_trap
diff --git a/arch/sparc64/kernel/pci.c b/arch/sparc64/kernel/pci.c
index dbf2fc2f4d87..112b09f16f36 100644
--- a/arch/sparc64/kernel/pci.c
+++ b/arch/sparc64/kernel/pci.c
@@ -350,8 +350,7 @@ static void pci_parse_of_addrs(struct of_device *op,
 
 struct pci_dev *of_create_pci_dev(struct pci_pbm_info *pbm,
                                   struct device_node *node,
-                                  struct pci_bus *bus, int devfn,
-                                  int host_controller)
+                                  struct pci_bus *bus, int devfn)
 {
         struct dev_archdata *sd;
         struct pci_dev *dev;
@@ -390,43 +389,28 @@ struct pci_dev *of_create_pci_dev(struct pci_pbm_info *pbm,
         dev->devfn = devfn;
         dev->multifunction = 0;         /* maybe a lie? */
 
-        if (host_controller) {
-                if (tlb_type != hypervisor) {
-                        pci_read_config_word(dev, PCI_VENDOR_ID,
-                                             &dev->vendor);
-                        pci_read_config_word(dev, PCI_DEVICE_ID,
-                                             &dev->device);
-                } else {
-                        dev->vendor = PCI_VENDOR_ID_SUN;
-                        dev->device = 0x80f0;
-                }
-                dev->cfg_size = 256;
-                dev->class = PCI_CLASS_BRIDGE_HOST << 8;
-                sprintf(pci_name(dev), "%04x:%02x:%02x.%d", pci_domain_nr(bus),
-                        0x00, PCI_SLOT(devfn), PCI_FUNC(devfn));
-        } else {
-                dev->vendor = of_getintprop_default(node, "vendor-id", 0xffff);
-                dev->device = of_getintprop_default(node, "device-id", 0xffff);
-                dev->subsystem_vendor =
-                        of_getintprop_default(node, "subsystem-vendor-id", 0);
-                dev->subsystem_device =
-                        of_getintprop_default(node, "subsystem-id", 0);
-
-                dev->cfg_size = pci_cfg_space_size(dev);
-
-                /* We can't actually use the firmware value, we have
-                 * to read what is in the register right now.  One
-                 * reason is that in the case of IDE interfaces the
-                 * firmware can sample the value before the the IDE
-                 * interface is programmed into native mode.
-                 */
-                pci_read_config_dword(dev, PCI_CLASS_REVISION, &class);
-                dev->class = class >> 8;
-                dev->revision = class & 0xff;
+        dev->vendor = of_getintprop_default(node, "vendor-id", 0xffff);
+        dev->device = of_getintprop_default(node, "device-id", 0xffff);
+        dev->subsystem_vendor =
+                of_getintprop_default(node, "subsystem-vendor-id", 0);
+        dev->subsystem_device =
+                of_getintprop_default(node, "subsystem-id", 0);
+
+        dev->cfg_size = pci_cfg_space_size(dev);
+
+        /* We can't actually use the firmware value, we have
+         * to read what is in the register right now.  One
+         * reason is that in the case of IDE interfaces the
+         * firmware can sample the value before the the IDE
+         * interface is programmed into native mode.
+         */
+        pci_read_config_dword(dev, PCI_CLASS_REVISION, &class);
+        dev->class = class >> 8;
+        dev->revision = class & 0xff;
+
+        sprintf(pci_name(dev), "%04x:%02x:%02x.%d", pci_domain_nr(bus),
+                dev->bus->number, PCI_SLOT(devfn), PCI_FUNC(devfn));
 
-                sprintf(pci_name(dev), "%04x:%02x:%02x.%d", pci_domain_nr(bus),
-                        dev->bus->number, PCI_SLOT(devfn), PCI_FUNC(devfn));
-        }
         if (ofpci_verbose)
                 printk("    class: 0x%x device name: %s\n",
                        dev->class, pci_name(dev));
@@ -441,26 +425,21 @@ struct pci_dev *of_create_pci_dev(struct pci_pbm_info *pbm,
         dev->current_state = 4;         /* unknown power state */
         dev->error_state = pci_channel_io_normal;
 
-        if (host_controller) {
+        if (!strcmp(type, "pci") || !strcmp(type, "pciex")) {
+                /* a PCI-PCI bridge */
                 dev->hdr_type = PCI_HEADER_TYPE_BRIDGE;
                 dev->rom_base_reg = PCI_ROM_ADDRESS1;
-                dev->irq = PCI_IRQ_NONE;
+        } else if (!strcmp(type, "cardbus")) {
+                dev->hdr_type = PCI_HEADER_TYPE_CARDBUS;
         } else {
-                if (!strcmp(type, "pci") || !strcmp(type, "pciex")) {
-                        /* a PCI-PCI bridge */
-                        dev->hdr_type = PCI_HEADER_TYPE_BRIDGE;
-                        dev->rom_base_reg = PCI_ROM_ADDRESS1;
-                } else if (!strcmp(type, "cardbus")) {
-                        dev->hdr_type = PCI_HEADER_TYPE_CARDBUS;
-                } else {
-                        dev->hdr_type = PCI_HEADER_TYPE_NORMAL;
-                        dev->rom_base_reg = PCI_ROM_ADDRESS;
+                dev->hdr_type = PCI_HEADER_TYPE_NORMAL;
+                dev->rom_base_reg = PCI_ROM_ADDRESS;
 
-                        dev->irq = sd->op->irqs[0];
-                        if (dev->irq == 0xffffffff)
-                                dev->irq = PCI_IRQ_NONE;
-                }
+                dev->irq = sd->op->irqs[0];
+                if (dev->irq == 0xffffffff)
+                        dev->irq = PCI_IRQ_NONE;
         }
+
         pci_parse_of_addrs(sd->op, node, dev);
 
         if (ofpci_verbose)
@@ -749,7 +728,7 @@ static void __devinit pci_of_scan_bus(struct pci_pbm_info *pbm,
                 prev_devfn = devfn;
 
                 /* create a new pci_dev for this device */
-                dev = of_create_pci_dev(pbm, child, bus, devfn, 0);
+                dev = of_create_pci_dev(pbm, child, bus, devfn);
                 if (!dev)
                         continue;
                 if (ofpci_verbose)
@@ -796,48 +775,9 @@ static void __devinit pci_bus_register_of_sysfs(struct pci_bus *bus)
                 pci_bus_register_of_sysfs(child_bus);
 }
 
-int pci_host_bridge_read_pci_cfg(struct pci_bus *bus_dev,
-                                 unsigned int devfn,
-                                 int where, int size,
-                                 u32 *value)
-{
-        static u8 fake_pci_config[] = {
-                0x8e, 0x10, /* Vendor: 0x108e (Sun) */
-                0xf0, 0x80, /* Device: 0x80f0 (Fire) */
-                0x46, 0x01, /* Command: 0x0146 (SERR, PARITY, MASTER, MEM) */
-                0xa0, 0x22, /* Status: 0x02a0 (DEVSEL_MED, FB2B, 66MHZ) */
-                0x00, 0x00, 0x00, 0x06, /* Class: 0x06000000 host bridge */
-                0x00, /* Cacheline: 0x00 */
-                0x40, /* Latency: 0x40 */
-                0x00, /* Header-Type: 0x00 normal */
-        };
-
-        *value = 0;
-        if (where >= 0 && where < sizeof(fake_pci_config) &&
-            (where + size) >= 0 &&
-            (where + size) < sizeof(fake_pci_config) &&
-            size <= sizeof(u32)) {
-                while (size--) {
-                        *value <<= 8;
-                        *value |= fake_pci_config[where + size];
-                }
-        }
-
-        return PCIBIOS_SUCCESSFUL;
-}
-
-int pci_host_bridge_write_pci_cfg(struct pci_bus *bus_dev,
-                                  unsigned int devfn,
-                                  int where, int size,
-                                  u32 value)
-{
-        return PCIBIOS_SUCCESSFUL;
-}
-
 struct pci_bus * __devinit pci_scan_one_pbm(struct pci_pbm_info *pbm)
 {
         struct device_node *node = pbm->prom_node;
-        struct pci_dev *host_pdev;
         struct pci_bus *bus;
 
         printk("PCI: Scanning PBM %s\n", node->full_name);
@@ -855,10 +795,6 @@ struct pci_bus * __devinit pci_scan_one_pbm(struct pci_pbm_info *pbm)
         bus->resource[0] = &pbm->io_space;
         bus->resource[1] = &pbm->mem_space;
 
-        /* Create the dummy host bridge and link it in.  */
-        host_pdev = of_create_pci_dev(pbm, node, bus, 0x00, 1);
-        bus->self = host_pdev;
-
         pci_of_scan_bus(pbm, node, bus);
         pci_bus_add_devices(bus);
         pci_bus_register_of_sysfs(bus);
diff --git a/arch/sparc64/kernel/pci_common.c b/arch/sparc64/kernel/pci_common.c
index 923e0bcc3bfd..19fa621d6a60 100644
--- a/arch/sparc64/kernel/pci_common.c
+++ b/arch/sparc64/kernel/pci_common.c
@@ -264,9 +264,6 @@ static int sun4v_read_pci_cfg(struct pci_bus *bus_dev, unsigned int devfn,
         unsigned int func = PCI_FUNC(devfn);
         unsigned long ret;
 
-        if (!bus && devfn == 0x00)
-                return pci_host_bridge_read_pci_cfg(bus_dev, devfn, where,
-                                                    size, value);
         if (config_out_of_range(pbm, bus, devfn, where)) {
                 ret = ~0UL;
         } else {
@@ -300,9 +297,6 @@ static int sun4v_write_pci_cfg(struct pci_bus *bus_dev, unsigned int devfn,
         unsigned int func = PCI_FUNC(devfn);
         unsigned long ret;
 
-        if (!bus && devfn == 0x00)
-                return pci_host_bridge_write_pci_cfg(bus_dev, devfn, where,
-                                                     size, value);
         if (config_out_of_range(pbm, bus, devfn, where)) {
                 /* Do nothing. */
         } else {
diff --git a/arch/sparc64/kernel/pci_impl.h b/arch/sparc64/kernel/pci_impl.h
index 218bac4ff79b..c385d126be11 100644
--- a/arch/sparc64/kernel/pci_impl.h
+++ b/arch/sparc64/kernel/pci_impl.h
@@ -167,15 +167,6 @@ extern void pci_get_pbm_props(struct pci_pbm_info *pbm);
 extern struct pci_bus *pci_scan_one_pbm(struct pci_pbm_info *pbm);
 extern void pci_determine_mem_io_space(struct pci_pbm_info *pbm);
 
-extern int pci_host_bridge_read_pci_cfg(struct pci_bus *bus_dev,
-                                        unsigned int devfn,
-                                        int where, int size,
-                                        u32 *value);
-extern int pci_host_bridge_write_pci_cfg(struct pci_bus *bus_dev,
-                                         unsigned int devfn,
-                                         int where, int size,
-                                         u32 value);
-
 /* Error reporting support. */
 extern void pci_scan_for_target_abort(struct pci_pbm_info *, struct pci_bus *);
 extern void pci_scan_for_master_abort(struct pci_pbm_info *, struct pci_bus *);
diff --git a/arch/sparc64/kernel/process.c b/arch/sparc64/kernel/process.c
index 056013749157..500ac6d483a0 100644
--- a/arch/sparc64/kernel/process.c
+++ b/arch/sparc64/kernel/process.c
@@ -591,12 +591,6 @@ int copy_thread(int nr, unsigned long clone_flags, unsigned long sp,
         if (clone_flags & CLONE_SETTLS)
                 t->kregs->u_regs[UREG_G7] = regs->u_regs[UREG_I3];
 
-        /* We do not want to accidently trigger system call restart
-         * handling in the new thread.  Therefore, clear out the trap
-         * type, which will make pt_regs_regs_is_syscall() return false.
-         */
-        pt_regs_clear_trap_type(t->kregs);
-
         return 0;
 }
 
diff --git a/arch/sparc64/kernel/signal.c b/arch/sparc64/kernel/signal.c
index f2d88d8f7a42..45d6bf632daa 100644
--- a/arch/sparc64/kernel/signal.c
+++ b/arch/sparc64/kernel/signal.c
@@ -332,6 +332,9 @@ void do_rt_sigreturn(struct pt_regs *regs)
         regs->tpc = tpc;
         regs->tnpc = tnpc;
 
+        /* Prevent syscall restart.  */
+        pt_regs_clear_trap_type(regs);
+
         sigdelsetmask(&set, ~_BLOCKABLE);
         spin_lock_irq(&current->sighand->siglock);
         current->blocked = set;
@@ -515,7 +518,8 @@ static void do_signal(struct pt_regs *regs, unsigned long orig_i0)
         siginfo_t info;
         int signr;
         
-        if (pt_regs_is_syscall(regs)) {
+        if (pt_regs_is_syscall(regs) &&
+            (regs->tstate & (TSTATE_XCARRY | TSTATE_ICARRY))) {
                 pt_regs_clear_trap_type(regs);
                 cookie.restart_syscall = 1;
         } else
diff --git a/arch/sparc64/kernel/signal32.c b/arch/sparc64/kernel/signal32.c
index 91f8d0826db1..9415d2c918c5 100644
--- a/arch/sparc64/kernel/signal32.c
+++ b/arch/sparc64/kernel/signal32.c
@@ -268,6 +268,9 @@ void do_sigreturn32(struct pt_regs *regs)
         regs->tstate &= ~(TSTATE_ICC|TSTATE_XCC);
         regs->tstate |= psr_to_tstate_icc(psr);
 
+        /* Prevent syscall restart.  */
+        pt_regs_clear_trap_type(regs);
+
         err |= __get_user(fpu_save, &sf->fpu_save);
         if (fpu_save)
                 err |= restore_fpu_state32(regs, &sf->fpu_state);
@@ -351,6 +354,9 @@ asmlinkage void do_rt_sigreturn32(struct pt_regs *regs)
         regs->tstate &= ~(TSTATE_ICC|TSTATE_XCC);
         regs->tstate |= psr_to_tstate_icc(psr);
 
+        /* Prevent syscall restart.  */
+        pt_regs_clear_trap_type(regs);
+
         err |= __get_user(fpu_save, &sf->fpu_save);
         if (fpu_save)
                 err |= restore_fpu_state32(regs, &sf->fpu_state);
diff --git a/arch/sparc64/kernel/smp.c b/arch/sparc64/kernel/smp.c
index 409dd71f2738..3aba47624df4 100644
--- a/arch/sparc64/kernel/smp.c
+++ b/arch/sparc64/kernel/smp.c
@@ -38,7 +38,6 @@
 #include <asm/pgtable.h>
 #include <asm/oplib.h>
 #include <asm/uaccess.h>
-#include <asm/timer.h>
 #include <asm/starfire.h>
 #include <asm/tlb.h>
 #include <asm/sections.h>
@@ -910,6 +909,9 @@ extern unsigned long xcall_flush_tlb_kernel_range;
 extern unsigned long xcall_report_regs;
 extern unsigned long xcall_receive_signal;
 extern unsigned long xcall_new_mmu_context_version;
+#ifdef CONFIG_KGDB
+extern unsigned long xcall_kgdb_capture;
+#endif
 
 #ifdef DCACHE_ALIASING_POSSIBLE
 extern unsigned long xcall_flush_dcache_page_cheetah;
@@ -1079,6 +1081,13 @@ void smp_new_mmu_context_version(void)
         smp_cross_call(&xcall_new_mmu_context_version, 0, 0, 0);
 }
 
+#ifdef CONFIG_KGDB
+void kgdb_roundup_cpus(unsigned long flags)
+{
+        smp_cross_call(&xcall_kgdb_capture, 0, 0, 0);
+}
+#endif
+
 void smp_report_regs(void)
 {
         smp_cross_call(&xcall_report_regs, 0, 0, 0);
diff --git a/arch/sparc64/kernel/spiterrs.S b/arch/sparc64/kernel/spiterrs.S
new file mode 100644
index 000000000000..ef902c6f8e3c
--- /dev/null
+++ b/arch/sparc64/kernel/spiterrs.S
@@ -0,0 +1,245 @@
+        /* We need to carefully read the error status, ACK the errors,
+         * prevent recursive traps, and pass the information on to C
+         * code for logging.
+         *
+         * We pass the AFAR in as-is, and we encode the status
+         * information as described in asm-sparc64/sfafsr.h
+         */
+        .type           __spitfire_access_error,#function
+__spitfire_access_error:
+        /* Disable ESTATE error reporting so that we do not take
+         * recursive traps and RED state the processor.
+         */
+        stxa            %g0, [%g0] ASI_ESTATE_ERROR_EN
+        membar          #Sync
+
+        mov             UDBE_UE, %g1
+        ldxa            [%g0] ASI_AFSR, %g4     ! Get AFSR
+
+        /* __spitfire_cee_trap branches here with AFSR in %g4 and
+         * UDBE_CE in %g1.  It only clears ESTATE_ERR_CE in the ESTATE
+         * Error Enable register.
+         */
+__spitfire_cee_trap_continue:
+        ldxa            [%g0] ASI_AFAR, %g5     ! Get AFAR
+
+        rdpr            %tt, %g3
+        and             %g3, 0x1ff, %g3         ! Paranoia
+        sllx            %g3, SFSTAT_TRAP_TYPE_SHIFT, %g3
+        or              %g4, %g3, %g4
+        rdpr            %tl, %g3
+        cmp             %g3, 1
+        mov             1, %g3
+        bleu            %xcc, 1f
+         sllx           %g3, SFSTAT_TL_GT_ONE_SHIFT, %g3
+
+        or              %g4, %g3, %g4
+
+        /* Read in the UDB error register state, clearing the sticky
+         * error bits as-needed.  We only clear them if the UE bit is
+         * set.  Likewise, __spitfire_cee_trap below will only do so
+         * if the CE bit is set.
+         *
+         * NOTE: UltraSparc-I/II have high and low UDB error
+         *       registers, corresponding to the two UDB units
+         *       present on those chips.  UltraSparc-IIi only
+         *       has a single UDB, called "SDB" in the manual.
+         *       For IIi the upper UDB register always reads
+         *       as zero so for our purposes things will just
+         *       work with the checks below.
+         */
+1:      ldxa            [%g0] ASI_UDBH_ERROR_R, %g3
+        and             %g3, 0x3ff, %g7         ! Paranoia
+        sllx            %g7, SFSTAT_UDBH_SHIFT, %g7
+        or              %g4, %g7, %g4
+        andcc           %g3, %g1, %g3           ! UDBE_UE or UDBE_CE
+        be,pn           %xcc, 1f
+         nop
+        stxa            %g3, [%g0] ASI_UDB_ERROR_W
+        membar          #Sync
+
+1:      mov             0x18, %g3
+        ldxa            [%g3] ASI_UDBL_ERROR_R, %g3
+        and             %g3, 0x3ff, %g7         ! Paranoia
+        sllx            %g7, SFSTAT_UDBL_SHIFT, %g7
+        or              %g4, %g7, %g4
+        andcc           %g3, %g1, %g3           ! UDBE_UE or UDBE_CE
+        be,pn           %xcc, 1f
+         nop
+        mov             0x18, %g7
+        stxa            %g3, [%g7] ASI_UDB_ERROR_W
+        membar          #Sync
+
+1:      /* Ok, now that we've latched the error state, clear the
+         * sticky bits in the AFSR.
+         */
+        stxa            %g4, [%g0] ASI_AFSR
+        membar          #Sync
+
+        rdpr            %tl, %g2
+        cmp             %g2, 1
+        rdpr            %pil, %g2
+        bleu,pt         %xcc, 1f
+         wrpr           %g0, 15, %pil
+
+        ba,pt           %xcc, etraptl1
+         rd             %pc, %g7
+
+        ba,pt           %xcc, 2f
+         nop
+
+1:      ba,pt           %xcc, etrap_irq
+         rd             %pc, %g7
+
+2:
+#ifdef CONFIG_TRACE_IRQFLAGS
+        call    trace_hardirqs_off
+         nop
+#endif
+        mov             %l4, %o1
+        mov             %l5, %o2
+        call            spitfire_access_error
+         add            %sp, PTREGS_OFF, %o0
+        ba,pt           %xcc, rtrap
+         nop
+        .size           __spitfire_access_error,.-__spitfire_access_error
+
+        /* This is the trap handler entry point for ECC correctable
+         * errors.  They are corrected, but we listen for the trap so
+         * that the event can be logged.
+         *
+         * Disrupting errors are either:
+         * 1) single-bit ECC errors during UDB reads to system
+         *    memory
+         * 2) data parity errors during write-back events
+         *
+         * As far as I can make out from the manual, the CEE trap is
+         * only for correctable errors during memory read accesses by
+         * the front-end of the processor.
+         *
+         * The code below is only for trap level 1 CEE events, as it
+         * is the only situation where we can safely record and log.
+         * For trap level >1 we just clear the CE bit in the AFSR and
+         * return.
+         *
+         * This is just like __spiftire_access_error above, but it
+         * specifically handles correctable errors.  If an
+         * uncorrectable error is indicated in the AFSR we will branch
+         * directly above to __spitfire_access_error to handle it
+         * instead.  Uncorrectable therefore takes priority over
+         * correctable, and the error logging C code will notice this
+         * case by inspecting the trap type.
+         */
+        .type           __spitfire_cee_trap,#function
+__spitfire_cee_trap:
+        ldxa            [%g0] ASI_AFSR, %g4     ! Get AFSR
+        mov             1, %g3
+        sllx            %g3, SFAFSR_UE_SHIFT, %g3
+        andcc           %g4, %g3, %g0           ! Check for UE
+        bne,pn          %xcc, __spitfire_access_error
+         nop
+
+        /* Ok, in this case we only have a correctable error.
+         * Indicate we only wish to capture that state in register
+         * %g1, and we only disable CE error reporting unlike UE
+         * handling which disables all errors.
+         */
+        ldxa            [%g0] ASI_ESTATE_ERROR_EN, %g3
+        andn            %g3, ESTATE_ERR_CE, %g3
+        stxa            %g3, [%g0] ASI_ESTATE_ERROR_EN
+        membar          #Sync
+
+        /* Preserve AFSR in %g4, indicate UDB state to capture in %g1 */
+        ba,pt           %xcc, __spitfire_cee_trap_continue
+         mov            UDBE_CE, %g1
+        .size           __spitfire_cee_trap,.-__spitfire_cee_trap
+
+        .type           __spitfire_data_access_exception_tl1,#function
+__spitfire_data_access_exception_tl1:
+        rdpr            %pstate, %g4
+        wrpr            %g4, PSTATE_MG|PSTATE_AG, %pstate
+        mov             TLB_SFSR, %g3
+        mov             DMMU_SFAR, %g5
+        ldxa            [%g3] ASI_DMMU, %g4     ! Get SFSR
+        ldxa            [%g5] ASI_DMMU, %g5     ! Get SFAR
+        stxa            %g0, [%g3] ASI_DMMU     ! Clear SFSR.FaultValid bit
+        membar          #Sync
+        rdpr            %tt, %g3
+        cmp             %g3, 0x80               ! first win spill/fill trap
+        blu,pn          %xcc, 1f
+         cmp            %g3, 0xff               ! last win spill/fill trap
+        bgu,pn          %xcc, 1f
+         nop
+        ba,pt           %xcc, winfix_dax
+         rdpr           %tpc, %g3
+1:      sethi           %hi(109f), %g7
+        ba,pt           %xcc, etraptl1
+109:     or             %g7, %lo(109b), %g7
+        mov             %l4, %o1
+        mov             %l5, %o2
+        call            spitfire_data_access_exception_tl1
+         add            %sp, PTREGS_OFF, %o0
+        ba,pt           %xcc, rtrap
+         nop
+        .size           __spitfire_data_access_exception_tl1,.-__spitfire_data_access_exception_tl1
+
+        .type           __spitfire_data_access_exception,#function
+__spitfire_data_access_exception:
+        rdpr            %pstate, %g4
+        wrpr            %g4, PSTATE_MG|PSTATE_AG, %pstate
+        mov             TLB_SFSR, %g3
+        mov             DMMU_SFAR, %g5
+        ldxa            [%g3] ASI_DMMU, %g4     ! Get SFSR
+        ldxa            [%g5] ASI_DMMU, %g5     ! Get SFAR
+        stxa            %g0, [%g3] ASI_DMMU     ! Clear SFSR.FaultValid bit
+        membar          #Sync
+        sethi           %hi(109f), %g7
+        ba,pt           %xcc, etrap
+109:     or             %g7, %lo(109b), %g7
+        mov             %l4, %o1
+        mov             %l5, %o2
+        call            spitfire_data_access_exception
+         add            %sp, PTREGS_OFF, %o0
+        ba,pt           %xcc, rtrap
+         nop
+        .size           __spitfire_data_access_exception,.-__spitfire_data_access_exception
+
+        .type           __spitfire_insn_access_exception_tl1,#function
+__spitfire_insn_access_exception_tl1:
+        rdpr            %pstate, %g4
+        wrpr            %g4, PSTATE_MG|PSTATE_AG, %pstate
+        mov             TLB_SFSR, %g3
+        ldxa            [%g3] ASI_IMMU, %g4     ! Get SFSR
+        rdpr            %tpc, %g5               ! IMMU has no SFAR, use TPC
+        stxa            %g0, [%g3] ASI_IMMU     ! Clear FaultValid bit
+        membar          #Sync
+        sethi           %hi(109f), %g7
+        ba,pt           %xcc, etraptl1
+109:     or             %g7, %lo(109b), %g7
+        mov             %l4, %o1
+        mov             %l5, %o2
+        call            spitfire_insn_access_exception_tl1
+         add            %sp, PTREGS_OFF, %o0
+        ba,pt           %xcc, rtrap
+         nop
+        .size           __spitfire_insn_access_exception_tl1,.-__spitfire_insn_access_exception_tl1
+
+        .type           __spitfire_insn_access_exception,#function
+__spitfire_insn_access_exception:
+        rdpr            %pstate, %g4
+        wrpr            %g4, PSTATE_MG|PSTATE_AG, %pstate
+        mov             TLB_SFSR, %g3
+        ldxa            [%g3] ASI_IMMU, %g4     ! Get SFSR
+        rdpr            %tpc, %g5               ! IMMU has no SFAR, use TPC
+        stxa            %g0, [%g3] ASI_IMMU     ! Clear FaultValid bit
+        membar          #Sync
+        sethi           %hi(109f), %g7
+        ba,pt           %xcc, etrap
+109:     or             %g7, %lo(109b), %g7
+        mov             %l4, %o1
+        mov             %l5, %o2
+        call            spitfire_insn_access_exception
+         add            %sp, PTREGS_OFF, %o0
+        ba,pt           %xcc, rtrap
+         nop
+        .size           __spitfire_insn_access_exception,.-__spitfire_insn_access_exception
diff --git a/arch/sparc64/kernel/syscalls.S b/arch/sparc64/kernel/syscalls.S
new file mode 100644
index 000000000000..db19ed67acf6
--- /dev/null
+++ b/arch/sparc64/kernel/syscalls.S
@@ -0,0 +1,279 @@
+        /* SunOS's execv() call only specifies the argv argument, the
+         * environment settings are the same as the calling processes.
+         */
+sys_execve:
+        sethi   %hi(sparc_execve), %g1
+        ba,pt   %xcc, execve_merge
+         or     %g1, %lo(sparc_execve), %g1
+
+#ifdef CONFIG_COMPAT
+sunos_execv:
+        stx     %g0, [%sp + PTREGS_OFF + PT_V9_I2]
+sys32_execve:
+        sethi   %hi(sparc32_execve), %g1
+        or      %g1, %lo(sparc32_execve), %g1
+#endif
+
+execve_merge:
+        flushw
+        jmpl    %g1, %g0
+         add    %sp, PTREGS_OFF, %o0
+
+        .align  32
+sys_pipe:
+        ba,pt   %xcc, sparc_pipe
+         add    %sp, PTREGS_OFF, %o0
+sys_nis_syscall:
+        ba,pt   %xcc, c_sys_nis_syscall
+         add    %sp, PTREGS_OFF, %o0
+sys_memory_ordering:
+        ba,pt   %xcc, sparc_memory_ordering
+         add    %sp, PTREGS_OFF, %o1
+sys_sigaltstack:
+        ba,pt   %xcc, do_sigaltstack
+         add    %i6, STACK_BIAS, %o2
+#ifdef CONFIG_COMPAT
+sys32_sigstack:
+        ba,pt   %xcc, do_sys32_sigstack
+         mov    %i6, %o2
+sys32_sigaltstack:
+        ba,pt   %xcc, do_sys32_sigaltstack
+         mov    %i6, %o2
+#endif
+        .align  32
+#ifdef CONFIG_COMPAT
+sys32_sigreturn:
+        add     %sp, PTREGS_OFF, %o0
+        call    do_sigreturn32
+         add    %o7, 1f-.-4, %o7
+        nop
+#endif
+sys_rt_sigreturn:
+        add     %sp, PTREGS_OFF, %o0
+        call    do_rt_sigreturn
+         add    %o7, 1f-.-4, %o7
+        nop
+#ifdef CONFIG_COMPAT
+sys32_rt_sigreturn:
+        add     %sp, PTREGS_OFF, %o0
+        call    do_rt_sigreturn32
+         add    %o7, 1f-.-4, %o7
+        nop
+#endif
+        .align  32
+1:      ldx     [%g6 + TI_FLAGS], %l5
+        andcc   %l5, (_TIF_SYSCALL_TRACE|_TIF_SECCOMP|_TIF_SYSCALL_AUDIT), %g0
+        be,pt   %icc, rtrap
+         nop
+        add     %sp, PTREGS_OFF, %o0
+        call    syscall_trace
+         mov    1, %o1
+        ba,pt   %xcc, rtrap
+         nop
+
+        /* This is how fork() was meant to be done, 8 instruction entry.
+         *
+         * I questioned the following code briefly, let me clear things
+         * up so you must not reason on it like I did.
+         *
+         * Know the fork_kpsr etc. we use in the sparc32 port?  We don't
+         * need it here because the only piece of window state we copy to
+         * the child is the CWP register.  Even if the parent sleeps,
+         * we are safe because we stuck it into pt_regs of the parent
+         * so it will not change.
+         *
+         * XXX This raises the question, whether we can do the same on
+         * XXX sparc32 to get rid of fork_kpsr _and_ fork_kwim.  The
+         * XXX answer is yes.  We stick fork_kpsr in UREG_G0 and
+         * XXX fork_kwim in UREG_G1 (global registers are considered
+         * XXX volatile across a system call in the sparc ABI I think
+         * XXX if it isn't we can use regs->y instead, anyone who depends
+         * XXX upon the Y register being preserved across a fork deserves
+         * XXX to lose).
+         *
+         * In fact we should take advantage of that fact for other things
+         * during system calls...
+         */
+        .align  32
+sys_vfork: /* Under Linux, vfork and fork are just special cases of clone. */
+        sethi   %hi(0x4000 | 0x0100 | SIGCHLD), %o0
+        or      %o0, %lo(0x4000 | 0x0100 | SIGCHLD), %o0
+        ba,pt   %xcc, sys_clone
+sys_fork:
+         clr    %o1
+        mov     SIGCHLD, %o0
+sys_clone:
+        flushw
+        movrz   %o1, %fp, %o1
+        mov     0, %o3
+        ba,pt   %xcc, sparc_do_fork
+         add    %sp, PTREGS_OFF, %o2
+
+        .globl  ret_from_syscall
+ret_from_syscall:
+        /* Clear current_thread_info()->new_child, and
+         * check performance counter stuff too.
+         */
+        stb     %g0, [%g6 + TI_NEW_CHILD]
+        ldx     [%g6 + TI_FLAGS], %l0
+        call    schedule_tail
+         mov    %g7, %o0
+        andcc   %l0, _TIF_PERFCTR, %g0
+        be,pt   %icc, 1f
+         nop
+        ldx     [%g6 + TI_PCR], %o7
+        wr      %g0, %o7, %pcr
+
+        /* Blackbird errata workaround.  See commentary in
+         * smp.c:smp_percpu_timer_interrupt() for more
+         * information.
+         */
+        ba,pt   %xcc, 99f
+         nop
+
+        .align  64
+99:     wr      %g0, %g0, %pic
+        rd      %pic, %g0
+
+1:      ba,pt   %xcc, ret_sys_call
+         ldx    [%sp + PTREGS_OFF + PT_V9_I0], %o0
+
+        .globl  sparc_exit
+        .type   sparc_exit,#function
+sparc_exit:
+        rdpr    %pstate, %g2
+        wrpr    %g2, PSTATE_IE, %pstate
+        rdpr    %otherwin, %g1
+        rdpr    %cansave, %g3
+        add     %g3, %g1, %g3
+        wrpr    %g3, 0x0, %cansave
+        wrpr    %g0, 0x0, %otherwin
+        wrpr    %g2, 0x0, %pstate
+        ba,pt   %xcc, sys_exit
+         stb    %g0, [%g6 + TI_WSAVED]
+        .size   sparc_exit,.-sparc_exit
+
+linux_sparc_ni_syscall:
+        sethi   %hi(sys_ni_syscall), %l7
+        ba,pt   %xcc, 4f
+         or     %l7, %lo(sys_ni_syscall), %l7
+
+linux_syscall_trace32:
+        add     %sp, PTREGS_OFF, %o0
+        call    syscall_trace
+         clr    %o1
+        srl     %i0, 0, %o0
+        srl     %i4, 0, %o4
+        srl     %i1, 0, %o1
+        srl     %i2, 0, %o2
+        ba,pt   %xcc, 2f
+         srl    %i3, 0, %o3
+
+linux_syscall_trace:
+        add     %sp, PTREGS_OFF, %o0
+        call    syscall_trace
+         clr    %o1
+        mov     %i0, %o0
+        mov     %i1, %o1
+        mov     %i2, %o2
+        mov     %i3, %o3
+        b,pt    %xcc, 2f
+         mov    %i4, %o4
+
+
+        /* Linux 32-bit system calls enter here... */
+        .align  32
+        .globl  linux_sparc_syscall32
+linux_sparc_syscall32:
+        /* Direct access to user regs, much faster. */
+        cmp     %g1, NR_SYSCALLS                        ! IEU1  Group
+        bgeu,pn %xcc, linux_sparc_ni_syscall            ! CTI
+         srl    %i0, 0, %o0                             ! IEU0
+        sll     %g1, 2, %l4                             ! IEU0  Group
+        srl     %i4, 0, %o4                             ! IEU1
+        lduw    [%l7 + %l4], %l7                        ! Load
+        srl     %i1, 0, %o1                             ! IEU0  Group
+        ldx     [%g6 + TI_FLAGS], %l0           ! Load
+
+        srl     %i5, 0, %o5                             ! IEU1
+        srl     %i2, 0, %o2                             ! IEU0  Group
+        andcc   %l0, (_TIF_SYSCALL_TRACE|_TIF_SECCOMP|_TIF_SYSCALL_AUDIT), %g0
+        bne,pn  %icc, linux_syscall_trace32             ! CTI
+         mov    %i0, %l5                                ! IEU1
+        call    %l7                                     ! CTI   Group brk forced
+         srl    %i3, 0, %o3                             ! IEU0
+        ba,a,pt %xcc, 3f
+
+        /* Linux native system calls enter here... */
+        .align  32
+        .globl  linux_sparc_syscall
+linux_sparc_syscall:
+        /* Direct access to user regs, much faster. */
+        cmp     %g1, NR_SYSCALLS                        ! IEU1  Group
+        bgeu,pn %xcc, linux_sparc_ni_syscall            ! CTI
+         mov    %i0, %o0                                ! IEU0
+        sll     %g1, 2, %l4                             ! IEU0  Group
+        mov     %i1, %o1                                ! IEU1
+        lduw    [%l7 + %l4], %l7                        ! Load
+4:      mov     %i2, %o2                                ! IEU0  Group
+        ldx     [%g6 + TI_FLAGS], %l0           ! Load
+
+        mov     %i3, %o3                                ! IEU1
+        mov     %i4, %o4                                ! IEU0  Group
+        andcc   %l0, (_TIF_SYSCALL_TRACE|_TIF_SECCOMP|_TIF_SYSCALL_AUDIT), %g0
+        bne,pn  %icc, linux_syscall_trace               ! CTI   Group
+         mov    %i0, %l5                                ! IEU0
+2:      call    %l7                                     ! CTI   Group brk forced
+         mov    %i5, %o5                                ! IEU0
+        nop
+
+3:      stx     %o0, [%sp + PTREGS_OFF + PT_V9_I0]
+ret_sys_call:
+        ldx     [%sp + PTREGS_OFF + PT_V9_TSTATE], %g3
+        ldx     [%sp + PTREGS_OFF + PT_V9_TNPC], %l1 ! pc = npc
+        sra     %o0, 0, %o0
+        mov     %ulo(TSTATE_XCARRY | TSTATE_ICARRY), %g2
+        sllx    %g2, 32, %g2
+
+        /* Check if force_successful_syscall_return()
+         * was invoked.
+         */
+        ldub    [%g6 + TI_SYS_NOERROR], %l2
+        brnz,a,pn %l2, 80f
+         stb    %g0, [%g6 + TI_SYS_NOERROR]
+
+        cmp     %o0, -ERESTART_RESTARTBLOCK
+        bgeu,pn %xcc, 1f
+         andcc  %l0, (_TIF_SYSCALL_TRACE|_TIF_SECCOMP|_TIF_SYSCALL_AUDIT), %l6
+80:
+        /* System call success, clear Carry condition code. */
+        andn    %g3, %g2, %g3
+        stx     %g3, [%sp + PTREGS_OFF + PT_V9_TSTATE]  
+        bne,pn  %icc, linux_syscall_trace2
+         add    %l1, 0x4, %l2                   ! npc = npc+4
+        stx     %l1, [%sp + PTREGS_OFF + PT_V9_TPC]
+        ba,pt   %xcc, rtrap
+         stx    %l2, [%sp + PTREGS_OFF + PT_V9_TNPC]
+
+1:
+        /* System call failure, set Carry condition code.
+         * Also, get abs(errno) to return to the process.
+         */
+        andcc   %l0, (_TIF_SYSCALL_TRACE|_TIF_SECCOMP|_TIF_SYSCALL_AUDIT), %l6  
+        sub     %g0, %o0, %o0
+        or      %g3, %g2, %g3
+        stx     %o0, [%sp + PTREGS_OFF + PT_V9_I0]
+        stx     %g3, [%sp + PTREGS_OFF + PT_V9_TSTATE]
+        bne,pn  %icc, linux_syscall_trace2
+         add    %l1, 0x4, %l2                   ! npc = npc+4
+        stx     %l1, [%sp + PTREGS_OFF + PT_V9_TPC]
+
+        b,pt    %xcc, rtrap
+         stx    %l2, [%sp + PTREGS_OFF + PT_V9_TNPC]
+linux_syscall_trace2:
+        add     %sp, PTREGS_OFF, %o0
+        call    syscall_trace
+         mov    1, %o1
+        stx     %l1, [%sp + PTREGS_OFF + PT_V9_TPC]
+        ba,pt   %xcc, rtrap
+         stx    %l2, [%sp + PTREGS_OFF + PT_V9_TNPC]
diff --git a/arch/sparc64/kernel/ttable.S b/arch/sparc64/kernel/ttable.S
index b0de4c00b11a..450053af039e 100644
--- a/arch/sparc64/kernel/ttable.S
+++ b/arch/sparc64/kernel/ttable.S
@@ -153,7 +153,7 @@ tl0_resv164:	BTRAP(0x164) BTRAP(0x165) BTRAP(0x166) BTRAP(0x167) BTRAP(0x168)
 tl0_resv169:    BTRAP(0x169) BTRAP(0x16a) BTRAP(0x16b) BTRAP(0x16c)
 tl0_linux64:    LINUX_64BIT_SYSCALL_TRAP
 tl0_gsctx:      TRAP(sparc64_get_context) TRAP(sparc64_set_context)
-tl0_resv170:    KPROBES_TRAP(0x170) KPROBES_TRAP(0x171) BTRAP(0x172)
+tl0_resv170:    KPROBES_TRAP(0x170) KPROBES_TRAP(0x171) KGDB_TRAP(0x172)
 tl0_resv173:    BTRAP(0x173) BTRAP(0x174) BTRAP(0x175) BTRAP(0x176) BTRAP(0x177)
 tl0_resv178:    BTRAP(0x178) BTRAP(0x179) BTRAP(0x17a) BTRAP(0x17b) BTRAP(0x17c)
 tl0_resv17d:    BTRAP(0x17d) BTRAP(0x17e) BTRAP(0x17f)
diff --git a/arch/sparc64/kernel/utrap.S b/arch/sparc64/kernel/utrap.S
new file mode 100644
index 000000000000..b7f0f3f3a909
--- /dev/null
+++ b/arch/sparc64/kernel/utrap.S
@@ -0,0 +1,29 @@
+        .globl          utrap_trap
+        .type           utrap_trap,#function
+utrap_trap:             /* %g3=handler,%g4=level */
+        TRAP_LOAD_THREAD_REG(%g6, %g1)
+        ldx             [%g6 + TI_UTRAPS], %g1
+        brnz,pt         %g1, invoke_utrap
+         nop
+
+        ba,pt           %xcc, etrap
+         rd             %pc, %g7
+        mov             %l4, %o1
+        call            bad_trap
+         add            %sp, PTREGS_OFF, %o0
+        ba,pt           %xcc, rtrap
+         nop
+
+invoke_utrap:
+        sllx            %g3, 3, %g3
+        ldx             [%g1 + %g3], %g1
+        save            %sp, -128, %sp
+        rdpr            %tstate, %l6
+        rdpr            %cwp, %l7
+        andn            %l6, TSTATE_CWP, %l6
+        wrpr            %l6, %l7, %tstate
+        rdpr            %tpc, %l6
+        rdpr            %tnpc, %l7
+        wrpr            %g1, 0, %tnpc
+        done
+        .size           utrap_trap,.-utrap_trap
diff --git a/arch/sparc64/lib/iomap.c b/arch/sparc64/lib/iomap.c
index ac556db06973..7120ebbd4d03 100644
--- a/arch/sparc64/lib/iomap.c
+++ b/arch/sparc64/lib/iomap.c
@@ -21,8 +21,8 @@ EXPORT_SYMBOL(ioport_unmap);
 /* Create a virtual mapping cookie for a PCI BAR (memory or IO) */
 void __iomem *pci_iomap(struct pci_dev *dev, int bar, unsigned long maxlen)
 {
-        unsigned long start = pci_resource_start(dev, bar);
-        unsigned long len = pci_resource_len(dev, bar);
+        resource_size_t start = pci_resource_start(dev, bar);
+        resource_size_t len = pci_resource_len(dev, bar);
         unsigned long flags = pci_resource_flags(dev, bar);
 
         if (!len || !start)
diff --git a/arch/sparc64/mm/init.c b/arch/sparc64/mm/init.c
index 8c2b50e8abc6..4cad0b32b0af 100644
--- a/arch/sparc64/mm/init.c
+++ b/arch/sparc64/mm/init.c
@@ -160,6 +160,7 @@ extern unsigned int sparc_ramdisk_image;
 extern unsigned int sparc_ramdisk_size;
 
 struct page *mem_map_zero __read_mostly;
+EXPORT_SYMBOL(mem_map_zero);
 
 unsigned int sparc64_highest_unlocked_tlb_ent __read_mostly;
 
diff --git a/arch/sparc64/mm/ultra.S b/arch/sparc64/mm/ultra.S
index e686a67561af..796e005dad8b 100644
--- a/arch/sparc64/mm/ultra.S
+++ b/arch/sparc64/mm/ultra.S
@@ -676,6 +676,33 @@ xcall_new_mmu_context_version:
         wr              %g0, (1 << PIL_SMP_CTX_NEW_VERSION), %set_softint
         retry
 
+#ifdef CONFIG_KGDB
+        .globl          xcall_kgdb_capture
+xcall_kgdb_capture:
+661:    rdpr            %pstate, %g2
+        wrpr            %g2, PSTATE_IG | PSTATE_AG, %pstate
+        .section        .sun4v_2insn_patch, "ax"
+        .word           661b
+        nop
+        nop
+        .previous
+
+        rdpr            %pil, %g2
+        wrpr            %g0, 15, %pil
+        sethi           %hi(109f), %g7
+        ba,pt           %xcc, etrap_irq
+109:     or             %g7, %lo(109b), %g7
+#ifdef CONFIG_TRACE_IRQFLAGS
+        call            trace_hardirqs_off
+         nop
+#endif
+        call            smp_kgdb_capture_client
+         add            %sp, PTREGS_OFF, %o0
+        /* Has to be a non-v9 branch due to the large distance. */
+        ba              rtrap_xcall
+         ldx            [%sp + PTREGS_OFF + PT_V9_TSTATE], %l1
+#endif
+
 #endif /* CONFIG_SMP */
 
 
diff --git a/arch/um/Makefile b/arch/um/Makefile
index dbeab15e7bb7..01b97c19a8ba 100644
--- a/arch/um/Makefile
+++ b/arch/um/Makefile
@@ -77,7 +77,10 @@ include $(srctree)/$(ARCH_DIR)/Makefile-os-$(OS)
 KERNEL_DEFINES = $(strip -Derrno=kernel_errno -Dsigprocmask=kernel_sigprocmask \
                          -Dmktime=kernel_mktime $(ARCH_KERNEL_DEFINES))
 KBUILD_CFLAGS += $(KERNEL_DEFINES)
-KBUILD_CFLAGS += $(call cc-option,-fno-unit-at-a-time,)
+# Disable unit-at-a-time mode on pre-gcc-4.0 compilers, it makes gcc use
+# a lot more stack due to the lack of sharing of stacklots:
+KBUILD_CFLAGS += $(shell if [ $(call cc-version) -lt 0400 ] ; then \
+                        echo $(call cc-option,-fno-unit-at-a-time); fi ;)
 
 PHONY += linux
 
diff --git a/arch/um/kernel/exitcode.c b/arch/um/kernel/exitcode.c
index 984f80e668ca..6540d2c9fbb7 100644
--- a/arch/um/kernel/exitcode.c
+++ b/arch/um/kernel/exitcode.c
@@ -59,7 +59,7 @@ static int make_proc_exitcode(void)
 {
         struct proc_dir_entry *ent;
 
-        ent = create_proc_entry("exitcode", 0600, &proc_root);
+        ent = create_proc_entry("exitcode", 0600, NULL);
         if (ent == NULL) {
                 printk(KERN_WARNING "make_proc_exitcode : Failed to register "
                        "/proc/exitcode\n");
diff --git a/arch/um/kernel/process.c b/arch/um/kernel/process.c
index e8cb9ff183e9..83603cfbde81 100644
--- a/arch/um/kernel/process.c
+++ b/arch/um/kernel/process.c
@@ -364,7 +364,7 @@ int __init make_proc_sysemu(void)
         if (!sysemu_supported)
                 return 0;
 
-        ent = create_proc_entry("sysemu", 0600, &proc_root);
+        ent = create_proc_entry("sysemu", 0600, NULL);
 
         if (ent == NULL)
         {
diff --git a/arch/um/kernel/syscall.c b/arch/um/kernel/syscall.c
index 9cffc628a37e..128ee85bc8d9 100644
--- a/arch/um/kernel/syscall.c
+++ b/arch/um/kernel/syscall.c
@@ -73,23 +73,6 @@ long old_mmap(unsigned long addr, unsigned long len,
  out:
         return err;
 }
-/*
- * sys_pipe() is the normal C calling standard for creating
- * a pipe. It's not the way unix traditionally does this, though.
- */
-long sys_pipe(unsigned long __user * fildes)
-{
-        int fd[2];
-        long error;
-
-        error = do_pipe(fd);
-        if (!error) {
-                if (copy_to_user(fildes, fd, sizeof(fd)))
-                        error = -EFAULT;
-        }
-        return error;
-}
-
 
 long sys_uname(struct old_utsname __user * name)
 {
diff --git a/arch/um/kernel/time.c b/arch/um/kernel/time.c
index e066e84493b1..0d0cea2ac98d 100644
--- a/arch/um/kernel/time.c
+++ b/arch/um/kernel/time.c
@@ -4,6 +4,7 @@
  */
 
 #include <linux/clockchips.h>
+#include <linux/init.h>
 #include <linux/interrupt.h>
 #include <linux/jiffies.h>
 #include <linux/threads.h>
@@ -109,8 +110,6 @@ static void __init setup_itimer(void)
         clockevents_register_device(&itimer_clockevent);
 }
 
-extern void (*late_time_init)(void);
-
 void __init time_init(void)
 {
         long long nsecs;
diff --git a/arch/v850/kernel/asm-offsets.c b/arch/v850/kernel/asm-offsets.c
index cee5c3142d41..581e6986a776 100644
--- a/arch/v850/kernel/asm-offsets.c
+++ b/arch/v850/kernel/asm-offsets.c
@@ -13,14 +13,11 @@
 #include <linux/kernel_stat.h>
 #include <linux/ptrace.h>
 #include <linux/hardirq.h>
+#include <linux/kbuild.h>
+
 #include <asm/irq.h>
 #include <asm/errno.h>
 
-#define DEFINE(sym, val) \
-        asm volatile("\n->" #sym " %0 " #val : : "i" (val))
-
-#define BLANK() asm volatile("\n->" : : )
-
 int main (void)
 {
         /* offsets into the task struct */
diff --git a/arch/v850/kernel/rte_mb_a_pci.c b/arch/v850/kernel/rte_mb_a_pci.c
index 7165478824e7..687e367d8b64 100644
--- a/arch/v850/kernel/rte_mb_a_pci.c
+++ b/arch/v850/kernel/rte_mb_a_pci.c
@@ -790,8 +790,8 @@ pci_free_consistent (struct pci_dev *pdev, size_t size, void *cpu_addr,
 
 void __iomem *pci_iomap (struct pci_dev *dev, int bar, unsigned long max)
 {
-        unsigned long start = pci_resource_start (dev, bar);
-        unsigned long len = pci_resource_len (dev, bar);
+        resource_size_t start = pci_resource_start (dev, bar);
+        resource_size_t len = pci_resource_len (dev, bar);
 
         if (!start || len == 0)
                 return 0;
diff --git a/arch/v850/kernel/syscalls.c b/arch/v850/kernel/syscalls.c
index 003db9c8c44a..1a83daf8e24f 100644
--- a/arch/v850/kernel/syscalls.c
+++ b/arch/v850/kernel/syscalls.c
@@ -132,23 +132,6 @@ sys_ipc (uint call, int first, int second, int third, void *ptr, long fifth)
         return ret;
 }
 
-/*
- * sys_pipe() is the normal C calling standard for creating
- * a pipe. It's not the way unix traditionally does this, though.
- */
-int sys_pipe (int *fildes)
-{
-        int fd[2];
-        int error;
-
-        error = do_pipe (fd);
-        if (!error) {
-                if (copy_to_user (fildes, fd, 2*sizeof (int)))
-                        error = -EFAULT;
-        }
-        return error;
-}
-
 static inline unsigned long
 do_mmap2 (unsigned long addr, size_t len,
          unsigned long prot, unsigned long flags,
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
index a12dbb2b93f3..845ea2b2d487 100644
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@ -25,6 +25,18 @@ config X86
         select HAVE_KVM if ((X86_32 && !X86_VOYAGER && !X86_VISWS && !X86_NUMAQ) || X86_64)
         select HAVE_ARCH_KGDB if !X86_VOYAGER
 
+config DEFCONFIG_LIST
+        string
+        depends on X86_32
+        option defconfig_list
+        default "arch/x86/configs/i386_defconfig"
+
+config DEFCONFIG_LIST
+        string
+        depends on X86_64
+        option defconfig_list
+        default "arch/x86/configs/x86_64_defconfig"
+
 
 config GENERIC_LOCKBREAK
         def_bool n
@@ -180,7 +192,7 @@ config X86_HT
 
 config X86_BIOS_REBOOT
         bool
-        depends on X86_32 && !(X86_VISWS || X86_VOYAGER)
+        depends on !X86_VISWS && !X86_VOYAGER
         default y
 
 config X86_TRAMPOLINE
@@ -537,9 +549,6 @@ config CALGARY_IOMMU_ENABLED_BY_DEFAULT
           Calgary anyway, pass 'iommu=calgary' on the kernel command line.
           If unsure, say Y.
 
-config IOMMU_HELPER
-        def_bool (CALGARY_IOMMU || GART_IOMMU)
-
 # need this always selected by IOMMU for the VIA workaround
 config SWIOTLB
         bool
@@ -550,6 +559,8 @@ config SWIOTLB
           access 32-bits of memory can be used on systems with more than
           3 GB of memory. If unsure, say Y.
 
+config IOMMU_HELPER
+        def_bool (CALGARY_IOMMU || GART_IOMMU || SWIOTLB)
 
 config NR_CPUS
         int "Maximum number of CPUs (2-255)"
@@ -1162,7 +1173,7 @@ source kernel/Kconfig.hz
 
 config KEXEC
         bool "kexec system call"
-        depends on X86_64 || X86_BIOS_REBOOT
+        depends on X86_BIOS_REBOOT
         help
           kexec is a system call that implements the ability to shutdown your
           current kernel, and to start another kernel.  It is like a reboot
@@ -1505,6 +1516,10 @@ config PCI_GODIRECT
 config PCI_GOANY
         bool "Any"
 
+config PCI_GOOLPC
+        bool "OLPC"
+        depends on OLPC
+
 endchoice
 
 config PCI_BIOS
@@ -1514,12 +1529,17 @@ config PCI_BIOS
 # x86-64 doesn't support PCI BIOS access from long mode so always go direct.
 config PCI_DIRECT
         def_bool y
-        depends on PCI && (X86_64 || (PCI_GODIRECT || PCI_GOANY) || X86_VISWS)
+        depends on PCI && (X86_64 || (PCI_GODIRECT || PCI_GOANY || PCI_GOOLPC) || X86_VISWS)
 
 config PCI_MMCONFIG
         def_bool y
         depends on X86_32 && PCI && ACPI && (PCI_GOMMCONFIG || PCI_GOANY)
 
+config PCI_OLPC
+        bool
+        depends on PCI && PCI_GOOLPC
+        default y
+
 config PCI_DOMAINS
         def_bool y
         depends on PCI
@@ -1639,6 +1659,14 @@ config GEODE_MFGPT_TIMER
           MFGPTs have a better resolution and max interval than the
           generic PIT, and are suitable for use as high-res timers.
 
+config OLPC
+        bool "One Laptop Per Child support"
+        depends on MGEODE_LX
+        default n
+        help
+          Add support for detecting the unique features of the OLPC
+          XO hardware.
+
 endif # X86_32
 
 config K8_NB
diff --git a/arch/x86/Kconfig.cpu b/arch/x86/Kconfig.cpu
index 7ef18b01f0bc..2ad6301849a1 100644
--- a/arch/x86/Kconfig.cpu
+++ b/arch/x86/Kconfig.cpu
@@ -278,11 +278,6 @@ config GENERIC_CPU
 
 endchoice
 
-config X86_CPU
-        def_bool y
-        select GENERIC_FIND_FIRST_BIT
-        select GENERIC_FIND_NEXT_BIT
-
 config X86_GENERIC
         bool "Generic x86 support"
         depends on X86_32
@@ -297,6 +292,11 @@ config X86_GENERIC
 
 endif
 
+config X86_CPU
+        def_bool y
+        select GENERIC_FIND_FIRST_BIT
+        select GENERIC_FIND_NEXT_BIT
+
 #
 # Define implied options from the CPU selection here
 config X86_L1_CACHE_BYTES
diff --git a/arch/x86/Kconfig.debug b/arch/x86/Kconfig.debug
index 5b1979a45a1e..ac1e31ba4795 100644
--- a/arch/x86/Kconfig.debug
+++ b/arch/x86/Kconfig.debug
@@ -118,7 +118,6 @@ config DEBUG_NX_TEST
 config 4KSTACKS
         bool "Use 4Kb for kernel stacks instead of 8Kb"
         depends on X86_32
-        default y
         help
           If you say Y here the kernel will use a 4Kb stacksize for the
           kernel stack attached to each process/thread. This facilitates
@@ -256,11 +255,9 @@ config CPA_DEBUG
         help
           Do change_page_attr() self-tests every 30 seconds.
 
-endmenu
-
 config OPTIMIZE_INLINING
         bool "Allow gcc to uninline functions marked 'inline'"
-        default y
+        depends on BROKEN
         help
           This option determines if the kernel forces gcc to inline the functions
           developers have marked 'inline'. Doing so takes away freedom from gcc to
@@ -270,3 +267,6 @@ config OPTIMIZE_INLINING
           this algorithm is so good that allowing gcc4 to make the decision can
           become the default in the future, until then this option is there to
           test gcc for this.
+
+endmenu
+
diff --git a/arch/x86/boot/compressed/relocs.c b/arch/x86/boot/compressed/relocs.c
index d01ea42187e6..edaadea90aaf 100644
--- a/arch/x86/boot/compressed/relocs.c
+++ b/arch/x86/boot/compressed/relocs.c
@@ -191,7 +191,7 @@ static void read_ehdr(FILE *fp)
                 die("Cannot read ELF header: %s\n",
                         strerror(errno));
         }
-        if (memcmp(ehdr.e_ident, ELFMAG, 4) != 0) {
+        if (memcmp(ehdr.e_ident, ELFMAG, SELFMAG) != 0) {
                 die("No ELF magic\n");
         }
         if (ehdr.e_ident[EI_CLASS] != ELFCLASS32) {
diff --git a/arch/x86/boot/edd.c b/arch/x86/boot/edd.c
index d84a48ece785..03399d64013b 100644
--- a/arch/x86/boot/edd.c
+++ b/arch/x86/boot/edd.c
@@ -126,17 +126,25 @@ void query_edd(void)
 {
         char eddarg[8];
         int do_mbr = 1;
+#ifdef CONFIG_EDD_OFF
+        int do_edd = 0;
+#else
         int do_edd = 1;
+#endif
         int be_quiet;
         int devno;
         struct edd_info ei, *edp;
         u32 *mbrptr;
 
         if (cmdline_find_option("edd", eddarg, sizeof eddarg) > 0) {
-                if (!strcmp(eddarg, "skipmbr") || !strcmp(eddarg, "skip"))
+                if (!strcmp(eddarg, "skipmbr") || !strcmp(eddarg, "skip")) {
+                        do_edd = 1;
                         do_mbr = 0;
+                }
                 else if (!strcmp(eddarg, "off"))
                         do_edd = 0;
+                else if (!strcmp(eddarg, "on"))
+                        do_edd = 1;
         }
 
         be_quiet = cmdline_find_option_bool("quiet");
diff --git a/arch/x86/ia32/ia32_signal.c b/arch/x86/ia32/ia32_signal.c
index bbed3a26ce55..cb3856a18c85 100644
--- a/arch/x86/ia32/ia32_signal.c
+++ b/arch/x86/ia32/ia32_signal.c
@@ -128,7 +128,7 @@ asmlinkage long sys32_sigsuspend(int history0, int history1, old_sigset_t mask)
 
         current->state = TASK_INTERRUPTIBLE;
         schedule();
-        set_thread_flag(TIF_RESTORE_SIGMASK);
+        set_restore_sigmask();
         return -ERESTARTNOHAND;
 }
 
diff --git a/arch/x86/kernel/Makefile b/arch/x86/kernel/Makefile
index fa19c3819540..bbdacb398d48 100644
--- a/arch/x86/kernel/Makefile
+++ b/arch/x86/kernel/Makefile
@@ -40,7 +40,6 @@ obj-$(CONFIG_STACKTRACE)	+= stacktrace.o
 obj-y                           += cpu/
 obj-y                           += acpi/
 obj-$(CONFIG_X86_BIOS_REBOOT)   += reboot.o
-obj-$(CONFIG_X86_64)            += reboot.o
 obj-$(CONFIG_MCA)               += mca_32.o
 obj-$(CONFIG_X86_MSR)           += msr.o
 obj-$(CONFIG_X86_CPUID)         += cpuid.o
@@ -91,6 +90,8 @@ endif
 obj-$(CONFIG_SCx200)            += scx200.o
 scx200-y                        += scx200_32.o
 
+obj-$(CONFIG_OLPC)              += olpc.o
+
 ###
 # 64 bit specific files
 ifeq ($(CONFIG_X86_64),y)
@@ -101,4 +102,6 @@ ifeq ($(CONFIG_X86_64),y)
         obj-$(CONFIG_GART_IOMMU)        += pci-gart_64.o aperture_64.o
         obj-$(CONFIG_CALGARY_IOMMU)     += pci-calgary_64.o tce_64.o
         obj-$(CONFIG_SWIOTLB)           += pci-swiotlb_64.o
+
+        obj-$(CONFIG_PCI_MMCONFIG)      += mmconf-fam10h_64.o
 endif
diff --git a/arch/x86/kernel/acpi/Makefile b/arch/x86/kernel/acpi/Makefile
index 7335959b6aff..fd5ca97a2ad5 100644
--- a/arch/x86/kernel/acpi/Makefile
+++ b/arch/x86/kernel/acpi/Makefile
@@ -10,5 +10,5 @@ endif
 $(obj)/wakeup_rm.o:    $(obj)/realmode/wakeup.bin
 
 $(obj)/realmode/wakeup.bin: FORCE
-        $(Q)$(MAKE) $(build)=$(obj)/realmode $@
+        $(Q)$(MAKE) $(build)=$(obj)/realmode
 
diff --git a/arch/x86/kernel/acpi/boot.c b/arch/x86/kernel/acpi/boot.c
index 977ed5cdeaa3..c49ebcc6c41e 100644
--- a/arch/x86/kernel/acpi/boot.c
+++ b/arch/x86/kernel/acpi/boot.c
@@ -771,6 +771,32 @@ static void __init acpi_register_lapic_address(unsigned long address)
                 boot_cpu_physical_apicid  = GET_APIC_ID(read_apic_id());
 }
 
+static int __init early_acpi_parse_madt_lapic_addr_ovr(void)
+{
+        int count;
+
+        if (!cpu_has_apic)
+                return -ENODEV;
+
+        /*
+         * Note that the LAPIC address is obtained from the MADT (32-bit value)
+         * and (optionally) overriden by a LAPIC_ADDR_OVR entry (64-bit value).
+         */
+
+        count =
+            acpi_table_parse_madt(ACPI_MADT_TYPE_LOCAL_APIC_OVERRIDE,
+                                  acpi_parse_lapic_addr_ovr, 0);
+        if (count < 0) {
+                printk(KERN_ERR PREFIX
+                       "Error parsing LAPIC address override entry\n");
+                return count;
+        }
+
+        acpi_register_lapic_address(acpi_lapic_addr);
+
+        return count;
+}
+
 static int __init acpi_parse_madt_lapic_entries(void)
 {
         int count;
@@ -901,6 +927,33 @@ static inline int acpi_parse_madt_ioapic_entries(void)
 }
 #endif  /* !CONFIG_X86_IO_APIC */
 
+static void __init early_acpi_process_madt(void)
+{
+#ifdef CONFIG_X86_LOCAL_APIC
+        int error;
+
+        if (!acpi_table_parse(ACPI_SIG_MADT, acpi_parse_madt)) {
+
+                /*
+                 * Parse MADT LAPIC entries
+                 */
+                error = early_acpi_parse_madt_lapic_addr_ovr();
+                if (!error) {
+                        acpi_lapic = 1;
+                        smp_found_config = 1;
+                }
+                if (error == -EINVAL) {
+                        /*
+                         * Dell Precision Workstation 410, 610 come here.
+                         */
+                        printk(KERN_ERR PREFIX
+                               "Invalid BIOS MADT, disabling ACPI\n");
+                        disable_acpi();
+                }
+        }
+#endif
+}
+
 static void __init acpi_process_madt(void)
 {
 #ifdef CONFIG_X86_LOCAL_APIC
@@ -1233,6 +1286,23 @@ int __init acpi_boot_table_init(void)
         return 0;
 }
 
+int __init early_acpi_boot_init(void)
+{
+        /*
+         * If acpi_disabled, bail out
+         * One exception: acpi=ht continues far enough to enumerate LAPICs
+         */
+        if (acpi_disabled && !acpi_ht)
+                return 1;
+
+        /*
+         * Process the Multiple APIC Description Table (MADT), if present
+         */
+        early_acpi_process_madt();
+
+        return 0;
+}
+
 int __init acpi_boot_init(void)
 {
         /*
diff --git a/arch/x86/kernel/acpi/realmode/Makefile b/arch/x86/kernel/acpi/realmode/Makefile
index 092900854acc..1c31cc0e9def 100644
--- a/arch/x86/kernel/acpi/realmode/Makefile
+++ b/arch/x86/kernel/acpi/realmode/Makefile
@@ -6,7 +6,8 @@
 # for more details.
 #
 
-targets         := wakeup.bin wakeup.elf
+always          := wakeup.bin
+targets         := wakeup.elf wakeup.lds
 
 wakeup-y        += wakeup.o wakemain.o video-mode.o copy.o
 
@@ -48,7 +49,7 @@ LDFLAGS_wakeup.elf	:= -T
 
 CPPFLAGS_wakeup.lds += -P -C
 
-$(obj)/wakeup.elf: $(src)/wakeup.lds $(WAKEUP_OBJS) FORCE
+$(obj)/wakeup.elf: $(obj)/wakeup.lds $(WAKEUP_OBJS) FORCE
         $(call if_changed,ld)
 
 OBJCOPYFLAGS_wakeup.bin := -O binary
diff --git a/arch/x86/kernel/apm_32.c b/arch/x86/kernel/apm_32.c
index e4ea362e8480..bf9290e29013 100644
--- a/arch/x86/kernel/apm_32.c
+++ b/arch/x86/kernel/apm_32.c
@@ -1192,19 +1192,6 @@ static int suspend(int vetoable)
         int err;
         struct apm_user *as;
 
-        if (pm_send_all(PM_SUSPEND, (void *)3)) {
-                /* Vetoed */
-                if (vetoable) {
-                        if (apm_info.connection_version > 0x100)
-                                set_system_power_state(APM_STATE_REJECT);
-                        err = -EBUSY;
-                        ignore_sys_suspend = 0;
-                        printk(KERN_WARNING "apm: suspend was vetoed.\n");
-                        goto out;
-                }
-                printk(KERN_CRIT "apm: suspend was vetoed, but suspending anyway.\n");
-        }
-
         device_suspend(PMSG_SUSPEND);
         local_irq_disable();
         device_power_down(PMSG_SUSPEND);
@@ -1227,9 +1214,7 @@ static int suspend(int vetoable)
         device_power_up();
         local_irq_enable();
         device_resume();
-        pm_send_all(PM_RESUME, (void *)0);
         queue_event(APM_NORMAL_RESUME, NULL);
- out:
         spin_lock(&user_list_lock);
         for (as = user_list; as != NULL; as = as->next) {
                 as->suspend_wait = 0;
@@ -1340,7 +1325,6 @@ static void check_events(void)
                         if ((event != APM_NORMAL_RESUME)
                             || (ignore_normal_resume == 0)) {
                                 device_resume();
-                                pm_send_all(PM_RESUME, (void *)0);
                                 queue_event(event, NULL);
                         }
                         ignore_normal_resume = 0;
diff --git a/arch/x86/kernel/asm-offsets_32.c b/arch/x86/kernel/asm-offsets_32.c
index 670c3c311289..92588083950f 100644
--- a/arch/x86/kernel/asm-offsets_32.c
+++ b/arch/x86/kernel/asm-offsets_32.c
@@ -9,6 +9,7 @@
 #include <linux/signal.h>
 #include <linux/personality.h>
 #include <linux/suspend.h>
+#include <linux/kbuild.h>
 #include <asm/ucontext.h>
 #include "sigframe.h"
 #include <asm/pgtable.h>
@@ -23,14 +24,6 @@
 #include <linux/lguest.h>
 #include "../../../drivers/lguest/lg.h"
 
-#define DEFINE(sym, val) \
-        asm volatile("\n->" #sym " %0 " #val : : "i" (val))
-
-#define BLANK() asm volatile("\n->" : : )
-
-#define OFFSET(sym, str, mem) \
-        DEFINE(sym, offsetof(struct str, mem));
-
 /* workaround for a warning with -Wmissing-prototypes */
 void foo(void);
 
diff --git a/arch/x86/kernel/asm-offsets_64.c b/arch/x86/kernel/asm-offsets_64.c
index 494e1e096ee6..f126c05d6170 100644
--- a/arch/x86/kernel/asm-offsets_64.c
+++ b/arch/x86/kernel/asm-offsets_64.c
@@ -10,6 +10,7 @@
 #include <linux/errno.h> 
 #include <linux/hardirq.h>
 #include <linux/suspend.h>
+#include <linux/kbuild.h>
 #include <asm/pda.h>
 #include <asm/processor.h>
 #include <asm/segment.h>
@@ -17,14 +18,6 @@
 #include <asm/ia32.h>
 #include <asm/bootparam.h>
 
-#define DEFINE(sym, val) \
-        asm volatile("\n->" #sym " %0 " #val : : "i" (val))
-
-#define BLANK() asm volatile("\n->" : : )
-
-#define OFFSET(sym, str, mem) \
-        DEFINE(sym, offsetof(struct str, mem))
-
 #define __NO_STUBS 1
 #undef __SYSCALL
 #undef _ASM_X86_64_UNISTD_H_
diff --git a/arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c b/arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c
index 8db8f73503b3..b0c8208df9fa 100644
--- a/arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c
+++ b/arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c
@@ -601,6 +601,7 @@ static int acpi_cpufreq_cpu_init(struct cpufreq_policy *policy)
             policy->shared_type == CPUFREQ_SHARED_TYPE_ANY) {
                 policy->cpus = perf->shared_cpu_map;
         }
+        policy->related_cpus = perf->shared_cpu_map;
 
 #ifdef CONFIG_SMP
         dmi_check_system(sw_any_bug_dmi_table);
diff --git a/arch/x86/kernel/cpu/mtrr/generic.c b/arch/x86/kernel/cpu/mtrr/generic.c
index 353efe4f5017..5d241ce94a44 100644
--- a/arch/x86/kernel/cpu/mtrr/generic.c
+++ b/arch/x86/kernel/cpu/mtrr/generic.c
@@ -90,7 +90,7 @@ u8 mtrr_type_lookup(u64 start, u64 end)
          * Look of multiple ranges matching this address and pick type
          * as per MTRR precedence
          */
-        if (!mtrr_state.enabled & 2) {
+        if (!(mtrr_state.enabled & 2)) {
                 return mtrr_state.def_type;
         }
 
diff --git a/arch/x86/kernel/cpu/mtrr/if.c b/arch/x86/kernel/cpu/mtrr/if.c
index 1960f1985e5e..84c480bb3715 100644
--- a/arch/x86/kernel/cpu/mtrr/if.c
+++ b/arch/x86/kernel/cpu/mtrr/if.c
@@ -424,7 +424,7 @@ static int __init mtrr_if_init(void)
                 return -ENODEV;
 
         proc_root_mtrr =
-                proc_create("mtrr", S_IWUSR | S_IRUGO, &proc_root, &mtrr_fops);
+                proc_create("mtrr", S_IWUSR | S_IRUGO, NULL, &mtrr_fops);
 
         if (proc_root_mtrr)
                 proc_root_mtrr->owner = THIS_MODULE;
diff --git a/arch/x86/kernel/e820_64.c b/arch/x86/kernel/e820_64.c
index 645ee5e32a27..124480c0008d 100644
--- a/arch/x86/kernel/e820_64.c
+++ b/arch/x86/kernel/e820_64.c
@@ -100,7 +100,7 @@ void __init free_early(unsigned long start, unsigned long end)
         for (j = i + 1; j < MAX_EARLY_RES && early_res[j].end; j++)
                 ;
 
-        memcpy(&early_res[i], &early_res[i + 1],
+        memmove(&early_res[i], &early_res[i + 1],
                (j - 1 - i) * sizeof(struct early_res));
 
         early_res[j - 1].end = 0;
diff --git a/arch/x86/kernel/genapic_64.c b/arch/x86/kernel/genapic_64.c
index 021624c83583..cbaaf69bedb2 100644
--- a/arch/x86/kernel/genapic_64.c
+++ b/arch/x86/kernel/genapic_64.c
@@ -83,7 +83,7 @@ unsigned int read_apic_id(void)
 {
         unsigned int id;
 
-        WARN_ON(preemptible());
+        WARN_ON(preemptible() && num_online_cpus() > 1);
         id = apic_read(APIC_ID);
         if (uv_system_type >= UV_X2APIC)
                 id  |= __get_cpu_var(x2apic_extra_bits);
diff --git a/arch/x86/kernel/head_32.S b/arch/x86/kernel/head_32.S
index 90f038af3adc..b2cc73768a9d 100644
--- a/arch/x86/kernel/head_32.S
+++ b/arch/x86/kernel/head_32.S
@@ -656,15 +656,16 @@ int_msg:
         .asciz "Unknown interrupt or fault at EIP %p %p %p\n"
 
 fault_msg:
-        .asciz                                                          \
-/* fault info: */       "BUG: Int %d: CR2 %p\n"                         \
-/* pusha regs: */       "     EDI %p  ESI %p  EBP %p  ESP %p\n"         \
-                        "     EBX %p  EDX %p  ECX %p  EAX %p\n"         \
-/* fault frame: */      "     err %p  EIP %p   CS %p  flg %p\n"         \
-                                                                        \
-                        "Stack: %p %p %p %p %p %p %p %p\n"              \
-                        "       %p %p %p %p %p %p %p %p\n"              \
-                        "       %p %p %p %p %p %p %p %p\n"
+/* fault info: */
+        .ascii "BUG: Int %d: CR2 %p\n"
+/* pusha regs: */
+        .ascii "     EDI %p  ESI %p  EBP %p  ESP %p\n"
+        .ascii "     EBX %p  EDX %p  ECX %p  EAX %p\n"
+/* fault frame: */
+        .ascii "     err %p  EIP %p   CS %p  flg %p\n"
+        .ascii "Stack: %p %p %p %p %p %p %p %p\n"
+        .ascii "       %p %p %p %p %p %p %p %p\n"
+        .asciz "       %p %p %p %p %p %p %p %p\n"
 
 #include "../../x86/xen/xen-head.S"
 
diff --git a/arch/x86/kernel/hpet.c b/arch/x86/kernel/hpet.c
index 9007f9ea64ee..9b5cfcdfc426 100644
--- a/arch/x86/kernel/hpet.c
+++ b/arch/x86/kernel/hpet.c
@@ -137,9 +137,10 @@ static void hpet_reserve_platform_timers(unsigned long id)
         hd.hd_irq[0] = HPET_LEGACY_8254;
         hd.hd_irq[1] = HPET_LEGACY_RTC;
 
-        for (i = 2; i < nrtimers; timer++, i++)
-                hd.hd_irq[i] = (timer->hpet_config & Tn_INT_ROUTE_CNF_MASK) >>
+        for (i = 2; i < nrtimers; timer++, i++) {
+                hd.hd_irq[i] = (readl(&timer->hpet_config) & Tn_INT_ROUTE_CNF_MASK) >>
                         Tn_INT_ROUTE_CNF_SHIFT;
+        }
 
         hpet_alloc(&hd);
 
diff --git a/arch/x86/kernel/irq_32.c b/arch/x86/kernel/irq_32.c
index 00bda7bcda63..147352df28b9 100644
--- a/arch/x86/kernel/irq_32.c
+++ b/arch/x86/kernel/irq_32.c
@@ -190,8 +190,6 @@ void irq_ctx_exit(int cpu)
         hardirq_ctx[cpu] = NULL;
 }
 
-extern asmlinkage void __do_softirq(void);
-
 asmlinkage void do_softirq(void)
 {
         unsigned long flags;
diff --git a/arch/x86/kernel/kvmclock.c b/arch/x86/kernel/kvmclock.c
index ddee04043aeb..4bc1be5d5472 100644
--- a/arch/x86/kernel/kvmclock.c
+++ b/arch/x86/kernel/kvmclock.c
@@ -133,6 +133,7 @@ static int kvm_register_clock(void)
         return native_write_msr_safe(MSR_KVM_SYSTEM_TIME, low, high);
 }
 
+#ifdef CONFIG_X86_LOCAL_APIC
 static void kvm_setup_secondary_clock(void)
 {
         /*
@@ -143,6 +144,7 @@ static void kvm_setup_secondary_clock(void)
         /* ok, done with our trickery, call native */
         setup_secondary_APIC_clock();
 }
+#endif
 
 /*
  * After the clock is registered, the host will keep writing to the
@@ -177,7 +179,9 @@ void __init kvmclock_init(void)
                 pv_time_ops.get_wallclock = kvm_get_wallclock;
                 pv_time_ops.set_wallclock = kvm_set_wallclock;
                 pv_time_ops.sched_clock = kvm_clock_read;
+#ifdef CONFIG_X86_LOCAL_APIC
                 pv_apic_ops.setup_secondary_clock = kvm_setup_secondary_clock;
+#endif
                 machine_ops.shutdown  = kvm_shutdown;
 #ifdef CONFIG_KEXEC
                 machine_ops.crash_shutdown  = kvm_crash_shutdown;
diff --git a/arch/x86/kernel/mmconf-fam10h_64.c b/arch/x86/kernel/mmconf-fam10h_64.c
new file mode 100644
index 000000000000..edc5fbfe85c0
--- /dev/null
+++ b/arch/x86/kernel/mmconf-fam10h_64.c
@@ -0,0 +1,243 @@
+/*
+ * AMD Family 10h mmconfig enablement
+ */
+
+#include <linux/types.h>
+#include <linux/mm.h>
+#include <linux/string.h>
+#include <linux/pci.h>
+#include <linux/dmi.h>
+#include <asm/pci-direct.h>
+#include <linux/sort.h>
+#include <asm/io.h>
+#include <asm/msr.h>
+#include <asm/acpi.h>
+
+#include "../pci/pci.h"
+
+struct pci_hostbridge_probe {
+        u32 bus;
+        u32 slot;
+        u32 vendor;
+        u32 device;
+};
+
+static u64 __cpuinitdata fam10h_pci_mmconf_base;
+static int __cpuinitdata fam10h_pci_mmconf_base_status;
+
+static struct pci_hostbridge_probe pci_probes[] __cpuinitdata = {
+        { 0, 0x18, PCI_VENDOR_ID_AMD, 0x1200 },
+        { 0xff, 0, PCI_VENDOR_ID_AMD, 0x1200 },
+};
+
+struct range {
+        u64 start;
+        u64 end;
+};
+
+static int __cpuinit cmp_range(const void *x1, const void *x2)
+{
+        const struct range *r1 = x1;
+        const struct range *r2 = x2;
+        int start1, start2;
+
+        start1 = r1->start >> 32;
+        start2 = r2->start >> 32;
+
+        return start1 - start2;
+}
+
+/*[47:0] */
+/* need to avoid (0xfd<<32) and (0xfe<<32), ht used space */
+#define FAM10H_PCI_MMCONF_BASE (0xfcULL<<32)
+#define BASE_VALID(b) ((b != (0xfdULL << 32)) && (b != (0xfeULL << 32)))
+static void __cpuinit get_fam10h_pci_mmconf_base(void)
+{
+        int i;
+        unsigned bus;
+        unsigned slot;
+        int found;
+
+        u64 val;
+        u32 address;
+        u64 tom2;
+        u64 base = FAM10H_PCI_MMCONF_BASE;
+
+        int hi_mmio_num;
+        struct range range[8];
+
+        /* only try to get setting from BSP */
+        /* -1 or 1 */
+        if (fam10h_pci_mmconf_base_status)
+                return;
+
+        if (!early_pci_allowed())
+                goto fail;
+
+        found = 0;
+        for (i = 0; i < ARRAY_SIZE(pci_probes); i++) {
+                u32 id;
+                u16 device;
+                u16 vendor;
+
+                bus = pci_probes[i].bus;
+                slot = pci_probes[i].slot;
+                id = read_pci_config(bus, slot, 0, PCI_VENDOR_ID);
+
+                vendor = id & 0xffff;
+                device = (id>>16) & 0xffff;
+                if (pci_probes[i].vendor == vendor &&
+                    pci_probes[i].device == device) {
+                        found = 1;
+                        break;
+                }
+        }
+
+        if (!found)
+                goto fail;
+
+        /* SYS_CFG */
+        address = MSR_K8_SYSCFG;
+        rdmsrl(address, val);
+
+        /* TOP_MEM2 is not enabled? */
+        if (!(val & (1<<21))) {
+                tom2 = 0;
+        } else {
+                /* TOP_MEM2 */
+                address = MSR_K8_TOP_MEM2;
+                rdmsrl(address, val);
+                tom2 = val & (0xffffULL<<32);
+        }
+
+        if (base <= tom2)
+                base = tom2 + (1ULL<<32);
+
+        /*
+         * need to check if the range is in the high mmio range that is
+         * above 4G
+         */
+        hi_mmio_num = 0;
+        for (i = 0; i < 8; i++) {
+                u32 reg;
+                u64 start;
+                u64 end;
+                reg = read_pci_config(bus, slot, 1, 0x80 + (i << 3));
+                if (!(reg & 3))
+                        continue;
+
+                start = (((u64)reg) << 8) & (0xffULL << 32); /* 39:16 on 31:8*/
+                reg = read_pci_config(bus, slot, 1, 0x84 + (i << 3));
+                end = (((u64)reg) << 8) & (0xffULL << 32); /* 39:16 on 31:8*/
+
+                if (!end)
+                        continue;
+
+                range[hi_mmio_num].start = start;
+                range[hi_mmio_num].end = end;
+                hi_mmio_num++;
+        }
+
+        if (!hi_mmio_num)
+                goto out;
+
+        /* sort the range */
+        sort(range, hi_mmio_num, sizeof(struct range), cmp_range, NULL);
+
+        if (range[hi_mmio_num - 1].end < base)
+                goto out;
+        if (range[0].start > base)
+                goto out;
+
+        /* need to find one window */
+        base = range[0].start - (1ULL << 32);
+        if ((base > tom2) && BASE_VALID(base))
+                goto out;
+        base = range[hi_mmio_num - 1].end + (1ULL << 32);
+        if ((base > tom2) && BASE_VALID(base))
+                goto out;
+        /* need to find window between ranges */
+        if (hi_mmio_num > 1)
+        for (i = 0; i < hi_mmio_num - 1; i++) {
+                if (range[i + 1].start > (range[i].end + (1ULL << 32))) {
+                        base = range[i].end + (1ULL << 32);
+                        if ((base > tom2) && BASE_VALID(base))
+                                goto out;
+                }
+        }
+
+fail:
+        fam10h_pci_mmconf_base_status = -1;
+        return;
+out:
+        fam10h_pci_mmconf_base = base;
+        fam10h_pci_mmconf_base_status = 1;
+}
+
+void __cpuinit fam10h_check_enable_mmcfg(void)
+{
+        u64 val;
+        u32 address;
+
+        if (!(pci_probe & PCI_CHECK_ENABLE_AMD_MMCONF))
+                return;
+
+        address = MSR_FAM10H_MMIO_CONF_BASE;
+        rdmsrl(address, val);
+
+        /* try to make sure that AP's setting is identical to BSP setting */
+        if (val & FAM10H_MMIO_CONF_ENABLE) {
+                unsigned busnbits;
+                busnbits = (val >> FAM10H_MMIO_CONF_BUSRANGE_SHIFT) &
+                        FAM10H_MMIO_CONF_BUSRANGE_MASK;
+
+                /* only trust the one handle 256 buses, if acpi=off */
+                if (!acpi_pci_disabled || busnbits >= 8) {
+                        u64 base;
+                        base = val & (0xffffULL << 32);
+                        if (fam10h_pci_mmconf_base_status <= 0) {
+                                fam10h_pci_mmconf_base = base;
+                                fam10h_pci_mmconf_base_status = 1;
+                                return;
+                        } else if (fam10h_pci_mmconf_base ==  base)
+                                return;
+                }
+        }
+
+        /*
+         * if it is not enabled, try to enable it and assume only one segment
+         * with 256 buses
+         */
+        get_fam10h_pci_mmconf_base();
+        if (fam10h_pci_mmconf_base_status <= 0)
+                return;
+
+        printk(KERN_INFO "Enable MMCONFIG on AMD Family 10h\n");
+        val &= ~((FAM10H_MMIO_CONF_BASE_MASK<<FAM10H_MMIO_CONF_BASE_SHIFT) |
+             (FAM10H_MMIO_CONF_BUSRANGE_MASK<<FAM10H_MMIO_CONF_BUSRANGE_SHIFT));
+        val |= fam10h_pci_mmconf_base | (8 << FAM10H_MMIO_CONF_BUSRANGE_SHIFT) |
+               FAM10H_MMIO_CONF_ENABLE;
+        wrmsrl(address, val);
+}
+
+static int __devinit set_check_enable_amd_mmconf(const struct dmi_system_id *d)
+{
+        pci_probe |= PCI_CHECK_ENABLE_AMD_MMCONF;
+        return 0;
+}
+
+static struct dmi_system_id __devinitdata mmconf_dmi_table[] = {
+        {
+                .callback = set_check_enable_amd_mmconf,
+                .ident = "Sun Microsystems Machine",
+                .matches = {
+                        DMI_MATCH(DMI_SYS_VENDOR, "Sun Microsystems"),
+                },
+        },
+        {}
+};
+
+void __init check_enable_amd_mmconf_dmi(void)
+{
+        dmi_check_system(mmconf_dmi_table);
+}
diff --git a/arch/x86/kernel/mpparse.c b/arch/x86/kernel/mpparse.c
index 3e2c54dc8b29..404683b94e79 100644
--- a/arch/x86/kernel/mpparse.c
+++ b/arch/x86/kernel/mpparse.c
@@ -794,6 +794,11 @@ void __init find_smp_config(void)
                             ACPI-based MP Configuration
    -------------------------------------------------------------------------- */
 
+/*
+ * Keep this outside and initialized to 0, for !CONFIG_ACPI builds:
+ */
+int es7000_plat;
+
 #ifdef CONFIG_ACPI
 
 #ifdef  CONFIG_X86_IO_APIC
@@ -909,8 +914,6 @@ void __init mp_override_legacy_irq(u8 bus_irq, u8 polarity, u8 trigger, u32 gsi)
         MP_intsrc_info(&intsrc);
 }
 
-int es7000_plat;
-
 void __init mp_config_acpi_legacy_irqs(void)
 {
         struct mpc_config_intsrc intsrc;
diff --git a/arch/x86/kernel/olpc.c b/arch/x86/kernel/olpc.c
new file mode 100644
index 000000000000..3e6672274807
--- /dev/null
+++ b/arch/x86/kernel/olpc.c
@@ -0,0 +1,260 @@
+/*
+ * Support for the OLPC DCON and OLPC EC access
+ *
+ * Copyright © 2006  Advanced Micro Devices, Inc.
+ * Copyright © 2007-2008  Andres Salomon <dilinger@debian.org>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ */
+
+#include <linux/kernel.h>
+#include <linux/init.h>
+#include <linux/module.h>
+#include <linux/delay.h>
+#include <linux/spinlock.h>
+#include <linux/io.h>
+#include <linux/string.h>
+#include <asm/geode.h>
+#include <asm/olpc.h>
+
+#ifdef CONFIG_OPEN_FIRMWARE
+#include <asm/ofw.h>
+#endif
+
+struct olpc_platform_t olpc_platform_info;
+EXPORT_SYMBOL_GPL(olpc_platform_info);
+
+static DEFINE_SPINLOCK(ec_lock);
+
+/* what the timeout *should* be (in ms) */
+#define EC_BASE_TIMEOUT 20
+
+/* the timeout that bugs in the EC might force us to actually use */
+static int ec_timeout = EC_BASE_TIMEOUT;
+
+static int __init olpc_ec_timeout_set(char *str)
+{
+        if (get_option(&str, &ec_timeout) != 1) {
+                ec_timeout = EC_BASE_TIMEOUT;
+                printk(KERN_ERR "olpc-ec:  invalid argument to "
+                                "'olpc_ec_timeout=', ignoring!\n");
+        }
+        printk(KERN_DEBUG "olpc-ec:  using %d ms delay for EC commands.\n",
+                        ec_timeout);
+        return 1;
+}
+__setup("olpc_ec_timeout=", olpc_ec_timeout_set);
+
+/*
+ * These {i,o}bf_status functions return whether the buffers are full or not.
+ */
+
+static inline unsigned int ibf_status(unsigned int port)
+{
+        return !!(inb(port) & 0x02);
+}
+
+static inline unsigned int obf_status(unsigned int port)
+{
+        return inb(port) & 0x01;
+}
+
+#define wait_on_ibf(p, d) __wait_on_ibf(__LINE__, (p), (d))
+static int __wait_on_ibf(unsigned int line, unsigned int port, int desired)
+{
+        unsigned int timeo;
+        int state = ibf_status(port);
+
+        for (timeo = ec_timeout; state != desired && timeo; timeo--) {
+                mdelay(1);
+                state = ibf_status(port);
+        }
+
+        if ((state == desired) && (ec_timeout > EC_BASE_TIMEOUT) &&
+                        timeo < (ec_timeout - EC_BASE_TIMEOUT)) {
+                printk(KERN_WARNING "olpc-ec:  %d: waited %u ms for IBF!\n",
+                                line, ec_timeout - timeo);
+        }
+
+        return !(state == desired);
+}
+
+#define wait_on_obf(p, d) __wait_on_obf(__LINE__, (p), (d))
+static int __wait_on_obf(unsigned int line, unsigned int port, int desired)
+{
+        unsigned int timeo;
+        int state = obf_status(port);
+
+        for (timeo = ec_timeout; state != desired && timeo; timeo--) {
+                mdelay(1);
+                state = obf_status(port);
+        }
+
+        if ((state == desired) && (ec_timeout > EC_BASE_TIMEOUT) &&
+                        timeo < (ec_timeout - EC_BASE_TIMEOUT)) {
+                printk(KERN_WARNING "olpc-ec:  %d: waited %u ms for OBF!\n",
+                                line, ec_timeout - timeo);
+        }
+
+        return !(state == desired);
+}
+
+/*
+ * This allows the kernel to run Embedded Controller commands.  The EC is
+ * documented at <http://wiki.laptop.org/go/Embedded_controller>, and the
+ * available EC commands are here:
+ * <http://wiki.laptop.org/go/Ec_specification>.  Unfortunately, while
+ * OpenFirmware's source is available, the EC's is not.
+ */
+int olpc_ec_cmd(unsigned char cmd, unsigned char *inbuf, size_t inlen,
+                unsigned char *outbuf,  size_t outlen)
+{
+        unsigned long flags;
+        int ret = -EIO;
+        int i;
+
+        spin_lock_irqsave(&ec_lock, flags);
+
+        /* Clear OBF */
+        for (i = 0; i < 10 && (obf_status(0x6c) == 1); i++)
+                inb(0x68);
+        if (i == 10) {
+                printk(KERN_ERR "olpc-ec:  timeout while attempting to "
+                                "clear OBF flag!\n");
+                goto err;
+        }
+
+        if (wait_on_ibf(0x6c, 0)) {
+                printk(KERN_ERR "olpc-ec:  timeout waiting for EC to "
+                                "quiesce!\n");
+                goto err;
+        }
+
+restart:
+        /*
+         * Note that if we time out during any IBF checks, that's a failure;
+         * we have to return.  There's no way for the kernel to clear that.
+         *
+         * If we time out during an OBF check, we can restart the command;
+         * reissuing it will clear the OBF flag, and we should be alright.
+         * The OBF flag will sometimes misbehave due to what we believe
+         * is a hardware quirk..
+         */
+        printk(KERN_DEBUG "olpc-ec:  running cmd 0x%x\n", cmd);
+        outb(cmd, 0x6c);
+
+        if (wait_on_ibf(0x6c, 0)) {
+                printk(KERN_ERR "olpc-ec:  timeout waiting for EC to read "
+                                "command!\n");
+                goto err;
+        }
+
+        if (inbuf && inlen) {
+                /* write data to EC */
+                for (i = 0; i < inlen; i++) {
+                        if (wait_on_ibf(0x6c, 0)) {
+                                printk(KERN_ERR "olpc-ec:  timeout waiting for"
+                                                " EC accept data!\n");
+                                goto err;
+                        }
+                        printk(KERN_DEBUG "olpc-ec:  sending cmd arg 0x%x\n",
+                                        inbuf[i]);
+                        outb(inbuf[i], 0x68);
+                }
+        }
+        if (outbuf && outlen) {
+                /* read data from EC */
+                for (i = 0; i < outlen; i++) {
+                        if (wait_on_obf(0x6c, 1)) {
+                                printk(KERN_ERR "olpc-ec:  timeout waiting for"
+                                                " EC to provide data!\n");
+                                goto restart;
+                        }
+                        outbuf[i] = inb(0x68);
+                        printk(KERN_DEBUG "olpc-ec:  received 0x%x\n",
+                                        outbuf[i]);
+                }
+        }
+
+        ret = 0;
+err:
+        spin_unlock_irqrestore(&ec_lock, flags);
+        return ret;
+}
+EXPORT_SYMBOL_GPL(olpc_ec_cmd);
+
+#ifdef CONFIG_OPEN_FIRMWARE
+static void __init platform_detect(void)
+{
+        size_t propsize;
+        u32 rev;
+
+        if (ofw("getprop", 4, 1, NULL, "board-revision-int", &rev, 4,
+                        &propsize) || propsize != 4) {
+                printk(KERN_ERR "ofw: getprop call failed!\n");
+                rev = 0;
+        }
+        olpc_platform_info.boardrev = be32_to_cpu(rev);
+}
+#else
+static void __init platform_detect(void)
+{
+        /* stopgap until OFW support is added to the kernel */
+        olpc_platform_info.boardrev = be32_to_cpu(0xc2);
+}
+#endif
+
+static int __init olpc_init(void)
+{
+        unsigned char *romsig;
+
+        /* The ioremap check is dangerous; limit what we run it on */
+        if (!is_geode() || geode_has_vsa2())
+                return 0;
+
+        spin_lock_init(&ec_lock);
+
+        romsig = ioremap(0xffffffc0, 16);
+        if (!romsig)
+                return 0;
+
+        if (strncmp(romsig, "CL1   Q", 7))
+                goto unmap;
+        if (strncmp(romsig+6, romsig+13, 3)) {
+                printk(KERN_INFO "OLPC BIOS signature looks invalid.  "
+                                "Assuming not OLPC\n");
+                goto unmap;
+        }
+
+        printk(KERN_INFO "OLPC board with OpenFirmware %.16s\n", romsig);
+        olpc_platform_info.flags |= OLPC_F_PRESENT;
+
+        /* get the platform revision */
+        platform_detect();
+
+        /* assume B1 and above models always have a DCON */
+        if (olpc_board_at_least(olpc_board(0xb1)))
+                olpc_platform_info.flags |= OLPC_F_DCON;
+
+        /* get the EC revision */
+        olpc_ec_cmd(EC_FIRMWARE_REV, NULL, 0,
+                        (unsigned char *) &olpc_platform_info.ecver, 1);
+
+        /* check to see if the VSA exists */
+        if (geode_has_vsa2())
+                olpc_platform_info.flags |= OLPC_F_VSA;
+
+        printk(KERN_INFO "OLPC board revision %s%X (EC=%x)\n",
+                        ((olpc_platform_info.boardrev & 0xf) < 8) ? "pre" : "",
+                        olpc_platform_info.boardrev >> 4,
+                        olpc_platform_info.ecver);
+
+unmap:
+        iounmap(romsig);
+        return 0;
+}
+
+postcore_initcall(olpc_init);
diff --git a/arch/x86/kernel/pci-dma.c b/arch/x86/kernel/pci-dma.c
index 388b113a7d88..0c37f16b6950 100644
--- a/arch/x86/kernel/pci-dma.c
+++ b/arch/x86/kernel/pci-dma.c
@@ -14,7 +14,7 @@ EXPORT_SYMBOL(forbid_dac);
 const struct dma_mapping_ops *dma_ops;
 EXPORT_SYMBOL(dma_ops);
 
-int iommu_sac_force __read_mostly = 0;
+static int iommu_sac_force __read_mostly;
 
 #ifdef CONFIG_IOMMU_DEBUG
 int panic_on_overflow __read_mostly = 1;
diff --git a/arch/x86/kernel/reboot.c b/arch/x86/kernel/reboot.c
index a4a838306b2c..f6be7d5f82f8 100644
--- a/arch/x86/kernel/reboot.c
+++ b/arch/x86/kernel/reboot.c
@@ -9,6 +9,7 @@
 #include <asm/desc.h>
 #include <asm/hpet.h>
 #include <asm/pgtable.h>
+#include <asm/proto.h>
 #include <asm/reboot_fixups.h>
 #include <asm/reboot.h>
 
@@ -148,7 +149,6 @@ static struct dmi_system_id __initdata reboot_dmi_table[] = {
                 .matches = {
                         DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."),
                         DMI_MATCH(DMI_PRODUCT_NAME, "OptiPlex 745"),
-                        DMI_MATCH(DMI_BOARD_NAME, "0WF810"),
                 },
         },
         {       /* Handle problems with rebooting on Dell Optiplex 745's DFF*/
diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c
index c0c68c18a788..cc6f5eb20b24 100644
--- a/arch/x86/kernel/setup.c
+++ b/arch/x86/kernel/setup.c
@@ -95,7 +95,7 @@ void __init setup_per_cpu_areas(void)
 
         /* Copy section for each CPU (we discard the original) */
         size = PERCPU_ENOUGH_ROOM;
-        printk(KERN_INFO "PERCPU: Allocating %lu bytes of per cpu data\n",
+        printk(KERN_INFO "PERCPU: Allocating %zd bytes of per cpu data\n",
                           size);
 
         for_each_possible_cpu(i) {
diff --git a/arch/x86/kernel/setup_64.c b/arch/x86/kernel/setup_64.c
index a94fb959a87a..22c14e21c97c 100644
--- a/arch/x86/kernel/setup_64.c
+++ b/arch/x86/kernel/setup_64.c
@@ -29,6 +29,7 @@
 #include <linux/crash_dump.h>
 #include <linux/root_dev.h>
 #include <linux/pci.h>
+#include <asm/pci-direct.h>
 #include <linux/efi.h>
 #include <linux/acpi.h>
 #include <linux/kallsyms.h>
@@ -40,6 +41,7 @@
 #include <linux/dmi.h>
 #include <linux/dma-mapping.h>
 #include <linux/ctype.h>
+#include <linux/sort.h>
 #include <linux/uaccess.h>
 #include <linux/init_ohci1394_dma.h>
 #include <linux/kvm_para.h>
@@ -288,6 +290,18 @@ static void __init parse_setup_data(void)
         }
 }
 
+#ifdef CONFIG_PCI_MMCONFIG
+extern void __cpuinit fam10h_check_enable_mmcfg(void);
+extern void __init check_enable_amd_mmconf_dmi(void);
+#else
+void __cpuinit fam10h_check_enable_mmcfg(void)
+{
+}
+void __init check_enable_amd_mmconf_dmi(void)
+{
+}
+#endif
+
 /*
  * setup_arch - architecture-specific boot-time initializations
  *
@@ -515,6 +529,9 @@ void __init setup_arch(char **cmdline_p)
         conswitchp = &dummy_con;
 #endif
 #endif
+
+        /* do this before identify_cpu for boot cpu */
+        check_enable_amd_mmconf_dmi();
 }
 
 static int __cpuinit get_model_name(struct cpuinfo_x86 *c)
@@ -767,6 +784,9 @@ static void __cpuinit init_amd(struct cpuinfo_x86 *c)
         /* MFENCE stops RDTSC speculation */
         set_cpu_cap(c, X86_FEATURE_MFENCE_RDTSC);
 
+        if (c->x86 == 0x10)
+                fam10h_check_enable_mmcfg();
+
         if (amd_apic_timer_broken())
                 disable_apic_timer = 1;
 
diff --git a/arch/x86/kernel/signal_32.c b/arch/x86/kernel/signal_32.c
index 8e05e7f7bd40..d92373630963 100644
--- a/arch/x86/kernel/signal_32.c
+++ b/arch/x86/kernel/signal_32.c
@@ -57,7 +57,7 @@ sys_sigsuspend(int history0, int history1, old_sigset_t mask)
 
         current->state = TASK_INTERRUPTIBLE;
         schedule();
-        set_thread_flag(TIF_RESTORE_SIGMASK);
+        set_restore_sigmask();
 
         return -ERESTARTNOHAND;
 }
@@ -593,7 +593,7 @@ static void do_signal(struct pt_regs *regs)
         if (!user_mode(regs))
                 return;
 
-        if (test_thread_flag(TIF_RESTORE_SIGMASK))
+        if (current_thread_info()->status & TS_RESTORE_SIGMASK)
                 oldset = &current->saved_sigmask;
         else
                 oldset = &current->blocked;
@@ -612,13 +612,12 @@ static void do_signal(struct pt_regs *regs)
                 /* Whee! Actually deliver the signal.  */
                 if (handle_signal(signr, &info, &ka, oldset, regs) == 0) {
                         /*
-                         * a signal was successfully delivered; the saved
+                         * A signal was successfully delivered; the saved
                          * sigmask will have been stored in the signal frame,
                          * and will be restored by sigreturn, so we can simply
-                         * clear the TIF_RESTORE_SIGMASK flag
+                         * clear the TS_RESTORE_SIGMASK flag.
                          */
-                        if (test_thread_flag(TIF_RESTORE_SIGMASK))
-                                clear_thread_flag(TIF_RESTORE_SIGMASK);
+                        current_thread_info()->status &= ~TS_RESTORE_SIGMASK;
                 }
                 return;
         }
@@ -645,8 +644,8 @@ static void do_signal(struct pt_regs *regs)
          * If there's no signal to deliver, we just put the saved sigmask
          * back.
          */
-        if (test_thread_flag(TIF_RESTORE_SIGMASK)) {
-                clear_thread_flag(TIF_RESTORE_SIGMASK);
+        if (current_thread_info()->status & TS_RESTORE_SIGMASK) {
+                current_thread_info()->status &= ~TS_RESTORE_SIGMASK;
                 sigprocmask(SIG_SETMASK, &current->saved_sigmask, NULL);
         }
 }
@@ -665,7 +664,7 @@ do_notify_resume(struct pt_regs *regs, void *unused, __u32 thread_info_flags)
         }
 
         /* deal with pending signal delivery */
-        if (thread_info_flags & (_TIF_SIGPENDING | _TIF_RESTORE_SIGMASK))
+        if (thread_info_flags & _TIF_SIGPENDING)
                 do_signal(regs);
 
         if (thread_info_flags & _TIF_HRTICK_RESCHED)
diff --git a/arch/x86/kernel/signal_64.c b/arch/x86/kernel/signal_64.c
index ccb2a4560c2d..e53b267662e7 100644
--- a/arch/x86/kernel/signal_64.c
+++ b/arch/x86/kernel/signal_64.c
@@ -427,7 +427,7 @@ static void do_signal(struct pt_regs *regs)
         if (!user_mode(regs))
                 return;
 
-        if (test_thread_flag(TIF_RESTORE_SIGMASK))
+        if (current_thread_info()->status & TS_RESTORE_SIGMASK)
                 oldset = &current->saved_sigmask;
         else
                 oldset = &current->blocked;
@@ -444,11 +444,13 @@ static void do_signal(struct pt_regs *regs)
 
                 /* Whee!  Actually deliver the signal.  */
                 if (handle_signal(signr, &info, &ka, oldset, regs) == 0) {
-                        /* a signal was successfully delivered; the saved
+                        /*
+                         * A signal was successfully delivered; the saved
                          * sigmask will have been stored in the signal frame,
                          * and will be restored by sigreturn, so we can simply
-                         * clear the TIF_RESTORE_SIGMASK flag */
-                        clear_thread_flag(TIF_RESTORE_SIGMASK);
+                         * clear the TS_RESTORE_SIGMASK flag.
+                         */
+                        current_thread_info()->status &= ~TS_RESTORE_SIGMASK;
                 }
                 return;
         }
@@ -476,8 +478,8 @@ static void do_signal(struct pt_regs *regs)
          * If there's no signal to deliver, we just put the saved sigmask
          * back.
          */
-        if (test_thread_flag(TIF_RESTORE_SIGMASK)) {
-                clear_thread_flag(TIF_RESTORE_SIGMASK);
+        if (current_thread_info()->status & TS_RESTORE_SIGMASK) {
+                current_thread_info()->status &= ~TS_RESTORE_SIGMASK;
                 sigprocmask(SIG_SETMASK, &current->saved_sigmask, NULL);
         }
 }
@@ -498,7 +500,7 @@ void do_notify_resume(struct pt_regs *regs, void *unused,
 #endif /* CONFIG_X86_MCE */
 
         /* deal with pending signal delivery */
-        if (thread_info_flags & (_TIF_SIGPENDING | _TIF_RESTORE_SIGMASK))
+        if (thread_info_flags & _TIF_SIGPENDING)
                 do_signal(regs);
 
         if (thread_info_flags & _TIF_HRTICK_RESCHED)
diff --git a/arch/x86/kernel/smpboot.c b/arch/x86/kernel/smpboot.c
index 04c662ba18f1..6b087ab6cd8f 100644
--- a/arch/x86/kernel/smpboot.c
+++ b/arch/x86/kernel/smpboot.c
@@ -299,7 +299,7 @@ static void __cpuinit smp_callin(void)
 /*
  * Activate a secondary processor.
  */
-void __cpuinit start_secondary(void *unused)
+static void __cpuinit start_secondary(void *unused)
 {
         /*
          * Don't put *anything* before cpu_init(), SMP booting is too
@@ -1149,14 +1149,10 @@ static int __init smp_sanity_check(unsigned max_cpus)
                                  "forcing use of dummy APIC emulation.\n");
                 smpboot_clear_io_apic();
 #ifdef CONFIG_X86_32
-                if (nmi_watchdog == NMI_LOCAL_APIC) {
-                        printk(KERN_INFO "activating minimal APIC for"
-                                         "NMI watchdog use.\n");
-                        connect_bsp_APIC();
-                        setup_local_APIC();
-                        end_local_APIC_setup();
-                }
+                connect_bsp_APIC();
 #endif
+                setup_local_APIC();
+                end_local_APIC_setup();
                 return -1;
         }
 
@@ -1310,7 +1306,7 @@ static void remove_siblinginfo(int cpu)
         cpu_clear(cpu, cpu_sibling_setup_map);
 }
 
-int additional_cpus __initdata = -1;
+static int additional_cpus __initdata = -1;
 
 static __init int setup_additional_cpus(char *s)
 {
diff --git a/arch/x86/kernel/sys_i386_32.c b/arch/x86/kernel/sys_i386_32.c
index a86d26f036e1..d2ab52cc1d6b 100644
--- a/arch/x86/kernel/sys_i386_32.c
+++ b/arch/x86/kernel/sys_i386_32.c
@@ -22,23 +22,6 @@
 #include <asm/uaccess.h>
 #include <asm/unistd.h>
 
-/*
- * sys_pipe() is the normal C calling standard for creating
- * a pipe. It's not the way Unix traditionally does this, though.
- */
-asmlinkage int sys_pipe(unsigned long __user * fildes)
-{
-        int fd[2];
-        int error;
-
-        error = do_pipe(fd);
-        if (!error) {
-                if (copy_to_user(fildes, fd, 2*sizeof(int)))
-                        error = -EFAULT;
-        }
-        return error;
-}
-
 asmlinkage long sys_mmap2(unsigned long addr, unsigned long len,
                           unsigned long prot, unsigned long flags,
                           unsigned long fd, unsigned long pgoff)
diff --git a/arch/x86/kernel/sys_x86_64.c b/arch/x86/kernel/sys_x86_64.c
index bd802a5e1aa3..3b360ef33817 100644
--- a/arch/x86/kernel/sys_x86_64.c
+++ b/arch/x86/kernel/sys_x86_64.c
@@ -17,23 +17,6 @@
 #include <asm/uaccess.h>
 #include <asm/ia32.h>
 
-/*
- * sys_pipe() is the normal C calling standard for creating
- * a pipe. It's not the way Unix traditionally does this, though.
- */
-asmlinkage long sys_pipe(int __user *fildes)
-{
-        int fd[2];
-        int error;
-
-        error = do_pipe(fd);
-        if (!error) {
-                if (copy_to_user(fildes, fd, 2*sizeof(int)))
-                        error = -EFAULT;
-        }
-        return error;
-}
-
 asmlinkage long sys_mmap(unsigned long addr, unsigned long len, unsigned long prot, unsigned long flags,
         unsigned long fd, unsigned long off)
 {
diff --git a/arch/x86/kernel/time_32.c b/arch/x86/kernel/time_32.c
index 1a89e93f3f1c..2ff21f398934 100644
--- a/arch/x86/kernel/time_32.c
+++ b/arch/x86/kernel/time_32.c
@@ -115,7 +115,6 @@ irqreturn_t timer_interrupt(int irq, void *dev_id)
         return IRQ_HANDLED;
 }
 
-extern void (*late_time_init)(void);
 /* Duplicate of time_init() below, with hpet_enable part added */
 void __init hpet_time_init(void)
 {
diff --git a/arch/x86/kernel/vsmp_64.c b/arch/x86/kernel/vsmp_64.c
index caf2a26f5cfd..ba8c0b75ab0a 100644
--- a/arch/x86/kernel/vsmp_64.c
+++ b/arch/x86/kernel/vsmp_64.c
@@ -133,7 +133,7 @@ int is_vsmp_box(void)
         }
 }
 #else
-static int __init detect_vsmp_box(void)
+static void __init detect_vsmp_box(void)
 {
 }
 int is_vsmp_box(void)
diff --git a/arch/x86/kvm/i8254.c b/arch/x86/kvm/i8254.c
index 361e31611276..3324d90038e4 100644
--- a/arch/x86/kvm/i8254.c
+++ b/arch/x86/kvm/i8254.c
@@ -35,7 +35,7 @@
 #include "i8254.h"
 
 #ifndef CONFIG_X86_64
-#define mod_64(x, y) ((x) - (y) * div64_64(x, y))
+#define mod_64(x, y) ((x) - (y) * div64_u64(x, y))
 #else
 #define mod_64(x, y) ((x) % (y))
 #endif
@@ -60,8 +60,8 @@ static u64 muldiv64(u64 a, u32 b, u32 c)
         rl = (u64)u.l.low * (u64)b;
         rh = (u64)u.l.high * (u64)b;
         rh += (rl >> 32);
-        res.l.high = div64_64(rh, c);
-        res.l.low = div64_64(((mod_64(rh, c) << 32) + (rl & 0xffffffff)), c);
+        res.l.high = div64_u64(rh, c);
+        res.l.low = div64_u64(((mod_64(rh, c) << 32) + (rl & 0xffffffff)), c);
         return res.ll;
 }
 
@@ -288,6 +288,8 @@ static void pit_load_count(struct kvm *kvm, int channel, u32 val)
          * mode 1 is one shot, mode 2 is period, otherwise del timer */
         switch (ps->channels[0].mode) {
         case 1:
+        /* FIXME: enhance mode 4 precision */
+        case 4:
                 create_pit_timer(&ps->pit_timer, val, 0);
                 break;
         case 2:
diff --git a/arch/x86/kvm/lapic.c b/arch/x86/kvm/lapic.c
index 57ac4e4c556a..36809d79788b 100644
--- a/arch/x86/kvm/lapic.c
+++ b/arch/x86/kvm/lapic.c
@@ -25,13 +25,13 @@
 #include <linux/hrtimer.h>
 #include <linux/io.h>
 #include <linux/module.h>
+#include <linux/math64.h>
 #include <asm/processor.h>
 #include <asm/msr.h>
 #include <asm/page.h>
 #include <asm/current.h>
 #include <asm/apicdef.h>
 #include <asm/atomic.h>
-#include <asm/div64.h>
 #include "irq.h"
 
 #define PRId64 "d"
@@ -526,8 +526,8 @@ static u32 apic_get_tmcct(struct kvm_lapic *apic)
         } else
                 passed = ktime_sub(now, apic->timer.last_update);
 
-        counter_passed = div64_64(ktime_to_ns(passed),
-                                  (APIC_BUS_CYCLE_NS * apic->timer.divide_count));
+        counter_passed = div64_u64(ktime_to_ns(passed),
+                                   (APIC_BUS_CYCLE_NS * apic->timer.divide_count));
 
         if (counter_passed > tmcct) {
                 if (unlikely(!apic_lvtt_period(apic))) {
diff --git a/arch/x86/kvm/mmu.c b/arch/x86/kvm/mmu.c
index 2ad6f5481671..36c5406b1813 100644
--- a/arch/x86/kvm/mmu.c
+++ b/arch/x86/kvm/mmu.c
@@ -79,36 +79,6 @@ static int dbg = 1;
         }
 #endif
 
-#define PT64_PT_BITS 9
-#define PT64_ENT_PER_PAGE (1 << PT64_PT_BITS)
-#define PT32_PT_BITS 10
-#define PT32_ENT_PER_PAGE (1 << PT32_PT_BITS)
-
-#define PT_WRITABLE_SHIFT 1
-
-#define PT_PRESENT_MASK (1ULL << 0)
-#define PT_WRITABLE_MASK (1ULL << PT_WRITABLE_SHIFT)
-#define PT_USER_MASK (1ULL << 2)
-#define PT_PWT_MASK (1ULL << 3)
-#define PT_PCD_MASK (1ULL << 4)
-#define PT_ACCESSED_MASK (1ULL << 5)
-#define PT_DIRTY_MASK (1ULL << 6)
-#define PT_PAGE_SIZE_MASK (1ULL << 7)
-#define PT_PAT_MASK (1ULL << 7)
-#define PT_GLOBAL_MASK (1ULL << 8)
-#define PT64_NX_SHIFT 63
-#define PT64_NX_MASK (1ULL << PT64_NX_SHIFT)
-
-#define PT_PAT_SHIFT 7
-#define PT_DIR_PAT_SHIFT 12
-#define PT_DIR_PAT_MASK (1ULL << PT_DIR_PAT_SHIFT)
-
-#define PT32_DIR_PSE36_SIZE 4
-#define PT32_DIR_PSE36_SHIFT 13
-#define PT32_DIR_PSE36_MASK \
-        (((1ULL << PT32_DIR_PSE36_SIZE) - 1) << PT32_DIR_PSE36_SHIFT)
-
-
 #define PT_FIRST_AVAIL_BITS_SHIFT 9
 #define PT64_SECOND_AVAIL_BITS_SHIFT 52
 
@@ -154,10 +124,6 @@ static int dbg = 1;
 #define PFERR_USER_MASK (1U << 2)
 #define PFERR_FETCH_MASK (1U << 4)
 
-#define PT64_ROOT_LEVEL 4
-#define PT32_ROOT_LEVEL 2
-#define PT32E_ROOT_LEVEL 3
-
 #define PT_DIRECTORY_LEVEL 2
 #define PT_PAGE_TABLE_LEVEL 1
 
@@ -186,6 +152,12 @@ static struct kmem_cache *mmu_page_header_cache;
 
 static u64 __read_mostly shadow_trap_nonpresent_pte;
 static u64 __read_mostly shadow_notrap_nonpresent_pte;
+static u64 __read_mostly shadow_base_present_pte;
+static u64 __read_mostly shadow_nx_mask;
+static u64 __read_mostly shadow_x_mask; /* mutual exclusive with nx_mask */
+static u64 __read_mostly shadow_user_mask;
+static u64 __read_mostly shadow_accessed_mask;
+static u64 __read_mostly shadow_dirty_mask;
 
 void kvm_mmu_set_nonpresent_ptes(u64 trap_pte, u64 notrap_pte)
 {
@@ -194,6 +166,23 @@ void kvm_mmu_set_nonpresent_ptes(u64 trap_pte, u64 notrap_pte)
 }
 EXPORT_SYMBOL_GPL(kvm_mmu_set_nonpresent_ptes);
 
+void kvm_mmu_set_base_ptes(u64 base_pte)
+{
+        shadow_base_present_pte = base_pte;
+}
+EXPORT_SYMBOL_GPL(kvm_mmu_set_base_ptes);
+
+void kvm_mmu_set_mask_ptes(u64 user_mask, u64 accessed_mask,
+                u64 dirty_mask, u64 nx_mask, u64 x_mask)
+{
+        shadow_user_mask = user_mask;
+        shadow_accessed_mask = accessed_mask;
+        shadow_dirty_mask = dirty_mask;
+        shadow_nx_mask = nx_mask;
+        shadow_x_mask = x_mask;
+}
+EXPORT_SYMBOL_GPL(kvm_mmu_set_mask_ptes);
+
 static int is_write_protection(struct kvm_vcpu *vcpu)
 {
         return vcpu->arch.cr0 & X86_CR0_WP;
@@ -232,7 +221,7 @@ static int is_writeble_pte(unsigned long pte)
 
 static int is_dirty_pte(unsigned long pte)
 {
-        return pte & PT_DIRTY_MASK;
+        return pte & shadow_dirty_mask;
 }
 
 static int is_rmap_pte(u64 pte)
@@ -387,7 +376,6 @@ static void account_shadowed(struct kvm *kvm, gfn_t gfn)
 
         write_count = slot_largepage_idx(gfn, gfn_to_memslot(kvm, gfn));
         *write_count += 1;
-        WARN_ON(*write_count > KVM_PAGES_PER_HPAGE);
 }
 
 static void unaccount_shadowed(struct kvm *kvm, gfn_t gfn)
@@ -547,7 +535,7 @@ static void rmap_remove(struct kvm *kvm, u64 *spte)
                 return;
         sp = page_header(__pa(spte));
         pfn = spte_to_pfn(*spte);
-        if (*spte & PT_ACCESSED_MASK)
+        if (*spte & shadow_accessed_mask)
                 kvm_set_pfn_accessed(pfn);
         if (is_writeble_pte(*spte))
                 kvm_release_pfn_dirty(pfn);
@@ -1073,17 +1061,17 @@ static void mmu_set_spte(struct kvm_vcpu *vcpu, u64 *shadow_pte,
          * whether the guest actually used the pte (in order to detect
          * demand paging).
          */
-        spte = PT_PRESENT_MASK | PT_DIRTY_MASK;
+        spte = shadow_base_present_pte | shadow_dirty_mask;
         if (!speculative)
                 pte_access |= PT_ACCESSED_MASK;
         if (!dirty)
                 pte_access &= ~ACC_WRITE_MASK;
-        if (!(pte_access & ACC_EXEC_MASK))
-                spte |= PT64_NX_MASK;
-
-        spte |= PT_PRESENT_MASK;
+        if (pte_access & ACC_EXEC_MASK)
+                spte |= shadow_x_mask;
+        else
+                spte |= shadow_nx_mask;
         if (pte_access & ACC_USER_MASK)
-                spte |= PT_USER_MASK;
+                spte |= shadow_user_mask;
         if (largepage)
                 spte |= PT_PAGE_SIZE_MASK;
 
@@ -1188,8 +1176,9 @@ static int __direct_map(struct kvm_vcpu *vcpu, gpa_t v, int write,
                                 return -ENOMEM;
                         }
 
-                        table[index] = __pa(new_table->spt) | PT_PRESENT_MASK
-                                | PT_WRITABLE_MASK | PT_USER_MASK;
+                        table[index] = __pa(new_table->spt)
+                                | PT_PRESENT_MASK | PT_WRITABLE_MASK
+                                | shadow_user_mask | shadow_x_mask;
                 }
                 table_addr = table[index] & PT64_BASE_ADDR_MASK;
         }
@@ -1244,7 +1233,6 @@ static void mmu_free_roots(struct kvm_vcpu *vcpu)
         if (!VALID_PAGE(vcpu->arch.mmu.root_hpa))
                 return;
         spin_lock(&vcpu->kvm->mmu_lock);
-#ifdef CONFIG_X86_64
         if (vcpu->arch.mmu.shadow_root_level == PT64_ROOT_LEVEL) {
                 hpa_t root = vcpu->arch.mmu.root_hpa;
 
@@ -1256,7 +1244,6 @@ static void mmu_free_roots(struct kvm_vcpu *vcpu)
                 spin_unlock(&vcpu->kvm->mmu_lock);
                 return;
         }
-#endif
         for (i = 0; i < 4; ++i) {
                 hpa_t root = vcpu->arch.mmu.pae_root[i];
 
@@ -1282,7 +1269,6 @@ static void mmu_alloc_roots(struct kvm_vcpu *vcpu)
 
         root_gfn = vcpu->arch.cr3 >> PAGE_SHIFT;
 
-#ifdef CONFIG_X86_64
         if (vcpu->arch.mmu.shadow_root_level == PT64_ROOT_LEVEL) {
                 hpa_t root = vcpu->arch.mmu.root_hpa;
 
@@ -1297,7 +1283,6 @@ static void mmu_alloc_roots(struct kvm_vcpu *vcpu)
                 vcpu->arch.mmu.root_hpa = root;
                 return;
         }
-#endif
         metaphysical = !is_paging(vcpu);
         if (tdp_enabled)
                 metaphysical = 1;
@@ -1377,7 +1362,7 @@ static int tdp_page_fault(struct kvm_vcpu *vcpu, gva_t gpa,
         spin_lock(&vcpu->kvm->mmu_lock);
         kvm_mmu_free_some_pages(vcpu);
         r = __direct_map(vcpu, gpa, error_code & PFERR_WRITE_MASK,
-                         largepage, gfn, pfn, TDP_ROOT_LEVEL);
+                         largepage, gfn, pfn, kvm_x86_ops->get_tdp_level());
         spin_unlock(&vcpu->kvm->mmu_lock);
 
         return r;
@@ -1484,7 +1469,7 @@ static int init_kvm_tdp_mmu(struct kvm_vcpu *vcpu)
         context->page_fault = tdp_page_fault;
         context->free = nonpaging_free;
         context->prefetch_page = nonpaging_prefetch_page;
-        context->shadow_root_level = TDP_ROOT_LEVEL;
+        context->shadow_root_level = kvm_x86_ops->get_tdp_level();
         context->root_hpa = INVALID_PAGE;
 
         if (!is_paging(vcpu)) {
@@ -1633,7 +1618,7 @@ static bool last_updated_pte_accessed(struct kvm_vcpu *vcpu)
 {
         u64 *spte = vcpu->arch.last_pte_updated;
 
-        return !!(spte && (*spte & PT_ACCESSED_MASK));
+        return !!(spte && (*spte & shadow_accessed_mask));
 }
 
 static void mmu_guess_page_from_pte_write(struct kvm_vcpu *vcpu, gpa_t gpa,
diff --git a/arch/x86/kvm/mmu.h b/arch/x86/kvm/mmu.h
index e64e9f56a65e..1730757bbc7a 100644
--- a/arch/x86/kvm/mmu.h
+++ b/arch/x86/kvm/mmu.h
@@ -3,11 +3,38 @@
 
 #include <linux/kvm_host.h>
 
-#ifdef CONFIG_X86_64
-#define TDP_ROOT_LEVEL PT64_ROOT_LEVEL
-#else
-#define TDP_ROOT_LEVEL PT32E_ROOT_LEVEL
-#endif
+#define PT64_PT_BITS 9
+#define PT64_ENT_PER_PAGE (1 << PT64_PT_BITS)
+#define PT32_PT_BITS 10
+#define PT32_ENT_PER_PAGE (1 << PT32_PT_BITS)
+
+#define PT_WRITABLE_SHIFT 1
+
+#define PT_PRESENT_MASK (1ULL << 0)
+#define PT_WRITABLE_MASK (1ULL << PT_WRITABLE_SHIFT)
+#define PT_USER_MASK (1ULL << 2)
+#define PT_PWT_MASK (1ULL << 3)
+#define PT_PCD_MASK (1ULL << 4)
+#define PT_ACCESSED_MASK (1ULL << 5)
+#define PT_DIRTY_MASK (1ULL << 6)
+#define PT_PAGE_SIZE_MASK (1ULL << 7)
+#define PT_PAT_MASK (1ULL << 7)
+#define PT_GLOBAL_MASK (1ULL << 8)
+#define PT64_NX_SHIFT 63
+#define PT64_NX_MASK (1ULL << PT64_NX_SHIFT)
+
+#define PT_PAT_SHIFT 7
+#define PT_DIR_PAT_SHIFT 12
+#define PT_DIR_PAT_MASK (1ULL << PT_DIR_PAT_SHIFT)
+
+#define PT32_DIR_PSE36_SIZE 4
+#define PT32_DIR_PSE36_SHIFT 13
+#define PT32_DIR_PSE36_MASK \
+        (((1ULL << PT32_DIR_PSE36_SIZE) - 1) << PT32_DIR_PSE36_SHIFT)
+
+#define PT64_ROOT_LEVEL 4
+#define PT32_ROOT_LEVEL 2
+#define PT32E_ROOT_LEVEL 3
 
 static inline void kvm_mmu_free_some_pages(struct kvm_vcpu *vcpu)
 {
diff --git a/arch/x86/kvm/svm.c b/arch/x86/kvm/svm.c
index 89e0be2c10d0..ab22615eee89 100644
--- a/arch/x86/kvm/svm.c
+++ b/arch/x86/kvm/svm.c
@@ -1863,6 +1863,15 @@ static bool svm_cpu_has_accelerated_tpr(void)
         return false;
 }
 
+static int get_npt_level(void)
+{
+#ifdef CONFIG_X86_64
+        return PT64_ROOT_LEVEL;
+#else
+        return PT32E_ROOT_LEVEL;
+#endif
+}
+
 static struct kvm_x86_ops svm_x86_ops = {
         .cpu_has_kvm_support = has_svm,
         .disabled_by_bios = is_disabled,
@@ -1920,6 +1929,7 @@ static struct kvm_x86_ops svm_x86_ops = {
         .inject_pending_vectors = do_interrupt_requests,
 
         .set_tss_addr = svm_set_tss_addr,
+        .get_tdp_level = get_npt_level,
 };
 
 static int __init svm_init(void)
diff --git a/arch/x86/kvm/vmx.c b/arch/x86/kvm/vmx.c
index 8e5d6645b90d..bfe4db11989c 100644
--- a/arch/x86/kvm/vmx.c
+++ b/arch/x86/kvm/vmx.c
@@ -42,6 +42,9 @@ module_param(enable_vpid, bool, 0);
 static int flexpriority_enabled = 1;
 module_param(flexpriority_enabled, bool, 0);
 
+static int enable_ept = 1;
+module_param(enable_ept, bool, 0);
+
 struct vmcs {
         u32 revision_id;
         u32 abort;
@@ -84,7 +87,7 @@ static inline struct vcpu_vmx *to_vmx(struct kvm_vcpu *vcpu)
         return container_of(vcpu, struct vcpu_vmx, vcpu);
 }
 
-static int init_rmode_tss(struct kvm *kvm);
+static int init_rmode(struct kvm *kvm);
 
 static DEFINE_PER_CPU(struct vmcs *, vmxarea);
 static DEFINE_PER_CPU(struct vmcs *, current_vmcs);
@@ -107,6 +110,11 @@ static struct vmcs_config {
         u32 vmentry_ctrl;
 } vmcs_config;
 
+struct vmx_capability {
+        u32 ept;
+        u32 vpid;
+} vmx_capability;
+
 #define VMX_SEGMENT_FIELD(seg)                                  \
         [VCPU_SREG_##seg] = {                                   \
                 .selector = GUEST_##seg##_SELECTOR,             \
@@ -214,6 +222,32 @@ static inline bool cpu_has_vmx_virtualize_apic_accesses(void)
                     SECONDARY_EXEC_VIRTUALIZE_APIC_ACCESSES);
 }
 
+static inline int cpu_has_vmx_invept_individual_addr(void)
+{
+        return (!!(vmx_capability.ept & VMX_EPT_EXTENT_INDIVIDUAL_BIT));
+}
+
+static inline int cpu_has_vmx_invept_context(void)
+{
+        return (!!(vmx_capability.ept & VMX_EPT_EXTENT_CONTEXT_BIT));
+}
+
+static inline int cpu_has_vmx_invept_global(void)
+{
+        return (!!(vmx_capability.ept & VMX_EPT_EXTENT_GLOBAL_BIT));
+}
+
+static inline int cpu_has_vmx_ept(void)
+{
+        return (vmcs_config.cpu_based_2nd_exec_ctrl &
+                SECONDARY_EXEC_ENABLE_EPT);
+}
+
+static inline int vm_need_ept(void)
+{
+        return (cpu_has_vmx_ept() && enable_ept);
+}
+
 static inline int vm_need_virtualize_apic_accesses(struct kvm *kvm)
 {
         return ((cpu_has_vmx_virtualize_apic_accesses()) &&
@@ -250,6 +284,18 @@ static inline void __invvpid(int ext, u16 vpid, gva_t gva)
                   : : "a"(&operand), "c"(ext) : "cc", "memory");
 }
 
+static inline void __invept(int ext, u64 eptp, gpa_t gpa)
+{
+        struct {
+                u64 eptp, gpa;
+        } operand = {eptp, gpa};
+
+        asm volatile (ASM_VMX_INVEPT
+                        /* CF==1 or ZF==1 --> rc = -1 */
+                        "; ja 1f ; ud2 ; 1:\n"
+                        : : "a" (&operand), "c" (ext) : "cc", "memory");
+}
+
 static struct kvm_msr_entry *find_msr_entry(struct vcpu_vmx *vmx, u32 msr)
 {
         int i;
@@ -301,6 +347,33 @@ static inline void vpid_sync_vcpu_all(struct vcpu_vmx *vmx)
         __invvpid(VMX_VPID_EXTENT_SINGLE_CONTEXT, vmx->vpid, 0);
 }
 
+static inline void ept_sync_global(void)
+{
+        if (cpu_has_vmx_invept_global())
+                __invept(VMX_EPT_EXTENT_GLOBAL, 0, 0);
+}
+
+static inline void ept_sync_context(u64 eptp)
+{
+        if (vm_need_ept()) {
+                if (cpu_has_vmx_invept_context())
+                        __invept(VMX_EPT_EXTENT_CONTEXT, eptp, 0);
+                else
+                        ept_sync_global();
+        }
+}
+
+static inline void ept_sync_individual_addr(u64 eptp, gpa_t gpa)
+{
+        if (vm_need_ept()) {
+                if (cpu_has_vmx_invept_individual_addr())
+                        __invept(VMX_EPT_EXTENT_INDIVIDUAL_ADDR,
+                                        eptp, gpa);
+                else
+                        ept_sync_context(eptp);
+        }
+}
+
 static unsigned long vmcs_readl(unsigned long field)
 {
         unsigned long value;
@@ -388,6 +461,8 @@ static void update_exception_bitmap(struct kvm_vcpu *vcpu)
                 eb |= 1u << 1;
         if (vcpu->arch.rmode.active)
                 eb = ~0;
+        if (vm_need_ept())
+                eb &= ~(1u << PF_VECTOR); /* bypass_guest_pf = 0 */
         vmcs_write32(EXCEPTION_BITMAP, eb);
 }
 
@@ -985,7 +1060,7 @@ static __init int adjust_vmx_controls(u32 ctl_min, u32 ctl_opt,
 static __init int setup_vmcs_config(struct vmcs_config *vmcs_conf)
 {
         u32 vmx_msr_low, vmx_msr_high;
-        u32 min, opt;
+        u32 min, opt, min2, opt2;
         u32 _pin_based_exec_control = 0;
         u32 _cpu_based_exec_control = 0;
         u32 _cpu_based_2nd_exec_control = 0;
@@ -1003,6 +1078,8 @@ static __init int setup_vmcs_config(struct vmcs_config *vmcs_conf)
               CPU_BASED_CR8_LOAD_EXITING |
               CPU_BASED_CR8_STORE_EXITING |
 #endif
+              CPU_BASED_CR3_LOAD_EXITING |
+              CPU_BASED_CR3_STORE_EXITING |
               CPU_BASED_USE_IO_BITMAPS |
               CPU_BASED_MOV_DR_EXITING |
               CPU_BASED_USE_TSC_OFFSETING;
@@ -1018,11 +1095,13 @@ static __init int setup_vmcs_config(struct vmcs_config *vmcs_conf)
                                            ~CPU_BASED_CR8_STORE_EXITING;
 #endif
         if (_cpu_based_exec_control & CPU_BASED_ACTIVATE_SECONDARY_CONTROLS) {
-                min = 0;
-                opt = SECONDARY_EXEC_VIRTUALIZE_APIC_ACCESSES |
+                min2 = 0;
+                opt2 = SECONDARY_EXEC_VIRTUALIZE_APIC_ACCESSES |
                         SECONDARY_EXEC_WBINVD_EXITING |
-                        SECONDARY_EXEC_ENABLE_VPID;
-                if (adjust_vmx_controls(min, opt, MSR_IA32_VMX_PROCBASED_CTLS2,
+                        SECONDARY_EXEC_ENABLE_VPID |
+                        SECONDARY_EXEC_ENABLE_EPT;
+                if (adjust_vmx_controls(min2, opt2,
+                                        MSR_IA32_VMX_PROCBASED_CTLS2,
                                         &_cpu_based_2nd_exec_control) < 0)
                         return -EIO;
         }
@@ -1031,6 +1110,16 @@ static __init int setup_vmcs_config(struct vmcs_config *vmcs_conf)
                                 SECONDARY_EXEC_VIRTUALIZE_APIC_ACCESSES))
                 _cpu_based_exec_control &= ~CPU_BASED_TPR_SHADOW;
 #endif
+        if (_cpu_based_2nd_exec_control & SECONDARY_EXEC_ENABLE_EPT) {
+                /* CR3 accesses don't need to cause VM Exits when EPT enabled */
+                min &= ~(CPU_BASED_CR3_LOAD_EXITING |
+                         CPU_BASED_CR3_STORE_EXITING);
+                if (adjust_vmx_controls(min, opt, MSR_IA32_VMX_PROCBASED_CTLS,
+                                        &_cpu_based_exec_control) < 0)
+                        return -EIO;
+                rdmsr(MSR_IA32_VMX_EPT_VPID_CAP,
+                      vmx_capability.ept, vmx_capability.vpid);
+        }
 
         min = 0;
 #ifdef CONFIG_X86_64
@@ -1256,7 +1345,7 @@ static void enter_rmode(struct kvm_vcpu *vcpu)
         fix_rmode_seg(VCPU_SREG_FS, &vcpu->arch.rmode.fs);
 
         kvm_mmu_reset_context(vcpu);
-        init_rmode_tss(vcpu->kvm);
+        init_rmode(vcpu->kvm);
 }
 
 #ifdef CONFIG_X86_64
@@ -1304,8 +1393,64 @@ static void vmx_decache_cr4_guest_bits(struct kvm_vcpu *vcpu)
         vcpu->arch.cr4 |= vmcs_readl(GUEST_CR4) & ~KVM_GUEST_CR4_MASK;
 }
 
+static void ept_load_pdptrs(struct kvm_vcpu *vcpu)
+{
+        if (is_paging(vcpu) && is_pae(vcpu) && !is_long_mode(vcpu)) {
+                if (!load_pdptrs(vcpu, vcpu->arch.cr3)) {
+                        printk(KERN_ERR "EPT: Fail to load pdptrs!\n");
+                        return;
+                }
+                vmcs_write64(GUEST_PDPTR0, vcpu->arch.pdptrs[0]);
+                vmcs_write64(GUEST_PDPTR1, vcpu->arch.pdptrs[1]);
+                vmcs_write64(GUEST_PDPTR2, vcpu->arch.pdptrs[2]);
+                vmcs_write64(GUEST_PDPTR3, vcpu->arch.pdptrs[3]);
+        }
+}
+
+static void vmx_set_cr4(struct kvm_vcpu *vcpu, unsigned long cr4);
+
+static void ept_update_paging_mode_cr0(unsigned long *hw_cr0,
+                                        unsigned long cr0,
+                                        struct kvm_vcpu *vcpu)
+{
+        if (!(cr0 & X86_CR0_PG)) {
+                /* From paging/starting to nonpaging */
+                vmcs_write32(CPU_BASED_VM_EXEC_CONTROL,
+                             vmcs_config.cpu_based_exec_ctrl |
+                             (CPU_BASED_CR3_LOAD_EXITING |
+                              CPU_BASED_CR3_STORE_EXITING));
+                vcpu->arch.cr0 = cr0;
+                vmx_set_cr4(vcpu, vcpu->arch.cr4);
+                *hw_cr0 |= X86_CR0_PE | X86_CR0_PG;
+                *hw_cr0 &= ~X86_CR0_WP;
+        } else if (!is_paging(vcpu)) {
+                /* From nonpaging to paging */
+                vmcs_write32(CPU_BASED_VM_EXEC_CONTROL,
+                             vmcs_config.cpu_based_exec_ctrl &
+                             ~(CPU_BASED_CR3_LOAD_EXITING |
+                               CPU_BASED_CR3_STORE_EXITING));
+                vcpu->arch.cr0 = cr0;
+                vmx_set_cr4(vcpu, vcpu->arch.cr4);
+                if (!(vcpu->arch.cr0 & X86_CR0_WP))
+                        *hw_cr0 &= ~X86_CR0_WP;
+        }
+}
+
+static void ept_update_paging_mode_cr4(unsigned long *hw_cr4,
+                                        struct kvm_vcpu *vcpu)
+{
+        if (!is_paging(vcpu)) {
+                *hw_cr4 &= ~X86_CR4_PAE;
+                *hw_cr4 |= X86_CR4_PSE;
+        } else if (!(vcpu->arch.cr4 & X86_CR4_PAE))
+                *hw_cr4 &= ~X86_CR4_PAE;
+}
+
 static void vmx_set_cr0(struct kvm_vcpu *vcpu, unsigned long cr0)
 {
+        unsigned long hw_cr0 = (cr0 & ~KVM_GUEST_CR0_MASK) |
+                                KVM_VM_CR0_ALWAYS_ON;
+
         vmx_fpu_deactivate(vcpu);
 
         if (vcpu->arch.rmode.active && (cr0 & X86_CR0_PE))
@@ -1323,29 +1468,61 @@ static void vmx_set_cr0(struct kvm_vcpu *vcpu, unsigned long cr0)
         }
 #endif
 
+        if (vm_need_ept())
+                ept_update_paging_mode_cr0(&hw_cr0, cr0, vcpu);
+
         vmcs_writel(CR0_READ_SHADOW, cr0);
-        vmcs_writel(GUEST_CR0,
-                    (cr0 & ~KVM_GUEST_CR0_MASK) | KVM_VM_CR0_ALWAYS_ON);
+        vmcs_writel(GUEST_CR0, hw_cr0);
         vcpu->arch.cr0 = cr0;
 
         if (!(cr0 & X86_CR0_TS) || !(cr0 & X86_CR0_PE))
                 vmx_fpu_activate(vcpu);
 }
 
+static u64 construct_eptp(unsigned long root_hpa)
+{
+        u64 eptp;
+
+        /* TODO write the value reading from MSR */
+        eptp = VMX_EPT_DEFAULT_MT |
+                VMX_EPT_DEFAULT_GAW << VMX_EPT_GAW_EPTP_SHIFT;
+        eptp |= (root_hpa & PAGE_MASK);
+
+        return eptp;
+}
+
 static void vmx_set_cr3(struct kvm_vcpu *vcpu, unsigned long cr3)
 {
+        unsigned long guest_cr3;
+        u64 eptp;
+
+        guest_cr3 = cr3;
+        if (vm_need_ept()) {
+                eptp = construct_eptp(cr3);
+                vmcs_write64(EPT_POINTER, eptp);
+                ept_sync_context(eptp);
+                ept_load_pdptrs(vcpu);
+                guest_cr3 = is_paging(vcpu) ? vcpu->arch.cr3 :
+                        VMX_EPT_IDENTITY_PAGETABLE_ADDR;
+        }
+
         vmx_flush_tlb(vcpu);
-        vmcs_writel(GUEST_CR3, cr3);
+        vmcs_writel(GUEST_CR3, guest_cr3);
         if (vcpu->arch.cr0 & X86_CR0_PE)
                 vmx_fpu_deactivate(vcpu);
 }
 
 static void vmx_set_cr4(struct kvm_vcpu *vcpu, unsigned long cr4)
 {
-        vmcs_writel(CR4_READ_SHADOW, cr4);
-        vmcs_writel(GUEST_CR4, cr4 | (vcpu->arch.rmode.active ?
-                    KVM_RMODE_VM_CR4_ALWAYS_ON : KVM_PMODE_VM_CR4_ALWAYS_ON));
+        unsigned long hw_cr4 = cr4 | (vcpu->arch.rmode.active ?
+                    KVM_RMODE_VM_CR4_ALWAYS_ON : KVM_PMODE_VM_CR4_ALWAYS_ON);
+
         vcpu->arch.cr4 = cr4;
+        if (vm_need_ept())
+                ept_update_paging_mode_cr4(&hw_cr4, vcpu);
+
+        vmcs_writel(CR4_READ_SHADOW, cr4);
+        vmcs_writel(GUEST_CR4, hw_cr4);
 }
 
 static void vmx_set_efer(struct kvm_vcpu *vcpu, u64 efer)
@@ -1530,6 +1707,41 @@ out:
         return ret;
 }
 
+static int init_rmode_identity_map(struct kvm *kvm)
+{
+        int i, r, ret;
+        pfn_t identity_map_pfn;
+        u32 tmp;
+
+        if (!vm_need_ept())
+                return 1;
+        if (unlikely(!kvm->arch.ept_identity_pagetable)) {
+                printk(KERN_ERR "EPT: identity-mapping pagetable "
+                        "haven't been allocated!\n");
+                return 0;
+        }
+        if (likely(kvm->arch.ept_identity_pagetable_done))
+                return 1;
+        ret = 0;
+        identity_map_pfn = VMX_EPT_IDENTITY_PAGETABLE_ADDR >> PAGE_SHIFT;
+        r = kvm_clear_guest_page(kvm, identity_map_pfn, 0, PAGE_SIZE);
+        if (r < 0)
+                goto out;
+        /* Set up identity-mapping pagetable for EPT in real mode */
+        for (i = 0; i < PT32_ENT_PER_PAGE; i++) {
+                tmp = (i << 22) + (_PAGE_PRESENT | _PAGE_RW | _PAGE_USER |
+                        _PAGE_ACCESSED | _PAGE_DIRTY | _PAGE_PSE);
+                r = kvm_write_guest_page(kvm, identity_map_pfn,
+                                &tmp, i * sizeof(tmp), sizeof(tmp));
+                if (r < 0)
+                        goto out;
+        }
+        kvm->arch.ept_identity_pagetable_done = true;
+        ret = 1;
+out:
+        return ret;
+}
+
 static void seg_setup(int seg)
 {
         struct kvm_vmx_segment_field *sf = &kvm_vmx_segment_fields[seg];
@@ -1564,6 +1776,31 @@ out:
         return r;
 }
 
+static int alloc_identity_pagetable(struct kvm *kvm)
+{
+        struct kvm_userspace_memory_region kvm_userspace_mem;
+        int r = 0;
+
+        down_write(&kvm->slots_lock);
+        if (kvm->arch.ept_identity_pagetable)
+                goto out;
+        kvm_userspace_mem.slot = IDENTITY_PAGETABLE_PRIVATE_MEMSLOT;
+        kvm_userspace_mem.flags = 0;
+        kvm_userspace_mem.guest_phys_addr = VMX_EPT_IDENTITY_PAGETABLE_ADDR;
+        kvm_userspace_mem.memory_size = PAGE_SIZE;
+        r = __kvm_set_memory_region(kvm, &kvm_userspace_mem, 0);
+        if (r)
+                goto out;
+
+        down_read(&current->mm->mmap_sem);
+        kvm->arch.ept_identity_pagetable = gfn_to_page(kvm,
+                        VMX_EPT_IDENTITY_PAGETABLE_ADDR >> PAGE_SHIFT);
+        up_read(&current->mm->mmap_sem);
+out:
+        up_write(&kvm->slots_lock);
+        return r;
+}
+
 static void allocate_vpid(struct vcpu_vmx *vmx)
 {
         int vpid;
@@ -1638,6 +1875,9 @@ static int vmx_vcpu_setup(struct vcpu_vmx *vmx)
                                 CPU_BASED_CR8_LOAD_EXITING;
 #endif
         }
+        if (!vm_need_ept())
+                exec_control |= CPU_BASED_CR3_STORE_EXITING |
+                                CPU_BASED_CR3_LOAD_EXITING;
         vmcs_write32(CPU_BASED_VM_EXEC_CONTROL, exec_control);
 
         if (cpu_has_secondary_exec_ctrls()) {
@@ -1647,6 +1887,8 @@ static int vmx_vcpu_setup(struct vcpu_vmx *vmx)
                                 ~SECONDARY_EXEC_VIRTUALIZE_APIC_ACCESSES;
                 if (vmx->vpid == 0)
                         exec_control &= ~SECONDARY_EXEC_ENABLE_VPID;
+                if (!vm_need_ept())
+                        exec_control &= ~SECONDARY_EXEC_ENABLE_EPT;
                 vmcs_write32(SECONDARY_VM_EXEC_CONTROL, exec_control);
         }
 
@@ -1722,6 +1964,15 @@ static int vmx_vcpu_setup(struct vcpu_vmx *vmx)
         return 0;
 }
 
+static int init_rmode(struct kvm *kvm)
+{
+        if (!init_rmode_tss(kvm))
+                return 0;
+        if (!init_rmode_identity_map(kvm))
+                return 0;
+        return 1;
+}
+
 static int vmx_vcpu_reset(struct kvm_vcpu *vcpu)
 {
         struct vcpu_vmx *vmx = to_vmx(vcpu);
@@ -1729,7 +1980,7 @@ static int vmx_vcpu_reset(struct kvm_vcpu *vcpu)
         int ret;
 
         down_read(&vcpu->kvm->slots_lock);
-        if (!init_rmode_tss(vmx->vcpu.kvm)) {
+        if (!init_rmode(vmx->vcpu.kvm)) {
                 ret = -ENOMEM;
                 goto out;
         }
@@ -1994,6 +2245,9 @@ static int handle_exception(struct kvm_vcpu *vcpu, struct kvm_run *kvm_run)
         if (intr_info & INTR_INFO_DELIVER_CODE_MASK)
                 error_code = vmcs_read32(VM_EXIT_INTR_ERROR_CODE);
         if (is_page_fault(intr_info)) {
+                /* EPT won't cause page fault directly */
+                if (vm_need_ept())
+                        BUG();
                 cr2 = vmcs_readl(EXIT_QUALIFICATION);
                 KVMTRACE_3D(PAGE_FAULT, vcpu, error_code, (u32)cr2,
                             (u32)((u64)cr2 >> 32), handler);
@@ -2323,6 +2577,64 @@ static int handle_task_switch(struct kvm_vcpu *vcpu, struct kvm_run *kvm_run)
         return kvm_task_switch(vcpu, tss_selector, reason);
 }
 
+static int handle_ept_violation(struct kvm_vcpu *vcpu, struct kvm_run *kvm_run)
+{
+        u64 exit_qualification;
+        enum emulation_result er;
+        gpa_t gpa;
+        unsigned long hva;
+        int gla_validity;
+        int r;
+
+        exit_qualification = vmcs_read64(EXIT_QUALIFICATION);
+
+        if (exit_qualification & (1 << 6)) {
+                printk(KERN_ERR "EPT: GPA exceeds GAW!\n");
+                return -ENOTSUPP;
+        }
+
+        gla_validity = (exit_qualification >> 7) & 0x3;
+        if (gla_validity != 0x3 && gla_validity != 0x1 && gla_validity != 0) {
+                printk(KERN_ERR "EPT: Handling EPT violation failed!\n");
+                printk(KERN_ERR "EPT: GPA: 0x%lx, GVA: 0x%lx\n",
+                        (long unsigned int)vmcs_read64(GUEST_PHYSICAL_ADDRESS),
+                        (long unsigned int)vmcs_read64(GUEST_LINEAR_ADDRESS));
+                printk(KERN_ERR "EPT: Exit qualification is 0x%lx\n",
+                        (long unsigned int)exit_qualification);
+                kvm_run->exit_reason = KVM_EXIT_UNKNOWN;
+                kvm_run->hw.hardware_exit_reason = 0;
+                return -ENOTSUPP;
+        }
+
+        gpa = vmcs_read64(GUEST_PHYSICAL_ADDRESS);
+        hva = gfn_to_hva(vcpu->kvm, gpa >> PAGE_SHIFT);
+        if (!kvm_is_error_hva(hva)) {
+                r = kvm_mmu_page_fault(vcpu, gpa & PAGE_MASK, 0);
+                if (r < 0) {
+                        printk(KERN_ERR "EPT: Not enough memory!\n");
+                        return -ENOMEM;
+                }
+                return 1;
+        } else {
+                /* must be MMIO */
+                er = emulate_instruction(vcpu, kvm_run, 0, 0, 0);
+
+                if (er == EMULATE_FAIL) {
+                        printk(KERN_ERR
+                         "EPT: Fail to handle EPT violation vmexit!er is %d\n",
+                         er);
+                        printk(KERN_ERR "EPT: GPA: 0x%lx, GVA: 0x%lx\n",
+                         (long unsigned int)vmcs_read64(GUEST_PHYSICAL_ADDRESS),
+                         (long unsigned int)vmcs_read64(GUEST_LINEAR_ADDRESS));
+                        printk(KERN_ERR "EPT: Exit qualification is 0x%lx\n",
+                                (long unsigned int)exit_qualification);
+                        return -ENOTSUPP;
+                } else if (er == EMULATE_DO_MMIO)
+                        return 0;
+        }
+        return 1;
+}
+
 /*
  * The exit handlers return 1 if the exit was handled fully and guest execution
  * may resume.  Otherwise they set the kvm_run parameter to indicate what needs
@@ -2346,6 +2658,7 @@ static int (*kvm_vmx_exit_handlers[])(struct kvm_vcpu *vcpu,
         [EXIT_REASON_APIC_ACCESS]             = handle_apic_access,
         [EXIT_REASON_WBINVD]                  = handle_wbinvd,
         [EXIT_REASON_TASK_SWITCH]             = handle_task_switch,
+        [EXIT_REASON_EPT_VIOLATION]           = handle_ept_violation,
 };
 
 static const int kvm_vmx_max_exit_handlers =
@@ -2364,6 +2677,13 @@ static int kvm_handle_exit(struct kvm_run *kvm_run, struct kvm_vcpu *vcpu)
         KVMTRACE_3D(VMEXIT, vcpu, exit_reason, (u32)vmcs_readl(GUEST_RIP),
                     (u32)((u64)vmcs_readl(GUEST_RIP) >> 32), entryexit);
 
+        /* Access CR3 don't cause VMExit in paging mode, so we need
+         * to sync with guest real CR3. */
+        if (vm_need_ept() && is_paging(vcpu)) {
+                vcpu->arch.cr3 = vmcs_readl(GUEST_CR3);
+                ept_load_pdptrs(vcpu);
+        }
+
         if (unlikely(vmx->fail)) {
                 kvm_run->exit_reason = KVM_EXIT_FAIL_ENTRY;
                 kvm_run->fail_entry.hardware_entry_failure_reason
@@ -2372,7 +2692,8 @@ static int kvm_handle_exit(struct kvm_run *kvm_run, struct kvm_vcpu *vcpu)
         }
 
         if ((vectoring_info & VECTORING_INFO_VALID_MASK) &&
-                                exit_reason != EXIT_REASON_EXCEPTION_NMI)
+                        (exit_reason != EXIT_REASON_EXCEPTION_NMI &&
+                        exit_reason != EXIT_REASON_EPT_VIOLATION))
                 printk(KERN_WARNING "%s: unexpected, valid vectoring info and "
                        "exit reason is 0x%x\n", __func__, exit_reason);
         if (exit_reason < kvm_vmx_max_exit_handlers
@@ -2674,6 +2995,15 @@ static struct kvm_vcpu *vmx_create_vcpu(struct kvm *kvm, unsigned int id)
                 return ERR_PTR(-ENOMEM);
 
         allocate_vpid(vmx);
+        if (id == 0 && vm_need_ept()) {
+                kvm_mmu_set_base_ptes(VMX_EPT_READABLE_MASK |
+                        VMX_EPT_WRITABLE_MASK |
+                        VMX_EPT_DEFAULT_MT << VMX_EPT_MT_EPTE_SHIFT);
+                kvm_mmu_set_mask_ptes(0ull, VMX_EPT_FAKE_ACCESSED_MASK,
+                                VMX_EPT_FAKE_DIRTY_MASK, 0ull,
+                                VMX_EPT_EXECUTABLE_MASK);
+                kvm_enable_tdp();
+        }
 
         err = kvm_vcpu_init(&vmx->vcpu, kvm, id);
         if (err)
@@ -2706,6 +3036,10 @@ static struct kvm_vcpu *vmx_create_vcpu(struct kvm *kvm, unsigned int id)
                 if (alloc_apic_access_page(kvm) != 0)
                         goto free_vmcs;
 
+        if (vm_need_ept())
+                if (alloc_identity_pagetable(kvm) != 0)
+                        goto free_vmcs;
+
         return &vmx->vcpu;
 
 free_vmcs:
@@ -2735,6 +3069,11 @@ static void __init vmx_check_processor_compat(void *rtn)
         }
 }
 
+static int get_ept_level(void)
+{
+        return VMX_EPT_DEFAULT_GAW + 1;
+}
+
 static struct kvm_x86_ops vmx_x86_ops = {
         .cpu_has_kvm_support = cpu_has_kvm_support,
         .disabled_by_bios = vmx_disabled_by_bios,
@@ -2791,6 +3130,7 @@ static struct kvm_x86_ops vmx_x86_ops = {
         .inject_pending_vectors = do_interrupt_requests,
 
         .set_tss_addr = vmx_set_tss_addr,
+        .get_tdp_level = get_ept_level,
 };
 
 static int __init vmx_init(void)
@@ -2843,9 +3183,14 @@ static int __init vmx_init(void)
         vmx_disable_intercept_for_msr(vmx_msr_bitmap, MSR_IA32_SYSENTER_ESP);
         vmx_disable_intercept_for_msr(vmx_msr_bitmap, MSR_IA32_SYSENTER_EIP);
 
+        if (cpu_has_vmx_ept())
+                bypass_guest_pf = 0;
+
         if (bypass_guest_pf)
                 kvm_mmu_set_nonpresent_ptes(~0xffeull, 0ull);
 
+        ept_sync_global();
+
         return 0;
 
 out2:
diff --git a/arch/x86/kvm/vmx.h b/arch/x86/kvm/vmx.h
index 5dff4606b988..79d94c610dfe 100644
--- a/arch/x86/kvm/vmx.h
+++ b/arch/x86/kvm/vmx.h
@@ -35,6 +35,8 @@
 #define CPU_BASED_MWAIT_EXITING                 0x00000400
 #define CPU_BASED_RDPMC_EXITING                 0x00000800
 #define CPU_BASED_RDTSC_EXITING                 0x00001000
+#define CPU_BASED_CR3_LOAD_EXITING              0x00008000
+#define CPU_BASED_CR3_STORE_EXITING             0x00010000
 #define CPU_BASED_CR8_LOAD_EXITING              0x00080000
 #define CPU_BASED_CR8_STORE_EXITING             0x00100000
 #define CPU_BASED_TPR_SHADOW                    0x00200000
@@ -49,6 +51,7 @@
  * Definitions of Secondary Processor-Based VM-Execution Controls.
  */
 #define SECONDARY_EXEC_VIRTUALIZE_APIC_ACCESSES 0x00000001
+#define SECONDARY_EXEC_ENABLE_EPT               0x00000002
 #define SECONDARY_EXEC_ENABLE_VPID              0x00000020
 #define SECONDARY_EXEC_WBINVD_EXITING           0x00000040
 
@@ -100,10 +103,22 @@ enum vmcs_field {
         VIRTUAL_APIC_PAGE_ADDR_HIGH     = 0x00002013,
         APIC_ACCESS_ADDR                = 0x00002014,
         APIC_ACCESS_ADDR_HIGH           = 0x00002015,
+        EPT_POINTER                     = 0x0000201a,
+        EPT_POINTER_HIGH                = 0x0000201b,
+        GUEST_PHYSICAL_ADDRESS          = 0x00002400,
+        GUEST_PHYSICAL_ADDRESS_HIGH     = 0x00002401,
         VMCS_LINK_POINTER               = 0x00002800,
         VMCS_LINK_POINTER_HIGH          = 0x00002801,
         GUEST_IA32_DEBUGCTL             = 0x00002802,
         GUEST_IA32_DEBUGCTL_HIGH        = 0x00002803,
+        GUEST_PDPTR0                    = 0x0000280a,
+        GUEST_PDPTR0_HIGH               = 0x0000280b,
+        GUEST_PDPTR1                    = 0x0000280c,
+        GUEST_PDPTR1_HIGH               = 0x0000280d,
+        GUEST_PDPTR2                    = 0x0000280e,
+        GUEST_PDPTR2_HIGH               = 0x0000280f,
+        GUEST_PDPTR3                    = 0x00002810,
+        GUEST_PDPTR3_HIGH               = 0x00002811,
         PIN_BASED_VM_EXEC_CONTROL       = 0x00004000,
         CPU_BASED_VM_EXEC_CONTROL       = 0x00004002,
         EXCEPTION_BITMAP                = 0x00004004,
@@ -226,6 +241,8 @@ enum vmcs_field {
 #define EXIT_REASON_MWAIT_INSTRUCTION   36
 #define EXIT_REASON_TPR_BELOW_THRESHOLD 43
 #define EXIT_REASON_APIC_ACCESS         44
+#define EXIT_REASON_EPT_VIOLATION       48
+#define EXIT_REASON_EPT_MISCONFIG       49
 #define EXIT_REASON_WBINVD              54
 
 /*
@@ -316,15 +333,36 @@ enum vmcs_field {
 #define MSR_IA32_VMX_CR4_FIXED1                 0x489
 #define MSR_IA32_VMX_VMCS_ENUM                  0x48a
 #define MSR_IA32_VMX_PROCBASED_CTLS2            0x48b
+#define MSR_IA32_VMX_EPT_VPID_CAP               0x48c
 
 #define MSR_IA32_FEATURE_CONTROL                0x3a
 #define MSR_IA32_FEATURE_CONTROL_LOCKED         0x1
 #define MSR_IA32_FEATURE_CONTROL_VMXON_ENABLED  0x4
 
 #define APIC_ACCESS_PAGE_PRIVATE_MEMSLOT        9
+#define IDENTITY_PAGETABLE_PRIVATE_MEMSLOT      10
 
 #define VMX_NR_VPIDS                            (1 << 16)
 #define VMX_VPID_EXTENT_SINGLE_CONTEXT          1
 #define VMX_VPID_EXTENT_ALL_CONTEXT             2
 
+#define VMX_EPT_EXTENT_INDIVIDUAL_ADDR          0
+#define VMX_EPT_EXTENT_CONTEXT                  1
+#define VMX_EPT_EXTENT_GLOBAL                   2
+#define VMX_EPT_EXTENT_INDIVIDUAL_BIT           (1ull << 24)
+#define VMX_EPT_EXTENT_CONTEXT_BIT              (1ull << 25)
+#define VMX_EPT_EXTENT_GLOBAL_BIT               (1ull << 26)
+#define VMX_EPT_DEFAULT_GAW                     3
+#define VMX_EPT_MAX_GAW                         0x4
+#define VMX_EPT_MT_EPTE_SHIFT                   3
+#define VMX_EPT_GAW_EPTP_SHIFT                  3
+#define VMX_EPT_DEFAULT_MT                      0x6ull
+#define VMX_EPT_READABLE_MASK                   0x1ull
+#define VMX_EPT_WRITABLE_MASK                   0x2ull
+#define VMX_EPT_EXECUTABLE_MASK                 0x4ull
+#define VMX_EPT_FAKE_ACCESSED_MASK              (1ull << 62)
+#define VMX_EPT_FAKE_DIRTY_MASK                 (1ull << 63)
+
+#define VMX_EPT_IDENTITY_PAGETABLE_ADDR         0xfffbc000ul
+
 #endif
diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c
index 0ce556372a4d..21338bdb28ff 100644
--- a/arch/x86/kvm/x86.c
+++ b/arch/x86/kvm/x86.c
@@ -2417,6 +2417,9 @@ int kvm_arch_init(void *opaque)
 
         kvm_x86_ops = ops;
         kvm_mmu_set_nonpresent_ptes(0ull, 0ull);
+        kvm_mmu_set_base_ptes(PT_PRESENT_MASK);
+        kvm_mmu_set_mask_ptes(PT_USER_MASK, PT_ACCESSED_MASK,
+                        PT_DIRTY_MASK, PT64_NX_MASK, 0);
         return 0;
 
 out:
@@ -3019,6 +3022,8 @@ int kvm_arch_vcpu_ioctl_set_regs(struct kvm_vcpu *vcpu, struct kvm_regs *regs)
 
         kvm_x86_ops->decache_regs(vcpu);
 
+        vcpu->arch.exception.pending = false;
+
         vcpu_put(vcpu);
 
         return 0;
@@ -3481,7 +3486,7 @@ int kvm_task_switch(struct kvm_vcpu *vcpu, u16 tss_selector, int reason)
         }
 
         if (reason == TASK_SWITCH_IRET || reason == TASK_SWITCH_JMP) {
-                cseg_desc.type &= ~(1 << 8); //clear the B flag
+                cseg_desc.type &= ~(1 << 1); //clear the B flag
                 save_guest_segment_descriptor(vcpu, tr_seg.selector,
                                               &cseg_desc);
         }
@@ -3507,7 +3512,7 @@ int kvm_task_switch(struct kvm_vcpu *vcpu, u16 tss_selector, int reason)
         }
 
         if (reason != TASK_SWITCH_IRET) {
-                nseg_desc.type |= (1 << 8);
+                nseg_desc.type |= (1 << 1);
                 save_guest_segment_descriptor(vcpu, tss_selector,
                                               &nseg_desc);
         }
@@ -3698,10 +3703,19 @@ void fx_init(struct kvm_vcpu *vcpu)
 {
         unsigned after_mxcsr_mask;
 
+        /*
+         * Touch the fpu the first time in non atomic context as if
+         * this is the first fpu instruction the exception handler
+         * will fire before the instruction returns and it'll have to
+         * allocate ram with GFP_KERNEL.
+         */
+        if (!used_math())
+                fx_save(&vcpu->arch.host_fx_image);
+
         /* Initialize guest FPU by resetting ours and saving into guest's */
         preempt_disable();
         fx_save(&vcpu->arch.host_fx_image);
-        fpu_init();
+        fx_finit();
         fx_save(&vcpu->arch.guest_fx_image);
         fx_restore(&vcpu->arch.host_fx_image);
         preempt_enable();
@@ -3906,6 +3920,8 @@ void kvm_arch_destroy_vm(struct kvm *kvm)
         kvm_free_physmem(kvm);
         if (kvm->arch.apic_access_page)
                 put_page(kvm->arch.apic_access_page);
+        if (kvm->arch.ept_identity_pagetable)
+                put_page(kvm->arch.ept_identity_pagetable);
         kfree(kvm);
 }
 
diff --git a/arch/x86/kvm/x86_emulate.c b/arch/x86/kvm/x86_emulate.c
index 2ca08386f993..f2a696d6a243 100644
--- a/arch/x86/kvm/x86_emulate.c
+++ b/arch/x86/kvm/x86_emulate.c
@@ -1761,6 +1761,7 @@ twobyte_insn:
                 case 6: /* lmsw */
                         realmode_lmsw(ctxt->vcpu, (u16)c->src.val,
                                       &ctxt->eflags);
+                        c->dst.type = OP_NONE;
                         break;
                 case 7: /* invlpg*/
                         emulate_invlpg(ctxt->vcpu, memop);
diff --git a/arch/x86/mach-voyager/voyager_cat.c b/arch/x86/mach-voyager/voyager_cat.c
index ecab9fff0fd1..2ad598c104af 100644
--- a/arch/x86/mach-voyager/voyager_cat.c
+++ b/arch/x86/mach-voyager/voyager_cat.c
@@ -877,7 +877,7 @@ void __init voyager_cat_init(void)
                         request_resource(&iomem_resource, res);
                 }
 
-                qic_addr = (unsigned long)ioremap(qic_addr, 0x400);
+                qic_addr = (unsigned long)ioremap_cache(qic_addr, 0x400);
 
                 for (j = 0; j < 4; j++) {
                         __u8 cpu;
diff --git a/arch/x86/mm/discontig_32.c b/arch/x86/mm/discontig_32.c
index 18378850e25a..914ccf983687 100644
--- a/arch/x86/mm/discontig_32.c
+++ b/arch/x86/mm/discontig_32.c
@@ -476,29 +476,3 @@ int memory_add_physaddr_to_nid(u64 addr)
 
 EXPORT_SYMBOL_GPL(memory_add_physaddr_to_nid);
 #endif
-
-#ifndef CONFIG_HAVE_ARCH_PARSE_SRAT
-/*
- * XXX FIXME: Make SLIT table parsing available to 32-bit NUMA
- *
- * These stub functions are needed to compile 32-bit NUMA when SRAT is
- * not set. There are functions in srat_64.c for parsing this table
- * and it may be possible to make them common functions.
- */
-void acpi_numa_slit_init (struct acpi_table_slit *slit)
-{
-        printk(KERN_INFO "ACPI: No support for parsing SLIT table\n");
-}
-
-void acpi_numa_processor_affinity_init (struct acpi_srat_cpu_affinity *pa)
-{
-}
-
-void acpi_numa_memory_affinity_init (struct acpi_srat_mem_affinity *ma)
-{
-}
-
-void acpi_numa_arch_fixup(void)
-{
-}
-#endif /* CONFIG_HAVE_ARCH_PARSE_SRAT */
diff --git a/arch/x86/mm/highmem_32.c b/arch/x86/mm/highmem_32.c
index 9cf33d3ee5bc..165c871ba9af 100644
--- a/arch/x86/mm/highmem_32.c
+++ b/arch/x86/mm/highmem_32.c
@@ -155,4 +155,3 @@ EXPORT_SYMBOL(kmap);
 EXPORT_SYMBOL(kunmap);
 EXPORT_SYMBOL(kmap_atomic);
 EXPORT_SYMBOL(kunmap_atomic);
-EXPORT_SYMBOL(kmap_atomic_to_page);
diff --git a/arch/x86/mm/ioremap.c b/arch/x86/mm/ioremap.c
index 804de18abcc2..71bb3159031a 100644
--- a/arch/x86/mm/ioremap.c
+++ b/arch/x86/mm/ioremap.c
@@ -149,7 +149,8 @@ static void __iomem *__ioremap_caller(resource_size_t phys_addr,
          * Don't allow anybody to remap normal RAM that we're using..
          */
         for (pfn = phys_addr >> PAGE_SHIFT;
-                                (pfn << PAGE_SHIFT) < last_addr; pfn++) {
+                                (pfn << PAGE_SHIFT) < (last_addr & PAGE_MASK);
+                                pfn++) {
 
                 int is_ram = page_is_ram(pfn);
 
@@ -176,11 +177,11 @@ static void __iomem *__ioremap_caller(resource_size_t phys_addr,
                 /*
                  * Do not fallback to certain memory types with certain
                  * requested type:
-                 * - request is uncached, return cannot be write-back
-                 * - request is uncached, return cannot be write-combine
+                 * - request is uc-, return cannot be write-back
+                 * - request is uc-, return cannot be write-combine
                  * - request is write-combine, return cannot be write-back
                  */
-                if ((prot_val == _PAGE_CACHE_UC &&
+                if ((prot_val == _PAGE_CACHE_UC_MINUS &&
                      (new_prot_val == _PAGE_CACHE_WB ||
                       new_prot_val == _PAGE_CACHE_WC)) ||
                     (prot_val == _PAGE_CACHE_WC &&
@@ -201,6 +202,9 @@ static void __iomem *__ioremap_caller(resource_size_t phys_addr,
         default:
                 prot = PAGE_KERNEL_NOCACHE;
                 break;
+        case _PAGE_CACHE_UC_MINUS:
+                prot = PAGE_KERNEL_UC_MINUS;
+                break;
         case _PAGE_CACHE_WC:
                 prot = PAGE_KERNEL_WC;
                 break;
@@ -255,7 +259,16 @@ static void __iomem *__ioremap_caller(resource_size_t phys_addr,
  */
 void __iomem *ioremap_nocache(resource_size_t phys_addr, unsigned long size)
 {
-        return __ioremap_caller(phys_addr, size, _PAGE_CACHE_UC,
+        /*
+         * Ideally, this should be:
+         *      pat_wc_enabled ? _PAGE_CACHE_UC : _PAGE_CACHE_UC_MINUS;
+         *
+         * Till we fix all X drivers to use ioremap_wc(), we will use
+         * UC MINUS.
+         */
+        unsigned long val = _PAGE_CACHE_UC_MINUS;
+
+        return __ioremap_caller(phys_addr, size, val,
                                 __builtin_return_address(0));
 }
 EXPORT_SYMBOL(ioremap_nocache);
diff --git a/arch/x86/mm/k8topology_64.c b/arch/x86/mm/k8topology_64.c
index 86808e666f9c..1f476e477844 100644
--- a/arch/x86/mm/k8topology_64.c
+++ b/arch/x86/mm/k8topology_64.c
@@ -13,12 +13,15 @@
 #include <linux/nodemask.h>
 #include <asm/io.h>
 #include <linux/pci_ids.h>
+#include <linux/acpi.h>
 #include <asm/types.h>
 #include <asm/mmzone.h>
 #include <asm/proto.h>
 #include <asm/e820.h>
 #include <asm/pci-direct.h>
 #include <asm/numa.h>
+#include <asm/mpspec.h>
+#include <asm/apic.h>
 
 static __init int find_northbridge(void)
 {
@@ -44,6 +47,30 @@ static __init int find_northbridge(void)
         return -1;
 }
 
+static __init void early_get_boot_cpu_id(void)
+{
+        /*
+         * need to get boot_cpu_id so can use that to create apicid_to_node
+         * in k8_scan_nodes()
+         */
+        /*
+         * Find possible boot-time SMP configuration:
+         */
+        early_find_smp_config();
+#ifdef CONFIG_ACPI
+        /*
+         * Read APIC information from ACPI tables.
+         */
+        early_acpi_boot_init();
+#endif
+        /*
+         * get boot-time SMP configuration:
+         */
+        if (smp_found_config)
+                early_get_smp_config();
+        early_init_lapic_mapping();
+}
+
 int __init k8_scan_nodes(unsigned long start, unsigned long end)
 {
         unsigned long prevbase;
@@ -56,6 +83,7 @@ int __init k8_scan_nodes(unsigned long start, unsigned long end)
         unsigned cores;
         unsigned bits;
         int j;
+        unsigned apicid_base;
 
         if (!early_pci_allowed())
                 return -1;
@@ -174,11 +202,19 @@ int __init k8_scan_nodes(unsigned long start, unsigned long end)
         /* use the coreid bits from early_identify_cpu */
         bits = boot_cpu_data.x86_coreid_bits;
         cores = (1<<bits);
+        apicid_base = 0;
+        /* need to get boot_cpu_id early for system with apicid lifting */
+        early_get_boot_cpu_id();
+        if (boot_cpu_physical_apicid > 0) {
+                printk(KERN_INFO "BSP APIC ID: %02x\n",
+                                 boot_cpu_physical_apicid);
+                apicid_base = boot_cpu_physical_apicid;
+        }
 
         for (i = 0; i < 8; i++) {
                 if (nodes[i].start != nodes[i].end) {
                         nodeid = nodeids[i];
-                        for (j = 0; j < cores; j++)
+                        for (j = apicid_base; j < cores + apicid_base; j++)
                                 apicid_to_node[(nodeid << bits) + j] = i;
                         setup_node_bootmem(i, nodes[i].start, nodes[i].end);
                 }
diff --git a/arch/x86/mm/pageattr.c b/arch/x86/mm/pageattr.c
index bd5e05c654dc..60bcb5b6a37e 100644
--- a/arch/x86/mm/pageattr.c
+++ b/arch/x86/mm/pageattr.c
@@ -777,14 +777,20 @@ static inline int change_page_attr_clear(unsigned long addr, int numpages,
 
 int _set_memory_uc(unsigned long addr, int numpages)
 {
+        /*
+         * for now UC MINUS. see comments in ioremap_nocache()
+         */
         return change_page_attr_set(addr, numpages,
-                                    __pgprot(_PAGE_CACHE_UC));
+                                    __pgprot(_PAGE_CACHE_UC_MINUS));
 }
 
 int set_memory_uc(unsigned long addr, int numpages)
 {
+        /*
+         * for now UC MINUS. see comments in ioremap_nocache()
+         */
         if (reserve_memtype(addr, addr + numpages * PAGE_SIZE,
-                            _PAGE_CACHE_UC, NULL))
+                            _PAGE_CACHE_UC_MINUS, NULL))
                 return -EINVAL;
 
         return _set_memory_uc(addr, numpages);
diff --git a/arch/x86/pci/Makefile_32 b/arch/x86/pci/Makefile_32
index cdd6828b5abb..89ec35d00efd 100644
--- a/arch/x86/pci/Makefile_32
+++ b/arch/x86/pci/Makefile_32
@@ -3,12 +3,22 @@ obj-y				:= i386.o init.o
 obj-$(CONFIG_PCI_BIOS)          += pcbios.o
 obj-$(CONFIG_PCI_MMCONFIG)      += mmconfig_32.o direct.o mmconfig-shared.o
 obj-$(CONFIG_PCI_DIRECT)        += direct.o
+obj-$(CONFIG_PCI_OLPC)          += olpc.o
 
 pci-y                           := fixup.o
+
+# Do not change the ordering here. There is a nasty init function
+# ordering dependency which breaks when you move acpi.o below
+# legacy/irq.o
 pci-$(CONFIG_ACPI)              += acpi.o
 pci-y                           += legacy.o irq.o
 
+# Careful: VISWS and NUMAQ overrule the pci-y above. The colons are
+# therefor correct. This needs a proper fix by distangling the code.
 pci-$(CONFIG_X86_VISWS)         := visws.o fixup.o
 pci-$(CONFIG_X86_NUMAQ)         := numa.o irq.o
 
+# Necessary for NUMAQ as well
+pci-$(CONFIG_NUMA)              += mp_bus_to_node.o
+
 obj-y                           += $(pci-y) common.o early.o
diff --git a/arch/x86/pci/Makefile_64 b/arch/x86/pci/Makefile_64
index 7d8c467bf143..8fbd19832cf6 100644
--- a/arch/x86/pci/Makefile_64
+++ b/arch/x86/pci/Makefile_64
@@ -13,5 +13,5 @@ obj-y			+= legacy.o irq.o common.o early.o
 # mmconfig has a 64bit special
 obj-$(CONFIG_PCI_MMCONFIG) += mmconfig_64.o direct.o mmconfig-shared.o
 
-obj-$(CONFIG_NUMA)      += k8-bus_64.o
+obj-y           += k8-bus_64.o
 
diff --git a/arch/x86/pci/acpi.c b/arch/x86/pci/acpi.c
index 2664cb3fc96c..1a9c0c6a1a18 100644
--- a/arch/x86/pci/acpi.c
+++ b/arch/x86/pci/acpi.c
@@ -191,7 +191,10 @@ struct pci_bus * __devinit pci_acpi_scan_root(struct acpi_device *device, int do
 {
         struct pci_bus *bus;
         struct pci_sysdata *sd;
+        int node;
+#ifdef CONFIG_ACPI_NUMA
         int pxm;
+#endif
 
         dmi_check_system(acpi_pciprobe_dmi_table);
 
@@ -201,6 +204,17 @@ struct pci_bus * __devinit pci_acpi_scan_root(struct acpi_device *device, int do
                 return NULL;
         }
 
+        node = -1;
+#ifdef CONFIG_ACPI_NUMA
+        pxm = acpi_get_pxm(device->handle);
+        if (pxm >= 0)
+                node = pxm_to_node(pxm);
+        if (node != -1)
+                set_mp_bus_to_node(busnum, node);
+        else
+                node = get_mp_bus_to_node(busnum);
+#endif
+
         /* Allocate per-root-bus (not per bus) arch-specific data.
          * TODO: leak; this memory is never freed.
          * It's arguable whether it's worth the trouble to care.
@@ -212,13 +226,7 @@ struct pci_bus * __devinit pci_acpi_scan_root(struct acpi_device *device, int do
         }
 
         sd->domain = domain;
-        sd->node = -1;
-
-        pxm = acpi_get_pxm(device->handle);
-#ifdef CONFIG_ACPI_NUMA
-        if (pxm >= 0)
-                sd->node = pxm_to_node(pxm);
-#endif
+        sd->node = node;
         /*
          * Maybe the desired pci bus has been already scanned. In such case
          * it is unnecessary to scan the pci bus with the given domain,busnum.
@@ -238,9 +246,9 @@ struct pci_bus * __devinit pci_acpi_scan_root(struct acpi_device *device, int do
                 kfree(sd);
 
 #ifdef CONFIG_ACPI_NUMA
-        if (bus != NULL) {
+        if (bus) {
                 if (pxm >= 0) {
-                        printk("bus %d -> pxm %d -> node %d\n",
+                        printk(KERN_DEBUG "bus %02x -> pxm %d -> node %d\n",
                                 busnum, pxm, pxm_to_node(pxm));
                 }
         }
@@ -248,7 +256,6 @@ struct pci_bus * __devinit pci_acpi_scan_root(struct acpi_device *device, int do
 
         if (bus && (pci_probe & PCI_USE__CRS))
                 get_current_resources(device, busnum, domain, bus);
-        
         return bus;
 }
 
diff --git a/arch/x86/pci/common.c b/arch/x86/pci/common.c
index 75fcc29ecf52..2a4d751818b7 100644
--- a/arch/x86/pci/common.c
+++ b/arch/x86/pci/common.c
@@ -342,9 +342,14 @@ struct pci_bus * __devinit pcibios_scan_root(int busnum)
                 return NULL;
         }
 
+        sd->node = get_mp_bus_to_node(busnum);
+
         printk(KERN_DEBUG "PCI: Probing PCI hardware (bus %02x)\n", busnum);
+        bus = pci_scan_bus_parented(NULL, busnum, &pci_root_ops, sd);
+        if (!bus)
+                kfree(sd);
 
-        return pci_scan_bus_parented(NULL, busnum, &pci_root_ops, sd);
+        return bus;
 }
 
 extern u8 pci_cache_line_size;
@@ -420,6 +425,10 @@ char * __devinit  pcibios_setup(char *str)
                 pci_probe &= ~PCI_PROBE_MMCONF;
                 return NULL;
         }
+        else if (!strcmp(str, "check_enable_amd_mmconf")) {
+                pci_probe |= PCI_CHECK_ENABLE_AMD_MMCONF;
+                return NULL;
+        }
 #endif
         else if (!strcmp(str, "noacpi")) {
                 acpi_noirq_set();
@@ -480,7 +489,7 @@ void pcibios_disable_device (struct pci_dev *dev)
                 pcibios_disable_irq(dev);
 }
 
-struct pci_bus *__devinit pci_scan_bus_with_sysdata(int busno)
+struct pci_bus *pci_scan_bus_on_node(int busno, struct pci_ops *ops, int node)
 {
         struct pci_bus *bus = NULL;
         struct pci_sysdata *sd;
@@ -495,10 +504,15 @@ struct pci_bus *__devinit pci_scan_bus_with_sysdata(int busno)
                 printk(KERN_ERR "PCI: OOM, skipping PCI bus %02x\n", busno);
                 return NULL;
         }
-        sd->node = -1;
-        bus = pci_scan_bus(busno, &pci_root_ops, sd);
+        sd->node = node;
+        bus = pci_scan_bus(busno, ops, sd);
         if (!bus)
                 kfree(sd);
 
         return bus;
 }
+
+struct pci_bus *pci_scan_bus_with_sysdata(int busno)
+{
+        return pci_scan_bus_on_node(busno, &pci_root_ops, -1);
+}
diff --git a/arch/x86/pci/direct.c b/arch/x86/pci/direct.c
index 42f3e4cad179..21d1e0e0d535 100644
--- a/arch/x86/pci/direct.c
+++ b/arch/x86/pci/direct.c
@@ -258,7 +258,8 @@ void __init pci_direct_init(int type)
 {
         if (type == 0)
                 return;
-        printk(KERN_INFO "PCI: Using configuration type %d\n", type);
+        printk(KERN_INFO "PCI: Using configuration type %d for base access\n",
+                 type);
         if (type == 1)
                 raw_pci_ops = &pci_direct_conf1;
         else
@@ -275,8 +276,10 @@ int __init pci_direct_probe(void)
         if (!region)
                 goto type2;
 
-        if (pci_check_type1())
+        if (pci_check_type1()) {
+                raw_pci_ops = &pci_direct_conf1;
                 return 1;
+        }
         release_resource(region);
 
  type2:
@@ -290,7 +293,6 @@ int __init pci_direct_probe(void)
                 goto fail2;
 
         if (pci_check_type2()) {
-                printk(KERN_INFO "PCI: Using configuration type 2\n");
                 raw_pci_ops = &pci_direct_conf2;
                 return 2;
         }
diff --git a/arch/x86/pci/fixup.c b/arch/x86/pci/fixup.c
index a5ef5f551373..b60b2abd480c 100644
--- a/arch/x86/pci/fixup.c
+++ b/arch/x86/pci/fixup.c
@@ -493,3 +493,20 @@ static void __devinit pci_siemens_interrupt_controller(struct pci_dev *dev)
 }
 DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_SIEMENS, 0x0015,
                           pci_siemens_interrupt_controller);
+
+/*
+ * Regular PCI devices have 256 bytes, but AMD Family 10h Opteron ext config
+ * have 4096 bytes.  Even if the device is capable, that doesn't mean we can
+ * access it.  Maybe we don't have a way to generate extended config space
+ * accesses.   So check it
+ */
+static void fam10h_pci_cfg_space_size(struct pci_dev *dev)
+{
+        dev->cfg_size = pci_cfg_space_size_ext(dev, 0);
+}
+
+DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_AMD, 0x1200, fam10h_pci_cfg_space_size);
+DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_AMD, 0x1201, fam10h_pci_cfg_space_size);
+DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_AMD, 0x1202, fam10h_pci_cfg_space_size);
+DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_AMD, 0x1203, fam10h_pci_cfg_space_size);
+DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_AMD, 0x1204, fam10h_pci_cfg_space_size);
diff --git a/arch/x86/pci/i386.c b/arch/x86/pci/i386.c
index 94f6c73a53d0..8af0f0bae2af 100644
--- a/arch/x86/pci/i386.c
+++ b/arch/x86/pci/i386.c
@@ -301,6 +301,13 @@ int pci_mmap_page_range(struct pci_dev *dev, struct vm_area_struct *vma,
         prot = pgprot_val(vma->vm_page_prot);
         if (pat_wc_enabled && write_combine)
                 prot |= _PAGE_CACHE_WC;
+        else if (pat_wc_enabled)
+                /*
+                 * ioremap() and ioremap_nocache() defaults to UC MINUS for now.
+                 * To avoid attribute conflicts, request UC MINUS here
+                 * aswell.
+                 */
+                prot |= _PAGE_CACHE_UC_MINUS;
         else if (boot_cpu_data.x86 > 3)
                 prot |= _PAGE_CACHE_UC;
 
@@ -319,9 +326,8 @@ int pci_mmap_page_range(struct pci_dev *dev, struct vm_area_struct *vma,
                  * - request is uncached, return cannot be write-combine
                  * - request is write-combine, return cannot be write-back
                  */
-                if ((flags == _PAGE_CACHE_UC &&
-                     (new_flags == _PAGE_CACHE_WB ||
-                      new_flags == _PAGE_CACHE_WC)) ||
+                if ((flags == _PAGE_CACHE_UC_MINUS &&
+                     (new_flags == _PAGE_CACHE_WB)) ||
                     (flags == _PAGE_CACHE_WC &&
                      new_flags == _PAGE_CACHE_WB)) {
                         free_memtype(addr, addr+len);
diff --git a/arch/x86/pci/init.c b/arch/x86/pci/init.c
index 3de9f9ba2da6..dd30c6076b5d 100644
--- a/arch/x86/pci/init.c
+++ b/arch/x86/pci/init.c
@@ -6,16 +6,17 @@
    in the right sequence from here. */
 static __init int pci_access_init(void)
 {
-        int type __maybe_unused = 0;
-
 #ifdef CONFIG_PCI_DIRECT
+        int type = 0;
+
         type = pci_direct_probe();
 #endif
-#ifdef CONFIG_PCI_MMCONFIG
-        pci_mmcfg_init(type);
+
+        pci_mmcfg_early_init();
+
+#ifdef CONFIG_PCI_OLPC
+        pci_olpc_init();
 #endif
-        if (raw_pci_ops)
-                return 0;
 #ifdef CONFIG_PCI_BIOS
         pci_pcbios_init();
 #endif
@@ -28,7 +29,7 @@ static __init int pci_access_init(void)
 #ifdef CONFIG_PCI_DIRECT
         pci_direct_init(type);
 #endif
-        if (!raw_pci_ops)
+        if (!raw_pci_ops && !raw_pci_ext_ops)
                 printk(KERN_ERR
                 "PCI: Fatal: No config space access function found\n");
 
diff --git a/arch/x86/pci/irq.c b/arch/x86/pci/irq.c
index 579745ca6b66..0908fca901bf 100644
--- a/arch/x86/pci/irq.c
+++ b/arch/x86/pci/irq.c
@@ -136,9 +136,11 @@ static void __init pirq_peer_trick(void)
                 busmap[e->bus] = 1;
         }
         for(i = 1; i < 256; i++) {
+                int node;
                 if (!busmap[i] || pci_find_bus(0, i))
                         continue;
-                if (pci_scan_bus_with_sysdata(i))
+                node = get_mp_bus_to_node(i);
+                if (pci_scan_bus_on_node(i, &pci_root_ops, node))
                         printk(KERN_INFO "PCI: Discovered primary peer "
                                "bus %02x [IRQ]\n", i);
         }
diff --git a/arch/x86/pci/k8-bus_64.c b/arch/x86/pci/k8-bus_64.c
index 9cc813e29706..ab6d4b18a88f 100644
--- a/arch/x86/pci/k8-bus_64.c
+++ b/arch/x86/pci/k8-bus_64.c
@@ -1,83 +1,536 @@
 #include <linux/init.h>
 #include <linux/pci.h>
+#include <asm/pci-direct.h>
 #include <asm/mpspec.h>
 #include <linux/cpumask.h>
+#include <linux/topology.h>
 
 /*
  * This discovers the pcibus <-> node mapping on AMD K8.
- *
- * RED-PEN need to call this again on PCI hotplug
- * RED-PEN empty cpus get reported wrong
+ * also get peer root bus resource for io,mmio
  */
 
-#define NODE_ID_REGISTER 0x60
-#define NODE_ID(dword) (dword & 0x07)
-#define LDT_BUS_NUMBER_REGISTER_0 0x94
-#define LDT_BUS_NUMBER_REGISTER_1 0xB4
-#define LDT_BUS_NUMBER_REGISTER_2 0xD4
-#define NR_LDT_BUS_NUMBER_REGISTERS 3
-#define SECONDARY_LDT_BUS_NUMBER(dword) ((dword >> 8) & 0xFF)
-#define SUBORDINATE_LDT_BUS_NUMBER(dword) ((dword >> 16) & 0xFF)
-#define PCI_DEVICE_ID_K8HTCONFIG 0x1100
+
+/*
+ * sub bus (transparent) will use entres from 3 to store extra from root,
+ * so need to make sure have enought slot there, increase PCI_BUS_NUM_RESOURCES?
+ */
+#define RES_NUM 16
+struct pci_root_info {
+        char name[12];
+        unsigned int res_num;
+        struct resource res[RES_NUM];
+        int bus_min;
+        int bus_max;
+        int node;
+        int link;
+};
+
+/* 4 at this time, it may become to 32 */
+#define PCI_ROOT_NR 4
+static int pci_root_num;
+static struct pci_root_info pci_root_info[PCI_ROOT_NR];
+
+#ifdef CONFIG_NUMA
+
+#define BUS_NR 256
+
+static int mp_bus_to_node[BUS_NR];
+
+void set_mp_bus_to_node(int busnum, int node)
+{
+        if (busnum >= 0 &&  busnum < BUS_NR)
+                mp_bus_to_node[busnum] = node;
+}
+
+int get_mp_bus_to_node(int busnum)
+{
+        int node = -1;
+
+        if (busnum < 0 || busnum > (BUS_NR - 1))
+                return node;
+
+        node = mp_bus_to_node[busnum];
+
+        /*
+         * let numa_node_id to decide it later in dma_alloc_pages
+         * if there is no ram on that node
+         */
+        if (node != -1 && !node_online(node))
+                node = -1;
+
+        return node;
+}
+#endif
+
+void set_pci_bus_resources_arch_default(struct pci_bus *b)
+{
+        int i;
+        int j;
+        struct pci_root_info *info;
+
+        /* if only one root bus, don't need to anything */
+        if (pci_root_num < 2)
+                return;
+
+        for (i = 0; i < pci_root_num; i++) {
+                if (pci_root_info[i].bus_min == b->number)
+                        break;
+        }
+
+        if (i == pci_root_num)
+                return;
+
+        info = &pci_root_info[i];
+        for (j = 0; j < info->res_num; j++) {
+                struct resource *res;
+                struct resource *root;
+
+                res = &info->res[j];
+                b->resource[j] = res;
+                if (res->flags & IORESOURCE_IO)
+                        root = &ioport_resource;
+                else
+                        root = &iomem_resource;
+                insert_resource(root, res);
+        }
+}
+
+#define RANGE_NUM 16
+
+struct res_range {
+        size_t start;
+        size_t end;
+};
+
+static void __init update_range(struct res_range *range, size_t start,
+                                size_t end)
+{
+        int i;
+        int j;
+
+        for (j = 0; j < RANGE_NUM; j++) {
+                if (!range[j].end)
+                        continue;
+
+                if (start <= range[j].start && end >= range[j].end) {
+                        range[j].start = 0;
+                        range[j].end = 0;
+                        continue;
+                }
+
+                if (start <= range[j].start && end < range[j].end && range[j].start < end + 1) {
+                        range[j].start = end + 1;
+                        continue;
+                }
+
+
+                if (start > range[j].start && end >= range[j].end && range[j].end > start - 1) {
+                        range[j].end = start - 1;
+                        continue;
+                }
+
+                if (start > range[j].start && end < range[j].end) {
+                        /* find the new spare */
+                        for (i = 0; i < RANGE_NUM; i++) {
+                                if (range[i].end == 0)
+                                        break;
+                        }
+                        if (i < RANGE_NUM) {
+                                range[i].end = range[j].end;
+                                range[i].start = end + 1;
+                        } else {
+                                printk(KERN_ERR "run of slot in ranges\n");
+                        }
+                        range[j].end = start - 1;
+                        continue;
+                }
+        }
+}
+
+static void __init update_res(struct pci_root_info *info, size_t start,
+                              size_t end, unsigned long flags, int merge)
+{
+        int i;
+        struct resource *res;
+
+        if (!merge)
+                goto addit;
+
+        /* try to merge it with old one */
+        for (i = 0; i < info->res_num; i++) {
+                size_t final_start, final_end;
+                size_t common_start, common_end;
+
+                res = &info->res[i];
+                if (res->flags != flags)
+                        continue;
+
+                common_start = max((size_t)res->start, start);
+                common_end = min((size_t)res->end, end);
+                if (common_start > common_end + 1)
+                        continue;
+
+                final_start = min((size_t)res->start, start);
+                final_end = max((size_t)res->end, end);
+
+                res->start = final_start;
+                res->end = final_end;
+                return;
+        }
+
+addit:
+
+        /* need to add that */
+        if (info->res_num >= RES_NUM)
+                return;
+
+        res = &info->res[info->res_num];
+        res->name = info->name;
+        res->flags = flags;
+        res->start = start;
+        res->end = end;
+        res->child = NULL;
+        info->res_num++;
+}
+
+struct pci_hostbridge_probe {
+        u32 bus;
+        u32 slot;
+        u32 vendor;
+        u32 device;
+};
+
+static struct pci_hostbridge_probe pci_probes[] __initdata = {
+        { 0, 0x18, PCI_VENDOR_ID_AMD, 0x1100 },
+        { 0, 0x18, PCI_VENDOR_ID_AMD, 0x1200 },
+        { 0xff, 0, PCI_VENDOR_ID_AMD, 0x1200 },
+        { 0, 0x18, PCI_VENDOR_ID_AMD, 0x1300 },
+};
+
+static u64 __initdata fam10h_mmconf_start;
+static u64 __initdata fam10h_mmconf_end;
+static void __init get_pci_mmcfg_amd_fam10h_range(void)
+{
+        u32 address;
+        u64 base, msr;
+        unsigned segn_busn_bits;
+
+        /* assume all cpus from fam10h have mmconf */
+        if (boot_cpu_data.x86 < 0x10)
+                return;
+
+        address = MSR_FAM10H_MMIO_CONF_BASE;
+        rdmsrl(address, msr);
+
+        /* mmconfig is not enable */
+        if (!(msr & FAM10H_MMIO_CONF_ENABLE))
+                return;
+
+        base = msr & (FAM10H_MMIO_CONF_BASE_MASK<<FAM10H_MMIO_CONF_BASE_SHIFT);
+
+        segn_busn_bits = (msr >> FAM10H_MMIO_CONF_BUSRANGE_SHIFT) &
+                         FAM10H_MMIO_CONF_BUSRANGE_MASK;
+
+        fam10h_mmconf_start = base;
+        fam10h_mmconf_end = base + (1ULL<<(segn_busn_bits + 20)) - 1;
+}
 
 /**
- * fill_mp_bus_to_cpumask()
+ * early_fill_mp_bus_to_node()
+ * called before pcibios_scan_root and pci_scan_bus
  * fills the mp_bus_to_cpumask array based according to the LDT Bus Number
  * Registers found in the K8 northbridge
  */
-__init static int
-fill_mp_bus_to_cpumask(void)
+static int __init early_fill_mp_bus_info(void)
 {
-        struct pci_dev *nb_dev = NULL;
-        int i, j;
-        u32 ldtbus, nid;
-        static int lbnr[3] = {
-                LDT_BUS_NUMBER_REGISTER_0,
-                LDT_BUS_NUMBER_REGISTER_1,
-                LDT_BUS_NUMBER_REGISTER_2
-        };
-
-        while ((nb_dev = pci_get_device(PCI_VENDOR_ID_AMD,
-                        PCI_DEVICE_ID_K8HTCONFIG, nb_dev))) {
-                pci_read_config_dword(nb_dev, NODE_ID_REGISTER, &nid);
-
-                for (i = 0; i < NR_LDT_BUS_NUMBER_REGISTERS; i++) {
-                        pci_read_config_dword(nb_dev, lbnr[i], &ldtbus);
-                        /*
-                         * if there are no busses hanging off of the current
-                         * ldt link then both the secondary and subordinate
-                         * bus number fields are set to 0.
-                         * 
-                         * RED-PEN
-                         * This is slightly broken because it assumes
-                         * HT node IDs == Linux node ids, which is not always
-                         * true. However it is probably mostly true.
-                         */
-                        if (!(SECONDARY_LDT_BUS_NUMBER(ldtbus) == 0
-                                && SUBORDINATE_LDT_BUS_NUMBER(ldtbus) == 0)) {
-                                for (j = SECONDARY_LDT_BUS_NUMBER(ldtbus);
-                                     j <= SUBORDINATE_LDT_BUS_NUMBER(ldtbus);
-                                     j++) { 
-                                        struct pci_bus *bus;
-                                        struct pci_sysdata *sd;
-
-                                        long node = NODE_ID(nid);
-                                        /* Algorithm a bit dumb, but
-                                           it shouldn't matter here */
-                                        bus = pci_find_bus(0, j);
-                                        if (!bus)
-                                                continue;
-                                        if (!node_online(node))
-                                                node = 0;
-
-                                        sd = bus->sysdata;
-                                        sd->node = node;
-                                }               
+        int i;
+        int j;
+        unsigned bus;
+        unsigned slot;
+        int found;
+        int node;
+        int link;
+        int def_node;
+        int def_link;
+        struct pci_root_info *info;
+        u32 reg;
+        struct resource *res;
+        size_t start;
+        size_t end;
+        struct res_range range[RANGE_NUM];
+        u64 val;
+        u32 address;
+
+#ifdef CONFIG_NUMA
+        for (i = 0; i < BUS_NR; i++)
+                mp_bus_to_node[i] = -1;
+#endif
+
+        if (!early_pci_allowed())
+                return -1;
+
+        found = 0;
+        for (i = 0; i < ARRAY_SIZE(pci_probes); i++) {
+                u32 id;
+                u16 device;
+                u16 vendor;
+
+                bus = pci_probes[i].bus;
+                slot = pci_probes[i].slot;
+                id = read_pci_config(bus, slot, 0, PCI_VENDOR_ID);
+
+                vendor = id & 0xffff;
+                device = (id>>16) & 0xffff;
+                if (pci_probes[i].vendor == vendor &&
+                    pci_probes[i].device == device) {
+                        found = 1;
+                        break;
+                }
+        }
+
+        if (!found)
+                return 0;
+
+        pci_root_num = 0;
+        for (i = 0; i < 4; i++) {
+                int min_bus;
+                int max_bus;
+                reg = read_pci_config(bus, slot, 1, 0xe0 + (i << 2));
+
+                /* Check if that register is enabled for bus range */
+                if ((reg & 7) != 3)
+                        continue;
+
+                min_bus = (reg >> 16) & 0xff;
+                max_bus = (reg >> 24) & 0xff;
+                node = (reg >> 4) & 0x07;
+#ifdef CONFIG_NUMA
+                for (j = min_bus; j <= max_bus; j++)
+                        mp_bus_to_node[j] = (unsigned char) node;
+#endif
+                link = (reg >> 8) & 0x03;
+
+                info = &pci_root_info[pci_root_num];
+                info->bus_min = min_bus;
+                info->bus_max = max_bus;
+                info->node = node;
+                info->link = link;
+                sprintf(info->name, "PCI Bus #%02x", min_bus);
+                pci_root_num++;
+        }
+
+        /* get the default node and link for left over res */
+        reg = read_pci_config(bus, slot, 0, 0x60);
+        def_node = (reg >> 8) & 0x07;
+        reg = read_pci_config(bus, slot, 0, 0x64);
+        def_link = (reg >> 8) & 0x03;
+
+        memset(range, 0, sizeof(range));
+        range[0].end = 0xffff;
+        /* io port resource */
+        for (i = 0; i < 4; i++) {
+                reg = read_pci_config(bus, slot, 1, 0xc0 + (i << 3));
+                if (!(reg & 3))
+                        continue;
+
+                start = reg & 0xfff000;
+                reg = read_pci_config(bus, slot, 1, 0xc4 + (i << 3));
+                node = reg & 0x07;
+                link = (reg >> 4) & 0x03;
+                end = (reg & 0xfff000) | 0xfff;
+
+                /* find the position */
+                for (j = 0; j < pci_root_num; j++) {
+                        info = &pci_root_info[j];
+                        if (info->node == node && info->link == link)
+                                break;
+                }
+                if (j == pci_root_num)
+                        continue; /* not found */
+
+                info = &pci_root_info[j];
+                printk(KERN_DEBUG "node %d link %d: io port [%llx, %llx]\n",
+                       node, link, (u64)start, (u64)end);
+
+                /* kernel only handle 16 bit only */
+                if (end > 0xffff)
+                        end = 0xffff;
+                update_res(info, start, end, IORESOURCE_IO, 1);
+                update_range(range, start, end);
+        }
+        /* add left over io port range to def node/link, [0, 0xffff] */
+        /* find the position */
+        for (j = 0; j < pci_root_num; j++) {
+                info = &pci_root_info[j];
+                if (info->node == def_node && info->link == def_link)
+                        break;
+        }
+        if (j < pci_root_num) {
+                info = &pci_root_info[j];
+                for (i = 0; i < RANGE_NUM; i++) {
+                        if (!range[i].end)
+                                continue;
+
+                        update_res(info, range[i].start, range[i].end,
+                                   IORESOURCE_IO, 1);
+                }
+        }
+
+        memset(range, 0, sizeof(range));
+        /* 0xfd00000000-0xffffffffff for HT */
+        range[0].end = (0xfdULL<<32) - 1;
+
+        /* need to take out [0, TOM) for RAM*/
+        address = MSR_K8_TOP_MEM1;
+        rdmsrl(address, val);
+        end = (val & 0xffffff8000000ULL);
+        printk(KERN_INFO "TOM: %016lx aka %ldM\n", end, end>>20);
+        if (end < (1ULL<<32))
+                update_range(range, 0, end - 1);
+
+        /* get mmconfig */
+        get_pci_mmcfg_amd_fam10h_range();
+        /* need to take out mmconf range */
+        if (fam10h_mmconf_end) {
+                printk(KERN_DEBUG "Fam 10h mmconf [%llx, %llx]\n", fam10h_mmconf_start, fam10h_mmconf_end);
+                update_range(range, fam10h_mmconf_start, fam10h_mmconf_end);
+        }
+
+        /* mmio resource */
+        for (i = 0; i < 8; i++) {
+                reg = read_pci_config(bus, slot, 1, 0x80 + (i << 3));
+                if (!(reg & 3))
+                        continue;
+
+                start = reg & 0xffffff00; /* 39:16 on 31:8*/
+                start <<= 8;
+                reg = read_pci_config(bus, slot, 1, 0x84 + (i << 3));
+                node = reg & 0x07;
+                link = (reg >> 4) & 0x03;
+                end = (reg & 0xffffff00);
+                end <<= 8;
+                end |= 0xffff;
+
+                /* find the position */
+                for (j = 0; j < pci_root_num; j++) {
+                        info = &pci_root_info[j];
+                        if (info->node == node && info->link == link)
+                                break;
+                }
+                if (j == pci_root_num)
+                        continue; /* not found */
+
+                info = &pci_root_info[j];
+
+                printk(KERN_DEBUG "node %d link %d: mmio [%llx, %llx]",
+                       node, link, (u64)start, (u64)end);
+                /*
+                 * some sick allocation would have range overlap with fam10h
+                 * mmconf range, so need to update start and end.
+                 */
+                if (fam10h_mmconf_end) {
+                        int changed = 0;
+                        u64 endx = 0;
+                        if (start >= fam10h_mmconf_start &&
+                            start <= fam10h_mmconf_end) {
+                                start = fam10h_mmconf_end + 1;
+                                changed = 1;
+                        }
+
+                        if (end >= fam10h_mmconf_start &&
+                            end <= fam10h_mmconf_end) {
+                                end = fam10h_mmconf_start - 1;
+                                changed = 1;
+                        }
+
+                        if (start < fam10h_mmconf_start &&
+                            end > fam10h_mmconf_end) {
+                                /* we got a hole */
+                                endx = fam10h_mmconf_start - 1;
+                                update_res(info, start, endx, IORESOURCE_MEM, 0);
+                                update_range(range, start, endx);
+                                printk(KERN_CONT " ==> [%llx, %llx]", (u64)start, endx);
+                                start = fam10h_mmconf_end + 1;
+                                changed = 1;
+                        }
+                        if (changed) {
+                                if (start <= end) {
+                                        printk(KERN_CONT " %s [%llx, %llx]", endx?"and":"==>", (u64)start, (u64)end);
+                                } else {
+                                        printk(KERN_CONT "%s\n", endx?"":" ==> none");
+                                        continue;
+                                }
                         }
                 }
+
+                update_res(info, start, end, IORESOURCE_MEM, 1);
+                update_range(range, start, end);
+                printk(KERN_CONT "\n");
+        }
+
+        /* need to take out [4G, TOM2) for RAM*/
+        /* SYS_CFG */
+        address = MSR_K8_SYSCFG;
+        rdmsrl(address, val);
+        /* TOP_MEM2 is enabled? */
+        if (val & (1<<21)) {
+                /* TOP_MEM2 */
+                address = MSR_K8_TOP_MEM2;
+                rdmsrl(address, val);
+                end = (val & 0xffffff8000000ULL);
+                printk(KERN_INFO "TOM2: %016lx aka %ldM\n", end, end>>20);
+                update_range(range, 1ULL<<32, end - 1);
+        }
+
+        /*
+         * add left over mmio range to def node/link ?
+         * that is tricky, just record range in from start_min to 4G
+         */
+        for (j = 0; j < pci_root_num; j++) {
+                info = &pci_root_info[j];
+                if (info->node == def_node && info->link == def_link)
+                        break;
+        }
+        if (j < pci_root_num) {
+                info = &pci_root_info[j];
+
+                for (i = 0; i < RANGE_NUM; i++) {
+                        if (!range[i].end)
+                                continue;
+
+                        update_res(info, range[i].start, range[i].end,
+                                   IORESOURCE_MEM, 1);
+                }
+        }
+
+#ifdef CONFIG_NUMA
+        for (i = 0; i < BUS_NR; i++) {
+                node = mp_bus_to_node[i];
+                if (node >= 0)
+                        printk(KERN_DEBUG "bus: %02x to node: %02x\n", i, node);
+        }
+#endif
+
+        for (i = 0; i < pci_root_num; i++) {
+                int res_num;
+                int busnum;
+
+                info = &pci_root_info[i];
+                res_num = info->res_num;
+                busnum = info->bus_min;
+                printk(KERN_DEBUG "bus: [%02x,%02x] on node %x link %x\n",
+                       info->bus_min, info->bus_max, info->node, info->link);
+                for (j = 0; j < res_num; j++) {
+                        res = &info->res[j];
+                        printk(KERN_DEBUG "bus: %02x index %x %s: [%llx, %llx]\n",
+                               busnum, j,
+                               (res->flags & IORESOURCE_IO)?"io port":"mmio",
+                               res->start, res->end);
+                }
         }
 
         return 0;
 }
 
-fs_initcall(fill_mp_bus_to_cpumask);
+postcore_initcall(early_fill_mp_bus_info);
diff --git a/arch/x86/pci/legacy.c b/arch/x86/pci/legacy.c
index e041ced0ce13..a67921ce60af 100644
--- a/arch/x86/pci/legacy.c
+++ b/arch/x86/pci/legacy.c
@@ -12,6 +12,7 @@
 static void __devinit pcibios_fixup_peer_bridges(void)
 {
         int n, devfn;
+        long node;
 
         if (pcibios_last_bus <= 0 || pcibios_last_bus >= 0xff)
                 return;
@@ -21,12 +22,13 @@ static void __devinit pcibios_fixup_peer_bridges(void)
                 u32 l;
                 if (pci_find_bus(0, n))
                         continue;
+                node = get_mp_bus_to_node(n);
                 for (devfn = 0; devfn < 256; devfn += 8) {
                         if (!raw_pci_read(0, n, devfn, PCI_VENDOR_ID, 2, &l) &&
                             l != 0x0000 && l != 0xffff) {
                                 DBG("Found device at %02x:%02x [%04x]\n", n, devfn, l);
                                 printk(KERN_INFO "PCI: Discovered peer bus %02x\n", n);
-                                pci_scan_bus_with_sysdata(n);
+                                pci_scan_bus_on_node(n, &pci_root_ops, node);
                                 break;
                         }
                 }
diff --git a/arch/x86/pci/mmconfig-shared.c b/arch/x86/pci/mmconfig-shared.c
index 8d54df4dfaad..0cfebecf2a8f 100644
--- a/arch/x86/pci/mmconfig-shared.c
+++ b/arch/x86/pci/mmconfig-shared.c
@@ -28,7 +28,7 @@ static int __initdata pci_mmcfg_resources_inserted;
 static const char __init *pci_mmcfg_e7520(void)
 {
         u32 win;
-        pci_direct_conf1.read(0, 0, PCI_DEVFN(0,0), 0xce, 2, &win);
+        raw_pci_ops->read(0, 0, PCI_DEVFN(0, 0), 0xce, 2, &win);
 
         win = win & 0xf000;
         if(win == 0x0000 || win == 0xf000)
@@ -53,7 +53,7 @@ static const char __init *pci_mmcfg_intel_945(void)
 
         pci_mmcfg_config_num = 1;
 
-        pci_direct_conf1.read(0, 0, PCI_DEVFN(0,0), 0x48, 4, &pciexbar);
+        raw_pci_ops->read(0, 0, PCI_DEVFN(0, 0), 0x48, 4, &pciexbar);
 
         /* Enable bit */
         if (!(pciexbar & 1))
@@ -100,33 +100,102 @@ static const char __init *pci_mmcfg_intel_945(void)
         return "Intel Corporation 945G/GZ/P/PL Express Memory Controller Hub";
 }
 
+static const char __init *pci_mmcfg_amd_fam10h(void)
+{
+        u32 low, high, address;
+        u64 base, msr;
+        int i;
+        unsigned segnbits = 0, busnbits;
+
+        if (!(pci_probe & PCI_CHECK_ENABLE_AMD_MMCONF))
+                return NULL;
+
+        address = MSR_FAM10H_MMIO_CONF_BASE;
+        if (rdmsr_safe(address, &low, &high))
+                return NULL;
+
+        msr = high;
+        msr <<= 32;
+        msr |= low;
+
+        /* mmconfig is not enable */
+        if (!(msr & FAM10H_MMIO_CONF_ENABLE))
+                return NULL;
+
+        base = msr & (FAM10H_MMIO_CONF_BASE_MASK<<FAM10H_MMIO_CONF_BASE_SHIFT);
+
+        busnbits = (msr >> FAM10H_MMIO_CONF_BUSRANGE_SHIFT) &
+                         FAM10H_MMIO_CONF_BUSRANGE_MASK;
+
+        /*
+         * only handle bus 0 ?
+         * need to skip it
+         */
+        if (!busnbits)
+                return NULL;
+
+        if (busnbits > 8) {
+                segnbits = busnbits - 8;
+                busnbits = 8;
+        }
+
+        pci_mmcfg_config_num = (1 << segnbits);
+        pci_mmcfg_config = kzalloc(sizeof(pci_mmcfg_config[0]) *
+                                   pci_mmcfg_config_num, GFP_KERNEL);
+        if (!pci_mmcfg_config)
+                return NULL;
+
+        for (i = 0; i < (1 << segnbits); i++) {
+                pci_mmcfg_config[i].address = base + (1<<28) * i;
+                pci_mmcfg_config[i].pci_segment = i;
+                pci_mmcfg_config[i].start_bus_number = 0;
+                pci_mmcfg_config[i].end_bus_number = (1 << busnbits) - 1;
+        }
+
+        return "AMD Family 10h NB";
+}
+
 struct pci_mmcfg_hostbridge_probe {
+        u32 bus;
+        u32 devfn;
         u32 vendor;
         u32 device;
         const char *(*probe)(void);
 };
 
 static struct pci_mmcfg_hostbridge_probe pci_mmcfg_probes[] __initdata = {
-        { PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_E7520_MCH, pci_mmcfg_e7520 },
-        { PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82945G_HB, pci_mmcfg_intel_945 },
+        { 0, PCI_DEVFN(0, 0), PCI_VENDOR_ID_INTEL,
+          PCI_DEVICE_ID_INTEL_E7520_MCH, pci_mmcfg_e7520 },
+        { 0, PCI_DEVFN(0, 0), PCI_VENDOR_ID_INTEL,
+          PCI_DEVICE_ID_INTEL_82945G_HB, pci_mmcfg_intel_945 },
+        { 0, PCI_DEVFN(0x18, 0), PCI_VENDOR_ID_AMD,
+          0x1200, pci_mmcfg_amd_fam10h },
+        { 0xff, PCI_DEVFN(0, 0), PCI_VENDOR_ID_AMD,
+          0x1200, pci_mmcfg_amd_fam10h },
 };
 
 static int __init pci_mmcfg_check_hostbridge(void)
 {
         u32 l;
+        u32 bus, devfn;
         u16 vendor, device;
         int i;
         const char *name;
 
-        pci_direct_conf1.read(0, 0, PCI_DEVFN(0,0), 0, 4, &l);
-        vendor = l & 0xffff;
-        device = (l >> 16) & 0xffff;
+        if (!raw_pci_ops)
+                return 0;
 
         pci_mmcfg_config_num = 0;
         pci_mmcfg_config = NULL;
         name = NULL;
 
         for (i = 0; !name && i < ARRAY_SIZE(pci_mmcfg_probes); i++) {
+                bus =  pci_mmcfg_probes[i].bus;
+                devfn = pci_mmcfg_probes[i].devfn;
+                raw_pci_ops->read(0, bus, devfn, 0, 4, &l);
+                vendor = l & 0xffff;
+                device = (l >> 16) & 0xffff;
+
                 if (pci_mmcfg_probes[i].vendor == vendor &&
                     pci_mmcfg_probes[i].device == device)
                         name = pci_mmcfg_probes[i].probe();
@@ -173,9 +242,78 @@ static void __init pci_mmcfg_insert_resources(unsigned long resource_flags)
         pci_mmcfg_resources_inserted = 1;
 }
 
-static void __init pci_mmcfg_reject_broken(int type)
+static acpi_status __init check_mcfg_resource(struct acpi_resource *res,
+                                              void *data)
+{
+        struct resource *mcfg_res = data;
+        struct acpi_resource_address64 address;
+        acpi_status status;
+
+        if (res->type == ACPI_RESOURCE_TYPE_FIXED_MEMORY32) {
+                struct acpi_resource_fixed_memory32 *fixmem32 =
+                        &res->data.fixed_memory32;
+                if (!fixmem32)
+                        return AE_OK;
+                if ((mcfg_res->start >= fixmem32->address) &&
+                    (mcfg_res->end < (fixmem32->address +
+                                      fixmem32->address_length))) {
+                        mcfg_res->flags = 1;
+                        return AE_CTRL_TERMINATE;
+                }
+        }
+        if ((res->type != ACPI_RESOURCE_TYPE_ADDRESS32) &&
+            (res->type != ACPI_RESOURCE_TYPE_ADDRESS64))
+                return AE_OK;
+
+        status = acpi_resource_to_address64(res, &address);
+        if (ACPI_FAILURE(status) ||
+           (address.address_length <= 0) ||
+           (address.resource_type != ACPI_MEMORY_RANGE))
+                return AE_OK;
+
+        if ((mcfg_res->start >= address.minimum) &&
+            (mcfg_res->end < (address.minimum + address.address_length))) {
+                mcfg_res->flags = 1;
+                return AE_CTRL_TERMINATE;
+        }
+        return AE_OK;
+}
+
+static acpi_status __init find_mboard_resource(acpi_handle handle, u32 lvl,
+                void *context, void **rv)
+{
+        struct resource *mcfg_res = context;
+
+        acpi_walk_resources(handle, METHOD_NAME__CRS,
+                            check_mcfg_resource, context);
+
+        if (mcfg_res->flags)
+                return AE_CTRL_TERMINATE;
+
+        return AE_OK;
+}
+
+static int __init is_acpi_reserved(unsigned long start, unsigned long end)
+{
+        struct resource mcfg_res;
+
+        mcfg_res.start = start;
+        mcfg_res.end = end;
+        mcfg_res.flags = 0;
+
+        acpi_get_devices("PNP0C01", find_mboard_resource, &mcfg_res, NULL);
+
+        if (!mcfg_res.flags)
+                acpi_get_devices("PNP0C02", find_mboard_resource, &mcfg_res,
+                                 NULL);
+
+        return mcfg_res.flags;
+}
+
+static void __init pci_mmcfg_reject_broken(int early)
 {
         typeof(pci_mmcfg_config[0]) *cfg;
+        int i;
 
         if ((pci_mmcfg_config_num == 0) ||
             (pci_mmcfg_config == NULL) ||
@@ -184,51 +322,80 @@ static void __init pci_mmcfg_reject_broken(int type)
 
         cfg = &pci_mmcfg_config[0];
 
-        /*
-         * Handle more broken MCFG tables on Asus etc.
-         * They only contain a single entry for bus 0-0.
-         */
-        if (pci_mmcfg_config_num == 1 &&
-            cfg->pci_segment == 0 &&
-            (cfg->start_bus_number | cfg->end_bus_number) == 0) {
-                printk(KERN_ERR "PCI: start and end of bus number is 0. "
-                       "Rejected as broken MCFG.\n");
-                goto reject;
+        for (i = 0; i < pci_mmcfg_config_num; i++) {
+                int valid = 0;
+                u32 size = (cfg->end_bus_number + 1) << 20;
+                cfg = &pci_mmcfg_config[i];
+                printk(KERN_NOTICE "PCI: MCFG configuration %d: base %lx "
+                       "segment %hu buses %u - %u\n",
+                       i, (unsigned long)cfg->address, cfg->pci_segment,
+                       (unsigned int)cfg->start_bus_number,
+                       (unsigned int)cfg->end_bus_number);
+
+                if (!early &&
+                    is_acpi_reserved(cfg->address, cfg->address + size - 1)) {
+                        printk(KERN_NOTICE "PCI: MCFG area at %Lx reserved "
+                               "in ACPI motherboard resources\n",
+                               cfg->address);
+                        valid = 1;
+                }
+
+                if (valid)
+                        continue;
+
+                if (!early)
+                        printk(KERN_ERR "PCI: BIOS Bug: MCFG area at %Lx is not"
+                               " reserved in ACPI motherboard resources\n",
+                               cfg->address);
+                /* Don't try to do this check unless configuration
+                   type 1 is available. how about type 2 ?*/
+                if (raw_pci_ops && e820_all_mapped(cfg->address,
+                                                  cfg->address + size - 1,
+                                                  E820_RESERVED)) {
+                        printk(KERN_NOTICE
+                               "PCI: MCFG area at %Lx reserved in E820\n",
+                               cfg->address);
+                        valid = 1;
+                }
+
+                if (!valid)
+                        goto reject;
         }
 
-        /*
-         * Only do this check when type 1 works. If it doesn't work
-         * assume we run on a Mac and always use MCFG
-         */
-        if (type == 1 && !e820_all_mapped(cfg->address,
-                                          cfg->address + MMCONFIG_APER_MIN,
-                                          E820_RESERVED)) {
-                printk(KERN_ERR "PCI: BIOS Bug: MCFG area at %Lx is not"
-                       " E820-reserved\n", cfg->address);
-                goto reject;
-        }
         return;
 
 reject:
         printk(KERN_ERR "PCI: Not using MMCONFIG.\n");
+        pci_mmcfg_arch_free();
         kfree(pci_mmcfg_config);
         pci_mmcfg_config = NULL;
         pci_mmcfg_config_num = 0;
 }
 
-void __init pci_mmcfg_init(int type)
-{
-        int known_bridge = 0;
+static int __initdata known_bridge;
 
+void __init __pci_mmcfg_init(int early)
+{
+        /* MMCONFIG disabled */
         if ((pci_probe & PCI_PROBE_MMCONF) == 0)
                 return;
 
-        if (type == 1 && pci_mmcfg_check_hostbridge())
-                known_bridge = 1;
+        /* MMCONFIG already enabled */
+        if (!early && !(pci_probe & PCI_PROBE_MASK & ~PCI_PROBE_MMCONF))
+                return;
+
+        /* for late to exit */
+        if (known_bridge)
+                return;
+
+        if (early) {
+                if (pci_mmcfg_check_hostbridge())
+                        known_bridge = 1;
+        }
 
         if (!known_bridge) {
                 acpi_table_parse(ACPI_SIG_MCFG, acpi_parse_mcfg);
-                pci_mmcfg_reject_broken(type);
+                pci_mmcfg_reject_broken(early);
         }
 
         if ((pci_mmcfg_config_num == 0) ||
@@ -249,6 +416,16 @@ void __init pci_mmcfg_init(int type)
         }
 }
 
+void __init pci_mmcfg_early_init(void)
+{
+        __pci_mmcfg_init(1);
+}
+
+void __init pci_mmcfg_late_init(void)
+{
+        __pci_mmcfg_init(0);
+}
+
 static int __init pci_mmcfg_late_insert_resources(void)
 {
         /*
diff --git a/arch/x86/pci/mmconfig_32.c b/arch/x86/pci/mmconfig_32.c
index 081816ada057..f3c761dce695 100644
--- a/arch/x86/pci/mmconfig_32.c
+++ b/arch/x86/pci/mmconfig_32.c
@@ -136,3 +136,7 @@ int __init pci_mmcfg_arch_init(void)
         raw_pci_ext_ops = &pci_mmcfg;
         return 1;
 }
+
+void __init pci_mmcfg_arch_free(void)
+{
+}
diff --git a/arch/x86/pci/mmconfig_64.c b/arch/x86/pci/mmconfig_64.c
index 9207fd49233c..a1994163c99d 100644
--- a/arch/x86/pci/mmconfig_64.c
+++ b/arch/x86/pci/mmconfig_64.c
@@ -127,7 +127,7 @@ static void __iomem * __init mcfg_ioremap(struct acpi_mcfg_allocation *cfg)
 int __init pci_mmcfg_arch_init(void)
 {
         int i;
-        pci_mmcfg_virt = kmalloc(sizeof(*pci_mmcfg_virt) *
+        pci_mmcfg_virt = kzalloc(sizeof(*pci_mmcfg_virt) *
                                  pci_mmcfg_config_num, GFP_KERNEL);
         if (pci_mmcfg_virt == NULL) {
                 printk(KERN_ERR "PCI: Can not allocate memory for mmconfig structures\n");
@@ -141,9 +141,29 @@ int __init pci_mmcfg_arch_init(void)
                         printk(KERN_ERR "PCI: Cannot map mmconfig aperture for "
                                         "segment %d\n",
                                 pci_mmcfg_config[i].pci_segment);
+                        pci_mmcfg_arch_free();
                         return 0;
                 }
         }
         raw_pci_ext_ops = &pci_mmcfg;
         return 1;
 }
+
+void __init pci_mmcfg_arch_free(void)
+{
+        int i;
+
+        if (pci_mmcfg_virt == NULL)
+                return;
+
+        for (i = 0; i < pci_mmcfg_config_num; ++i) {
+                if (pci_mmcfg_virt[i].virt) {
+                        iounmap(pci_mmcfg_virt[i].virt);
+                        pci_mmcfg_virt[i].virt = NULL;
+                        pci_mmcfg_virt[i].cfg = NULL;
+                }
+        }
+
+        kfree(pci_mmcfg_virt);
+        pci_mmcfg_virt = NULL;
+}
diff --git a/arch/x86/pci/mp_bus_to_node.c b/arch/x86/pci/mp_bus_to_node.c
new file mode 100644
index 000000000000..022943999b84
--- /dev/null
+++ b/arch/x86/pci/mp_bus_to_node.c
@@ -0,0 +1,23 @@
+#include <linux/pci.h>
+#include <linux/init.h>
+#include <linux/topology.h>
+
+#define BUS_NR 256
+
+static unsigned char mp_bus_to_node[BUS_NR];
+
+void set_mp_bus_to_node(int busnum, int node)
+{
+        if (busnum >= 0 &&  busnum < BUS_NR)
+        mp_bus_to_node[busnum] = (unsigned char) node;
+}
+
+int get_mp_bus_to_node(int busnum)
+{
+        int node;
+
+        if (busnum < 0 || busnum > (BUS_NR - 1))
+                return 0;
+        node = mp_bus_to_node[busnum];
+        return node;
+}
diff --git a/arch/x86/pci/olpc.c b/arch/x86/pci/olpc.c
new file mode 100644
index 000000000000..5e7636558c02
--- /dev/null
+++ b/arch/x86/pci/olpc.c
@@ -0,0 +1,313 @@
+/*
+ * Low-level PCI config space access for OLPC systems who lack the VSA
+ * PCI virtualization software.
+ *
+ * Copyright © 2006  Advanced Micro Devices, Inc.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * The AMD Geode chipset (ie: GX2 processor, cs5536 I/O companion device)
+ * has some I/O functions (display, southbridge, sound, USB HCIs, etc)
+ * that more or less behave like PCI devices, but the hardware doesn't
+ * directly implement the PCI configuration space headers.  AMD provides
+ * "VSA" (Virtual System Architecture) software that emulates PCI config
+ * space for these devices, by trapping I/O accesses to PCI config register
+ * (CF8/CFC) and running some code in System Management Mode interrupt state.
+ * On the OLPC platform, we don't want to use that VSA code because
+ * (a) it slows down suspend/resume, and (b) recompiling it requires special
+ * compilers that are hard to get.  So instead of letting the complex VSA
+ * code simulate the PCI config registers for the on-chip devices, we
+ * just simulate them the easy way, by inserting the code into the
+ * pci_write_config and pci_read_config path.  Most of the config registers
+ * are read-only anyway, so the bulk of the simulation is just table lookup.
+ */
+
+#include <linux/pci.h>
+#include <linux/init.h>
+#include <asm/olpc.h>
+#include <asm/geode.h>
+#include "pci.h"
+
+/*
+ * In the tables below, the first two line (8 longwords) are the
+ * size masks that are used when the higher level PCI code determines
+ * the size of the region by writing ~0 to a base address register
+ * and reading back the result.
+ *
+ * The following lines are the values that are read during normal
+ * PCI config access cycles, i.e. not after just having written
+ * ~0 to a base address register.
+ */
+
+static const uint32_t lxnb_hdr[] = {  /* dev 1 function 0 - devfn = 8 */
+        0x0,    0x0,    0x0,    0x0,
+        0x0,    0x0,    0x0,    0x0,
+
+        0x281022, 0x2200005, 0x6000021, 0x80f808,       /* AMD Vendor ID */
+        0x0,    0x0,    0x0,    0x0,   /* No virtual registers, hence no BAR */
+        0x0,    0x0,    0x0,    0x28100b,
+        0x0,    0x0,    0x0,    0x0,
+        0x0,    0x0,    0x0,    0x0,
+        0x0,    0x0,    0x0,    0x0,
+        0x0,    0x0,    0x0,    0x0,
+};
+
+static const uint32_t gxnb_hdr[] = {  /* dev 1 function 0 - devfn = 8 */
+        0xfffffffd, 0x0, 0x0,   0x0,
+        0x0,    0x0,    0x0,    0x0,
+
+        0x28100b, 0x2200005, 0x6000021, 0x80f808,       /* NSC Vendor ID */
+        0xac1d, 0x0,    0x0,    0x0,  /* I/O BAR - base of virtual registers */
+        0x0,    0x0,    0x0,    0x28100b,
+        0x0,    0x0,    0x0,    0x0,
+        0x0,    0x0,    0x0,    0x0,
+        0x0,    0x0,    0x0,    0x0,
+        0x0,    0x0,    0x0,    0x0,
+};
+
+static const uint32_t lxfb_hdr[] = {  /* dev 1 function 1 - devfn = 9 */
+        0xff000008, 0xffffc000, 0xffffc000, 0xffffc000,
+        0xffffc000,     0x0,    0x0,    0x0,
+
+        0x20811022, 0x2200003, 0x3000000, 0x0,          /* AMD Vendor ID */
+        0xfd000000, 0xfe000000, 0xfe004000, 0xfe008000, /* FB, GP, VG, DF */
+        0xfe00c000, 0x0, 0x0,   0x30100b,               /* VIP */
+        0x0,    0x0,    0x0,    0x10e,     /* INTA, IRQ14 for graphics accel */
+        0x0,    0x0,    0x0,    0x0,
+        0x3d0,  0x3c0,  0xa0000, 0x0,       /* VG IO, VG IO, EGA FB, MONO FB */
+        0x0,    0x0,    0x0,    0x0,
+};
+
+static const uint32_t gxfb_hdr[] = {  /* dev 1 function 1 - devfn = 9 */
+        0xff800008, 0xffffc000, 0xffffc000, 0xffffc000,
+        0x0,    0x0,    0x0,    0x0,
+
+        0x30100b, 0x2200003, 0x3000000, 0x0,            /* NSC Vendor ID */
+        0xfd000000, 0xfe000000, 0xfe004000, 0xfe008000, /* FB, GP, VG, DF */
+        0x0,    0x0,    0x0,    0x30100b,
+        0x0,    0x0,    0x0,    0x0,
+        0x0,    0x0,    0x0,    0x0,
+        0x3d0,  0x3c0,  0xa0000, 0x0,       /* VG IO, VG IO, EGA FB, MONO FB */
+        0x0,    0x0,    0x0,    0x0,
+};
+
+static const uint32_t aes_hdr[] = {     /* dev 1 function 2 - devfn = 0xa */
+        0xffffc000, 0x0, 0x0,   0x0,
+        0x0,    0x0,    0x0,    0x0,
+
+        0x20821022, 0x2a00006, 0x10100000, 0x8,         /* NSC Vendor ID */
+        0xfe010000, 0x0, 0x0,   0x0,                    /* AES registers */
+        0x0,    0x0,    0x0,    0x20821022,
+        0x0,    0x0,    0x0,    0x0,
+        0x0,    0x0,    0x0,    0x0,
+        0x0,    0x0,    0x0,    0x0,
+        0x0,    0x0,    0x0,    0x0,
+};
+
+
+static const uint32_t isa_hdr[] = {  /* dev f function 0 - devfn = 78 */
+        0xfffffff9, 0xffffff01, 0xffffffc1, 0xffffffe1,
+        0xffffff81, 0xffffffc1, 0x0, 0x0,
+
+        0x20901022, 0x2a00049, 0x6010003, 0x802000,
+        0x18b1, 0x1001, 0x1801, 0x1881, /* SMB-8   GPIO-256 MFGPT-64  IRQ-32 */
+        0x1401, 0x1841, 0x0,    0x20901022,             /* PMS-128 ACPI-64 */
+        0x0,    0x0,    0x0,    0x0,
+        0x0,    0x0,    0x0,    0x0,
+        0x0,    0x0,    0x0,    0xaa5b,                 /* IRQ steering */
+        0x0,    0x0,    0x0,    0x0,
+};
+
+static const uint32_t ac97_hdr[] = {  /* dev f function 3 - devfn = 7b */
+        0xffffff81, 0x0, 0x0,   0x0,
+        0x0,    0x0,    0x0,    0x0,
+
+        0x20931022, 0x2a00041, 0x4010001, 0x0,
+        0x1481, 0x0,    0x0,    0x0,                    /* I/O BAR-128 */
+        0x0,    0x0,    0x0,    0x20931022,
+        0x0,    0x0,    0x0,    0x205,                  /* IntB, IRQ5 */
+        0x0,    0x0,    0x0,    0x0,
+        0x0,    0x0,    0x0,    0x0,
+        0x0,    0x0,    0x0,    0x0,
+};
+
+static const uint32_t ohci_hdr[] = {  /* dev f function 4 - devfn = 7c */
+        0xfffff000, 0x0, 0x0,   0x0,
+        0x0,    0x0,    0x0,    0x0,
+
+        0x20941022, 0x2300006, 0xc031002, 0x0,
+        0xfe01a000, 0x0, 0x0,   0x0,                    /* MEMBAR-1000 */
+        0x0,    0x0,    0x0,    0x20941022,
+        0x0,    0x40,   0x0,    0x40a,                  /* CapPtr INT-D, IRQA */
+        0xc8020001, 0x0, 0x0,   0x0,    /* Capabilities - 40 is R/O,
+                                           44 is mask 8103 (power control) */
+        0x0,    0x0,    0x0,    0x0,
+        0x0,    0x0,    0x0,    0x0,
+};
+
+static const uint32_t ehci_hdr[] = {  /* dev f function 4 - devfn = 7d */
+        0xfffff000, 0x0, 0x0,   0x0,
+        0x0,    0x0,    0x0,    0x0,
+
+        0x20951022, 0x2300006, 0xc032002, 0x0,
+        0xfe01b000, 0x0, 0x0,   0x0,                    /* MEMBAR-1000 */
+        0x0,    0x0,    0x0,    0x20951022,
+        0x0,    0x40,   0x0,    0x40a,                  /* CapPtr INT-D, IRQA */
+        0xc8020001, 0x0, 0x0,   0x0,    /* Capabilities - 40 is R/O, 44 is
+                                           mask 8103 (power control) */
+#if 0
+        0x1,    0x40080000, 0x0, 0x0,   /* EECP - see EHCI spec section 2.1.7 */
+#endif
+        0x01000001, 0x0, 0x0,   0x0,    /* EECP - see EHCI spec section 2.1.7 */
+        0x2020, 0x0,    0x0,    0x0,    /* (EHCI page 8) 60 SBRN (R/O),
+                                           61 FLADJ (R/W), PORTWAKECAP  */
+};
+
+static uint32_t ff_loc = ~0;
+static uint32_t zero_loc;
+static int bar_probing;         /* Set after a write of ~0 to a BAR */
+static int is_lx;
+
+#define NB_SLOT 0x1     /* Northbridge - GX chip - Device 1 */
+#define SB_SLOT 0xf     /* Southbridge - CS5536 chip - Device F */
+
+static int is_simulated(unsigned int bus, unsigned int devfn)
+{
+        return (!bus && ((PCI_SLOT(devfn) == NB_SLOT) ||
+                        (PCI_SLOT(devfn) == SB_SLOT)));
+}
+
+static uint32_t *hdr_addr(const uint32_t *hdr, int reg)
+{
+        uint32_t addr;
+
+        /*
+         * This is a little bit tricky.  The header maps consist of
+         * 0x20 bytes of size masks, followed by 0x70 bytes of header data.
+         * In the normal case, when not probing a BAR's size, we want
+         * to access the header data, so we add 0x20 to the reg offset,
+         * thus skipping the size mask area.
+         * In the BAR probing case, we want to access the size mask for
+         * the BAR, so we subtract 0x10 (the config header offset for
+         * BAR0), and don't skip the size mask area.
+         */
+
+        addr = (uint32_t)hdr + reg + (bar_probing ? -0x10 : 0x20);
+
+        bar_probing = 0;
+        return (uint32_t *)addr;
+}
+
+static int pci_olpc_read(unsigned int seg, unsigned int bus,
+                unsigned int devfn, int reg, int len, uint32_t *value)
+{
+        uint32_t *addr;
+
+        /* Use the hardware mechanism for non-simulated devices */
+        if (!is_simulated(bus, devfn))
+                return pci_direct_conf1.read(seg, bus, devfn, reg, len, value);
+
+        /*
+         * No device has config registers past 0x70, so we save table space
+         * by not storing entries for the nonexistent registers
+         */
+        if (reg >= 0x70)
+                addr = &zero_loc;
+        else {
+                switch (devfn) {
+                case  0x8:
+                        addr = hdr_addr(is_lx ? lxnb_hdr : gxnb_hdr, reg);
+                        break;
+                case  0x9:
+                        addr = hdr_addr(is_lx ? lxfb_hdr : gxfb_hdr, reg);
+                        break;
+                case  0xa:
+                        addr = is_lx ? hdr_addr(aes_hdr, reg) : &ff_loc;
+                        break;
+                case 0x78:
+                        addr = hdr_addr(isa_hdr, reg);
+                        break;
+                case 0x7b:
+                        addr = hdr_addr(ac97_hdr, reg);
+                        break;
+                case 0x7c:
+                        addr = hdr_addr(ohci_hdr, reg);
+                        break;
+                case 0x7d:
+                        addr = hdr_addr(ehci_hdr, reg);
+                        break;
+                default:
+                        addr = &ff_loc;
+                        break;
+                }
+        }
+        switch (len) {
+        case 1:
+                *value = *(uint8_t *)addr;
+                break;
+        case 2:
+                *value = *(uint16_t *)addr;
+                break;
+        case 4:
+                *value = *addr;
+                break;
+        default:
+                BUG();
+        }
+
+        return 0;
+}
+
+static int pci_olpc_write(unsigned int seg, unsigned int bus,
+                unsigned int devfn, int reg, int len, uint32_t value)
+{
+        /* Use the hardware mechanism for non-simulated devices */
+        if (!is_simulated(bus, devfn))
+                return pci_direct_conf1.write(seg, bus, devfn, reg, len, value);
+
+        /* XXX we may want to extend this to simulate EHCI power management */
+
+        /*
+         * Mostly we just discard writes, but if the write is a size probe
+         * (i.e. writing ~0 to a BAR), we remember it and arrange to return
+         * the appropriate size mask on the next read.  This is cheating
+         * to some extent, because it depends on the fact that the next
+         * access after such a write will always be a read to the same BAR.
+         */
+
+        if ((reg >= 0x10) && (reg < 0x2c)) {
+                /* write is to a BAR */
+                if (value == ~0)
+                        bar_probing = 1;
+        } else {
+                /*
+                 * No warning on writes to ROM BAR, CMD, LATENCY_TIMER,
+                 * CACHE_LINE_SIZE, or PM registers.
+                 */
+                if ((reg != PCI_ROM_ADDRESS) && (reg != PCI_COMMAND_MASTER) &&
+                                (reg != PCI_LATENCY_TIMER) &&
+                                (reg != PCI_CACHE_LINE_SIZE) && (reg != 0x44))
+                        printk(KERN_WARNING "OLPC PCI: Config write to devfn"
+                                " %x reg %x value %x\n", devfn, reg, value);
+        }
+
+        return 0;
+}
+
+static struct pci_raw_ops pci_olpc_conf = {
+        .read = pci_olpc_read,
+        .write = pci_olpc_write,
+};
+
+void __init pci_olpc_init(void)
+{
+        if (!machine_is_olpc() || olpc_has_vsa())
+                return;
+
+        printk(KERN_INFO "PCI: Using configuration type OLPC\n");
+        raw_pci_ops = &pci_olpc_conf;
+        is_lx = is_geode_lx();
+}
diff --git a/arch/x86/pci/pci.h b/arch/x86/pci/pci.h
index c4bddaeff619..c58805a92db5 100644
--- a/arch/x86/pci/pci.h
+++ b/arch/x86/pci/pci.h
@@ -26,6 +26,7 @@
 #define PCI_ASSIGN_ALL_BUSSES   0x4000
 #define PCI_CAN_SKIP_ISA_ALIGN  0x8000
 #define PCI_USE__CRS            0x10000
+#define PCI_CHECK_ENABLE_AMD_MMCONF     0x20000
 
 extern unsigned int pci_probe;
 extern unsigned long pirq_table_addr;
@@ -97,11 +98,12 @@ extern struct pci_raw_ops pci_direct_conf1;
 extern int pci_direct_probe(void);
 extern void pci_direct_init(int type);
 extern void pci_pcbios_init(void);
-extern void pci_mmcfg_init(int type);
+extern void pci_olpc_init(void);
 
 /* pci-mmconfig.c */
 
 extern int __init pci_mmcfg_arch_init(void);
+extern void __init pci_mmcfg_arch_free(void);
 
 /*
  * AMD Fam10h CPUs are buggy, and cannot access MMIO config space
diff --git a/arch/x86/vdso/vdso32-setup.c b/arch/x86/vdso/vdso32-setup.c
index e2af8eee80e3..cf058fecfcee 100644
--- a/arch/x86/vdso/vdso32-setup.c
+++ b/arch/x86/vdso/vdso32-setup.c
@@ -162,7 +162,7 @@ static __init void relocate_vdso(Elf32_Ehdr *ehdr)
         Elf32_Shdr *shdr;
         int i;
 
-        BUG_ON(memcmp(ehdr->e_ident, ELFMAG, 4) != 0 ||
+        BUG_ON(memcmp(ehdr->e_ident, ELFMAG, SELFMAG) != 0 ||
                !elf_check_arch_ia32(ehdr) ||
                ehdr->e_type != ET_DYN);
 
@@ -303,8 +303,6 @@ int __init sysenter_setup(void)
 
 #ifdef CONFIG_X86_32
         gate_vma_init();
-
-        printk("Compat vDSO mapped to %08lx.\n", __fix_to_virt(FIX_VDSO));
 #endif
 
         if (!vdso32_sysenter()) {
diff --git a/arch/x86/video/fbdev.c b/arch/x86/video/fbdev.c
index 4db42bff8c60..69527688f794 100644
--- a/arch/x86/video/fbdev.c
+++ b/arch/x86/video/fbdev.c
@@ -1,5 +1,4 @@
 /*
- *
  * Copyright (C) 2007 Antonino Daplas <adaplas@gmail.com>
  *
  * This file is subject to the terms and conditions of the GNU General Public
@@ -29,3 +28,4 @@ int fb_is_primary_device(struct fb_info *info)
         return retval;
 }
 EXPORT_SYMBOL(fb_is_primary_device);
+MODULE_LICENSE("GPL");
diff --git a/arch/xtensa/kernel/asm-offsets.c b/arch/xtensa/kernel/asm-offsets.c
index ef63adadf7f4..070ff8af3a21 100644
--- a/arch/xtensa/kernel/asm-offsets.c
+++ b/arch/xtensa/kernel/asm-offsets.c
@@ -19,12 +19,11 @@
 #include <linux/thread_info.h>
 #include <linux/ptrace.h>
 #include <linux/mm.h>
+#include <linux/kbuild.h>
 
 #include <asm/ptrace.h>
 #include <asm/uaccess.h>
 
-#define DEFINE(sym, val) asm volatile("\n->" #sym " %0 " #val : : "i" (val))
-
 int main(void)
 {
         /* struct pt_regs */