375 files changed, 9236 insertions, 3809 deletions

diff --git a/arch/alpha/include/asm/spinlock.h b/arch/alpha/include/asm/spinlock.h
index aeeb125f6851..e38fb95cb335 100644
--- a/arch/alpha/include/asm/spinlock.h
+++ b/arch/alpha/include/asm/spinlock.h
@@ -166,6 +166,9 @@ static inline void __raw_write_unlock(raw_rwlock_t * lock)
         lock->lock = 0;
 }
 
+#define __raw_read_lock_flags(lock, flags) __raw_read_lock(lock)
+#define __raw_write_lock_flags(lock, flags) __raw_write_lock(lock)
+
 #define _raw_spin_relax(lock)   cpu_relax()
 #define _raw_read_relax(lock)   cpu_relax()
 #define _raw_write_relax(lock)  cpu_relax()
diff --git a/arch/alpha/kernel/process.c b/arch/alpha/kernel/process.c
index 8d0097f10208..3a2fb7a02db4 100644
--- a/arch/alpha/kernel/process.c
+++ b/arch/alpha/kernel/process.c
@@ -272,7 +272,7 @@ alpha_vfork(struct pt_regs *regs)
  */
 
 int
-copy_thread(int nr, unsigned long clone_flags, unsigned long usp,
+copy_thread(unsigned long clone_flags, unsigned long usp,
             unsigned long unused,
             struct task_struct * p, struct pt_regs * regs)
 {
diff --git a/arch/arm/boot/compressed/misc.c b/arch/arm/boot/compressed/misc.c
index 393c81641314..9e6e512f0117 100644
--- a/arch/arm/boot/compressed/misc.c
+++ b/arch/arm/boot/compressed/misc.c
@@ -18,7 +18,10 @@
 
 unsigned int __machine_arch_type;
 
-#include <linux/string.h>
+#include <linux/compiler.h>     /* for inline */
+#include <linux/types.h>        /* for size_t */
+#include <linux/stddef.h>       /* for NULL */
+#include <asm/string.h>
 
 #ifdef STANDALONE_DEBUG
 #define putstr printf
diff --git a/arch/arm/configs/omap_ldp_defconfig b/arch/arm/configs/omap_ldp_defconfig
index aa9d34feddc6..679a4a3e265e 100644
--- a/arch/arm/configs/omap_ldp_defconfig
+++ b/arch/arm/configs/omap_ldp_defconfig
@@ -474,14 +474,34 @@ CONFIG_NETDEVICES=y
 # CONFIG_EQUALIZER is not set
 # CONFIG_TUN is not set
 # CONFIG_VETH is not set
-# CONFIG_PHYLIB is not set
+CONFIG_PHYLIB=y
+
+#
+# MII PHY device drivers
+#
+# CONFIG_MARVELL_PHY is not set
+# CONFIG_DAVICOM_PHY is not set
+# CONFIG_QSEMI_PHY is not set
+# CONFIG_LXT_PHY is not set
+# CONFIG_CICADA_PHY is not set
+# CONFIG_VITESSE_PHY is not set
+CONFIG_SMSC_PHY=y
+# CONFIG_BROADCOM_PHY is not set
+# CONFIG_ICPLUS_PHY is not set
+# CONFIG_REALTEK_PHY is not set
+# CONFIG_NATIONAL_PHY is not set
+# CONFIG_STE10XP is not set
+# CONFIG_LSI_ET1011C_PHY is not set
+# CONFIG_FIXED_PHY is not set
+# CONFIG_MDIO_BITBANG is not set
 CONFIG_NET_ETHERNET=y
 CONFIG_MII=y
 # CONFIG_AX88796 is not set
 # CONFIG_SMC91X is not set
 # CONFIG_DM9000 is not set
 # CONFIG_ENC28J60 is not set
-CONFIG_SMC911X=y
+# CONFIG_SMC911X is not set
+CONFIG_SMSC911X=y
 # CONFIG_IBM_NEW_EMAC_ZMII is not set
 # CONFIG_IBM_NEW_EMAC_RGMII is not set
 # CONFIG_IBM_NEW_EMAC_TAH is not set
diff --git a/arch/arm/configs/pcm037_defconfig b/arch/arm/configs/pcm037_defconfig
index 627474586470..6e37c77c4760 100644
--- a/arch/arm/configs/pcm037_defconfig
+++ b/arch/arm/configs/pcm037_defconfig
@@ -465,12 +465,33 @@ CONFIG_NETDEVICES=y
 # CONFIG_EQUALIZER is not set
 # CONFIG_TUN is not set
 # CONFIG_VETH is not set
-# CONFIG_PHYLIB is not set
+CONFIG_PHYLIB=y
+
+#
+# MII PHY device drivers
+#
+# CONFIG_MARVELL_PHY is not set
+# CONFIG_DAVICOM_PHY is not set
+# CONFIG_QSEMI_PHY is not set
+# CONFIG_LXT_PHY is not set
+# CONFIG_CICADA_PHY is not set
+# CONFIG_VITESSE_PHY is not set
+CONFIG_SMSC_PHY=y
+# CONFIG_BROADCOM_PHY is not set
+# CONFIG_ICPLUS_PHY is not set
+# CONFIG_REALTEK_PHY is not set
+# CONFIG_NATIONAL_PHY is not set
+# CONFIG_STE10XP is not set
+# CONFIG_LSI_ET1011C_PHY is not set
+# CONFIG_FIXED_PHY is not set
+# CONFIG_MDIO_BITBANG is not set
 CONFIG_NET_ETHERNET=y
 CONFIG_MII=y
 # CONFIG_AX88796 is not set
 CONFIG_SMC91X=y
 # CONFIG_DM9000 is not set
+# CONFIG_SMC911X is not set
+CONFIG_SMSC911X=y
 # CONFIG_IBM_NEW_EMAC_ZMII is not set
 # CONFIG_IBM_NEW_EMAC_RGMII is not set
 # CONFIG_IBM_NEW_EMAC_TAH is not set
diff --git a/arch/arm/configs/realview-smp_defconfig b/arch/arm/configs/realview-smp_defconfig
index cd29824d791c..21db4b3ec8ff 100644
--- a/arch/arm/configs/realview-smp_defconfig
+++ b/arch/arm/configs/realview-smp_defconfig
@@ -496,13 +496,33 @@ CONFIG_NETDEVICES=y
 # CONFIG_EQUALIZER is not set
 # CONFIG_TUN is not set
 # CONFIG_VETH is not set
-# CONFIG_PHYLIB is not set
+CONFIG_PHYLIB=y
+
+#
+# MII PHY device drivers
+#
+# CONFIG_MARVELL_PHY is not set
+# CONFIG_DAVICOM_PHY is not set
+# CONFIG_QSEMI_PHY is not set
+# CONFIG_LXT_PHY is not set
+# CONFIG_CICADA_PHY is not set
+# CONFIG_VITESSE_PHY is not set
+CONFIG_SMSC_PHY=y
+# CONFIG_BROADCOM_PHY is not set
+# CONFIG_ICPLUS_PHY is not set
+# CONFIG_REALTEK_PHY is not set
+# CONFIG_NATIONAL_PHY is not set
+# CONFIG_STE10XP is not set
+# CONFIG_LSI_ET1011C_PHY is not set
+# CONFIG_FIXED_PHY is not set
+# CONFIG_MDIO_BITBANG is not set
 CONFIG_NET_ETHERNET=y
 CONFIG_MII=y
 # CONFIG_AX88796 is not set
 CONFIG_SMC91X=y
 # CONFIG_DM9000 is not set
-CONFIG_SMC911X=y
+# CONFIG_SMC911X is not set
+CONFIG_SMSC911X=y
 # CONFIG_IBM_NEW_EMAC_ZMII is not set
 # CONFIG_IBM_NEW_EMAC_RGMII is not set
 # CONFIG_IBM_NEW_EMAC_TAH is not set
diff --git a/arch/arm/configs/realview_defconfig b/arch/arm/configs/realview_defconfig
index 7e253f58ed18..9a75c30b910d 100644
--- a/arch/arm/configs/realview_defconfig
+++ b/arch/arm/configs/realview_defconfig
@@ -490,13 +490,33 @@ CONFIG_NETDEVICES=y
 # CONFIG_EQUALIZER is not set
 # CONFIG_TUN is not set
 # CONFIG_VETH is not set
-# CONFIG_PHYLIB is not set
+CONFIG_PHYLIB=y
+
+#
+# MII PHY device drivers
+#
+# CONFIG_MARVELL_PHY is not set
+# CONFIG_DAVICOM_PHY is not set
+# CONFIG_QSEMI_PHY is not set
+# CONFIG_LXT_PHY is not set
+# CONFIG_CICADA_PHY is not set
+# CONFIG_VITESSE_PHY is not set
+CONFIG_SMSC_PHY=y
+# CONFIG_BROADCOM_PHY is not set
+# CONFIG_ICPLUS_PHY is not set
+# CONFIG_REALTEK_PHY is not set
+# CONFIG_NATIONAL_PHY is not set
+# CONFIG_STE10XP is not set
+# CONFIG_LSI_ET1011C_PHY is not set
+# CONFIG_FIXED_PHY is not set
+# CONFIG_MDIO_BITBANG is not set
 CONFIG_NET_ETHERNET=y
 CONFIG_MII=y
 # CONFIG_AX88796 is not set
 CONFIG_SMC91X=y
 # CONFIG_DM9000 is not set
-CONFIG_SMC911X=y
+# CONFIG_SMC911X is not set
+CONFIG_SMSC911X=y
 # CONFIG_IBM_NEW_EMAC_ZMII is not set
 # CONFIG_IBM_NEW_EMAC_RGMII is not set
 # CONFIG_IBM_NEW_EMAC_TAH is not set
diff --git a/arch/arm/include/asm/spinlock.h b/arch/arm/include/asm/spinlock.h
index 2b41ebbfa7ff..c13681ac1ede 100644
--- a/arch/arm/include/asm/spinlock.h
+++ b/arch/arm/include/asm/spinlock.h
@@ -217,6 +217,9 @@ static inline int __raw_read_trylock(raw_rwlock_t *rw)
 /* read_can_lock - would read_trylock() succeed? */
 #define __raw_read_can_lock(x)          ((x)->lock < 0x80000000)
 
+#define __raw_read_lock_flags(lock, flags) __raw_read_lock(lock)
+#define __raw_write_lock_flags(lock, flags) __raw_write_lock(lock)
+
 #define _raw_spin_relax(lock)   cpu_relax()
 #define _raw_read_relax(lock)   cpu_relax()
 #define _raw_write_relax(lock)  cpu_relax()
diff --git a/arch/arm/kernel/process.c b/arch/arm/kernel/process.c
index 2de14e2afdc5..c3265a2e7cd4 100644
--- a/arch/arm/kernel/process.c
+++ b/arch/arm/kernel/process.c
@@ -301,7 +301,7 @@ void release_thread(struct task_struct *dead_task)
 asmlinkage void ret_from_fork(void) __asm__("ret_from_fork");
 
 int
-copy_thread(int nr, unsigned long clone_flags, unsigned long stack_start,
+copy_thread(unsigned long clone_flags, unsigned long stack_start,
             unsigned long stk_sz, struct task_struct *p, struct pt_regs *regs)
 {
         struct thread_info *thread = task_thread_info(p);
diff --git a/arch/arm/mach-at91/pm.c b/arch/arm/mach-at91/pm.c
index 7ac812dc055a..e26c4fe61fae 100644
--- a/arch/arm/mach-at91/pm.c
+++ b/arch/arm/mach-at91/pm.c
@@ -198,17 +198,17 @@ static int at91_pm_verify_clocks(void)
         /* USB must not be using PLLB */
         if (cpu_is_at91rm9200()) {
                 if ((scsr & (AT91RM9200_PMC_UHP | AT91RM9200_PMC_UDP)) != 0) {
-                        pr_debug("AT91: PM - Suspend-to-RAM with USB still active\n");
+                        pr_err("AT91: PM - Suspend-to-RAM with USB still active\n");
                         return 0;
                 }
         } else if (cpu_is_at91sam9260() || cpu_is_at91sam9261() || cpu_is_at91sam9263() || cpu_is_at91sam9g20()) {
                 if ((scsr & (AT91SAM926x_PMC_UHP | AT91SAM926x_PMC_UDP)) != 0) {
-                        pr_debug("AT91: PM - Suspend-to-RAM with USB still active\n");
+                        pr_err("AT91: PM - Suspend-to-RAM with USB still active\n");
                         return 0;
                 }
         } else if (cpu_is_at91cap9()) {
                 if ((scsr & AT91CAP9_PMC_UHP) != 0) {
-                        pr_debug("AT91: PM - Suspend-to-RAM with USB still active\n");
+                        pr_err("AT91: PM - Suspend-to-RAM with USB still active\n");
                         return 0;
                 }
         }
@@ -223,7 +223,7 @@ static int at91_pm_verify_clocks(void)
 
                 css = at91_sys_read(AT91_PMC_PCKR(i)) & AT91_PMC_CSS;
                 if (css != AT91_PMC_CSS_SLOW) {
-                        pr_debug("AT91: PM - Suspend-to-RAM with PCK%d src %d\n", i, css);
+                        pr_err("AT91: PM - Suspend-to-RAM with PCK%d src %d\n", i, css);
                         return 0;
                 }
         }
diff --git a/arch/arm/mach-gemini/include/mach/system.h b/arch/arm/mach-gemini/include/mach/system.h
index bbbd72767a02..4d9c1f872472 100644
--- a/arch/arm/mach-gemini/include/mach/system.h
+++ b/arch/arm/mach-gemini/include/mach/system.h
@@ -28,7 +28,7 @@ static inline void arch_idle(void)
         cpu_do_idle();
 }
 
-static inline void arch_reset(char mode)
+static inline void arch_reset(char mode, const char *cmd)
 {
         __raw_writel(RESET_GLOBAL | RESET_CPU1,
                      IO_ADDRESS(GEMINI_GLOBAL_BASE) + GLOBAL_RESET);
diff --git a/arch/arm/mach-mmp/include/mach/system.h b/arch/arm/mach-mmp/include/mach/system.h
index 001edfefec19..4f5b0e0ce6cf 100644
--- a/arch/arm/mach-mmp/include/mach/system.h
+++ b/arch/arm/mach-mmp/include/mach/system.h
@@ -14,7 +14,7 @@ static inline void arch_idle(void)
         cpu_do_idle();
 }
 
-static inline void arch_reset(char mode)
+static inline void arch_reset(char mode, const char *cmd)
 {
         cpu_reset(0);
 }
diff --git a/arch/arm/mach-mx3/pcm037.c b/arch/arm/mach-mx3/pcm037.c
index 5fce022114de..c3648eff5137 100644
--- a/arch/arm/mach-mx3/pcm037.c
+++ b/arch/arm/mach-mx3/pcm037.c
@@ -24,7 +24,7 @@
 #include <linux/mtd/plat-ram.h>
 #include <linux/memory.h>
 #include <linux/gpio.h>
-#include <linux/smc911x.h>
+#include <linux/smsc911x.h>
 #include <linux/interrupt.h>
 #include <linux/i2c.h>
 #include <linux/i2c/at24.h>
@@ -70,7 +70,7 @@ static struct imxuart_platform_data uart_pdata = {
         .flags = IMXUART_HAVE_RTSCTS,
 };
 
-static struct resource smc911x_resources[] = {
+static struct resource smsc911x_resources[] = {
         [0] = {
                 .start          = CS1_BASE_ADDR + 0x300,
                 .end            = CS1_BASE_ADDR + 0x300 + SZ_64K - 1,
@@ -79,22 +79,25 @@ static struct resource smc911x_resources[] = {
         [1] = {
                 .start          = IOMUX_TO_IRQ(MX31_PIN_GPIO3_1),
                 .end            = IOMUX_TO_IRQ(MX31_PIN_GPIO3_1),
-                .flags          = IORESOURCE_IRQ,
+                .flags          = IORESOURCE_IRQ | IORESOURCE_IRQ_LOWLEVEL,
         },
 };
 
-static struct smc911x_platdata smc911x_info = {
-        .flags          = SMC911X_USE_32BIT,
-        .irq_flags      = IRQF_SHARED | IRQF_TRIGGER_LOW,
+static struct smsc911x_platform_config smsc911x_info = {
+        .flags          = SMSC911X_USE_32BIT | SMSC911X_FORCE_INTERNAL_PHY |
+                          SMSC911X_SAVE_MAC_ADDRESS,
+        .irq_polarity   = SMSC911X_IRQ_POLARITY_ACTIVE_LOW,
+        .irq_type       = SMSC911X_IRQ_TYPE_OPEN_DRAIN,
+        .phy_interface  = PHY_INTERFACE_MODE_MII,
 };
 
 static struct platform_device pcm037_eth = {
-        .name           = "smc911x",
+        .name           = "smsc911x",
         .id             = -1,
-        .num_resources  = ARRAY_SIZE(smc911x_resources),
-        .resource       = smc911x_resources,
+        .num_resources  = ARRAY_SIZE(smsc911x_resources),
+        .resource       = smsc911x_resources,
         .dev            = {
-                .platform_data = &smc911x_info,
+                .platform_data = &smsc911x_info,
         },
 };
 
diff --git a/arch/arm/mach-netx/include/mach/netx-regs.h b/arch/arm/mach-netx/include/mach/netx-regs.h
index 08c60ff227be..5a03e7ccb01a 100644
--- a/arch/arm/mach-netx/include/mach/netx-regs.h
+++ b/arch/arm/mach-netx/include/mach/netx-regs.h
@@ -80,7 +80,7 @@
 #define NETX_PA_XPEC(no) (NETX_IO_PHYS + NETX_OFS_XPEC(no))
 #define NETX_PA_VIC      (NETX_IO_PHYS + NETX_OFS_VIC)
 
-/* virual addresses */
+/* virtual addresses */
 #define NETX_VA_SYSTEM   (NETX_IO_VIRT + NETX_OFS_SYSTEM)
 #define NETX_VA_MEMCR    (NETX_IO_VIRT + NETX_OFS_MEMCR)
 #define NETX_VA_DPMAS    (NETX_IO_VIRT + NETX_OFS_DPMAS)
diff --git a/arch/arm/mach-omap1/Kconfig b/arch/arm/mach-omap1/Kconfig
index 3f325d3718a9..cd8de89c5fad 100644
--- a/arch/arm/mach-omap1/Kconfig
+++ b/arch/arm/mach-omap1/Kconfig
@@ -109,7 +109,7 @@ config MACH_OMAP_PALMZ71
         help
          Support for the Palm Zire71 PDA. To boot the kernel,
          you'll need a PalmOS compatible bootloader; check out
-         http://hackndev.com/palm/z71 for more informations.
+         http://hackndev.com/palm/z71 for more information.
          Say Y here if you have such a PDA, say N otherwise.
 
 config MACH_OMAP_PALMTT
diff --git a/arch/arm/mach-omap2/Makefile b/arch/arm/mach-omap2/Makefile
index a2c3fcc27a22..c49d9bfa3abd 100644
--- a/arch/arm/mach-omap2/Makefile
+++ b/arch/arm/mach-omap2/Makefile
@@ -47,6 +47,8 @@ obj-$(CONFIG_MACH_OMAP_3430SDP)		+= board-3430sdp.o \
 
 obj-$(CONFIG_MACH_NOKIA_RX51)           += board-rx51.o \
                                            board-rx51-peripherals.o \
+                                           mmc-twl4030.o
+
 # Platform specific device init code
 ifeq ($(CONFIG_USB_MUSB_SOC),y)
 obj-y                                   += usb-musb.o
diff --git a/arch/arm/mach-omap2/board-ldp.c b/arch/arm/mach-omap2/board-ldp.c
index e096f776f996..da57b0fcda14 100644
--- a/arch/arm/mach-omap2/board-ldp.c
+++ b/arch/arm/mach-omap2/board-ldp.c
@@ -23,6 +23,7 @@
 #include <linux/spi/ads7846.h>
 #include <linux/i2c/twl4030.h>
 #include <linux/io.h>
+#include <linux/smsc911x.h>
 
 #include <mach/hardware.h>
 #include <asm/mach-types.h>
@@ -41,12 +42,12 @@
 
 #include "mmc-twl4030.h"
 
-#define LDP_SMC911X_CS          1
-#define LDP_SMC911X_GPIO        152
+#define LDP_SMSC911X_CS         1
+#define LDP_SMSC911X_GPIO       152
 #define DEBUG_BASE              0x08000000
 #define LDP_ETHR_START          DEBUG_BASE
 
-static struct resource ldp_smc911x_resources[] = {
+static struct resource ldp_smsc911x_resources[] = {
         [0] = {
                 .start  = LDP_ETHR_START,
                 .end    = LDP_ETHR_START + SZ_4K,
@@ -59,40 +60,50 @@ static struct resource ldp_smc911x_resources[] = {
         },
 };
 
-static struct platform_device ldp_smc911x_device = {
-        .name           = "smc911x",
+static struct smsc911x_platform_config ldp_smsc911x_config = {
+        .irq_polarity   = SMSC911X_IRQ_POLARITY_ACTIVE_LOW,
+        .irq_type       = SMSC911X_IRQ_TYPE_OPEN_DRAIN,
+        .flags          = SMSC911X_USE_32BIT,
+        .phy_interface  = PHY_INTERFACE_MODE_MII,
+};
+
+static struct platform_device ldp_smsc911x_device = {
+        .name           = "smsc911x",
         .id             = -1,
-        .num_resources  = ARRAY_SIZE(ldp_smc911x_resources),
-        .resource       = ldp_smc911x_resources,
+        .num_resources  = ARRAY_SIZE(ldp_smsc911x_resources),
+        .resource       = ldp_smsc911x_resources,
+        .dev            = {
+                .platform_data = &ldp_smsc911x_config,
+        },
 };
 
 static struct platform_device *ldp_devices[] __initdata = {
-        &ldp_smc911x_device,
+        &ldp_smsc911x_device,
 };
 
-static inline void __init ldp_init_smc911x(void)
+static inline void __init ldp_init_smsc911x(void)
 {
         int eth_cs;
         unsigned long cs_mem_base;
         int eth_gpio = 0;
 
-        eth_cs = LDP_SMC911X_CS;
+        eth_cs = LDP_SMSC911X_CS;
 
         if (gpmc_cs_request(eth_cs, SZ_16M, &cs_mem_base) < 0) {
-                printk(KERN_ERR "Failed to request GPMC mem for smc911x\n");
+                printk(KERN_ERR "Failed to request GPMC mem for smsc911x\n");
                 return;
         }
 
-        ldp_smc911x_resources[0].start = cs_mem_base + 0x0;
-        ldp_smc911x_resources[0].end   = cs_mem_base + 0xff;
+        ldp_smsc911x_resources[0].start = cs_mem_base + 0x0;
+        ldp_smsc911x_resources[0].end   = cs_mem_base + 0xff;
         udelay(100);
 
-        eth_gpio = LDP_SMC911X_GPIO;
+        eth_gpio = LDP_SMSC911X_GPIO;
 
-        ldp_smc911x_resources[1].start = OMAP_GPIO_IRQ(eth_gpio);
+        ldp_smsc911x_resources[1].start = OMAP_GPIO_IRQ(eth_gpio);
 
-        if (gpio_request(eth_gpio, "smc911x irq") < 0) {
-                printk(KERN_ERR "Failed to request GPIO%d for smc911x IRQ\n",
+        if (gpio_request(eth_gpio, "smsc911x irq") < 0) {
+                printk(KERN_ERR "Failed to request GPIO%d for smsc911x IRQ\n",
                                 eth_gpio);
                 return;
         }
@@ -104,7 +115,7 @@ static void __init omap_ldp_init_irq(void)
         omap2_init_common_hw(NULL);
         omap_init_irq();
         omap_gpio_init();
-        ldp_init_smc911x();
+        ldp_init_smsc911x();
 }
 
 static struct omap_uart_config ldp_uart_config __initdata = {
diff --git a/arch/arm/mach-omap2/board-overo.c b/arch/arm/mach-omap2/board-overo.c
index b3f6e9d81807..b1f23bea863f 100644
--- a/arch/arm/mach-omap2/board-overo.c
+++ b/arch/arm/mach-omap2/board-overo.c
@@ -57,6 +57,9 @@
 #define GPMC_CS0_BASE  0x60
 #define GPMC_CS_SIZE   0x30
 
+#define OVERO_SMSC911X_CS      5
+#define OVERO_SMSC911X_GPIO    176
+
 #if defined(CONFIG_TOUCHSCREEN_ADS7846) || \
         defined(CONFIG_TOUCHSCREEN_ADS7846_MODULE)
 
@@ -116,6 +119,67 @@ static void __init overo_ads7846_init(void)
 static inline void __init overo_ads7846_init(void) { return; }
 #endif
 
+#if defined(CONFIG_SMSC911X) || defined(CONFIG_SMSC911X_MODULE)
+
+#include <linux/smsc911x.h>
+
+static struct resource overo_smsc911x_resources[] = {
+        {
+                .name   = "smsc911x-memory",
+                .flags  = IORESOURCE_MEM,
+        },
+        {
+                .flags  = IORESOURCE_IRQ | IORESOURCE_IRQ_LOWLEVEL,
+        },
+};
+
+static struct smsc911x_platform_config overo_smsc911x_config = {
+        .irq_polarity   = SMSC911X_IRQ_POLARITY_ACTIVE_LOW,
+        .irq_type       = SMSC911X_IRQ_TYPE_OPEN_DRAIN,
+        .flags          = SMSC911X_USE_32BIT ,
+        .phy_interface  = PHY_INTERFACE_MODE_MII,
+};
+
+static struct platform_device overo_smsc911x_device = {
+        .name           = "smsc911x",
+        .id             = -1,
+        .num_resources  = ARRAY_SIZE(overo_smsc911x_resources),
+        .resource       = &overo_smsc911x_resources,
+        .dev            = {
+                .platform_data = &overo_smsc911x_config,
+        },
+};
+
+static inline void __init overo_init_smsc911x(void)
+{
+        unsigned long cs_mem_base;
+
+        if (gpmc_cs_request(OVERO_SMSC911X_CS, SZ_16M, &cs_mem_base) < 0) {
+                printk(KERN_ERR "Failed request for GPMC mem for smsc911x\n");
+                return;
+        }
+
+        overo_smsc911x_resources[0].start = cs_mem_base + 0x0;
+        overo_smsc911x_resources[0].end   = cs_mem_base + 0xff;
+
+        if ((gpio_request(OVERO_SMSC911X_GPIO, "SMSC911X IRQ") == 0) &&
+            (gpio_direction_input(OVERO_SMSC911X_GPIO) == 0)) {
+                gpio_export(OVERO_SMSC911X_GPIO, 0);
+        } else {
+                printk(KERN_ERR "could not obtain gpio for SMSC911X IRQ\n");
+                return;
+        }
+
+        overo_smsc911x_resources[1].start = OMAP_GPIO_IRQ(OVERO_SMSC911X_GPIO);
+        overo_smsc911x_resources[1].end   = 0;
+
+        platform_device_register(&overo_smsc911x_device);
+}
+
+#else
+static inline void __init overo_init_smsc911x(void) { return; }
+#endif
+
 static struct mtd_partition overo_nand_partitions[] = {
         {
                 .name           = "xloader",
@@ -290,6 +354,7 @@ static void __init overo_init(void)
         overo_flash_init();
         usb_musb_init();
         overo_ads7846_init();
+        overo_init_smsc911x();
 
         if ((gpio_request(OVERO_GPIO_W2W_NRESET,
                           "OVERO_GPIO_W2W_NRESET") == 0) &&
diff --git a/arch/arm/mach-realview/core.c b/arch/arm/mach-realview/core.c
index d6766685cfc7..9ab947c14f26 100644
--- a/arch/arm/mach-realview/core.c
+++ b/arch/arm/mach-realview/core.c
@@ -28,7 +28,7 @@
 #include <linux/clocksource.h>
 #include <linux/clockchips.h>
 #include <linux/io.h>
-#include <linux/smc911x.h>
+#include <linux/smsc911x.h>
 #include <linux/ata_platform.h>
 
 #include <asm/clkdev.h>
@@ -128,14 +128,15 @@ int realview_flash_register(struct resource *res, u32 num)
         return platform_device_register(&realview_flash_device);
 }
 
-static struct smc911x_platdata realview_smc911x_platdata = {
-        .flags          = SMC911X_USE_32BIT,
-        .irq_flags      = IRQF_SHARED,
-        .irq_polarity   = 1,
+static struct smsc911x_platform_config smsc911x_config = {
+        .flags          = SMSC911X_USE_32BIT,
+        .irq_polarity   = SMSC911X_IRQ_POLARITY_ACTIVE_HIGH,
+        .irq_type       = SMSC911X_IRQ_TYPE_PUSH_PULL,
+        .phy_interface  = PHY_INTERFACE_MODE_MII,
 };
 
 static struct platform_device realview_eth_device = {
-        .name           = "smc911x",
+        .name           = "smsc911x",
         .id             = 0,
         .num_resources  = 2,
 };
@@ -145,8 +146,8 @@ int realview_eth_register(const char *name, struct resource *res)
         if (name)
                 realview_eth_device.name = name;
         realview_eth_device.resource = res;
-        if (strcmp(realview_eth_device.name, "smc911x") == 0)
-                realview_eth_device.dev.platform_data = &realview_smc911x_platdata;
+        if (strcmp(realview_eth_device.name, "smsc911x") == 0)
+                realview_eth_device.dev.platform_data = &smsc911x_config;
 
         return platform_device_register(&realview_eth_device);
 }
diff --git a/arch/arm/mach-realview/localtimer.c b/arch/arm/mach-realview/localtimer.c
index 67d6d9cc68b2..d0d39adf6407 100644
--- a/arch/arm/mach-realview/localtimer.c
+++ b/arch/arm/mach-realview/localtimer.c
@@ -191,6 +191,7 @@ void __cpuinit local_timer_setup(void)
         clk->name               = "dummy_timer";
         clk->features           = CLOCK_EVT_FEAT_DUMMY;
         clk->rating             = 200;
+        clk->mult               = 1;
         clk->set_mode           = dummy_timer_set_mode;
         clk->broadcast          = smp_timer_broadcast;
         clk->cpumask            = cpumask_of(cpu);
diff --git a/arch/arm/mm/abort-ev6.S b/arch/arm/mm/abort-ev6.S
index 94077fbd96b7..6f7e70907e44 100644
--- a/arch/arm/mm/abort-ev6.S
+++ b/arch/arm/mm/abort-ev6.S
@@ -29,10 +29,10 @@ ENTRY(v6_early_abort)
         mrc     p15, 0, r1, c5, c0, 0           @ get FSR
         mrc     p15, 0, r0, c6, c0, 0           @ get FAR
 /*
- * Faulty SWP instruction on 1136 doesn't set bit 11 in DFSR.
+ * Faulty SWP instruction on 1136 doesn't set bit 11 in DFSR (erratum 326103).
  * The test below covers all the write situations, including Java bytecodes
  */
-        bic     r1, r1, #1 << 11 | 1 << 10      @ clear bits 11 and 10 of FSR
+        bic     r1, r1, #1 << 11                @ clear bit 11 of FSR
         tst     r3, #PSR_J_BIT                  @ Java?
         movne   pc, lr
         do_thumb_abort
diff --git a/arch/arm/mm/cache-feroceon-l2.c b/arch/arm/mm/cache-feroceon-l2.c
index d6dd83826f8a..6e77c042d8e9 100644
--- a/arch/arm/mm/cache-feroceon-l2.c
+++ b/arch/arm/mm/cache-feroceon-l2.c
@@ -115,6 +115,10 @@ static inline void l2_inv_pa_range(unsigned long start, unsigned long end)
         raw_local_irq_restore(flags);
 }
 
+static inline void l2_inv_all(void)
+{
+        __asm__("mcr p15, 1, %0, c15, c11, 0" : : "r" (0));
+}
 
 /*
  * Linux primitives.
@@ -254,9 +258,7 @@ static void __init enable_dcache(void)
 
 static void __init __invalidate_icache(void)
 {
-        int dummy;
-
-        __asm__ __volatile__("mcr p15, 0, %0, c7, c5, 0" : "=r" (dummy));
+        __asm__("mcr p15, 0, %0, c7, c5, 0" : : "r" (0));
 }
 
 static int __init invalidate_and_disable_icache(void)
@@ -321,6 +323,7 @@ static void __init enable_l2(void)
 
                 d = flush_and_disable_dcache();
                 i = invalidate_and_disable_icache();
+                l2_inv_all();
                 write_extra_features(u | 0x00400000);
                 if (i)
                         enable_icache();
diff --git a/arch/arm/vfp/entry.S b/arch/arm/vfp/entry.S
index ba592a9e6fb3..a2bed62aec21 100644
--- a/arch/arm/vfp/entry.S
+++ b/arch/arm/vfp/entry.S
@@ -15,13 +15,16 @@
  *  r10 = thread_info structure
  *  lr  = failure return
  */
-#include <linux/linkage.h>
-#include <linux/init.h>
-#include <asm/asm-offsets.h>
-#include <asm/assembler.h>
+#include <asm/thread_info.h>
 #include <asm/vfpmacros.h>
+#include "../kernel/entry-header.S"
 
 ENTRY(do_vfp)
+#ifdef CONFIG_PREEMPT
+        ldr     r4, [r10, #TI_PREEMPT]  @ get preempt count
+        add     r11, r4, #1             @ increment it
+        str     r11, [r10, #TI_PREEMPT]
+#endif
         enable_irq
         ldr     r4, .LCvfp
         ldr     r11, [r10, #TI_CPU]     @ CPU number
@@ -30,6 +33,12 @@ ENTRY(do_vfp)
 ENDPROC(do_vfp)
 
 ENTRY(vfp_null_entry)
+#ifdef CONFIG_PREEMPT
+        get_thread_info r10
+        ldr     r4, [r10, #TI_PREEMPT]  @ get preempt count
+        sub     r11, r4, #1             @ decrement it
+        str     r11, [r10, #TI_PREEMPT]
+#endif
         mov     pc, lr
 ENDPROC(vfp_null_entry)
 
@@ -41,6 +50,12 @@ ENDPROC(vfp_null_entry)
 
         __INIT
 ENTRY(vfp_testing_entry)
+#ifdef CONFIG_PREEMPT
+        get_thread_info r10
+        ldr     r4, [r10, #TI_PREEMPT]  @ get preempt count
+        sub     r11, r4, #1             @ decrement it
+        str     r11, [r10, #TI_PREEMPT]
+#endif
         ldr     r0, VFP_arch_address
         str     r5, [r0]                @ known non-zero value
         mov     pc, r9                  @ we have handled the fault
diff --git a/arch/arm/vfp/vfphw.S b/arch/arm/vfp/vfphw.S
index a5a4e57763c3..83c4e384b16d 100644
--- a/arch/arm/vfp/vfphw.S
+++ b/arch/arm/vfp/vfphw.S
@@ -137,6 +137,12 @@ check_for_exception:
         VFPFMXR FPEXC, r1               @ restore FPEXC last
         sub     r2, r2, #4
         str     r2, [sp, #S_PC]         @ retry the instruction
+#ifdef CONFIG_PREEMPT
+        get_thread_info r10
+        ldr     r4, [r10, #TI_PREEMPT]  @ get preempt count
+        sub     r11, r4, #1             @ decrement it
+        str     r11, [r10, #TI_PREEMPT]
+#endif
         mov     pc, r9                  @ we think we have handled things
 
 
@@ -155,6 +161,12 @@ look_for_VFP_exceptions:
         @ not recognised by VFP
 
         DBGSTR  "not VFP"
+#ifdef CONFIG_PREEMPT
+        get_thread_info r10
+        ldr     r4, [r10, #TI_PREEMPT]  @ get preempt count
+        sub     r11, r4, #1             @ decrement it
+        str     r11, [r10, #TI_PREEMPT]
+#endif
         mov     pc, lr
 
 process_exception:
diff --git a/arch/arm/vfp/vfpmodule.c b/arch/arm/vfp/vfpmodule.c
index 75457b30d813..01599c4ef726 100644
--- a/arch/arm/vfp/vfpmodule.c
+++ b/arch/arm/vfp/vfpmodule.c
@@ -266,7 +266,7 @@ void VFP_bounce(u32 trigger, u32 fpexc, struct pt_regs *regs)
                  * on VFP subarch 1.
                  */
                  vfp_raise_exceptions(VFP_EXCEPTION_ERROR, trigger, fpscr, regs);
-                 return;
+                goto exit;
         }
 
         /*
@@ -297,7 +297,7 @@ void VFP_bounce(u32 trigger, u32 fpexc, struct pt_regs *regs)
          * the FPEXC.FP2V bit is valid only if FPEXC.EX is 1.
          */
         if (fpexc ^ (FPEXC_EX | FPEXC_FP2V))
-                return;
+                goto exit;
 
         /*
          * The barrier() here prevents fpinst2 being read
@@ -310,6 +310,8 @@ void VFP_bounce(u32 trigger, u32 fpexc, struct pt_regs *regs)
         exceptions = vfp_emulate_instruction(trigger, orig_fpscr, regs);
         if (exceptions)
                 vfp_raise_exceptions(exceptions, trigger, orig_fpscr, regs);
+ exit:
+        preempt_enable();
 }
 
 static void vfp_enable(void *unused)
diff --git a/arch/avr32/Kconfig b/arch/avr32/Kconfig
index 05fe3053dcae..414a8ad97f52 100644
--- a/arch/avr32/Kconfig
+++ b/arch/avr32/Kconfig
@@ -127,13 +127,13 @@ config BOARD_HAMMERHEAD
         select CPU_AT32AP7000
         select USB_ARCH_HAS_HCD
         help
-          The Hammerhead platform is built around a AVR32 32-bit microcontroller from Atmel.
+          The Hammerhead platform is built around an AVR32 32-bit microcontroller from Atmel.
           It offers versatile peripherals, such as ethernet, usb device, usb host etc.
 
-          The board also incooperates a power supply and is a Power over Ethernet (PoE) Powered
+          The board also incorporates a power supply and is a Power over Ethernet (PoE) Powered
           Device (PD).
 
-          Additonally, a Cyclone III FPGA from Altera is integrated on the board. The FPGA is
+          Additionally, a Cyclone III FPGA from Altera is integrated on the board. The FPGA is
           mapped into the 32-bit AVR memory bus. The FPGA offers two DDR2 SDRAM interfaces, which
           will cover even the most exceptional need of memory bandwidth. Together with the onboard
           video decoder the board is ready for video processing.
diff --git a/arch/avr32/kernel/process.c b/arch/avr32/kernel/process.c
index 43ae555ecb33..1bbe1da54869 100644
--- a/arch/avr32/kernel/process.c
+++ b/arch/avr32/kernel/process.c
@@ -332,7 +332,7 @@ int dump_fpu(struct pt_regs *regs, elf_fpregset_t *fpu)
 
 asmlinkage void ret_from_fork(void);
 
-int copy_thread(int nr, unsigned long clone_flags, unsigned long usp,
+int copy_thread(unsigned long clone_flags, unsigned long usp,
                 unsigned long unused,
                 struct task_struct *p, struct pt_regs *regs)
 {
diff --git a/arch/blackfin/Kconfig b/arch/blackfin/Kconfig
index 0c1f86e3e44a..3640cdc38aac 100644
--- a/arch/blackfin/Kconfig
+++ b/arch/blackfin/Kconfig
@@ -777,7 +777,7 @@ config CACHELINE_ALIGNED_L1
         default n if BF54x
         depends on !BF531
         help
-          If enabled, cacheline_anligned data is linked
+          If enabled, cacheline_aligned data is linked
           into L1 data memory. (less latency)
 
 config SYSCALL_TAB_L1
@@ -957,7 +957,7 @@ config MPU
           memory they do not own.  This comes at a performance penalty
           and is recommended only for debugging.
 
-comment "Asynchonous Memory Configuration"
+comment "Asynchronous Memory Configuration"
 
 menu "EBIU_AMGCTL Global Control"
 config C_AMCKEN
@@ -989,7 +989,7 @@ config C_B3PEN
         default n
 
 choice
-        prompt"Enable Asynchonous Memory Banks"
+        prompt "Enable Asynchronous Memory Banks"
         default C_AMBEN_ALL
 
 config C_AMBEN
diff --git a/arch/blackfin/kernel/process.c b/arch/blackfin/kernel/process.c
index 33e2e8993f7f..f49427293ca1 100644
--- a/arch/blackfin/kernel/process.c
+++ b/arch/blackfin/kernel/process.c
@@ -193,7 +193,7 @@ asmlinkage int bfin_clone(struct pt_regs *regs)
 }
 
 int
-copy_thread(int nr, unsigned long clone_flags,
+copy_thread(unsigned long clone_flags,
             unsigned long usp, unsigned long topstk,
             struct task_struct *p, struct pt_regs *regs)
 {
diff --git a/arch/cris/Kconfig b/arch/cris/Kconfig
index 3462245fe9fb..7adac388a771 100644
--- a/arch/cris/Kconfig
+++ b/arch/cris/Kconfig
@@ -438,7 +438,7 @@ config ETRAX_SERIAL_PORT0_DMA1_IN
         help
           Enables the DMA1 input channel for ser0 (ttyS0).
           If you do not enable DMA, an interrupt for each character will be
-          used when receiveing data.
+          used when receiving data.
           Normally you want to use DMA, unless you use the DMA channel for
           something else.
 
@@ -565,7 +565,7 @@ config ETRAX_SERIAL_PORT2_DMA7_IN
         help
           Enables the DMA7 input channel for ser2 (ttyS2).
           If you do not enable DMA, an interrupt for each character will be
-          used when receiveing data.
+          used when receiving data.
           Normally you want to use DMA, unless you use the DMA channel for
           something else.
 
@@ -604,7 +604,7 @@ config ETRAX_SERIAL_PORT3_DMA3_IN
         help
           Enables the DMA3 input channel for ser3 (ttyS3).
           If you do not enable DMA, an interrupt for each character will be
-          used when receiveing data.
+          used when receiving data.
           Normally you want to use DMA, unless you use the DMA channel for
           something else.
 
diff --git a/arch/cris/arch-v10/kernel/process.c b/arch/cris/arch-v10/kernel/process.c
index bd9b3ff63f6c..c4c69cf721e5 100644
--- a/arch/cris/arch-v10/kernel/process.c
+++ b/arch/cris/arch-v10/kernel/process.c
@@ -115,7 +115,7 @@ int kernel_thread(int (*fn)(void *), void * arg, unsigned long flags)
  */
 asmlinkage void ret_from_fork(void);
 
-int copy_thread(int nr, unsigned long clone_flags, unsigned long usp,
+int copy_thread(unsigned long clone_flags, unsigned long usp,
                 unsigned long unused,
                 struct task_struct *p, struct pt_regs *regs)
 {
diff --git a/arch/cris/arch-v32/Kconfig b/arch/cris/arch-v32/Kconfig
index 005ed2b3f7f4..21bbd93be34f 100644
--- a/arch/cris/arch-v32/Kconfig
+++ b/arch/cris/arch-v32/Kconfig
@@ -28,7 +28,7 @@ config	ETRAX_NBR_LED_GRP_ONE
         help
           Select this if you want one Ethernet LED group. This LED group
           can be used for one or more Ethernet interfaces. However, it is
-          recomended that each Ethernet interface use a dedicated LED group.
+          recommended that each Ethernet interface use a dedicated LED group.
 
 config  ETRAX_NBR_LED_GRP_TWO
         bool "Use two LED groups"
diff --git a/arch/cris/arch-v32/drivers/Kconfig b/arch/cris/arch-v32/drivers/Kconfig
index 7a64fcef9d07..b9e328e688be 100644
--- a/arch/cris/arch-v32/drivers/Kconfig
+++ b/arch/cris/arch-v32/drivers/Kconfig
@@ -342,7 +342,7 @@ config ETRAX_SERIAL_PORT4_DMA9_IN
         help
           Enables the DMA9 input channel for ser4 (ttyS4).
           If you do not enable DMA, an interrupt for each character will be
-          used when receiveing data.
+          used when receiving data.
           Normally you want to use DMA, unless you use the DMA channel for
           something else.
 
diff --git a/arch/cris/arch-v32/kernel/process.c b/arch/cris/arch-v32/kernel/process.c
index ced5b725d9bd..120e7f796fea 100644
--- a/arch/cris/arch-v32/kernel/process.c
+++ b/arch/cris/arch-v32/kernel/process.c
@@ -131,7 +131,7 @@ kernel_thread(int (*fn)(void *), void * arg, unsigned long flags)
 extern asmlinkage void ret_from_fork(void);
 
 int
-copy_thread(int nr, unsigned long clone_flags, unsigned long usp,
+copy_thread(unsigned long clone_flags, unsigned long usp,
         unsigned long unused,
         struct task_struct *p, struct pt_regs *regs)
 {
diff --git a/arch/cris/arch-v32/mach-fs/Kconfig b/arch/cris/arch-v32/mach-fs/Kconfig
index f6d74475f1c6..774de82abef6 100644
--- a/arch/cris/arch-v32/mach-fs/Kconfig
+++ b/arch/cris/arch-v32/mach-fs/Kconfig
@@ -59,7 +59,7 @@ config ETRAX_SDRAM_GRP1_CONFIG
         depends on ETRAX_ARCH_V32
         default "0"
         help
-          SDRAM configuration for group 1. The defult value is 0
+          SDRAM configuration for group 1. The default value is 0
           because group 1 is not used in the default configuration,
           described in the help for SDRAM_GRP0_CONFIG.
 
diff --git a/arch/cris/include/arch-v32/arch/spinlock.h b/arch/cris/include/arch-v32/arch/spinlock.h
index 0d5709b983a1..129756b96661 100644
--- a/arch/cris/include/arch-v32/arch/spinlock.h
+++ b/arch/cris/include/arch-v32/arch/spinlock.h
@@ -121,6 +121,8 @@ static  inline int __raw_write_trylock(raw_rwlock_t *rw)
         return 1;
 }
 
+#define _raw_read_lock_flags(lock, flags) _raw_read_lock(lock)
+#define _raw_write_lock_flags(lock, flags) _raw_write_lock(lock)
 
 #define _raw_spin_relax(lock)   cpu_relax()
 #define _raw_read_relax(lock)   cpu_relax()
diff --git a/arch/cris/kernel/process.c b/arch/cris/kernel/process.c
index 60816e876455..4df0b320d524 100644
--- a/arch/cris/kernel/process.c
+++ b/arch/cris/kernel/process.c
@@ -19,7 +19,6 @@
 #include <asm/system.h>
 #include <linux/module.h>
 #include <linux/spinlock.h>
-#include <linux/fs_struct.h>
 #include <linux/init_task.h>
 #include <linux/sched.h>
 #include <linux/fs.h>
diff --git a/arch/frv/kernel/process.c b/arch/frv/kernel/process.c
index 9583a338e9d6..0de50df74970 100644
--- a/arch/frv/kernel/process.c
+++ b/arch/frv/kernel/process.c
@@ -204,7 +204,7 @@ void prepare_to_copy(struct task_struct *tsk)
 /*
  * set up the kernel stack and exception frames for a new process
  */
-int copy_thread(int nr, unsigned long clone_flags,
+int copy_thread(unsigned long clone_flags,
                 unsigned long usp, unsigned long topstk,
                 struct task_struct *p, struct pt_regs *regs)
 {
diff --git a/arch/h8300/kernel/process.c b/arch/h8300/kernel/process.c
index a8ef654a5a0b..e2f33d0f9969 100644
--- a/arch/h8300/kernel/process.c
+++ b/arch/h8300/kernel/process.c
@@ -191,7 +191,7 @@ asmlinkage int h8300_clone(struct pt_regs *regs)
 
 }
 
-int copy_thread(int nr, unsigned long clone_flags,
+int copy_thread(unsigned long clone_flags,
                 unsigned long usp, unsigned long topstk,
                  struct task_struct * p, struct pt_regs * regs)
 {
diff --git a/arch/h8300/kernel/timer/tpu.c b/arch/h8300/kernel/timer/tpu.c
index ad383caae196..e7c6e614a758 100644
--- a/arch/h8300/kernel/timer/tpu.c
+++ b/arch/h8300/kernel/timer/tpu.c
@@ -67,7 +67,7 @@ static struct irqaction tpu_irq = {
         .flags          = IRQF_DISABLED | IRQF_TIMER,
 };
 
-const static int __initdata divide_rate[] = {
+static const int __initdata divide_rate[] = {
 #if CONFIG_H8300_TPU_CH == 0
         1,4,16,64,0,0,0,0,
 #elif (CONFIG_H8300_TPU_CH == 1) || (CONFIG_H8300_TPU_CH == 5)
diff --git a/arch/ia64/configs/generic_defconfig b/arch/ia64/configs/generic_defconfig
index a109db30ce55..75645495c2dd 100644
--- a/arch/ia64/configs/generic_defconfig
+++ b/arch/ia64/configs/generic_defconfig
@@ -193,7 +193,6 @@ CONFIG_BOUNCE=y
 CONFIG_NR_QUICK=1
 CONFIG_VIRT_TO_BUS=y
 CONFIG_UNEVICTABLE_LRU=y
-CONFIG_MMU_NOTIFIER=y
 CONFIG_ARCH_SELECT_MEMORY_MODEL=y
 CONFIG_ARCH_DISCONTIGMEM_ENABLE=y
 CONFIG_ARCH_FLATMEM_ENABLE=y
@@ -416,8 +415,6 @@ CONFIG_SGI_IOC4=y
 # CONFIG_ENCLOSURE_SERVICES is not set
 CONFIG_SGI_XP=m
 # CONFIG_HP_ILO is not set
-CONFIG_SGI_GRU=m
-# CONFIG_SGI_GRU_DEBUG is not set
 # CONFIG_C2PORT is not set
 CONFIG_HAVE_IDE=y
 CONFIG_IDE=y
diff --git a/arch/ia64/include/asm/intrinsics.h b/arch/ia64/include/asm/intrinsics.h
index c47830e26cb7..111ed5222892 100644
--- a/arch/ia64/include/asm/intrinsics.h
+++ b/arch/ia64/include/asm/intrinsics.h
@@ -202,7 +202,11 @@ extern long ia64_cmpxchg_called_with_bad_pointer (void);
 
 #ifndef __ASSEMBLY__
 #if defined(CONFIG_PARAVIRT) && defined(__KERNEL__)
-#define IA64_INTRINSIC_API(name)        pv_cpu_ops.name
+#ifdef ASM_SUPPORTED
+# define IA64_INTRINSIC_API(name)       paravirt_ ## name
+#else
+# define IA64_INTRINSIC_API(name)       pv_cpu_ops.name
+#endif
 #define IA64_INTRINSIC_MACRO(name)      paravirt_ ## name
 #else
 #define IA64_INTRINSIC_API(name)        ia64_native_ ## name
diff --git a/arch/ia64/include/asm/mmu_context.h b/arch/ia64/include/asm/mmu_context.h
index 040bc87db930..7f2a456603cb 100644
--- a/arch/ia64/include/asm/mmu_context.h
+++ b/arch/ia64/include/asm/mmu_context.h
@@ -87,7 +87,7 @@ get_mmu_context (struct mm_struct *mm)
         /* re-check, now that we've got the lock: */
         context = mm->context;
         if (context == 0) {
-                cpus_clear(mm->cpu_vm_mask);
+                cpumask_clear(mm_cpumask(mm));
                 if (ia64_ctx.next >= ia64_ctx.limit) {
                         ia64_ctx.next = find_next_zero_bit(ia64_ctx.bitmap,
                                         ia64_ctx.max_ctx, ia64_ctx.next);
@@ -166,8 +166,8 @@ activate_context (struct mm_struct *mm)
 
         do {
                 context = get_mmu_context(mm);
-                if (!cpu_isset(smp_processor_id(), mm->cpu_vm_mask))
-                        cpu_set(smp_processor_id(), mm->cpu_vm_mask);
+                if (!cpumask_test_cpu(smp_processor_id(), mm_cpumask(mm)))
+                        cpumask_set_cpu(smp_processor_id(), mm_cpumask(mm));
                 reload_context(context);
                 /*
                  * in the unlikely event of a TLB-flush by another thread,
diff --git a/arch/ia64/include/asm/module.h b/arch/ia64/include/asm/module.h
index d2da61e4c49b..908eaef42a08 100644
--- a/arch/ia64/include/asm/module.h
+++ b/arch/ia64/include/asm/module.h
@@ -16,6 +16,12 @@ struct mod_arch_specific {
         struct elf64_shdr *got;         /* global offset table */
         struct elf64_shdr *opd;         /* official procedure descriptors */
         struct elf64_shdr *unwind;      /* unwind-table section */
+#ifdef CONFIG_PARAVIRT
+        struct elf64_shdr *paravirt_bundles;
+                                        /* paravirt_alt_bundle_patch table */
+        struct elf64_shdr *paravirt_insts;
+                                        /* paravirt_alt_inst_patch table */
+#endif
         unsigned long gp;               /* global-pointer for module */
 
         void *core_unw_table;           /* core unwind-table cookie returned by unwinder */
diff --git a/arch/ia64/include/asm/native/inst.h b/arch/ia64/include/asm/native/inst.h
index 0a1026cca4fa..d2d46efb3e6e 100644
--- a/arch/ia64/include/asm/native/inst.h
+++ b/arch/ia64/include/asm/native/inst.h
@@ -30,6 +30,9 @@
 #define __paravirt_work_processed_syscall_target \
                                                 ia64_work_processed_syscall
 
+#define paravirt_fsyscall_table                 ia64_native_fsyscall_table
+#define paravirt_fsys_bubble_down               ia64_native_fsys_bubble_down
+
 #ifdef CONFIG_PARAVIRT_GUEST_ASM_CLOBBER_CHECK
 # define PARAVIRT_POISON        0xdeadbeefbaadf00d
 # define CLOBBER(clob)                          \
@@ -74,6 +77,11 @@
 (pred)  mov reg = psr                   \
         CLOBBER(clob)
 
+#define MOV_FROM_ITC(pred, pred_clob, reg, clob)        \
+(pred)  mov reg = ar.itc                                \
+        CLOBBER(clob)                                   \
+        CLOBBER_PRED(pred_clob)
+
 #define MOV_TO_IFA(reg, clob)   \
         mov cr.ifa = reg        \
         CLOBBER(clob)
@@ -158,6 +166,11 @@
 #define RSM_PSR_DT              \
         rsm psr.dt
 
+#define RSM_PSR_BE_I(clob0, clob1)      \
+        rsm psr.be | psr.i              \
+        CLOBBER(clob0)                  \
+        CLOBBER(clob1)
+
 #define SSM_PSR_DT_AND_SRLZ_I   \
         ssm psr.dt              \
         ;;                      \
diff --git a/arch/ia64/include/asm/native/patchlist.h b/arch/ia64/include/asm/native/patchlist.h
new file mode 100644
index 000000000000..be16ca9311bf
--- /dev/null
+++ b/arch/ia64/include/asm/native/patchlist.h
@@ -0,0 +1,38 @@
+/******************************************************************************
+ * arch/ia64/include/asm/native/inst.h
+ *
+ * Copyright (c) 2008 Isaku Yamahata <yamahata at valinux co jp>
+ *                    VA Linux Systems Japan K.K.
+ *
+ * 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.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ */
+
+#define __paravirt_start_gate_fsyscall_patchlist                \
+        __ia64_native_start_gate_fsyscall_patchlist
+#define __paravirt_end_gate_fsyscall_patchlist                  \
+        __ia64_native_end_gate_fsyscall_patchlist
+#define __paravirt_start_gate_brl_fsys_bubble_down_patchlist    \
+        __ia64_native_start_gate_brl_fsys_bubble_down_patchlist
+#define __paravirt_end_gate_brl_fsys_bubble_down_patchlist      \
+        __ia64_native_end_gate_brl_fsys_bubble_down_patchlist
+#define __paravirt_start_gate_vtop_patchlist                    \
+        __ia64_native_start_gate_vtop_patchlist
+#define __paravirt_end_gate_vtop_patchlist                      \
+        __ia64_native_end_gate_vtop_patchlist
+#define __paravirt_start_gate_mckinley_e9_patchlist             \
+        __ia64_native_start_gate_mckinley_e9_patchlist
+#define __paravirt_end_gate_mckinley_e9_patchlist               \
+        __ia64_native_end_gate_mckinley_e9_patchlist
diff --git a/arch/ia64/include/asm/native/pvchk_inst.h b/arch/ia64/include/asm/native/pvchk_inst.h
index b8e6eb1090d7..8d72962ec838 100644
--- a/arch/ia64/include/asm/native/pvchk_inst.h
+++ b/arch/ia64/include/asm/native/pvchk_inst.h
@@ -180,6 +180,11 @@
         IS_PRED_IN(pred)                        \
         IS_RREG_OUT(reg)                        \
         IS_RREG_CLOB(clob)
+#define MOV_FROM_ITC(pred, pred_clob, reg, clob)        \
+        IS_PRED_IN(pred)                                \
+        IS_PRED_CLOB(pred_clob)                         \
+        IS_RREG_OUT(reg)                                \
+        IS_RREG_CLOB(clob)
 #define MOV_TO_IFA(reg, clob)                   \
         IS_RREG_IN(reg)                         \
         IS_RREG_CLOB(clob)
@@ -246,6 +251,9 @@
         IS_RREG_CLOB(clob2)
 #define RSM_PSR_DT                              \
         nop 0
+#define RSM_PSR_BE_I(clob0, clob1)              \
+        IS_RREG_CLOB(clob0)                     \
+        IS_RREG_CLOB(clob1)
 #define SSM_PSR_DT_AND_SRLZ_I                   \
         nop 0
 #define BSW_0(clob0, clob1, clob2)              \
diff --git a/arch/ia64/include/asm/paravirt.h b/arch/ia64/include/asm/paravirt.h
index 2bf3636473fe..2eb0a981a09a 100644
--- a/arch/ia64/include/asm/paravirt.h
+++ b/arch/ia64/include/asm/paravirt.h
@@ -22,6 +22,56 @@
 #ifndef __ASM_PARAVIRT_H
 #define __ASM_PARAVIRT_H
 
+#ifndef __ASSEMBLY__
+/******************************************************************************
+ * fsys related addresses
+ */
+struct pv_fsys_data {
+        unsigned long *fsyscall_table;
+        void *fsys_bubble_down;
+};
+
+extern struct pv_fsys_data pv_fsys_data;
+
+unsigned long *paravirt_get_fsyscall_table(void);
+char *paravirt_get_fsys_bubble_down(void);
+
+/******************************************************************************
+ * patchlist addresses for gate page
+ */
+enum pv_gate_patchlist {
+        PV_GATE_START_FSYSCALL,
+        PV_GATE_END_FSYSCALL,
+
+        PV_GATE_START_BRL_FSYS_BUBBLE_DOWN,
+        PV_GATE_END_BRL_FSYS_BUBBLE_DOWN,
+
+        PV_GATE_START_VTOP,
+        PV_GATE_END_VTOP,
+
+        PV_GATE_START_MCKINLEY_E9,
+        PV_GATE_END_MCKINLEY_E9,
+};
+
+struct pv_patchdata {
+        unsigned long start_fsyscall_patchlist;
+        unsigned long end_fsyscall_patchlist;
+        unsigned long start_brl_fsys_bubble_down_patchlist;
+        unsigned long end_brl_fsys_bubble_down_patchlist;
+        unsigned long start_vtop_patchlist;
+        unsigned long end_vtop_patchlist;
+        unsigned long start_mckinley_e9_patchlist;
+        unsigned long end_mckinley_e9_patchlist;
+
+        void *gate_section;
+};
+
+extern struct pv_patchdata pv_patchdata;
+
+unsigned long paravirt_get_gate_patchlist(enum pv_gate_patchlist type);
+void *paravirt_get_gate_section(void);
+#endif
+
 #ifdef CONFIG_PARAVIRT_GUEST
 
 #define PARAVIRT_HYPERVISOR_TYPE_DEFAULT        0
@@ -68,6 +118,14 @@ struct pv_init_ops {
         int (*arch_setup_nomca)(void);
 
         void (*post_smp_prepare_boot_cpu)(void);
+
+#ifdef ASM_SUPPORTED
+        unsigned long (*patch_bundle)(void *sbundle, void *ebundle,
+                                      unsigned long type);
+        unsigned long (*patch_inst)(unsigned long stag, unsigned long etag,
+                                    unsigned long type);
+#endif
+        void (*patch_branch)(unsigned long tag, unsigned long type);
 };
 
 extern struct pv_init_ops pv_init_ops;
@@ -210,6 +268,8 @@ struct pv_time_ops {
         int (*do_steal_accounting)(unsigned long *new_itm);
 
         void (*clocksource_resume)(void);
+
+        unsigned long long (*sched_clock)(void);
 };
 
 extern struct pv_time_ops pv_time_ops;
@@ -227,6 +287,11 @@ paravirt_do_steal_accounting(unsigned long *new_itm)
         return pv_time_ops.do_steal_accounting(new_itm);
 }
 
+static inline unsigned long long paravirt_sched_clock(void)
+{
+        return pv_time_ops.sched_clock();
+}
+
 #endif /* !__ASSEMBLY__ */
 
 #else
diff --git a/arch/ia64/include/asm/paravirt_patch.h b/arch/ia64/include/asm/paravirt_patch.h
new file mode 100644
index 000000000000..128ff5db6e67
--- /dev/null
+++ b/arch/ia64/include/asm/paravirt_patch.h
@@ -0,0 +1,143 @@
+/******************************************************************************
+ * Copyright (c) 2008 Isaku Yamahata <yamahata at valinux co jp>
+ *                    VA Linux Systems Japan K.K.
+ *
+ * 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.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ */
+
+#ifndef __ASM_PARAVIRT_PATCH_H
+#define __ASM_PARAVIRT_PATCH_H
+
+#ifdef __ASSEMBLY__
+
+        .section .paravirt_branches, "a"
+        .previous
+#define PARAVIRT_PATCH_SITE_BR(type)            \
+        {                                       \
+        [1:] ;                                  \
+        br.cond.sptk.many 2f ;                  \
+        nop.b 0 ;                               \
+        nop.b 0;; ;                             \
+        } ;                                     \
+        2:                                      \
+        .xdata8 ".paravirt_branches", 1b, type
+
+#else
+
+#include <linux/stringify.h>
+#include <asm/intrinsics.h>
+
+/* for binary patch */
+struct paravirt_patch_site_bundle {
+        void            *sbundle;
+        void            *ebundle;
+        unsigned long   type;
+};
+
+/* label means the beginning of new bundle */
+#define paravirt_alt_bundle(instr, privop)                              \
+        "\t998:\n"                                                      \
+        "\t" instr "\n"                                                 \
+        "\t999:\n"                                                      \
+        "\t.pushsection .paravirt_bundles, \"a\"\n"                     \
+        "\t.popsection\n"                                               \
+        "\t.xdata8 \".paravirt_bundles\", 998b, 999b, "                 \
+        __stringify(privop) "\n"
+
+
+struct paravirt_patch_bundle_elem {
+        const void      *sbundle;
+        const void      *ebundle;
+        unsigned long   type;
+};
+
+
+struct paravirt_patch_site_inst {
+        unsigned long   stag;
+        unsigned long   etag;
+        unsigned long   type;
+};
+
+#define paravirt_alt_inst(instr, privop)                                \
+        "\t[998:]\n"                                                    \
+        "\t" instr "\n"                                                 \
+        "\t[999:]\n"                                                    \
+        "\t.pushsection .paravirt_insts, \"a\"\n"                       \
+        "\t.popsection\n"                                               \
+        "\t.xdata8 \".paravirt_insts\", 998b, 999b, "                   \
+        __stringify(privop) "\n"
+
+struct paravirt_patch_site_branch {
+        unsigned long   tag;
+        unsigned long   type;
+};
+
+struct paravirt_patch_branch_target {
+        const void      *entry;
+        unsigned long   type;
+};
+
+void
+__paravirt_patch_apply_branch(
+        unsigned long tag, unsigned long type,
+        const struct paravirt_patch_branch_target *entries,
+        unsigned int nr_entries);
+
+void
+paravirt_patch_reloc_br(unsigned long tag, const void *target);
+
+void
+paravirt_patch_reloc_brl(unsigned long tag, const void *target);
+
+
+#if defined(ASM_SUPPORTED) && defined(CONFIG_PARAVIRT)
+unsigned long
+ia64_native_patch_bundle(void *sbundle, void *ebundle, unsigned long type);
+
+unsigned long
+__paravirt_patch_apply_bundle(void *sbundle, void *ebundle, unsigned long type,
+                              const struct paravirt_patch_bundle_elem *elems,
+                              unsigned long nelems,
+                              const struct paravirt_patch_bundle_elem **found);
+
+void
+paravirt_patch_apply_bundle(const struct paravirt_patch_site_bundle *start,
+                            const struct paravirt_patch_site_bundle *end);
+
+void
+paravirt_patch_apply_inst(const struct paravirt_patch_site_inst *start,
+                          const struct paravirt_patch_site_inst *end);
+
+void paravirt_patch_apply(void);
+#else
+#define paravirt_patch_apply_bundle(start, end) do { } while (0)
+#define paravirt_patch_apply_inst(start, end)   do { } while (0)
+#define paravirt_patch_apply()                  do { } while (0)
+#endif
+
+#endif /* !__ASSEMBLEY__ */
+
+#endif /* __ASM_PARAVIRT_PATCH_H */
+
+/*
+ * Local variables:
+ * mode: C
+ * c-set-style: "linux"
+ * c-basic-offset: 8
+ * tab-width: 8
+ * indent-tabs-mode: t
+ * End:
+ */
diff --git a/arch/ia64/include/asm/paravirt_privop.h b/arch/ia64/include/asm/paravirt_privop.h
index 33c8e55f5775..3d2951130b5f 100644
--- a/arch/ia64/include/asm/paravirt_privop.h
+++ b/arch/ia64/include/asm/paravirt_privop.h
@@ -33,7 +33,7 @@
  */
 
 struct pv_cpu_ops {
-        void (*fc)(unsigned long addr);
+        void (*fc)(void *addr);
         unsigned long (*thash)(unsigned long addr);
         unsigned long (*get_cpuid)(int index);
         unsigned long (*get_pmd)(int index);
@@ -60,12 +60,18 @@ extern unsigned long ia64_native_getreg_func(int regnum);
 /* Instructions paravirtualized for performance */
 /************************************************/
 
+#ifndef ASM_SUPPORTED
+#define paravirt_ssm_i()        pv_cpu_ops.ssm_i()
+#define paravirt_rsm_i()        pv_cpu_ops.rsm_i()
+#define __paravirt_getreg()     pv_cpu_ops.getreg()
+#endif
+
 /* mask for ia64_native_ssm/rsm() must be constant.("i" constraing).
  * static inline function doesn't satisfy it. */
 #define paravirt_ssm(mask)                      \
         do {                                    \
                 if ((mask) == IA64_PSR_I)       \
-                        pv_cpu_ops.ssm_i();     \
+                        paravirt_ssm_i();       \
                 else                            \
                         ia64_native_ssm(mask);  \
         } while (0)
@@ -73,7 +79,7 @@ extern unsigned long ia64_native_getreg_func(int regnum);
 #define paravirt_rsm(mask)                      \
         do {                                    \
                 if ((mask) == IA64_PSR_I)       \
-                        pv_cpu_ops.rsm_i();     \
+                        paravirt_rsm_i();       \
                 else                            \
                         ia64_native_rsm(mask);  \
         } while (0)
@@ -86,7 +92,7 @@ extern unsigned long ia64_native_getreg_func(int regnum);
                 if ((reg) == _IA64_REG_IP)                      \
                         res = ia64_native_getreg(_IA64_REG_IP); \
                 else                                            \
-                        res = pv_cpu_ops.getreg(reg);           \
+                        res = __paravirt_getreg(reg);           \
                 res;                                            \
         })
 
@@ -112,6 +118,12 @@ void paravirt_cpu_asm_init(const struct pv_cpu_asm_switch *cpu_asm_switch);
 
 #endif /* CONFIG_PARAVIRT */
 
+#if defined(CONFIG_PARAVIRT) && defined(ASM_SUPPORTED)
+#define paravirt_dv_serialize_data()    ia64_dv_serialize_data()
+#else
+#define paravirt_dv_serialize_data()    /* nothing */
+#endif
+
 /* these routines utilize privilege-sensitive or performance-sensitive
  * privileged instructions so the code must be replaced with
  * paravirtualized versions */
@@ -121,4 +133,349 @@ void paravirt_cpu_asm_init(const struct pv_cpu_asm_switch *cpu_asm_switch);
         IA64_PARAVIRT_ASM_FUNC(work_processed_syscall)
 #define ia64_leave_kernel               IA64_PARAVIRT_ASM_FUNC(leave_kernel)
 
+
+#if defined(CONFIG_PARAVIRT)
+/******************************************************************************
+ * binary patching infrastructure
+ */
+#define PARAVIRT_PATCH_TYPE_FC                          1
+#define PARAVIRT_PATCH_TYPE_THASH                       2
+#define PARAVIRT_PATCH_TYPE_GET_CPUID                   3
+#define PARAVIRT_PATCH_TYPE_GET_PMD                     4
+#define PARAVIRT_PATCH_TYPE_PTCGA                       5
+#define PARAVIRT_PATCH_TYPE_GET_RR                      6
+#define PARAVIRT_PATCH_TYPE_SET_RR                      7
+#define PARAVIRT_PATCH_TYPE_SET_RR0_TO_RR4              8
+#define PARAVIRT_PATCH_TYPE_SSM_I                       9
+#define PARAVIRT_PATCH_TYPE_RSM_I                       10
+#define PARAVIRT_PATCH_TYPE_GET_PSR_I                   11
+#define PARAVIRT_PATCH_TYPE_INTRIN_LOCAL_IRQ_RESTORE    12
+
+/* PARAVIRT_PATY_TYPE_[GS]ETREG + _IA64_REG_xxx */
+#define PARAVIRT_PATCH_TYPE_GETREG                      0x10000000
+#define PARAVIRT_PATCH_TYPE_SETREG                      0x20000000
+
+/*
+ * struct task_struct* (*ia64_switch_to)(void* next_task);
+ * void *ia64_leave_syscall;
+ * void *ia64_work_processed_syscall
+ * void *ia64_leave_kernel;
+ */
+
+#define PARAVIRT_PATCH_TYPE_BR_START                    0x30000000
+#define PARAVIRT_PATCH_TYPE_BR_SWITCH_TO                \
+        (PARAVIRT_PATCH_TYPE_BR_START + 0)
+#define PARAVIRT_PATCH_TYPE_BR_LEAVE_SYSCALL            \
+        (PARAVIRT_PATCH_TYPE_BR_START + 1)
+#define PARAVIRT_PATCH_TYPE_BR_WORK_PROCESSED_SYSCALL   \
+        (PARAVIRT_PATCH_TYPE_BR_START + 2)
+#define PARAVIRT_PATCH_TYPE_BR_LEAVE_KERNEL             \
+        (PARAVIRT_PATCH_TYPE_BR_START + 3)
+
+#ifdef ASM_SUPPORTED
+#include <asm/paravirt_patch.h>
+
+/*
+ * pv_cpu_ops calling stub.
+ * normal function call convension can't be written by gcc
+ * inline assembly.
+ *
+ * from the caller's point of view,
+ * the following registers will be clobbered.
+ * r2, r3
+ * r8-r15
+ * r16, r17
+ * b6, b7
+ * p6-p15
+ * ar.ccv
+ *
+ * from the callee's point of view ,
+ * the following registers can be used.
+ * r2, r3: scratch
+ * r8: scratch, input argument0 and return value
+ * r0-r15: scratch, input argument1-5
+ * b6: return pointer
+ * b7: scratch
+ * p6-p15: scratch
+ * ar.ccv: scratch
+ *
+ * other registers must not be changed. especially
+ * b0: rp: preserved. gcc ignores b0 in clobbered register.
+ * r16: saved gp
+ */
+/* 5 bundles */
+#define __PARAVIRT_BR                                                   \
+        ";;\n"                                                          \
+        "{ .mlx\n"                                                      \
+        "nop 0\n"                                                       \
+        "movl r2 = %[op_addr]\n"/* get function pointer address */      \
+        ";;\n"                                                          \
+        "}\n"                                                           \
+        "1:\n"                                                          \
+        "{ .mii\n"                                                      \
+        "ld8 r2 = [r2]\n"       /* load function descriptor address */  \
+        "mov r17 = ip\n"        /* get ip to calc return address */     \
+        "mov r16 = gp\n"        /* save gp */                           \
+        ";;\n"                                                          \
+        "}\n"                                                           \
+        "{ .mii\n"                                                      \
+        "ld8 r3 = [r2], 8\n"    /* load entry address */                \
+        "adds r17 =  1f - 1b, r17\n"    /* calculate return address */  \
+        ";;\n"                                                          \
+        "mov b7 = r3\n"         /* set entry address */                 \
+        "}\n"                                                           \
+        "{ .mib\n"                                                      \
+        "ld8 gp = [r2]\n"       /* load gp value */                     \
+        "mov b6 = r17\n"        /* set return address */                \
+        "br.cond.sptk.few b7\n" /* intrinsics are very short isns */    \
+        "}\n"                                                           \
+        "1:\n"                                                          \
+        "{ .mii\n"                                                      \
+        "mov gp = r16\n"        /* restore gp value */                  \
+        "nop 0\n"                                                       \
+        "nop 0\n"                                                       \
+        ";;\n"                                                          \
+        "}\n"
+
+#define PARAVIRT_OP(op)                         \
+        [op_addr] "i"(&pv_cpu_ops.op)
+
+#define PARAVIRT_TYPE(type)                     \
+        PARAVIRT_PATCH_TYPE_ ## type
+
+#define PARAVIRT_REG_CLOBBERS0                                  \
+        "r2", "r3", /*"r8",*/ "r9", "r10", "r11", "r14",        \
+                "r15", "r16", "r17"
+
+#define PARAVIRT_REG_CLOBBERS1                                  \
+        "r2","r3", /*"r8",*/ "r9", "r10", "r11", "r14",         \
+                "r15", "r16", "r17"
+
+#define PARAVIRT_REG_CLOBBERS2                                  \
+        "r2", "r3", /*"r8", "r9",*/ "r10", "r11", "r14",        \
+                "r15", "r16", "r17"
+
+#define PARAVIRT_REG_CLOBBERS5                                  \
+        "r2", "r3", /*"r8", "r9", "r10", "r11", "r14",*/        \
+                "r15", "r16", "r17"
+
+#define PARAVIRT_BR_CLOBBERS                    \
+        "b6", "b7"
+
+#define PARAVIRT_PR_CLOBBERS                                            \
+        "p6", "p7", "p8", "p9", "p10", "p11", "p12", "p13", "p14", "p15"
+
+#define PARAVIRT_AR_CLOBBERS                    \
+        "ar.ccv"
+
+#define PARAVIRT_CLOBBERS0                      \
+                PARAVIRT_REG_CLOBBERS0,         \
+                PARAVIRT_BR_CLOBBERS,           \
+                PARAVIRT_PR_CLOBBERS,           \
+                PARAVIRT_AR_CLOBBERS,           \
+                "memory"
+
+#define PARAVIRT_CLOBBERS1                      \
+                PARAVIRT_REG_CLOBBERS1,         \
+                PARAVIRT_BR_CLOBBERS,           \
+                PARAVIRT_PR_CLOBBERS,           \
+                PARAVIRT_AR_CLOBBERS,           \
+                "memory"
+
+#define PARAVIRT_CLOBBERS2                      \
+                PARAVIRT_REG_CLOBBERS2,         \
+                PARAVIRT_BR_CLOBBERS,           \
+                PARAVIRT_PR_CLOBBERS,           \
+                PARAVIRT_AR_CLOBBERS,           \
+                "memory"
+
+#define PARAVIRT_CLOBBERS5                      \
+                PARAVIRT_REG_CLOBBERS5,         \
+                PARAVIRT_BR_CLOBBERS,           \
+                PARAVIRT_PR_CLOBBERS,           \
+                PARAVIRT_AR_CLOBBERS,           \
+                "memory"
+
+#define PARAVIRT_BR0(op, type)                                  \
+        register unsigned long ia64_clobber asm ("r8");         \
+        asm volatile (paravirt_alt_bundle(__PARAVIRT_BR,        \
+                                          PARAVIRT_TYPE(type))  \
+                      : "=r"(ia64_clobber)                      \
+                      : PARAVIRT_OP(op)                         \
+                      : PARAVIRT_CLOBBERS0)
+
+#define PARAVIRT_BR0_RET(op, type)                              \
+        register unsigned long ia64_intri_res asm ("r8");       \
+        asm volatile (paravirt_alt_bundle(__PARAVIRT_BR,        \
+                                          PARAVIRT_TYPE(type))  \
+                      : "=r"(ia64_intri_res)                    \
+                      : PARAVIRT_OP(op)                         \
+                      : PARAVIRT_CLOBBERS0)
+
+#define PARAVIRT_BR1(op, type, arg1)                            \
+        register unsigned long __##arg1 asm ("r8") = arg1;      \
+        register unsigned long ia64_clobber asm ("r8");         \
+        asm volatile (paravirt_alt_bundle(__PARAVIRT_BR,        \
+                                          PARAVIRT_TYPE(type))  \
+                      : "=r"(ia64_clobber)                      \
+                      : PARAVIRT_OP(op), "0"(__##arg1)          \
+                      : PARAVIRT_CLOBBERS1)
+
+#define PARAVIRT_BR1_RET(op, type, arg1)                        \
+        register unsigned long ia64_intri_res asm ("r8");       \
+        register unsigned long __##arg1 asm ("r8") = arg1;      \
+        asm volatile (paravirt_alt_bundle(__PARAVIRT_BR,        \
+                                          PARAVIRT_TYPE(type))  \
+                      : "=r"(ia64_intri_res)                    \
+                      : PARAVIRT_OP(op), "0"(__##arg1)          \
+                      : PARAVIRT_CLOBBERS1)
+
+#define PARAVIRT_BR1_VOID(op, type, arg1)                       \
+        register void *__##arg1 asm ("r8") = arg1;              \
+        register unsigned long ia64_clobber asm ("r8");         \
+        asm volatile (paravirt_alt_bundle(__PARAVIRT_BR,        \
+                                          PARAVIRT_TYPE(type))  \
+                      : "=r"(ia64_clobber)                      \
+                      : PARAVIRT_OP(op), "0"(__##arg1)          \
+                      : PARAVIRT_CLOBBERS1)
+
+#define PARAVIRT_BR2(op, type, arg1, arg2)                              \
+        register unsigned long __##arg1 asm ("r8") = arg1;              \
+        register unsigned long __##arg2 asm ("r9") = arg2;              \
+        register unsigned long ia64_clobber1 asm ("r8");                \
+        register unsigned long ia64_clobber2 asm ("r9");                \
+        asm volatile (paravirt_alt_bundle(__PARAVIRT_BR,                \
+                                          PARAVIRT_TYPE(type))          \
+                      : "=r"(ia64_clobber1), "=r"(ia64_clobber2)        \
+                      : PARAVIRT_OP(op), "0"(__##arg1), "1"(__##arg2)   \
+                      : PARAVIRT_CLOBBERS2)
+
+
+#define PARAVIRT_DEFINE_CPU_OP0(op, type)               \
+        static inline void                              \
+        paravirt_ ## op (void)                          \
+        {                                               \
+                PARAVIRT_BR0(op, type);                 \
+        }
+
+#define PARAVIRT_DEFINE_CPU_OP0_RET(op, type)           \
+        static inline unsigned long                     \
+        paravirt_ ## op (void)                          \
+        {                                               \
+                PARAVIRT_BR0_RET(op, type);             \
+                return ia64_intri_res;                  \
+        }
+
+#define PARAVIRT_DEFINE_CPU_OP1_VOID(op, type)          \
+        static inline void                              \
+        paravirt_ ## op (void *arg1)                    \
+        {                                               \
+                PARAVIRT_BR1_VOID(op, type, arg1);      \
+        }
+
+#define PARAVIRT_DEFINE_CPU_OP1(op, type)               \
+        static inline void                              \
+        paravirt_ ## op (unsigned long arg1)            \
+        {                                               \
+                PARAVIRT_BR1(op, type, arg1);           \
+        }
+
+#define PARAVIRT_DEFINE_CPU_OP1_RET(op, type)           \
+        static inline unsigned long                     \
+        paravirt_ ## op (unsigned long arg1)            \
+        {                                               \
+                PARAVIRT_BR1_RET(op, type, arg1);       \
+                return ia64_intri_res;                  \
+        }
+
+#define PARAVIRT_DEFINE_CPU_OP2(op, type)               \
+        static inline void                              \
+        paravirt_ ## op (unsigned long arg1,            \
+                         unsigned long arg2)            \
+        {                                               \
+                PARAVIRT_BR2(op, type, arg1, arg2);     \
+        }
+
+
+PARAVIRT_DEFINE_CPU_OP1_VOID(fc, FC);
+PARAVIRT_DEFINE_CPU_OP1_RET(thash, THASH)
+PARAVIRT_DEFINE_CPU_OP1_RET(get_cpuid, GET_CPUID)
+PARAVIRT_DEFINE_CPU_OP1_RET(get_pmd, GET_PMD)
+PARAVIRT_DEFINE_CPU_OP2(ptcga, PTCGA)
+PARAVIRT_DEFINE_CPU_OP1_RET(get_rr, GET_RR)
+PARAVIRT_DEFINE_CPU_OP2(set_rr, SET_RR)
+PARAVIRT_DEFINE_CPU_OP0(ssm_i, SSM_I)
+PARAVIRT_DEFINE_CPU_OP0(rsm_i, RSM_I)
+PARAVIRT_DEFINE_CPU_OP0_RET(get_psr_i, GET_PSR_I)
+PARAVIRT_DEFINE_CPU_OP1(intrin_local_irq_restore, INTRIN_LOCAL_IRQ_RESTORE)
+
+static inline void
+paravirt_set_rr0_to_rr4(unsigned long val0, unsigned long val1,
+                        unsigned long val2, unsigned long val3,
+                        unsigned long val4)
+{
+        register unsigned long __val0 asm ("r8") = val0;
+        register unsigned long __val1 asm ("r9") = val1;
+        register unsigned long __val2 asm ("r10") = val2;
+        register unsigned long __val3 asm ("r11") = val3;
+        register unsigned long __val4 asm ("r14") = val4;
+
+        register unsigned long ia64_clobber0 asm ("r8");
+        register unsigned long ia64_clobber1 asm ("r9");
+        register unsigned long ia64_clobber2 asm ("r10");
+        register unsigned long ia64_clobber3 asm ("r11");
+        register unsigned long ia64_clobber4 asm ("r14");
+
+        asm volatile (paravirt_alt_bundle(__PARAVIRT_BR,
+                                          PARAVIRT_TYPE(SET_RR0_TO_RR4))
+                      : "=r"(ia64_clobber0),
+                        "=r"(ia64_clobber1),
+                        "=r"(ia64_clobber2),
+                        "=r"(ia64_clobber3),
+                        "=r"(ia64_clobber4)
+                      : PARAVIRT_OP(set_rr0_to_rr4),
+                        "0"(__val0), "1"(__val1), "2"(__val2),
+                        "3"(__val3), "4"(__val4)
+                      : PARAVIRT_CLOBBERS5);
+}
+
+/* unsigned long paravirt_getreg(int reg) */
+#define __paravirt_getreg(reg)                                          \
+        ({                                                              \
+                register unsigned long ia64_intri_res asm ("r8");       \
+                register unsigned long __reg asm ("r8") = (reg);        \
+                                                                        \
+                BUILD_BUG_ON(!__builtin_constant_p(reg));               \
+                asm volatile (paravirt_alt_bundle(__PARAVIRT_BR,        \
+                                                  PARAVIRT_TYPE(GETREG) \
+                                                  + (reg))              \
+                              : "=r"(ia64_intri_res)                    \
+                              : PARAVIRT_OP(getreg), "0"(__reg)         \
+                              : PARAVIRT_CLOBBERS1);                    \
+                                                                        \
+                ia64_intri_res;                                         \
+        })
+
+/* void paravirt_setreg(int reg, unsigned long val) */
+#define paravirt_setreg(reg, val)                                       \
+        do {                                                            \
+                register unsigned long __val asm ("r8") = val;          \
+                register unsigned long __reg asm ("r9") = reg;          \
+                register unsigned long ia64_clobber1 asm ("r8");        \
+                register unsigned long ia64_clobber2 asm ("r9");        \
+                                                                        \
+                BUILD_BUG_ON(!__builtin_constant_p(reg));               \
+                asm volatile (paravirt_alt_bundle(__PARAVIRT_BR,        \
+                                                  PARAVIRT_TYPE(SETREG) \
+                                                  + (reg))              \
+                              : "=r"(ia64_clobber1),                    \
+                                "=r"(ia64_clobber2)                     \
+                              : PARAVIRT_OP(setreg),                    \
+                                "1"(__reg), "0"(__val)                  \
+                              : PARAVIRT_CLOBBERS2);                    \
+        } while (0)
+
+#endif /* ASM_SUPPORTED */
+#endif /* CONFIG_PARAVIRT && ASM_SUPPOTED */
+
 #endif /* _ASM_IA64_PARAVIRT_PRIVOP_H */
diff --git a/arch/ia64/include/asm/smp.h b/arch/ia64/include/asm/smp.h
index 21c402365d0e..598408336251 100644
--- a/arch/ia64/include/asm/smp.h
+++ b/arch/ia64/include/asm/smp.h
@@ -126,7 +126,8 @@ extern void identify_siblings (struct cpuinfo_ia64 *);
 extern int is_multithreading_enabled(void);
 
 extern void arch_send_call_function_single_ipi(int cpu);
-extern void arch_send_call_function_ipi(cpumask_t mask);
+extern void arch_send_call_function_ipi_mask(const struct cpumask *mask);
+#define arch_send_call_function_ipi_mask arch_send_call_function_ipi_mask
 
 #else /* CONFIG_SMP */
 
diff --git a/arch/ia64/include/asm/spinlock.h b/arch/ia64/include/asm/spinlock.h
index 0229fb95fb38..13ab71576bc7 100644
--- a/arch/ia64/include/asm/spinlock.h
+++ b/arch/ia64/include/asm/spinlock.h
@@ -120,6 +120,38 @@ do {											\
 #define __raw_read_can_lock(rw)         (*(volatile int *)(rw) >= 0)
 #define __raw_write_can_lock(rw)        (*(volatile int *)(rw) == 0)
 
+#ifdef ASM_SUPPORTED
+
+static __always_inline void
+__raw_read_lock_flags(raw_rwlock_t *lock, unsigned long flags)
+{
+        __asm__ __volatile__ (
+                "tbit.nz p6, p0 = %1,%2\n"
+                "br.few 3f\n"
+                "1:\n"
+                "fetchadd4.rel r2 = [%0], -1;;\n"
+                "(p6) ssm psr.i\n"
+                "2:\n"
+                "hint @pause\n"
+                "ld4 r2 = [%0];;\n"
+                "cmp4.lt p7,p0 = r2, r0\n"
+                "(p7) br.cond.spnt.few 2b\n"
+                "(p6) rsm psr.i\n"
+                ";;\n"
+                "3:\n"
+                "fetchadd4.acq r2 = [%0], 1;;\n"
+                "cmp4.lt p7,p0 = r2, r0\n"
+                "(p7) br.cond.spnt.few 1b\n"
+                : : "r"(lock), "r"(flags), "i"(IA64_PSR_I_BIT)
+                : "p6", "p7", "r2", "memory");
+}
+
+#define __raw_read_lock(lock) __raw_read_lock_flags(lock, 0)
+
+#else /* !ASM_SUPPORTED */
+
+#define __raw_read_lock_flags(rw, flags) __raw_read_lock(rw)
+
 #define __raw_read_lock(rw)                                                             \
 do {                                                                                    \
         raw_rwlock_t *__read_lock_ptr = (rw);                                           \
@@ -131,6 +163,8 @@ do {											\
         }                                                                               \
 } while (0)
 
+#endif /* !ASM_SUPPORTED */
+
 #define __raw_read_unlock(rw)                                   \
 do {                                                            \
         raw_rwlock_t *__read_lock_ptr = (rw);                   \
@@ -138,20 +172,33 @@ do {								\
 } while (0)
 
 #ifdef ASM_SUPPORTED
-#define __raw_write_lock(rw)                                                    \
-do {                                                                            \
-        __asm__ __volatile__ (                                                  \
-                "mov ar.ccv = r0\n"                                             \
-                "dep r29 = -1, r0, 31, 1;;\n"                                   \
-                "1:\n"                                                          \
-                "ld4 r2 = [%0];;\n"                                             \
-                "cmp4.eq p0,p7 = r0,r2\n"                                       \
-                "(p7) br.cond.spnt.few 1b \n"                                   \
-                "cmpxchg4.acq r2 = [%0], r29, ar.ccv;;\n"                       \
-                "cmp4.eq p0,p7 = r0, r2\n"                                      \
-                "(p7) br.cond.spnt.few 1b;;\n"                                  \
-                :: "r"(rw) : "ar.ccv", "p7", "r2", "r29", "memory");            \
-} while(0)
+
+static __always_inline void
+__raw_write_lock_flags(raw_rwlock_t *lock, unsigned long flags)
+{
+        __asm__ __volatile__ (
+                "tbit.nz p6, p0 = %1, %2\n"
+                "mov ar.ccv = r0\n"
+                "dep r29 = -1, r0, 31, 1\n"
+                "br.few 3f;;\n"
+                "1:\n"
+                "(p6) ssm psr.i\n"
+                "2:\n"
+                "hint @pause\n"
+                "ld4 r2 = [%0];;\n"
+                "cmp4.eq p0,p7 = r0, r2\n"
+                "(p7) br.cond.spnt.few 2b\n"
+                "(p6) rsm psr.i\n"
+                ";;\n"
+                "3:\n"
+                "cmpxchg4.acq r2 = [%0], r29, ar.ccv;;\n"
+                "cmp4.eq p0,p7 = r0, r2\n"
+                "(p7) br.cond.spnt.few 1b;;\n"
+                : : "r"(lock), "r"(flags), "i"(IA64_PSR_I_BIT)
+                : "ar.ccv", "p6", "p7", "r2", "r29", "memory");
+}
+
+#define __raw_write_lock(rw) __raw_write_lock_flags(rw, 0)
 
 #define __raw_write_trylock(rw)                                                 \
 ({                                                                              \
@@ -174,6 +221,8 @@ static inline void __raw_write_unlock(raw_rwlock_t *x)
 
 #else /* !ASM_SUPPORTED */
 
+#define __raw_write_lock_flags(l, flags) __raw_write_lock(l)
+
 #define __raw_write_lock(l)                                                             \
 ({                                                                                      \
         __u64 ia64_val, ia64_set_val = ia64_dep_mi(-1, 0, 31, 1);                       \
diff --git a/arch/ia64/include/asm/timex.h b/arch/ia64/include/asm/timex.h
index 4e03cfe74a0c..86c7db861180 100644
--- a/arch/ia64/include/asm/timex.h
+++ b/arch/ia64/include/asm/timex.h
@@ -40,5 +40,6 @@ get_cycles (void)
 }
 
 extern void ia64_cpu_local_tick (void);
+extern unsigned long long ia64_native_sched_clock (void);
 
 #endif /* _ASM_IA64_TIMEX_H */
diff --git a/arch/ia64/include/asm/topology.h b/arch/ia64/include/asm/topology.h
index f260dcf21515..7b4c8c70b2d1 100644
--- a/arch/ia64/include/asm/topology.h
+++ b/arch/ia64/include/asm/topology.h
@@ -112,11 +112,6 @@ void build_cpu_to_node_map(void);
 
 extern void arch_fix_phys_package_id(int num, u32 slot);
 
-#define pcibus_to_cpumask(bus)  (pcibus_to_node(bus) == -1 ? \
-                                        CPU_MASK_ALL : \
-                                        node_to_cpumask(pcibus_to_node(bus)) \
-                                )
-
 #define cpumask_of_pcibus(bus)  (pcibus_to_node(bus) == -1 ?            \
                                  cpu_all_mask :                         \
                                  cpumask_of_node(pcibus_to_node(bus)))
diff --git a/arch/ia64/include/asm/uv/uv_hub.h b/arch/ia64/include/asm/uv/uv_hub.h
index f607018af4a1..53e9dfacd073 100644
--- a/arch/ia64/include/asm/uv/uv_hub.h
+++ b/arch/ia64/include/asm/uv/uv_hub.h
@@ -305,5 +305,11 @@ static inline int uv_num_possible_blades(void)
         return 1;
 }
 
+static inline void uv_hub_send_ipi(int pnode, int apicid, int vector)
+{
+        /* not currently needed on ia64 */
+}
+
+
 #endif /* __ASM_IA64_UV_HUB__ */
 
diff --git a/arch/ia64/include/asm/uv/uv_mmrs.h b/arch/ia64/include/asm/uv/uv_mmrs.h
index c149ef085437..fe0b8f05e1a8 100644
--- a/arch/ia64/include/asm/uv/uv_mmrs.h
+++ b/arch/ia64/include/asm/uv/uv_mmrs.h
@@ -8,8 +8,8 @@
  * Copyright (C) 2007-2008 Silicon Graphics, Inc. All rights reserved.
  */
 
-#ifndef __ASM_IA64_UV_MMRS__
-#define __ASM_IA64_UV_MMRS__
+#ifndef _ASM_IA64_UV_UV_MMRS_H
+#define _ASM_IA64_UV_UV_MMRS_H
 
 #define UV_MMR_ENABLE           (1UL << 63)
 
@@ -243,6 +243,158 @@ union uvh_event_occurred0_u {
 #define UVH_EVENT_OCCURRED0_ALIAS_32 0x005f0
 
 /* ========================================================================= */
+/*                         UVH_GR0_TLB_INT0_CONFIG                           */
+/* ========================================================================= */
+#define UVH_GR0_TLB_INT0_CONFIG 0x61b00UL
+
+#define UVH_GR0_TLB_INT0_CONFIG_VECTOR_SHFT 0
+#define UVH_GR0_TLB_INT0_CONFIG_VECTOR_MASK 0x00000000000000ffUL
+#define UVH_GR0_TLB_INT0_CONFIG_DM_SHFT 8
+#define UVH_GR0_TLB_INT0_CONFIG_DM_MASK 0x0000000000000700UL
+#define UVH_GR0_TLB_INT0_CONFIG_DESTMODE_SHFT 11
+#define UVH_GR0_TLB_INT0_CONFIG_DESTMODE_MASK 0x0000000000000800UL
+#define UVH_GR0_TLB_INT0_CONFIG_STATUS_SHFT 12
+#define UVH_GR0_TLB_INT0_CONFIG_STATUS_MASK 0x0000000000001000UL
+#define UVH_GR0_TLB_INT0_CONFIG_P_SHFT 13
+#define UVH_GR0_TLB_INT0_CONFIG_P_MASK 0x0000000000002000UL
+#define UVH_GR0_TLB_INT0_CONFIG_T_SHFT 15
+#define UVH_GR0_TLB_INT0_CONFIG_T_MASK 0x0000000000008000UL
+#define UVH_GR0_TLB_INT0_CONFIG_M_SHFT 16
+#define UVH_GR0_TLB_INT0_CONFIG_M_MASK 0x0000000000010000UL
+#define UVH_GR0_TLB_INT0_CONFIG_APIC_ID_SHFT 32
+#define UVH_GR0_TLB_INT0_CONFIG_APIC_ID_MASK 0xffffffff00000000UL
+
+union uvh_gr0_tlb_int0_config_u {
+    unsigned long       v;
+    struct uvh_gr0_tlb_int0_config_s {
+        unsigned long   vector_  :  8;  /* RW */
+        unsigned long   dm       :  3;  /* RW */
+        unsigned long   destmode :  1;  /* RW */
+        unsigned long   status   :  1;  /* RO */
+        unsigned long   p        :  1;  /* RO */
+        unsigned long   rsvd_14  :  1;  /*    */
+        unsigned long   t        :  1;  /* RO */
+        unsigned long   m        :  1;  /* RW */
+        unsigned long   rsvd_17_31: 15;  /*    */
+        unsigned long   apic_id  : 32;  /* RW */
+    } s;
+};
+
+/* ========================================================================= */
+/*                         UVH_GR0_TLB_INT1_CONFIG                           */
+/* ========================================================================= */
+#define UVH_GR0_TLB_INT1_CONFIG 0x61b40UL
+
+#define UVH_GR0_TLB_INT1_CONFIG_VECTOR_SHFT 0
+#define UVH_GR0_TLB_INT1_CONFIG_VECTOR_MASK 0x00000000000000ffUL
+#define UVH_GR0_TLB_INT1_CONFIG_DM_SHFT 8
+#define UVH_GR0_TLB_INT1_CONFIG_DM_MASK 0x0000000000000700UL
+#define UVH_GR0_TLB_INT1_CONFIG_DESTMODE_SHFT 11
+#define UVH_GR0_TLB_INT1_CONFIG_DESTMODE_MASK 0x0000000000000800UL
+#define UVH_GR0_TLB_INT1_CONFIG_STATUS_SHFT 12
+#define UVH_GR0_TLB_INT1_CONFIG_STATUS_MASK 0x0000000000001000UL
+#define UVH_GR0_TLB_INT1_CONFIG_P_SHFT 13
+#define UVH_GR0_TLB_INT1_CONFIG_P_MASK 0x0000000000002000UL
+#define UVH_GR0_TLB_INT1_CONFIG_T_SHFT 15
+#define UVH_GR0_TLB_INT1_CONFIG_T_MASK 0x0000000000008000UL
+#define UVH_GR0_TLB_INT1_CONFIG_M_SHFT 16
+#define UVH_GR0_TLB_INT1_CONFIG_M_MASK 0x0000000000010000UL
+#define UVH_GR0_TLB_INT1_CONFIG_APIC_ID_SHFT 32
+#define UVH_GR0_TLB_INT1_CONFIG_APIC_ID_MASK 0xffffffff00000000UL
+
+union uvh_gr0_tlb_int1_config_u {
+    unsigned long       v;
+    struct uvh_gr0_tlb_int1_config_s {
+        unsigned long   vector_  :  8;  /* RW */
+        unsigned long   dm       :  3;  /* RW */
+        unsigned long   destmode :  1;  /* RW */
+        unsigned long   status   :  1;  /* RO */
+        unsigned long   p        :  1;  /* RO */
+        unsigned long   rsvd_14  :  1;  /*    */
+        unsigned long   t        :  1;  /* RO */
+        unsigned long   m        :  1;  /* RW */
+        unsigned long   rsvd_17_31: 15;  /*    */
+        unsigned long   apic_id  : 32;  /* RW */
+    } s;
+};
+
+/* ========================================================================= */
+/*                         UVH_GR1_TLB_INT0_CONFIG                           */
+/* ========================================================================= */
+#define UVH_GR1_TLB_INT0_CONFIG 0x61f00UL
+
+#define UVH_GR1_TLB_INT0_CONFIG_VECTOR_SHFT 0
+#define UVH_GR1_TLB_INT0_CONFIG_VECTOR_MASK 0x00000000000000ffUL
+#define UVH_GR1_TLB_INT0_CONFIG_DM_SHFT 8
+#define UVH_GR1_TLB_INT0_CONFIG_DM_MASK 0x0000000000000700UL
+#define UVH_GR1_TLB_INT0_CONFIG_DESTMODE_SHFT 11
+#define UVH_GR1_TLB_INT0_CONFIG_DESTMODE_MASK 0x0000000000000800UL
+#define UVH_GR1_TLB_INT0_CONFIG_STATUS_SHFT 12
+#define UVH_GR1_TLB_INT0_CONFIG_STATUS_MASK 0x0000000000001000UL
+#define UVH_GR1_TLB_INT0_CONFIG_P_SHFT 13
+#define UVH_GR1_TLB_INT0_CONFIG_P_MASK 0x0000000000002000UL
+#define UVH_GR1_TLB_INT0_CONFIG_T_SHFT 15
+#define UVH_GR1_TLB_INT0_CONFIG_T_MASK 0x0000000000008000UL
+#define UVH_GR1_TLB_INT0_CONFIG_M_SHFT 16
+#define UVH_GR1_TLB_INT0_CONFIG_M_MASK 0x0000000000010000UL
+#define UVH_GR1_TLB_INT0_CONFIG_APIC_ID_SHFT 32
+#define UVH_GR1_TLB_INT0_CONFIG_APIC_ID_MASK 0xffffffff00000000UL
+
+union uvh_gr1_tlb_int0_config_u {
+    unsigned long       v;
+    struct uvh_gr1_tlb_int0_config_s {
+        unsigned long   vector_  :  8;  /* RW */
+        unsigned long   dm       :  3;  /* RW */
+        unsigned long   destmode :  1;  /* RW */
+        unsigned long   status   :  1;  /* RO */
+        unsigned long   p        :  1;  /* RO */
+        unsigned long   rsvd_14  :  1;  /*    */
+        unsigned long   t        :  1;  /* RO */
+        unsigned long   m        :  1;  /* RW */
+        unsigned long   rsvd_17_31: 15;  /*    */
+        unsigned long   apic_id  : 32;  /* RW */
+    } s;
+};
+
+/* ========================================================================= */
+/*                         UVH_GR1_TLB_INT1_CONFIG                           */
+/* ========================================================================= */
+#define UVH_GR1_TLB_INT1_CONFIG 0x61f40UL
+
+#define UVH_GR1_TLB_INT1_CONFIG_VECTOR_SHFT 0
+#define UVH_GR1_TLB_INT1_CONFIG_VECTOR_MASK 0x00000000000000ffUL
+#define UVH_GR1_TLB_INT1_CONFIG_DM_SHFT 8
+#define UVH_GR1_TLB_INT1_CONFIG_DM_MASK 0x0000000000000700UL
+#define UVH_GR1_TLB_INT1_CONFIG_DESTMODE_SHFT 11
+#define UVH_GR1_TLB_INT1_CONFIG_DESTMODE_MASK 0x0000000000000800UL
+#define UVH_GR1_TLB_INT1_CONFIG_STATUS_SHFT 12
+#define UVH_GR1_TLB_INT1_CONFIG_STATUS_MASK 0x0000000000001000UL
+#define UVH_GR1_TLB_INT1_CONFIG_P_SHFT 13
+#define UVH_GR1_TLB_INT1_CONFIG_P_MASK 0x0000000000002000UL
+#define UVH_GR1_TLB_INT1_CONFIG_T_SHFT 15
+#define UVH_GR1_TLB_INT1_CONFIG_T_MASK 0x0000000000008000UL
+#define UVH_GR1_TLB_INT1_CONFIG_M_SHFT 16
+#define UVH_GR1_TLB_INT1_CONFIG_M_MASK 0x0000000000010000UL
+#define UVH_GR1_TLB_INT1_CONFIG_APIC_ID_SHFT 32
+#define UVH_GR1_TLB_INT1_CONFIG_APIC_ID_MASK 0xffffffff00000000UL
+
+union uvh_gr1_tlb_int1_config_u {
+    unsigned long       v;
+    struct uvh_gr1_tlb_int1_config_s {
+        unsigned long   vector_  :  8;  /* RW */
+        unsigned long   dm       :  3;  /* RW */
+        unsigned long   destmode :  1;  /* RW */
+        unsigned long   status   :  1;  /* RO */
+        unsigned long   p        :  1;  /* RO */
+        unsigned long   rsvd_14  :  1;  /*    */
+        unsigned long   t        :  1;  /* RO */
+        unsigned long   m        :  1;  /* RW */
+        unsigned long   rsvd_17_31: 15;  /*    */
+        unsigned long   apic_id  : 32;  /* RW */
+    } s;
+};
+
+/* ========================================================================= */
 /*                               UVH_INT_CMPB                                */
 /* ========================================================================= */
 #define UVH_INT_CMPB 0x22080UL
@@ -670,4 +822,4 @@ union uvh_si_alias2_overlay_config_u {
 };
 
 
-#endif /* __ASM_IA64_UV_MMRS__ */
+#endif /* _ASM_IA64_UV_UV_MMRS_H */
diff --git a/arch/ia64/include/asm/xen/hypervisor.h b/arch/ia64/include/asm/xen/hypervisor.h
index 7a804e80fc67..e425227a418e 100644
--- a/arch/ia64/include/asm/xen/hypervisor.h
+++ b/arch/ia64/include/asm/xen/hypervisor.h
@@ -33,9 +33,6 @@
 #ifndef _ASM_IA64_XEN_HYPERVISOR_H
 #define _ASM_IA64_XEN_HYPERVISOR_H
 
-#ifdef CONFIG_XEN
-
-#include <linux/init.h>
 #include <xen/interface/xen.h>
 #include <xen/interface/version.h>      /* to compile feature.c */
 #include <xen/features.h>               /* to comiple xen-netfront.c */
@@ -43,22 +40,32 @@
 
 /* xen_domain_type is set before executing any C code by early_xen_setup */
 enum xen_domain_type {
-        XEN_NATIVE,
-        XEN_PV_DOMAIN,
-        XEN_HVM_DOMAIN,
+        XEN_NATIVE,     /* running on bare hardware */
+        XEN_PV_DOMAIN,  /* running in a PV domain */
+        XEN_HVM_DOMAIN, /* running in a Xen hvm domain*/
 };
 
+#ifdef CONFIG_XEN
 extern enum xen_domain_type xen_domain_type;
+#else
+#define xen_domain_type         XEN_NATIVE
+#endif
 
 #define xen_domain()            (xen_domain_type != XEN_NATIVE)
-#define xen_pv_domain()         (xen_domain_type == XEN_PV_DOMAIN)
-#define xen_initial_domain()    (xen_pv_domain() && \
+#define xen_pv_domain()         (xen_domain() &&                        \
+                                 xen_domain_type == XEN_PV_DOMAIN)
+#define xen_hvm_domain()        (xen_domain() &&                        \
+                                 xen_domain_type == XEN_HVM_DOMAIN)
+
+#ifdef CONFIG_XEN_DOM0
+#define xen_initial_domain()    (xen_pv_domain() &&                     \
                                  (xen_start_info->flags & SIF_INITDOMAIN))
-#define xen_hvm_domain()        (xen_domain_type == XEN_HVM_DOMAIN)
+#else
+#define xen_initial_domain()    (0)
+#endif
 
-/* deprecated. remove this */
-#define is_running_on_xen()     (xen_domain_type == XEN_PV_DOMAIN)
 
+#ifdef CONFIG_XEN
 extern struct shared_info *HYPERVISOR_shared_info;
 extern struct start_info *xen_start_info;
 
@@ -74,16 +81,6 @@ void force_evtchn_callback(void);
 
 /* For setup_arch() in arch/ia64/kernel/setup.c */
 void xen_ia64_enable_opt_feature(void);
-
-#else /* CONFIG_XEN */
-
-#define xen_domain()            (0)
-#define xen_pv_domain()         (0)
-#define xen_initial_domain()    (0)
-#define xen_hvm_domain()        (0)
-#define is_running_on_xen()     (0)     /* deprecated. remove this */
 #endif
 
-#define is_initial_xendomain()  (0)     /* deprecated. remove this */
-
 #endif /* _ASM_IA64_XEN_HYPERVISOR_H */
diff --git a/arch/ia64/include/asm/xen/inst.h b/arch/ia64/include/asm/xen/inst.h
index 19c2ae1d878a..c53a47611208 100644
--- a/arch/ia64/include/asm/xen/inst.h
+++ b/arch/ia64/include/asm/xen/inst.h
@@ -33,6 +33,9 @@
 #define __paravirt_work_processed_syscall_target \
                                                 xen_work_processed_syscall
 
+#define paravirt_fsyscall_table                 xen_fsyscall_table
+#define paravirt_fsys_bubble_down               xen_fsys_bubble_down
+
 #define MOV_FROM_IFA(reg)       \
         movl reg = XSI_IFA;     \
         ;;                      \
@@ -110,6 +113,27 @@
 .endm
 #define MOV_FROM_PSR(pred, reg, clob)   __MOV_FROM_PSR pred, reg, clob
 
+/* assuming ar.itc is read with interrupt disabled. */
+#define MOV_FROM_ITC(pred, pred_clob, reg, clob)                \
+(pred)  movl clob = XSI_ITC_OFFSET;                             \
+        ;;                                                      \
+(pred)  ld8 clob = [clob];                                      \
+(pred)  mov reg = ar.itc;                                       \
+        ;;                                                      \
+(pred)  add reg = reg, clob;                                    \
+        ;;                                                      \
+(pred)  movl clob = XSI_ITC_LAST;                               \
+        ;;                                                      \
+(pred)  ld8 clob = [clob];                                      \
+        ;;                                                      \
+(pred)  cmp.geu.unc pred_clob, p0 = clob, reg;                  \
+        ;;                                                      \
+(pred_clob)     add reg = 1, clob;                              \
+        ;;                                                      \
+(pred)  movl clob = XSI_ITC_LAST;                               \
+        ;;                                                      \
+(pred)  st8 [clob] = reg
+
 
 #define MOV_TO_IFA(reg, clob)   \
         movl clob = XSI_IFA;    \
@@ -362,6 +386,10 @@
 #define RSM_PSR_DT              \
         XEN_HYPER_RSM_PSR_DT
 
+#define RSM_PSR_BE_I(clob0, clob1)      \
+        RSM_PSR_I(p0, clob0, clob1);    \
+        rum psr.be
+
 #define SSM_PSR_DT_AND_SRLZ_I   \
         XEN_HYPER_SSM_PSR_DT
 
diff --git a/arch/ia64/include/asm/xen/interface.h b/arch/ia64/include/asm/xen/interface.h
index f00fab40854d..e951e740bdf2 100644
--- a/arch/ia64/include/asm/xen/interface.h
+++ b/arch/ia64/include/asm/xen/interface.h
@@ -209,6 +209,15 @@ struct mapped_regs {
                         unsigned long krs[8];   /* kernel registers */
                         unsigned long tmp[16];  /* temp registers
                                                    (e.g. for hyperprivops) */
+
+                        /* itc paravirtualization
+                         * vAR.ITC = mAR.ITC + itc_offset
+                         * itc_last is one which was lastly passed to
+                         * the guest OS in order to prevent it from
+                         * going backwords.
+                         */
+                        unsigned long itc_offset;
+                        unsigned long itc_last;
                 };
         };
 };
diff --git a/arch/ia64/include/asm/xen/minstate.h b/arch/ia64/include/asm/xen/minstate.h
index 4d92d9bbda7b..c57fa910f2c9 100644
--- a/arch/ia64/include/asm/xen/minstate.h
+++ b/arch/ia64/include/asm/xen/minstate.h
@@ -1,3 +1,12 @@
+
+#ifdef CONFIG_VIRT_CPU_ACCOUNTING
+/* read ar.itc in advance, and use it before leaving bank 0 */
+#define XEN_ACCOUNT_GET_STAMP           \
+        MOV_FROM_ITC(pUStk, p6, r20, r2);
+#else
+#define XEN_ACCOUNT_GET_STAMP
+#endif
+
 /*
  * DO_SAVE_MIN switches to the kernel stacks (if necessary) and saves
  * the minimum state necessary that allows us to turn psr.ic back
@@ -123,7 +132,7 @@
         ;;                                                                                      \
 .mem.offset 0,0; st8.spill [r16]=r2,16;                                                         \
 .mem.offset 8,0; st8.spill [r17]=r3,16;                                                         \
-        ACCOUNT_GET_STAMP                                                                       \
+        XEN_ACCOUNT_GET_STAMP                                                                   \
         adds r2=IA64_PT_REGS_R16_OFFSET,r1;                                                     \
         ;;                                                                                      \
         EXTRA;                                                                                  \
diff --git a/arch/ia64/include/asm/xen/patchlist.h b/arch/ia64/include/asm/xen/patchlist.h
new file mode 100644
index 000000000000..eae944e88846
--- /dev/null
+++ b/arch/ia64/include/asm/xen/patchlist.h
@@ -0,0 +1,38 @@
+/******************************************************************************
+ * arch/ia64/include/asm/xen/patchlist.h
+ *
+ * Copyright (c) 2008 Isaku Yamahata <yamahata at valinux co jp>
+ *                    VA Linux Systems Japan K.K.
+ *
+ * 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.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ */
+
+#define __paravirt_start_gate_fsyscall_patchlist                \
+        __xen_start_gate_fsyscall_patchlist
+#define __paravirt_end_gate_fsyscall_patchlist                  \
+        __xen_end_gate_fsyscall_patchlist
+#define __paravirt_start_gate_brl_fsys_bubble_down_patchlist    \
+        __xen_start_gate_brl_fsys_bubble_down_patchlist
+#define __paravirt_end_gate_brl_fsys_bubble_down_patchlist      \
+        __xen_end_gate_brl_fsys_bubble_down_patchlist
+#define __paravirt_start_gate_vtop_patchlist                    \
+        __xen_start_gate_vtop_patchlist
+#define __paravirt_end_gate_vtop_patchlist                      \
+        __xen_end_gate_vtop_patchlist
+#define __paravirt_start_gate_mckinley_e9_patchlist             \
+        __xen_start_gate_mckinley_e9_patchlist
+#define __paravirt_end_gate_mckinley_e9_patchlist               \
+        __xen_end_gate_mckinley_e9_patchlist
diff --git a/arch/ia64/include/asm/xen/privop.h b/arch/ia64/include/asm/xen/privop.h
index 71ec7546e100..fb4ec5e0b066 100644
--- a/arch/ia64/include/asm/xen/privop.h
+++ b/arch/ia64/include/asm/xen/privop.h
@@ -55,6 +55,8 @@
 #define XSI_BANK1_R16                   (XSI_BASE + XSI_BANK1_R16_OFS)
 #define XSI_BANKNUM                     (XSI_BASE + XSI_BANKNUM_OFS)
 #define XSI_IHA                         (XSI_BASE + XSI_IHA_OFS)
+#define XSI_ITC_OFFSET                  (XSI_BASE + XSI_ITC_OFFSET_OFS)
+#define XSI_ITC_LAST                    (XSI_BASE + XSI_ITC_LAST_OFS)
 #endif
 
 #ifndef __ASSEMBLY__
@@ -67,7 +69,7 @@
  *  may have different semantics depending on whether they are executed
  *  at PL0 vs PL!=0.  When paravirtualized, these instructions mustn't
  *  be allowed to execute directly, lest incorrect semantics result. */
-extern void xen_fc(unsigned long addr);
+extern void xen_fc(void *addr);
 extern unsigned long xen_thash(unsigned long addr);
 
 /* Note that "ttag" and "cover" are also privilege-sensitive; "ttag"
@@ -80,8 +82,10 @@ extern unsigned long xen_thash(unsigned long addr);
 extern unsigned long xen_get_cpuid(int index);
 extern unsigned long xen_get_pmd(int index);
 
+#ifndef ASM_SUPPORTED
 extern unsigned long xen_get_eflag(void);       /* see xen_ia64_getreg */
 extern void xen_set_eflag(unsigned long);       /* see xen_ia64_setreg */
+#endif
 
 /************************************************/
 /* Instructions paravirtualized for performance */
@@ -106,6 +110,7 @@ extern void xen_set_eflag(unsigned long);	/* see xen_ia64_setreg */
 #define xen_get_virtual_pend()          \
         (*(((uint8_t *)XEN_MAPPEDREGS->interrupt_mask_addr) - 1))
 
+#ifndef ASM_SUPPORTED
 /* Although all privileged operations can be left to trap and will
  * be properly handled by Xen, some are frequent enough that we use
  * hyperprivops for performance. */
@@ -123,6 +128,7 @@ extern void xen_set_rr0_to_rr4(unsigned long val0, unsigned long val1,
                                unsigned long val4);
 extern void xen_set_kr(unsigned long index, unsigned long val);
 extern void xen_ptcga(unsigned long addr, unsigned long size);
+#endif /* !ASM_SUPPORTED */
 
 #endif /* !__ASSEMBLY__ */
 
diff --git a/arch/ia64/kernel/Makefile b/arch/ia64/kernel/Makefile
index dc62df021673..6b7edcab0cb5 100644
--- a/arch/ia64/kernel/Makefile
+++ b/arch/ia64/kernel/Makefile
@@ -9,7 +9,7 @@ endif
 extra-y := head.o init_task.o vmlinux.lds
 
 obj-y := acpi.o entry.o efi.o efi_stub.o gate-data.o fsys.o ia64_ksyms.o irq.o irq_ia64.o       \
-         irq_lsapic.o ivt.o machvec.o pal.o patch.o process.o perfmon.o ptrace.o sal.o          \
+         irq_lsapic.o ivt.o machvec.o pal.o paravirt_patchlist.o patch.o process.o perfmon.o ptrace.o sal.o             \
          salinfo.o setup.o signal.o sys_ia64.o time.o traps.o unaligned.o \
          unwind.o mca.o mca_asm.o topology.o dma-mapping.o
 
@@ -41,7 +41,8 @@ obj-$(CONFIG_PCI_MSI)		+= msi_ia64.o
 mca_recovery-y                  += mca_drv.o mca_drv_asm.o
 obj-$(CONFIG_IA64_MC_ERR_INJECT)+= err_inject.o
 
-obj-$(CONFIG_PARAVIRT)          += paravirt.o paravirtentry.o
+obj-$(CONFIG_PARAVIRT)          += paravirt.o paravirtentry.o \
+                                   paravirt_patch.o
 
 obj-$(CONFIG_IA64_ESI)          += esi.o
 ifneq ($(CONFIG_IA64_ESI),)
@@ -50,35 +51,13 @@ endif
 obj-$(CONFIG_DMAR)              += pci-dma.o
 obj-$(CONFIG_SWIOTLB)           += pci-swiotlb.o
 
-# The gate DSO image is built using a special linker script.
-targets += gate.so gate-syms.o
-
-extra-y += gate.so gate-syms.o gate.lds gate.o
-
 # fp_emulate() expects f2-f5,f16-f31 to contain the user-level state.
 CFLAGS_traps.o  += -mfixed-range=f2-f5,f16-f31
 
-CPPFLAGS_gate.lds := -P -C -U$(ARCH)
-
-quiet_cmd_gate = GATE $@
-      cmd_gate = $(CC) -nostdlib $(GATECFLAGS_$(@F)) -Wl,-T,$(filter-out FORCE,$^) -o $@
-
-GATECFLAGS_gate.so = -shared -s -Wl,-soname=linux-gate.so.1 \
-                     $(call ld-option, -Wl$(comma)--hash-style=sysv)
-$(obj)/gate.so: $(obj)/gate.lds $(obj)/gate.o FORCE
-        $(call if_changed,gate)
-
-$(obj)/built-in.o: $(obj)/gate-syms.o
-$(obj)/built-in.o: ld_flags += -R $(obj)/gate-syms.o
-
-GATECFLAGS_gate-syms.o = -r
-$(obj)/gate-syms.o: $(obj)/gate.lds $(obj)/gate.o FORCE
-        $(call if_changed,gate)
-
-# gate-data.o contains the gate DSO image as data in section .data.gate.
-# We must build gate.so before we can assemble it.
-# Note: kbuild does not track this dependency due to usage of .incbin
-$(obj)/gate-data.o: $(obj)/gate.so
+# The gate DSO image is built using a special linker script.
+include $(srctree)/arch/ia64/kernel/Makefile.gate
+# tell compiled for native
+CPPFLAGS_gate.lds += -D__IA64_GATE_PARAVIRTUALIZED_NATIVE
 
 # Calculate NR_IRQ = max(IA64_NATIVE_NR_IRQS, XEN_NR_IRQS, ...) based on config
 define sed-y
@@ -114,9 +93,9 @@ include/asm-ia64/nr-irqs.h: arch/$(SRCARCH)/kernel/nr-irqs.s
 clean-files += $(objtree)/include/asm-ia64/nr-irqs.h
 
 #
-# native ivt.S and entry.S
+# native ivt.S, entry.S and fsys.S
 #
-ASM_PARAVIRT_OBJS = ivt.o entry.o
+ASM_PARAVIRT_OBJS = ivt.o entry.o fsys.o
 define paravirtualized_native
 AFLAGS_$(1) += -D__IA64_ASM_PARAVIRTUALIZED_NATIVE
 AFLAGS_pvchk-sed-$(1) += -D__IA64_ASM_PARAVIRTUALIZED_PVCHECK
diff --git a/arch/ia64/kernel/Makefile.gate b/arch/ia64/kernel/Makefile.gate
new file mode 100644
index 000000000000..1d87f84069b3
--- /dev/null
+++ b/arch/ia64/kernel/Makefile.gate
@@ -0,0 +1,27 @@
+# The gate DSO image is built using a special linker script.
+
+targets += gate.so gate-syms.o
+
+extra-y += gate.so gate-syms.o gate.lds gate.o
+
+CPPFLAGS_gate.lds := -P -C -U$(ARCH)
+
+quiet_cmd_gate = GATE $@
+      cmd_gate = $(CC) -nostdlib $(GATECFLAGS_$(@F)) -Wl,-T,$(filter-out FORCE,$^) -o $@
+
+GATECFLAGS_gate.so = -shared -s -Wl,-soname=linux-gate.so.1 \
+                     $(call ld-option, -Wl$(comma)--hash-style=sysv)
+$(obj)/gate.so: $(obj)/gate.lds $(obj)/gate.o FORCE
+        $(call if_changed,gate)
+
+$(obj)/built-in.o: $(obj)/gate-syms.o
+$(obj)/built-in.o: ld_flags += -R $(obj)/gate-syms.o
+
+GATECFLAGS_gate-syms.o = -r
+$(obj)/gate-syms.o: $(obj)/gate.lds $(obj)/gate.o FORCE
+        $(call if_changed,gate)
+
+# gate-data.o contains the gate DSO image as data in section .data.gate.
+# We must build gate.so before we can assemble it.
+# Note: kbuild does not track this dependency due to usage of .incbin
+$(obj)/gate-data.o: $(obj)/gate.so
diff --git a/arch/ia64/kernel/acpi.c b/arch/ia64/kernel/acpi.c
index bdef2ce38c8b..5510317db37b 100644
--- a/arch/ia64/kernel/acpi.c
+++ b/arch/ia64/kernel/acpi.c
@@ -890,7 +890,7 @@ __init void prefill_possible_map(void)
                 possible, max((possible - available_cpus), 0));
 
         for (i = 0; i < possible; i++)
-                cpu_set(i, cpu_possible_map);
+                set_cpu_possible(i, true);
 }
 
 int acpi_map_lsapic(acpi_handle handle, int *pcpu)
@@ -928,9 +928,9 @@ int acpi_map_lsapic(acpi_handle handle, int *pcpu)
         buffer.length = ACPI_ALLOCATE_BUFFER;
         buffer.pointer = NULL;
 
-        cpus_complement(tmp_map, cpu_present_map);
-        cpu = first_cpu(tmp_map);
-        if (cpu >= NR_CPUS)
+        cpumask_complement(&tmp_map, cpu_present_mask);
+        cpu = cpumask_first(&tmp_map);
+        if (cpu >= nr_cpu_ids)
                 return -EINVAL;
 
         acpi_map_cpu2node(handle, cpu, physid);
diff --git a/arch/ia64/kernel/asm-offsets.c b/arch/ia64/kernel/asm-offsets.c
index 742dbb1d5a4f..af5650169043 100644
--- a/arch/ia64/kernel/asm-offsets.c
+++ b/arch/ia64/kernel/asm-offsets.c
@@ -316,5 +316,7 @@ void foo(void)
         DEFINE_MAPPED_REG_OFS(XSI_BANK1_R16_OFS, bank1_regs[0]);
         DEFINE_MAPPED_REG_OFS(XSI_B0NATS_OFS, vbnat);
         DEFINE_MAPPED_REG_OFS(XSI_B1NATS_OFS, vnat);
+        DEFINE_MAPPED_REG_OFS(XSI_ITC_OFFSET_OFS, itc_offset);
+        DEFINE_MAPPED_REG_OFS(XSI_ITC_LAST_OFS, itc_last);
 #endif /* CONFIG_XEN */
 }
diff --git a/arch/ia64/kernel/efi.c b/arch/ia64/kernel/efi.c
index efaff15d8cf1..7ef80e8161ce 100644
--- a/arch/ia64/kernel/efi.c
+++ b/arch/ia64/kernel/efi.c
@@ -456,6 +456,7 @@ efi_map_pal_code (void)
                  GRANULEROUNDDOWN((unsigned long) pal_vaddr),
                  pte_val(pfn_pte(__pa(pal_vaddr) >> PAGE_SHIFT, PAGE_KERNEL)),
                  IA64_GRANULE_SHIFT);
+        paravirt_dv_serialize_data();
         ia64_set_psr(psr);              /* restore psr */
 }
 
diff --git a/arch/ia64/kernel/entry.S b/arch/ia64/kernel/entry.S
index 7e3382b06d56..8dc69669586a 100644
--- a/arch/ia64/kernel/entry.S
+++ b/arch/ia64/kernel/entry.S
@@ -736,7 +736,7 @@ GLOBAL_ENTRY(__paravirt_leave_syscall)
 __paravirt_work_processed_syscall:
 #ifdef CONFIG_VIRT_CPU_ACCOUNTING
         adds r2=PT(LOADRS)+16,r12
-(pUStk) mov.m r22=ar.itc                        // fetch time at leave
+        MOV_FROM_ITC(pUStk, p9, r22, r19)       // fetch time at leave
         adds r18=TI_FLAGS+IA64_TASK_SIZE,r13
         ;;
 (p6)    ld4 r31=[r18]                           // load current_thread_info()->flags
@@ -985,7 +985,7 @@ GLOBAL_ENTRY(__paravirt_leave_kernel)
 #ifdef CONFIG_VIRT_CPU_ACCOUNTING
         .pred.rel.mutex pUStk,pKStk
         MOV_FROM_PSR(pKStk, r22, r29)   // M2 read PSR now that interrupts are disabled
-(pUStk) mov.m r22=ar.itc        // M  fetch time at leave
+        MOV_FROM_ITC(pUStk, p9, r22, r29)       // M  fetch time at leave
         nop.i 0
         ;;
 #else
diff --git a/arch/ia64/kernel/fsys.S b/arch/ia64/kernel/fsys.S
index c1625c7e1779..3567d54f8cee 100644
--- a/arch/ia64/kernel/fsys.S
+++ b/arch/ia64/kernel/fsys.S
@@ -25,6 +25,7 @@
 #include <asm/unistd.h>
 
 #include "entry.h"
+#include "paravirt_inst.h"
 
 /*
  * See Documentation/ia64/fsys.txt for details on fsyscalls.
@@ -279,7 +280,7 @@ ENTRY(fsys_gettimeofday)
 (p9)    cmp.eq p13,p0 = 0,r30   // if mmio_ptr, clear p13 jitter control
         ;;
         .pred.rel.mutex p8,p9
-(p8)    mov r2 = ar.itc         // CPU_TIMER. 36 clocks latency!!!
+        MOV_FROM_ITC(p8, p6, r2, r10)   // CPU_TIMER. 36 clocks latency!!!
 (p9)    ld8 r2 = [r30]          // MMIO_TIMER. Could also have latency issues..
 (p13)   ld8 r25 = [r19]         // get itc_lastcycle value
         ld8 r9 = [r22],IA64_TIMESPEC_TV_NSEC_OFFSET     // tv_sec
@@ -418,7 +419,7 @@ EX(.fail_efault, ld8 r14=[r33])			// r14 <- *set
         mov r17=(1 << (SIGKILL - 1)) | (1 << (SIGSTOP - 1))
         ;;
 
-        rsm psr.i                               // mask interrupt delivery
+        RSM_PSR_I(p0, r18, r19)                 // mask interrupt delivery
         mov ar.ccv=0
         andcm r14=r14,r17                       // filter out SIGKILL & SIGSTOP
 
@@ -491,7 +492,7 @@ EX(.fail_efault, ld8 r14=[r33])			// r14 <- *set
 #ifdef CONFIG_SMP
         st4.rel [r31]=r0                        // release the lock
 #endif
-        ssm psr.i
+        SSM_PSR_I(p0, p9, r31)
         ;;
 
         srlz.d                                  // ensure psr.i is set again
@@ -513,7 +514,7 @@ EX(.fail_efault, (p15) st8 [r34]=r3)
 #ifdef CONFIG_SMP
         st4.rel [r31]=r0                        // release the lock
 #endif
-        ssm psr.i
+        SSM_PSR_I(p0, p9, r17)
         ;;
         srlz.d
         br.sptk.many fsys_fallback_syscall      // with signal pending, do the heavy-weight syscall
@@ -521,7 +522,7 @@ EX(.fail_efault, (p15) st8 [r34]=r3)
 #ifdef CONFIG_SMP
 .lock_contention:
         /* Rather than spinning here, fall back on doing a heavy-weight syscall.  */
-        ssm psr.i
+        SSM_PSR_I(p0, p9, r17)
         ;;
         srlz.d
         br.sptk.many fsys_fallback_syscall
@@ -592,17 +593,17 @@ ENTRY(fsys_fallback_syscall)
         adds r17=-1024,r15
         movl r14=sys_call_table
         ;;
-        rsm psr.i
+        RSM_PSR_I(p0, r26, r27)
         shladd r18=r17,3,r14
         ;;
         ld8 r18=[r18]                           // load normal (heavy-weight) syscall entry-point
-        mov r29=psr                             // read psr (12 cyc load latency)
+        MOV_FROM_PSR(p0, r29, r26)              // read psr (12 cyc load latency)
         mov r27=ar.rsc
         mov r21=ar.fpsr
         mov r26=ar.pfs
 END(fsys_fallback_syscall)
         /* FALL THROUGH */
-GLOBAL_ENTRY(fsys_bubble_down)
+GLOBAL_ENTRY(paravirt_fsys_bubble_down)
         .prologue
         .altrp b6
         .body
@@ -640,7 +641,7 @@ GLOBAL_ENTRY(fsys_bubble_down)
          *
          * PSR.BE : already is turned off in __kernel_syscall_via_epc()
          * PSR.AC : don't care (kernel normally turns PSR.AC on)
-         * PSR.I  : already turned off by the time fsys_bubble_down gets
+         * PSR.I  : already turned off by the time paravirt_fsys_bubble_down gets
          *          invoked
          * PSR.DFL: always 0 (kernel never turns it on)
          * PSR.DFH: don't care --- kernel never touches f32-f127 on its own
@@ -650,7 +651,7 @@ GLOBAL_ENTRY(fsys_bubble_down)
          * PSR.DB : don't care --- kernel never enables kernel-level
          *          breakpoints
          * PSR.TB : must be 0 already; if it wasn't zero on entry to
-         *          __kernel_syscall_via_epc, the branch to fsys_bubble_down
+         *          __kernel_syscall_via_epc, the branch to paravirt_fsys_bubble_down
          *          will trigger a taken branch; the taken-trap-handler then
          *          converts the syscall into a break-based system-call.
          */
@@ -683,7 +684,7 @@ GLOBAL_ENTRY(fsys_bubble_down)
         ;;
         mov ar.rsc=0                            // M2   set enforced lazy mode, pl 0, LE, loadrs=0
 #ifdef CONFIG_VIRT_CPU_ACCOUNTING
-        mov.m r30=ar.itc                        // M    get cycle for accounting
+        MOV_FROM_ITC(p0, p6, r30, r23)          // M    get cycle for accounting
 #else
         nop.m 0
 #endif
@@ -734,21 +735,21 @@ GLOBAL_ENTRY(fsys_bubble_down)
         mov rp=r14                              // I0   set the real return addr
         and r3=_TIF_SYSCALL_TRACEAUDIT,r3       // A
         ;;
-        ssm psr.i                               // M2   we're on kernel stacks now, reenable irqs
+        SSM_PSR_I(p0, p6, r22)                  // M2   we're on kernel stacks now, reenable irqs
         cmp.eq p8,p0=r3,r0                      // A
 (p10)   br.cond.spnt.many ia64_ret_from_syscall // B    return if bad call-frame or r15 is a NaT
 
         nop.m 0
 (p8)    br.call.sptk.many b6=b6                 // B    (ignore return address)
         br.cond.spnt ia64_trace_syscall         // B
-END(fsys_bubble_down)
+END(paravirt_fsys_bubble_down)
 
         .rodata
         .align 8
-        .globl fsyscall_table
+        .globl paravirt_fsyscall_table
 
-        data8 fsys_bubble_down
-fsyscall_table:
+        data8 paravirt_fsys_bubble_down
+paravirt_fsyscall_table:
         data8 fsys_ni_syscall
         data8 0                         // exit                 // 1025
         data8 0                         // read
@@ -1033,4 +1034,4 @@ fsyscall_table:
 
         // fill in zeros for the remaining entries
         .zero:
-        .space fsyscall_table + 8*NR_syscalls - .zero, 0
+        .space paravirt_fsyscall_table + 8*NR_syscalls - .zero, 0
diff --git a/arch/ia64/kernel/gate.S b/arch/ia64/kernel/gate.S
index 74b1ccce4e84..cf5e0a105e16 100644
--- a/arch/ia64/kernel/gate.S
+++ b/arch/ia64/kernel/gate.S
@@ -13,6 +13,7 @@
 #include <asm/sigcontext.h>
 #include <asm/system.h>
 #include <asm/unistd.h>
+#include "paravirt_inst.h"
 
 /*
  * We can't easily refer to symbols inside the kernel.  To avoid full runtime relocation,
@@ -48,87 +49,6 @@ GLOBAL_ENTRY(__kernel_syscall_via_break)
 }
 END(__kernel_syscall_via_break)
 
-/*
- * On entry:
- *      r11 = saved ar.pfs
- *      r15 = system call #
- *      b0  = saved return address
- *      b6  = return address
- * On exit:
- *      r11 = saved ar.pfs
- *      r15 = system call #
- *      b0  = saved return address
- *      all other "scratch" registers:  undefined
- *      all "preserved" registers:      same as on entry
- */
-
-GLOBAL_ENTRY(__kernel_syscall_via_epc)
-        .prologue
-        .altrp b6
-        .body
-{
-        /*
-         * Note: the kernel cannot assume that the first two instructions in this
-         * bundle get executed.  The remaining code must be safe even if
-         * they do not get executed.
-         */
-        adds r17=-1024,r15                      // A
-        mov r10=0                               // A    default to successful syscall execution
-        epc                                     // B    causes split-issue
-}
-        ;;
-        rsm psr.be | psr.i                      // M2 (5 cyc to srlz.d)
-        LOAD_FSYSCALL_TABLE(r14)                // X
-        ;;
-        mov r16=IA64_KR(CURRENT)                // M2 (12 cyc)
-        shladd r18=r17,3,r14                    // A
-        mov r19=NR_syscalls-1                   // A
-        ;;
-        lfetch [r18]                            // M0|1
-        mov r29=psr                             // M2 (12 cyc)
-        // If r17 is a NaT, p6 will be zero
-        cmp.geu p6,p7=r19,r17                   // A    (sysnr > 0 && sysnr < 1024+NR_syscalls)?
-        ;;
-        mov r21=ar.fpsr                         // M2 (12 cyc)
-        tnat.nz p10,p9=r15                      // I0
-        mov.i r26=ar.pfs                        // I0 (would stall anyhow due to srlz.d...)
-        ;;
-        srlz.d                                  // M0 (forces split-issue) ensure PSR.BE==0
-(p6)    ld8 r18=[r18]                           // M0|1
-        nop.i 0
-        ;;
-        nop.m 0
-(p6)    tbit.z.unc p8,p0=r18,0                  // I0 (dual-issues with "mov b7=r18"!)
-        nop.i 0
-        ;;
-(p8)    ssm psr.i
-(p6)    mov b7=r18                              // I0
-(p8)    br.dptk.many b7                         // B
-
-        mov r27=ar.rsc                          // M2 (12 cyc)
-/*
- * brl.cond doesn't work as intended because the linker would convert this branch
- * into a branch to a PLT.  Perhaps there will be a way to avoid this with some
- * future version of the linker.  In the meantime, we just use an indirect branch
- * instead.
- */
-#ifdef CONFIG_ITANIUM
-(p6)    add r14=-8,r14                          // r14 <- addr of fsys_bubble_down entry
-        ;;
-(p6)    ld8 r14=[r14]                           // r14 <- fsys_bubble_down
-        ;;
-(p6)    mov b7=r14
-(p6)    br.sptk.many b7
-#else
-        BRL_COND_FSYS_BUBBLE_DOWN(p6)
-#endif
-        ssm psr.i
-        mov r10=-1
-(p10)   mov r8=EINVAL
-(p9)    mov r8=ENOSYS
-        FSYS_RETURN
-END(__kernel_syscall_via_epc)
-
 #       define ARG0_OFF         (16 + IA64_SIGFRAME_ARG0_OFFSET)
 #       define ARG1_OFF         (16 + IA64_SIGFRAME_ARG1_OFFSET)
 #       define ARG2_OFF         (16 + IA64_SIGFRAME_ARG2_OFFSET)
@@ -374,3 +294,92 @@ restore_rbs:
         // invala not necessary as that will happen when returning to user-mode
         br.cond.sptk back_from_restore_rbs
 END(__kernel_sigtramp)
+
+/*
+ * On entry:
+ *      r11 = saved ar.pfs
+ *      r15 = system call #
+ *      b0  = saved return address
+ *      b6  = return address
+ * On exit:
+ *      r11 = saved ar.pfs
+ *      r15 = system call #
+ *      b0  = saved return address
+ *      all other "scratch" registers:  undefined
+ *      all "preserved" registers:      same as on entry
+ */
+
+GLOBAL_ENTRY(__kernel_syscall_via_epc)
+        .prologue
+        .altrp b6
+        .body
+{
+        /*
+         * Note: the kernel cannot assume that the first two instructions in this
+         * bundle get executed.  The remaining code must be safe even if
+         * they do not get executed.
+         */
+        adds r17=-1024,r15                      // A
+        mov r10=0                               // A    default to successful syscall execution
+        epc                                     // B    causes split-issue
+}
+        ;;
+        RSM_PSR_BE_I(r20, r22)                  // M2 (5 cyc to srlz.d)
+        LOAD_FSYSCALL_TABLE(r14)                // X
+        ;;
+        mov r16=IA64_KR(CURRENT)                // M2 (12 cyc)
+        shladd r18=r17,3,r14                    // A
+        mov r19=NR_syscalls-1                   // A
+        ;;
+        lfetch [r18]                            // M0|1
+        MOV_FROM_PSR(p0, r29, r8)               // M2 (12 cyc)
+        // If r17 is a NaT, p6 will be zero
+        cmp.geu p6,p7=r19,r17                   // A    (sysnr > 0 && sysnr < 1024+NR_syscalls)?
+        ;;
+        mov r21=ar.fpsr                         // M2 (12 cyc)
+        tnat.nz p10,p9=r15                      // I0
+        mov.i r26=ar.pfs                        // I0 (would stall anyhow due to srlz.d...)
+        ;;
+        srlz.d                                  // M0 (forces split-issue) ensure PSR.BE==0
+(p6)    ld8 r18=[r18]                           // M0|1
+        nop.i 0
+        ;;
+        nop.m 0
+(p6)    tbit.z.unc p8,p0=r18,0                  // I0 (dual-issues with "mov b7=r18"!)
+        nop.i 0
+        ;;
+        SSM_PSR_I(p8, p14, r25)
+(p6)    mov b7=r18                              // I0
+(p8)    br.dptk.many b7                         // B
+
+        mov r27=ar.rsc                          // M2 (12 cyc)
+/*
+ * brl.cond doesn't work as intended because the linker would convert this branch
+ * into a branch to a PLT.  Perhaps there will be a way to avoid this with some
+ * future version of the linker.  In the meantime, we just use an indirect branch
+ * instead.
+ */
+#ifdef CONFIG_ITANIUM
+(p6)    add r14=-8,r14                          // r14 <- addr of fsys_bubble_down entry
+        ;;
+(p6)    ld8 r14=[r14]                           // r14 <- fsys_bubble_down
+        ;;
+(p6)    mov b7=r14
+(p6)    br.sptk.many b7
+#else
+        BRL_COND_FSYS_BUBBLE_DOWN(p6)
+#endif
+        SSM_PSR_I(p0, p14, r10)
+        mov r10=-1
+(p10)   mov r8=EINVAL
+(p9)    mov r8=ENOSYS
+        FSYS_RETURN
+
+#ifdef CONFIG_PARAVIRT
+        /*
+         * padd to make the size of this symbol constant
+         * independent of paravirtualization.
+         */
+        .align PAGE_SIZE / 8
+#endif
+END(__kernel_syscall_via_epc)
diff --git a/arch/ia64/kernel/gate.lds.S b/arch/ia64/kernel/gate.lds.S
index 3cb1abc00e24..88c64ed47c36 100644
--- a/arch/ia64/kernel/gate.lds.S
+++ b/arch/ia64/kernel/gate.lds.S
@@ -7,6 +7,7 @@
 
 
 #include <asm/system.h>
+#include "paravirt_patchlist.h"
 
 SECTIONS
 {
@@ -33,21 +34,21 @@ SECTIONS
         . = GATE_ADDR + 0x600;
 
         .data.patch             : {
-                __start_gate_mckinley_e9_patchlist = .;
+                __paravirt_start_gate_mckinley_e9_patchlist = .;
                 *(.data.patch.mckinley_e9)
-                __end_gate_mckinley_e9_patchlist = .;
+                __paravirt_end_gate_mckinley_e9_patchlist = .;
 
-                __start_gate_vtop_patchlist = .;
+                __paravirt_start_gate_vtop_patchlist = .;
                 *(.data.patch.vtop)
-                __end_gate_vtop_patchlist = .;
+                __paravirt_end_gate_vtop_patchlist = .;
 
-                __start_gate_fsyscall_patchlist = .;
+                __paravirt_start_gate_fsyscall_patchlist = .;
                 *(.data.patch.fsyscall_table)
-                __end_gate_fsyscall_patchlist = .;
+                __paravirt_end_gate_fsyscall_patchlist = .;
 
-                __start_gate_brl_fsys_bubble_down_patchlist = .;
+                __paravirt_start_gate_brl_fsys_bubble_down_patchlist = .;
                 *(.data.patch.brl_fsys_bubble_down)
-                __end_gate_brl_fsys_bubble_down_patchlist = .;
+                __paravirt_end_gate_brl_fsys_bubble_down_patchlist = .;
         }                                               :readable
 
         .IA_64.unwind_info      : { *(.IA_64.unwind_info*) }
diff --git a/arch/ia64/kernel/head.S b/arch/ia64/kernel/head.S
index 59301c472800..23f846de62d5 100644
--- a/arch/ia64/kernel/head.S
+++ b/arch/ia64/kernel/head.S
@@ -1050,7 +1050,7 @@ END(ia64_delay_loop)
  * except that the multiplication and the shift are done with 128-bit
  * intermediate precision so that we can produce a full 64-bit result.
  */
-GLOBAL_ENTRY(sched_clock)
+GLOBAL_ENTRY(ia64_native_sched_clock)
         addl r8=THIS_CPU(cpu_info) + IA64_CPUINFO_NSEC_PER_CYC_OFFSET,r0
         mov.m r9=ar.itc         // fetch cycle-counter                          (35 cyc)
         ;;
@@ -1066,7 +1066,13 @@ GLOBAL_ENTRY(sched_clock)
         ;;
         shrp r8=r9,r8,IA64_NSEC_PER_CYC_SHIFT
         br.ret.sptk.many rp
-END(sched_clock)
+END(ia64_native_sched_clock)
+#ifndef CONFIG_PARAVIRT
+        //unsigned long long
+        //sched_clock(void) __attribute__((alias("ia64_native_sched_clock")));
+        .global sched_clock
+sched_clock = ia64_native_sched_clock
+#endif
 
 #ifdef CONFIG_VIRT_CPU_ACCOUNTING
 GLOBAL_ENTRY(cycle_to_cputime)
diff --git a/arch/ia64/kernel/ivt.S b/arch/ia64/kernel/ivt.S
index f675d8e33853..ec9a5fdfa1b9 100644
--- a/arch/ia64/kernel/ivt.S
+++ b/arch/ia64/kernel/ivt.S
@@ -804,7 +804,7 @@ ENTRY(break_fault)
 ///////////////////////////////////////////////////////////////////////
         st1 [r16]=r0                            // M2|3 clear current->thread.on_ustack flag
 #ifdef CONFIG_VIRT_CPU_ACCOUNTING
-        mov.m r30=ar.itc                        // M    get cycle for accounting
+        MOV_FROM_ITC(p0, p14, r30, r18)         // M    get cycle for accounting
 #else
         mov b6=r30                              // I0   setup syscall handler branch reg early
 #endif
diff --git a/arch/ia64/kernel/mca.c b/arch/ia64/kernel/mca.c
index bab1de2d2f6a..8f33a8840422 100644
--- a/arch/ia64/kernel/mca.c
+++ b/arch/ia64/kernel/mca.c
@@ -1456,9 +1456,9 @@ ia64_mca_cmc_int_caller(int cmc_irq, void *arg)
 
         ia64_mca_cmc_int_handler(cmc_irq, arg);
 
-        for (++cpuid ; cpuid < NR_CPUS && !cpu_online(cpuid) ; cpuid++);
+        cpuid = cpumask_next(cpuid+1, cpu_online_mask);
 
-        if (cpuid < NR_CPUS) {
+        if (cpuid < nr_cpu_ids) {
                 platform_send_ipi(cpuid, IA64_CMCP_VECTOR, IA64_IPI_DM_INT, 0);
         } else {
                 /* If no log record, switch out of polling mode */
@@ -1525,7 +1525,7 @@ ia64_mca_cpe_int_caller(int cpe_irq, void *arg)
 
         ia64_mca_cpe_int_handler(cpe_irq, arg);
 
-        for (++cpuid ; cpuid < NR_CPUS && !cpu_online(cpuid) ; cpuid++);
+        cpuid = cpumask_next(cpuid+1, cpu_online_mask);
 
         if (cpuid < NR_CPUS) {
                 platform_send_ipi(cpuid, IA64_CPEP_VECTOR, IA64_IPI_DM_INT, 0);
diff --git a/arch/ia64/kernel/module.c b/arch/ia64/kernel/module.c
index aaa7d901521f..da3b0cf495a3 100644
--- a/arch/ia64/kernel/module.c
+++ b/arch/ia64/kernel/module.c
@@ -446,6 +446,14 @@ module_frob_arch_sections (Elf_Ehdr *ehdr, Elf_Shdr *sechdrs, char *secstrings,
                         mod->arch.opd = s;
                 else if (strcmp(".IA_64.unwind", secstrings + s->sh_name) == 0)
                         mod->arch.unwind = s;
+#ifdef CONFIG_PARAVIRT
+                else if (strcmp(".paravirt_bundles",
+                                secstrings + s->sh_name) == 0)
+                        mod->arch.paravirt_bundles = s;
+                else if (strcmp(".paravirt_insts",
+                                secstrings + s->sh_name) == 0)
+                        mod->arch.paravirt_insts = s;
+#endif
 
         if (!mod->arch.core_plt || !mod->arch.init_plt || !mod->arch.got || !mod->arch.opd) {
                 printk(KERN_ERR "%s: sections missing\n", mod->name);
@@ -525,8 +533,7 @@ get_ltoff (struct module *mod, uint64_t value, int *okp)
                         goto found;
 
         /* Not enough GOT entries? */
-        if (e >= (struct got_entry *) (mod->arch.got->sh_addr + mod->arch.got->sh_size))
-                BUG();
+        BUG_ON(e >= (struct got_entry *) (mod->arch.got->sh_addr + mod->arch.got->sh_size));
 
         e->val = value;
         ++mod->arch.next_got_entry;
@@ -921,6 +928,30 @@ module_finalize (const Elf_Ehdr *hdr, const Elf_Shdr *sechdrs, struct module *mo
         DEBUGP("%s: init: entry=%p\n", __func__, mod->init);
         if (mod->arch.unwind)
                 register_unwind_table(mod);
+#ifdef CONFIG_PARAVIRT
+        if (mod->arch.paravirt_bundles) {
+                struct paravirt_patch_site_bundle *start =
+                        (struct paravirt_patch_site_bundle *)
+                        mod->arch.paravirt_bundles->sh_addr;
+                struct paravirt_patch_site_bundle *end =
+                        (struct paravirt_patch_site_bundle *)
+                        (mod->arch.paravirt_bundles->sh_addr +
+                         mod->arch.paravirt_bundles->sh_size);
+
+                paravirt_patch_apply_bundle(start, end);
+        }
+        if (mod->arch.paravirt_insts) {
+                struct paravirt_patch_site_inst *start =
+                        (struct paravirt_patch_site_inst *)
+                        mod->arch.paravirt_insts->sh_addr;
+                struct paravirt_patch_site_inst *end =
+                        (struct paravirt_patch_site_inst *)
+                        (mod->arch.paravirt_insts->sh_addr +
+                         mod->arch.paravirt_insts->sh_size);
+
+                paravirt_patch_apply_inst(start, end);
+        }
+#endif
         return 0;
 }
 
diff --git a/arch/ia64/kernel/paravirt.c b/arch/ia64/kernel/paravirt.c
index 9f14c16f6369..a21d7bb9c69c 100644
--- a/arch/ia64/kernel/paravirt.c
+++ b/arch/ia64/kernel/paravirt.c
@@ -46,13 +46,23 @@ struct pv_info pv_info = {
  * initialization hooks.
  */
 
-struct pv_init_ops pv_init_ops;
+static void __init
+ia64_native_patch_branch(unsigned long tag, unsigned long type);
+
+struct pv_init_ops pv_init_ops =
+{
+#ifdef ASM_SUPPORTED
+        .patch_bundle = ia64_native_patch_bundle,
+#endif
+        .patch_branch = ia64_native_patch_branch,
+};
 
 /***************************************************************************
  * pv_cpu_ops
  * intrinsics hooks.
  */
 
+#ifndef ASM_SUPPORTED
 /* ia64_native_xxx are macros so that we have to make them real functions */
 
 #define DEFINE_VOID_FUNC1(name)                                 \
@@ -60,7 +70,14 @@ struct pv_init_ops pv_init_ops;
         ia64_native_ ## name ## _func(unsigned long arg)        \
         {                                                       \
                 ia64_native_ ## name(arg);                      \
-        }                                                       \
+        }
+
+#define DEFINE_VOID_FUNC1_VOID(name)                            \
+        static void                                             \
+        ia64_native_ ## name ## _func(void *arg)                \
+        {                                                       \
+                ia64_native_ ## name(arg);                      \
+        }
 
 #define DEFINE_VOID_FUNC2(name)                                 \
         static void                                             \
@@ -68,7 +85,7 @@ struct pv_init_ops pv_init_ops;
                                       unsigned long arg1)       \
         {                                                       \
                 ia64_native_ ## name(arg0, arg1);               \
-        }                                                       \
+        }
 
 #define DEFINE_FUNC0(name)                      \
         static unsigned long                    \
@@ -84,7 +101,7 @@ struct pv_init_ops pv_init_ops;
                 return ia64_native_ ## name(arg);       \
         }                                               \
 
-DEFINE_VOID_FUNC1(fc);
+DEFINE_VOID_FUNC1_VOID(fc);
 DEFINE_VOID_FUNC1(intrin_local_irq_restore);
 
 DEFINE_VOID_FUNC2(ptcga);
@@ -274,6 +291,266 @@ ia64_native_setreg_func(int regnum, unsigned long val)
                 break;
         }
 }
+#else
+
+#define __DEFINE_FUNC(name, code)                                       \
+        extern const char ia64_native_ ## name ## _direct_start[];      \
+        extern const char ia64_native_ ## name ## _direct_end[];        \
+        asm (".align 32\n"                                              \
+             ".proc ia64_native_" #name "_func\n"                       \
+             "ia64_native_" #name "_func:\n"                            \
+             "ia64_native_" #name "_direct_start:\n"                    \
+             code                                                       \
+             "ia64_native_" #name "_direct_end:\n"                      \
+             "br.cond.sptk.many b6\n"                                   \
+             ".endp ia64_native_" #name "_func\n")
+
+#define DEFINE_VOID_FUNC0(name, code)                           \
+        extern void                                             \
+        ia64_native_ ## name ## _func(void);                    \
+        __DEFINE_FUNC(name, code)
+
+#define DEFINE_VOID_FUNC1(name, code)                           \
+        extern void                                             \
+        ia64_native_ ## name ## _func(unsigned long arg);       \
+        __DEFINE_FUNC(name, code)
+
+#define DEFINE_VOID_FUNC1_VOID(name, code)                      \
+        extern void                                             \
+        ia64_native_ ## name ## _func(void *arg);               \
+        __DEFINE_FUNC(name, code)
+
+#define DEFINE_VOID_FUNC2(name, code)                           \
+        extern void                                             \
+        ia64_native_ ## name ## _func(unsigned long arg0,       \
+                                      unsigned long arg1);      \
+        __DEFINE_FUNC(name, code)
+
+#define DEFINE_FUNC0(name, code)                \
+        extern unsigned long                    \
+        ia64_native_ ## name ## _func(void);    \
+        __DEFINE_FUNC(name, code)
+
+#define DEFINE_FUNC1(name, type, code)                  \
+        extern unsigned long                            \
+        ia64_native_ ## name ## _func(type arg);        \
+        __DEFINE_FUNC(name, code)
+
+DEFINE_VOID_FUNC1_VOID(fc,
+                       "fc r8\n");
+DEFINE_VOID_FUNC1(intrin_local_irq_restore,
+                  ";;\n"
+                  "     cmp.ne p6, p7 = r8, r0\n"
+                  ";;\n"
+                  "(p6) ssm psr.i\n"
+                  "(p7) rsm psr.i\n"
+                  ";;\n"
+                  "(p6) srlz.d\n");
+
+DEFINE_VOID_FUNC2(ptcga,
+                  "ptc.ga r8, r9\n");
+DEFINE_VOID_FUNC2(set_rr,
+                  "mov rr[r8] = r9\n");
+
+/* ia64_native_getreg(_IA64_REG_PSR) & IA64_PSR_I */
+DEFINE_FUNC0(get_psr_i,
+             "mov r2 = " __stringify(1 << IA64_PSR_I_BIT) "\n"
+             "mov r8 = psr\n"
+             ";;\n"
+             "and r8 = r2, r8\n");
+
+DEFINE_FUNC1(thash, unsigned long,
+             "thash r8 = r8\n");
+DEFINE_FUNC1(get_cpuid, int,
+             "mov r8 = cpuid[r8]\n");
+DEFINE_FUNC1(get_pmd, int,
+             "mov r8 = pmd[r8]\n");
+DEFINE_FUNC1(get_rr, unsigned long,
+             "mov r8 = rr[r8]\n");
+
+DEFINE_VOID_FUNC0(ssm_i,
+                  "ssm psr.i\n");
+DEFINE_VOID_FUNC0(rsm_i,
+                  "rsm psr.i\n");
+
+extern void
+ia64_native_set_rr0_to_rr4_func(unsigned long val0, unsigned long val1,
+                                unsigned long val2, unsigned long val3,
+                                unsigned long val4);
+__DEFINE_FUNC(set_rr0_to_rr4,
+              "mov rr[r0] = r8\n"
+              "movl r2 = 0x2000000000000000\n"
+              ";;\n"
+              "mov rr[r2] = r9\n"
+              "shl r3 = r2, 1\n"        /* movl r3 = 0x4000000000000000 */
+              ";;\n"
+              "add r2 = r2, r3\n"       /* movl r2 = 0x6000000000000000 */
+              "mov rr[r3] = r10\n"
+              ";;\n"
+              "mov rr[r2] = r11\n"
+              "shl r3 = r3, 1\n"        /* movl r3 = 0x8000000000000000 */
+              ";;\n"
+              "mov rr[r3] = r14\n");
+
+extern unsigned long ia64_native_getreg_func(int regnum);
+asm(".global ia64_native_getreg_func\n");
+#define __DEFINE_GET_REG(id, reg)                       \
+        "mov r2 = " __stringify(_IA64_REG_ ## id) "\n"  \
+        ";;\n"                                          \
+        "cmp.eq p6, p0 = r2, r8\n"                      \
+        ";;\n"                                          \
+        "(p6) mov r8 = " #reg "\n"                      \
+        "(p6) br.cond.sptk.many b6\n"                   \
+        ";;\n"
+#define __DEFINE_GET_AR(id, reg)        __DEFINE_GET_REG(AR_ ## id, ar.reg)
+#define __DEFINE_GET_CR(id, reg)        __DEFINE_GET_REG(CR_ ## id, cr.reg)
+
+__DEFINE_FUNC(getreg,
+              __DEFINE_GET_REG(GP, gp)
+              /*__DEFINE_GET_REG(IP, ip)*/ /* returned ip value shouldn't be constant */
+              __DEFINE_GET_REG(PSR, psr)
+              __DEFINE_GET_REG(TP, tp)
+              __DEFINE_GET_REG(SP, sp)
+
+              __DEFINE_GET_REG(AR_KR0, ar0)
+              __DEFINE_GET_REG(AR_KR1, ar1)
+              __DEFINE_GET_REG(AR_KR2, ar2)
+              __DEFINE_GET_REG(AR_KR3, ar3)
+              __DEFINE_GET_REG(AR_KR4, ar4)
+              __DEFINE_GET_REG(AR_KR5, ar5)
+              __DEFINE_GET_REG(AR_KR6, ar6)
+              __DEFINE_GET_REG(AR_KR7, ar7)
+              __DEFINE_GET_AR(RSC, rsc)
+              __DEFINE_GET_AR(BSP, bsp)
+              __DEFINE_GET_AR(BSPSTORE, bspstore)
+              __DEFINE_GET_AR(RNAT, rnat)
+              __DEFINE_GET_AR(FCR, fcr)
+              __DEFINE_GET_AR(EFLAG, eflag)
+              __DEFINE_GET_AR(CSD, csd)
+              __DEFINE_GET_AR(SSD, ssd)
+              __DEFINE_GET_REG(AR_CFLAG, ar27)
+              __DEFINE_GET_AR(FSR, fsr)
+              __DEFINE_GET_AR(FIR, fir)
+              __DEFINE_GET_AR(FDR, fdr)
+              __DEFINE_GET_AR(CCV, ccv)
+              __DEFINE_GET_AR(UNAT, unat)
+              __DEFINE_GET_AR(FPSR, fpsr)
+              __DEFINE_GET_AR(ITC, itc)
+              __DEFINE_GET_AR(PFS, pfs)
+              __DEFINE_GET_AR(LC, lc)
+              __DEFINE_GET_AR(EC, ec)
+
+              __DEFINE_GET_CR(DCR, dcr)
+              __DEFINE_GET_CR(ITM, itm)
+              __DEFINE_GET_CR(IVA, iva)
+              __DEFINE_GET_CR(PTA, pta)
+              __DEFINE_GET_CR(IPSR, ipsr)
+              __DEFINE_GET_CR(ISR, isr)
+              __DEFINE_GET_CR(IIP, iip)
+              __DEFINE_GET_CR(IFA, ifa)
+              __DEFINE_GET_CR(ITIR, itir)
+              __DEFINE_GET_CR(IIPA, iipa)
+              __DEFINE_GET_CR(IFS, ifs)
+              __DEFINE_GET_CR(IIM, iim)
+              __DEFINE_GET_CR(IHA, iha)
+              __DEFINE_GET_CR(LID, lid)
+              __DEFINE_GET_CR(IVR, ivr)
+              __DEFINE_GET_CR(TPR, tpr)
+              __DEFINE_GET_CR(EOI, eoi)
+              __DEFINE_GET_CR(IRR0, irr0)
+              __DEFINE_GET_CR(IRR1, irr1)
+              __DEFINE_GET_CR(IRR2, irr2)
+              __DEFINE_GET_CR(IRR3, irr3)
+              __DEFINE_GET_CR(ITV, itv)
+              __DEFINE_GET_CR(PMV, pmv)
+              __DEFINE_GET_CR(CMCV, cmcv)
+              __DEFINE_GET_CR(LRR0, lrr0)
+              __DEFINE_GET_CR(LRR1, lrr1)
+
+              "mov r8 = -1\n"   /* unsupported case */
+        );
+
+extern void ia64_native_setreg_func(int regnum, unsigned long val);
+asm(".global ia64_native_setreg_func\n");
+#define __DEFINE_SET_REG(id, reg)                       \
+        "mov r2 = " __stringify(_IA64_REG_ ## id) "\n"  \
+        ";;\n"                                          \
+        "cmp.eq p6, p0 = r2, r9\n"                      \
+        ";;\n"                                          \
+        "(p6) mov " #reg " = r8\n"                      \
+        "(p6) br.cond.sptk.many b6\n"                   \
+        ";;\n"
+#define __DEFINE_SET_AR(id, reg)        __DEFINE_SET_REG(AR_ ## id, ar.reg)
+#define __DEFINE_SET_CR(id, reg)        __DEFINE_SET_REG(CR_ ## id, cr.reg)
+__DEFINE_FUNC(setreg,
+              "mov r2 = " __stringify(_IA64_REG_PSR_L) "\n"
+              ";;\n"
+              "cmp.eq p6, p0 = r2, r9\n"
+              ";;\n"
+              "(p6) mov psr.l = r8\n"
+#ifdef HAVE_SERIALIZE_DIRECTIVE
+              ".serialize.data\n"
+#endif
+              "(p6) br.cond.sptk.many b6\n"
+              __DEFINE_SET_REG(GP, gp)
+              __DEFINE_SET_REG(SP, sp)
+
+              __DEFINE_SET_REG(AR_KR0, ar0)
+              __DEFINE_SET_REG(AR_KR1, ar1)
+              __DEFINE_SET_REG(AR_KR2, ar2)
+              __DEFINE_SET_REG(AR_KR3, ar3)
+              __DEFINE_SET_REG(AR_KR4, ar4)
+              __DEFINE_SET_REG(AR_KR5, ar5)
+              __DEFINE_SET_REG(AR_KR6, ar6)
+              __DEFINE_SET_REG(AR_KR7, ar7)
+              __DEFINE_SET_AR(RSC, rsc)
+              __DEFINE_SET_AR(BSP, bsp)
+              __DEFINE_SET_AR(BSPSTORE, bspstore)
+              __DEFINE_SET_AR(RNAT, rnat)
+              __DEFINE_SET_AR(FCR, fcr)
+              __DEFINE_SET_AR(EFLAG, eflag)
+              __DEFINE_SET_AR(CSD, csd)
+              __DEFINE_SET_AR(SSD, ssd)
+              __DEFINE_SET_REG(AR_CFLAG, ar27)
+              __DEFINE_SET_AR(FSR, fsr)
+              __DEFINE_SET_AR(FIR, fir)
+              __DEFINE_SET_AR(FDR, fdr)
+              __DEFINE_SET_AR(CCV, ccv)
+              __DEFINE_SET_AR(UNAT, unat)
+              __DEFINE_SET_AR(FPSR, fpsr)
+              __DEFINE_SET_AR(ITC, itc)
+              __DEFINE_SET_AR(PFS, pfs)
+              __DEFINE_SET_AR(LC, lc)
+              __DEFINE_SET_AR(EC, ec)
+
+              __DEFINE_SET_CR(DCR, dcr)
+              __DEFINE_SET_CR(ITM, itm)
+              __DEFINE_SET_CR(IVA, iva)
+              __DEFINE_SET_CR(PTA, pta)
+              __DEFINE_SET_CR(IPSR, ipsr)
+              __DEFINE_SET_CR(ISR, isr)
+              __DEFINE_SET_CR(IIP, iip)
+              __DEFINE_SET_CR(IFA, ifa)
+              __DEFINE_SET_CR(ITIR, itir)
+              __DEFINE_SET_CR(IIPA, iipa)
+              __DEFINE_SET_CR(IFS, ifs)
+              __DEFINE_SET_CR(IIM, iim)
+              __DEFINE_SET_CR(IHA, iha)
+              __DEFINE_SET_CR(LID, lid)
+              __DEFINE_SET_CR(IVR, ivr)
+              __DEFINE_SET_CR(TPR, tpr)
+              __DEFINE_SET_CR(EOI, eoi)
+              __DEFINE_SET_CR(IRR0, irr0)
+              __DEFINE_SET_CR(IRR1, irr1)
+              __DEFINE_SET_CR(IRR2, irr2)
+              __DEFINE_SET_CR(IRR3, irr3)
+              __DEFINE_SET_CR(ITV, itv)
+              __DEFINE_SET_CR(PMV, pmv)
+              __DEFINE_SET_CR(CMCV, cmcv)
+              __DEFINE_SET_CR(LRR0, lrr0)
+              __DEFINE_SET_CR(LRR1, lrr1)
+        );
+#endif
 
 struct pv_cpu_ops pv_cpu_ops = {
         .fc             = ia64_native_fc_func,
@@ -366,4 +643,258 @@ ia64_native_do_steal_accounting(unsigned long *new_itm)
 
 struct pv_time_ops pv_time_ops = {
         .do_steal_accounting = ia64_native_do_steal_accounting,
+        .sched_clock = ia64_native_sched_clock,
+};
+
+/***************************************************************************
+ * binary pacthing
+ * pv_init_ops.patch_bundle
+ */
+
+#ifdef ASM_SUPPORTED
+#define IA64_NATIVE_PATCH_DEFINE_GET_REG(name, reg)     \
+        __DEFINE_FUNC(get_ ## name,                     \
+                      ";;\n"                            \
+                      "mov r8 = " #reg "\n"             \
+                      ";;\n")
+
+#define IA64_NATIVE_PATCH_DEFINE_SET_REG(name, reg)     \
+        __DEFINE_FUNC(set_ ## name,                     \
+                      ";;\n"                            \
+                      "mov " #reg " = r8\n"             \
+                      ";;\n")
+
+#define IA64_NATIVE_PATCH_DEFINE_REG(name, reg)         \
+        IA64_NATIVE_PATCH_DEFINE_GET_REG(name, reg);    \
+        IA64_NATIVE_PATCH_DEFINE_SET_REG(name, reg)     \
+
+#define IA64_NATIVE_PATCH_DEFINE_AR(name, reg)                  \
+        IA64_NATIVE_PATCH_DEFINE_REG(ar_ ## name, ar.reg)
+
+#define IA64_NATIVE_PATCH_DEFINE_CR(name, reg)                  \
+        IA64_NATIVE_PATCH_DEFINE_REG(cr_ ## name, cr.reg)
+
+
+IA64_NATIVE_PATCH_DEFINE_GET_REG(psr, psr);
+IA64_NATIVE_PATCH_DEFINE_GET_REG(tp, tp);
+
+/* IA64_NATIVE_PATCH_DEFINE_SET_REG(psr_l, psr.l); */
+__DEFINE_FUNC(set_psr_l,
+              ";;\n"
+              "mov psr.l = r8\n"
+#ifdef HAVE_SERIALIZE_DIRECTIVE
+              ".serialize.data\n"
+#endif
+              ";;\n");
+
+IA64_NATIVE_PATCH_DEFINE_REG(gp, gp);
+IA64_NATIVE_PATCH_DEFINE_REG(sp, sp);
+
+IA64_NATIVE_PATCH_DEFINE_REG(kr0, ar0);
+IA64_NATIVE_PATCH_DEFINE_REG(kr1, ar1);
+IA64_NATIVE_PATCH_DEFINE_REG(kr2, ar2);
+IA64_NATIVE_PATCH_DEFINE_REG(kr3, ar3);
+IA64_NATIVE_PATCH_DEFINE_REG(kr4, ar4);
+IA64_NATIVE_PATCH_DEFINE_REG(kr5, ar5);
+IA64_NATIVE_PATCH_DEFINE_REG(kr6, ar6);
+IA64_NATIVE_PATCH_DEFINE_REG(kr7, ar7);
+
+IA64_NATIVE_PATCH_DEFINE_AR(rsc, rsc);
+IA64_NATIVE_PATCH_DEFINE_AR(bsp, bsp);
+IA64_NATIVE_PATCH_DEFINE_AR(bspstore, bspstore);
+IA64_NATIVE_PATCH_DEFINE_AR(rnat, rnat);
+IA64_NATIVE_PATCH_DEFINE_AR(fcr, fcr);
+IA64_NATIVE_PATCH_DEFINE_AR(eflag, eflag);
+IA64_NATIVE_PATCH_DEFINE_AR(csd, csd);
+IA64_NATIVE_PATCH_DEFINE_AR(ssd, ssd);
+IA64_NATIVE_PATCH_DEFINE_REG(ar27, ar27);
+IA64_NATIVE_PATCH_DEFINE_AR(fsr, fsr);
+IA64_NATIVE_PATCH_DEFINE_AR(fir, fir);
+IA64_NATIVE_PATCH_DEFINE_AR(fdr, fdr);
+IA64_NATIVE_PATCH_DEFINE_AR(ccv, ccv);
+IA64_NATIVE_PATCH_DEFINE_AR(unat, unat);
+IA64_NATIVE_PATCH_DEFINE_AR(fpsr, fpsr);
+IA64_NATIVE_PATCH_DEFINE_AR(itc, itc);
+IA64_NATIVE_PATCH_DEFINE_AR(pfs, pfs);
+IA64_NATIVE_PATCH_DEFINE_AR(lc, lc);
+IA64_NATIVE_PATCH_DEFINE_AR(ec, ec);
+
+IA64_NATIVE_PATCH_DEFINE_CR(dcr, dcr);
+IA64_NATIVE_PATCH_DEFINE_CR(itm, itm);
+IA64_NATIVE_PATCH_DEFINE_CR(iva, iva);
+IA64_NATIVE_PATCH_DEFINE_CR(pta, pta);
+IA64_NATIVE_PATCH_DEFINE_CR(ipsr, ipsr);
+IA64_NATIVE_PATCH_DEFINE_CR(isr, isr);
+IA64_NATIVE_PATCH_DEFINE_CR(iip, iip);
+IA64_NATIVE_PATCH_DEFINE_CR(ifa, ifa);
+IA64_NATIVE_PATCH_DEFINE_CR(itir, itir);
+IA64_NATIVE_PATCH_DEFINE_CR(iipa, iipa);
+IA64_NATIVE_PATCH_DEFINE_CR(ifs, ifs);
+IA64_NATIVE_PATCH_DEFINE_CR(iim, iim);
+IA64_NATIVE_PATCH_DEFINE_CR(iha, iha);
+IA64_NATIVE_PATCH_DEFINE_CR(lid, lid);
+IA64_NATIVE_PATCH_DEFINE_CR(ivr, ivr);
+IA64_NATIVE_PATCH_DEFINE_CR(tpr, tpr);
+IA64_NATIVE_PATCH_DEFINE_CR(eoi, eoi);
+IA64_NATIVE_PATCH_DEFINE_CR(irr0, irr0);
+IA64_NATIVE_PATCH_DEFINE_CR(irr1, irr1);
+IA64_NATIVE_PATCH_DEFINE_CR(irr2, irr2);
+IA64_NATIVE_PATCH_DEFINE_CR(irr3, irr3);
+IA64_NATIVE_PATCH_DEFINE_CR(itv, itv);
+IA64_NATIVE_PATCH_DEFINE_CR(pmv, pmv);
+IA64_NATIVE_PATCH_DEFINE_CR(cmcv, cmcv);
+IA64_NATIVE_PATCH_DEFINE_CR(lrr0, lrr0);
+IA64_NATIVE_PATCH_DEFINE_CR(lrr1, lrr1);
+
+static const struct paravirt_patch_bundle_elem ia64_native_patch_bundle_elems[]
+__initdata_or_module =
+{
+#define IA64_NATIVE_PATCH_BUNDLE_ELEM(name, type)               \
+        {                                                       \
+                (void*)ia64_native_ ## name ## _direct_start,   \
+                (void*)ia64_native_ ## name ## _direct_end,     \
+                PARAVIRT_PATCH_TYPE_ ## type,                   \
+        }
+
+        IA64_NATIVE_PATCH_BUNDLE_ELEM(fc, FC),
+        IA64_NATIVE_PATCH_BUNDLE_ELEM(thash, THASH),
+        IA64_NATIVE_PATCH_BUNDLE_ELEM(get_cpuid, GET_CPUID),
+        IA64_NATIVE_PATCH_BUNDLE_ELEM(get_pmd, GET_PMD),
+        IA64_NATIVE_PATCH_BUNDLE_ELEM(ptcga, PTCGA),
+        IA64_NATIVE_PATCH_BUNDLE_ELEM(get_rr, GET_RR),
+        IA64_NATIVE_PATCH_BUNDLE_ELEM(set_rr, SET_RR),
+        IA64_NATIVE_PATCH_BUNDLE_ELEM(set_rr0_to_rr4, SET_RR0_TO_RR4),
+        IA64_NATIVE_PATCH_BUNDLE_ELEM(ssm_i, SSM_I),
+        IA64_NATIVE_PATCH_BUNDLE_ELEM(rsm_i, RSM_I),
+        IA64_NATIVE_PATCH_BUNDLE_ELEM(get_psr_i, GET_PSR_I),
+        IA64_NATIVE_PATCH_BUNDLE_ELEM(intrin_local_irq_restore,
+                                      INTRIN_LOCAL_IRQ_RESTORE),
+
+#define IA64_NATIVE_PATCH_BUNDLE_ELEM_GETREG(name, reg)                 \
+        {                                                               \
+                (void*)ia64_native_get_ ## name ## _direct_start,       \
+                (void*)ia64_native_get_ ## name ## _direct_end,         \
+                PARAVIRT_PATCH_TYPE_GETREG + _IA64_REG_ ## reg,         \
+        }
+
+#define IA64_NATIVE_PATCH_BUNDLE_ELEM_SETREG(name, reg)                 \
+        {                                                               \
+                (void*)ia64_native_set_ ## name ## _direct_start,       \
+                (void*)ia64_native_set_ ## name ## _direct_end,         \
+                PARAVIRT_PATCH_TYPE_SETREG + _IA64_REG_ ## reg,         \
+        }
+
+#define IA64_NATIVE_PATCH_BUNDLE_ELEM_REG(name, reg)            \
+        IA64_NATIVE_PATCH_BUNDLE_ELEM_GETREG(name, reg),        \
+        IA64_NATIVE_PATCH_BUNDLE_ELEM_SETREG(name, reg)         \
+
+#define IA64_NATIVE_PATCH_BUNDLE_ELEM_AR(name, reg)             \
+        IA64_NATIVE_PATCH_BUNDLE_ELEM_REG(ar_ ## name, AR_ ## reg)
+
+#define IA64_NATIVE_PATCH_BUNDLE_ELEM_CR(name, reg)             \
+        IA64_NATIVE_PATCH_BUNDLE_ELEM_REG(cr_ ## name, CR_ ## reg)
+
+        IA64_NATIVE_PATCH_BUNDLE_ELEM_GETREG(psr, PSR),
+        IA64_NATIVE_PATCH_BUNDLE_ELEM_GETREG(tp, TP),
+
+        IA64_NATIVE_PATCH_BUNDLE_ELEM_SETREG(psr_l, PSR_L),
+
+        IA64_NATIVE_PATCH_BUNDLE_ELEM_REG(gp, GP),
+        IA64_NATIVE_PATCH_BUNDLE_ELEM_REG(sp, SP),
+
+        IA64_NATIVE_PATCH_BUNDLE_ELEM_REG(kr0, AR_KR0),
+        IA64_NATIVE_PATCH_BUNDLE_ELEM_REG(kr1, AR_KR1),
+        IA64_NATIVE_PATCH_BUNDLE_ELEM_REG(kr2, AR_KR2),
+        IA64_NATIVE_PATCH_BUNDLE_ELEM_REG(kr3, AR_KR3),
+        IA64_NATIVE_PATCH_BUNDLE_ELEM_REG(kr4, AR_KR4),
+        IA64_NATIVE_PATCH_BUNDLE_ELEM_REG(kr5, AR_KR5),
+        IA64_NATIVE_PATCH_BUNDLE_ELEM_REG(kr6, AR_KR6),
+        IA64_NATIVE_PATCH_BUNDLE_ELEM_REG(kr7, AR_KR7),
+
+        IA64_NATIVE_PATCH_BUNDLE_ELEM_AR(rsc, RSC),
+        IA64_NATIVE_PATCH_BUNDLE_ELEM_AR(bsp, BSP),
+        IA64_NATIVE_PATCH_BUNDLE_ELEM_AR(bspstore, BSPSTORE),
+        IA64_NATIVE_PATCH_BUNDLE_ELEM_AR(rnat, RNAT),
+        IA64_NATIVE_PATCH_BUNDLE_ELEM_AR(fcr, FCR),
+        IA64_NATIVE_PATCH_BUNDLE_ELEM_AR(eflag, EFLAG),
+        IA64_NATIVE_PATCH_BUNDLE_ELEM_AR(csd, CSD),
+        IA64_NATIVE_PATCH_BUNDLE_ELEM_AR(ssd, SSD),
+        IA64_NATIVE_PATCH_BUNDLE_ELEM_REG(ar27, AR_CFLAG),
+        IA64_NATIVE_PATCH_BUNDLE_ELEM_AR(fsr, FSR),
+        IA64_NATIVE_PATCH_BUNDLE_ELEM_AR(fir, FIR),
+        IA64_NATIVE_PATCH_BUNDLE_ELEM_AR(fdr, FDR),
+        IA64_NATIVE_PATCH_BUNDLE_ELEM_AR(ccv, CCV),
+        IA64_NATIVE_PATCH_BUNDLE_ELEM_AR(unat, UNAT),
+        IA64_NATIVE_PATCH_BUNDLE_ELEM_AR(fpsr, FPSR),
+        IA64_NATIVE_PATCH_BUNDLE_ELEM_AR(itc, ITC),
+        IA64_NATIVE_PATCH_BUNDLE_ELEM_AR(pfs, PFS),
+        IA64_NATIVE_PATCH_BUNDLE_ELEM_AR(lc, LC),
+        IA64_NATIVE_PATCH_BUNDLE_ELEM_AR(ec, EC),
+
+        IA64_NATIVE_PATCH_BUNDLE_ELEM_CR(dcr, DCR),
+        IA64_NATIVE_PATCH_BUNDLE_ELEM_CR(itm, ITM),
+        IA64_NATIVE_PATCH_BUNDLE_ELEM_CR(iva, IVA),
+        IA64_NATIVE_PATCH_BUNDLE_ELEM_CR(pta, PTA),
+        IA64_NATIVE_PATCH_BUNDLE_ELEM_CR(ipsr, IPSR),
+        IA64_NATIVE_PATCH_BUNDLE_ELEM_CR(isr, ISR),
+        IA64_NATIVE_PATCH_BUNDLE_ELEM_CR(iip, IIP),
+        IA64_NATIVE_PATCH_BUNDLE_ELEM_CR(ifa, IFA),
+        IA64_NATIVE_PATCH_BUNDLE_ELEM_CR(itir, ITIR),
+        IA64_NATIVE_PATCH_BUNDLE_ELEM_CR(iipa, IIPA),
+        IA64_NATIVE_PATCH_BUNDLE_ELEM_CR(ifs, IFS),
+        IA64_NATIVE_PATCH_BUNDLE_ELEM_CR(iim, IIM),
+        IA64_NATIVE_PATCH_BUNDLE_ELEM_CR(iha, IHA),
+        IA64_NATIVE_PATCH_BUNDLE_ELEM_CR(lid, LID),
+        IA64_NATIVE_PATCH_BUNDLE_ELEM_CR(ivr, IVR),
+        IA64_NATIVE_PATCH_BUNDLE_ELEM_CR(tpr, TPR),
+        IA64_NATIVE_PATCH_BUNDLE_ELEM_CR(eoi, EOI),
+        IA64_NATIVE_PATCH_BUNDLE_ELEM_CR(irr0, IRR0),
+        IA64_NATIVE_PATCH_BUNDLE_ELEM_CR(irr1, IRR1),
+        IA64_NATIVE_PATCH_BUNDLE_ELEM_CR(irr2, IRR2),
+        IA64_NATIVE_PATCH_BUNDLE_ELEM_CR(irr3, IRR3),
+        IA64_NATIVE_PATCH_BUNDLE_ELEM_CR(itv, ITV),
+        IA64_NATIVE_PATCH_BUNDLE_ELEM_CR(pmv, PMV),
+        IA64_NATIVE_PATCH_BUNDLE_ELEM_CR(cmcv, CMCV),
+        IA64_NATIVE_PATCH_BUNDLE_ELEM_CR(lrr0, LRR0),
+        IA64_NATIVE_PATCH_BUNDLE_ELEM_CR(lrr1, LRR1),
 };
+
+unsigned long __init_or_module
+ia64_native_patch_bundle(void *sbundle, void *ebundle, unsigned long type)
+{
+        const unsigned long nelems = sizeof(ia64_native_patch_bundle_elems) /
+                sizeof(ia64_native_patch_bundle_elems[0]);
+
+        return __paravirt_patch_apply_bundle(sbundle, ebundle, type,
+                                              ia64_native_patch_bundle_elems,
+                                              nelems, NULL);
+}
+#endif /* ASM_SUPPOTED */
+
+extern const char ia64_native_switch_to[];
+extern const char ia64_native_leave_syscall[];
+extern const char ia64_native_work_processed_syscall[];
+extern const char ia64_native_leave_kernel[];
+
+const struct paravirt_patch_branch_target ia64_native_branch_target[]
+__initconst = {
+#define PARAVIRT_BR_TARGET(name, type)                  \
+        {                                               \
+                ia64_native_ ## name,                   \
+                PARAVIRT_PATCH_TYPE_BR_ ## type,        \
+        }
+        PARAVIRT_BR_TARGET(switch_to, SWITCH_TO),
+        PARAVIRT_BR_TARGET(leave_syscall, LEAVE_SYSCALL),
+        PARAVIRT_BR_TARGET(work_processed_syscall, WORK_PROCESSED_SYSCALL),
+        PARAVIRT_BR_TARGET(leave_kernel, LEAVE_KERNEL),
+};
+
+static void __init
+ia64_native_patch_branch(unsigned long tag, unsigned long type)
+{
+        const unsigned long nelem =
+                sizeof(ia64_native_branch_target) /
+                sizeof(ia64_native_branch_target[0]);
+        __paravirt_patch_apply_branch(tag, type,
+                                      ia64_native_branch_target, nelem);
+}
diff --git a/arch/ia64/kernel/paravirt_patch.c b/arch/ia64/kernel/paravirt_patch.c
new file mode 100644
index 000000000000..bfdfef1b1ffd
--- /dev/null
+++ b/arch/ia64/kernel/paravirt_patch.c
@@ -0,0 +1,514 @@
+/******************************************************************************
+ * linux/arch/ia64/xen/paravirt_patch.c
+ *
+ * Copyright (c) 2008 Isaku Yamahata <yamahata at valinux co jp>
+ *                    VA Linux Systems Japan K.K.
+ *
+ * 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.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * 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/init.h>
+#include <asm/intrinsics.h>
+#include <asm/kprobes.h>
+#include <asm/paravirt.h>
+#include <asm/paravirt_patch.h>
+
+typedef union ia64_inst {
+        struct {
+                unsigned long long qp : 6;
+                unsigned long long : 31;
+                unsigned long long opcode : 4;
+                unsigned long long reserved : 23;
+        } generic;
+        unsigned long long l;
+} ia64_inst_t;
+
+/*
+ * flush_icache_range() can't be used here.
+ * we are here before cpu_init() which initializes
+ * ia64_i_cache_stride_shift. flush_icache_range() uses it.
+ */
+void __init_or_module
+paravirt_flush_i_cache_range(const void *instr, unsigned long size)
+{
+        extern void paravirt_fc_i(const void *addr);
+        unsigned long i;
+
+        for (i = 0; i < size; i += sizeof(bundle_t))
+                paravirt_fc_i(instr + i);
+}
+
+bundle_t* __init_or_module
+paravirt_get_bundle(unsigned long tag)
+{
+        return (bundle_t *)(tag & ~3UL);
+}
+
+unsigned long __init_or_module
+paravirt_get_slot(unsigned long tag)
+{
+        return tag & 3UL;
+}
+
+unsigned long __init_or_module
+paravirt_get_num_inst(unsigned long stag, unsigned long etag)
+{
+        bundle_t *sbundle = paravirt_get_bundle(stag);
+        unsigned long sslot = paravirt_get_slot(stag);
+        bundle_t *ebundle = paravirt_get_bundle(etag);
+        unsigned long eslot = paravirt_get_slot(etag);
+
+        return (ebundle - sbundle) * 3 + eslot - sslot + 1;
+}
+
+unsigned long __init_or_module
+paravirt_get_next_tag(unsigned long tag)
+{
+        unsigned long slot = paravirt_get_slot(tag);
+
+        switch (slot) {
+        case 0:
+        case 1:
+                return tag + 1;
+        case 2: {
+                bundle_t *bundle = paravirt_get_bundle(tag);
+                return (unsigned long)(bundle + 1);
+        }
+        default:
+                BUG();
+        }
+        /* NOTREACHED */
+}
+
+ia64_inst_t __init_or_module
+paravirt_read_slot0(const bundle_t *bundle)
+{
+        ia64_inst_t inst;
+        inst.l = bundle->quad0.slot0;
+        return inst;
+}
+
+ia64_inst_t __init_or_module
+paravirt_read_slot1(const bundle_t *bundle)
+{
+        ia64_inst_t inst;
+        inst.l = bundle->quad0.slot1_p0 |
+                ((unsigned long long)bundle->quad1.slot1_p1 << 18UL);
+        return inst;
+}
+
+ia64_inst_t __init_or_module
+paravirt_read_slot2(const bundle_t *bundle)
+{
+        ia64_inst_t inst;
+        inst.l = bundle->quad1.slot2;
+        return inst;
+}
+
+ia64_inst_t __init_or_module
+paravirt_read_inst(unsigned long tag)
+{
+        bundle_t *bundle = paravirt_get_bundle(tag);
+        unsigned long slot = paravirt_get_slot(tag);
+
+        switch (slot) {
+        case 0:
+                return paravirt_read_slot0(bundle);
+        case 1:
+                return paravirt_read_slot1(bundle);
+        case 2:
+                return paravirt_read_slot2(bundle);
+        default:
+                BUG();
+        }
+        /* NOTREACHED */
+}
+
+void __init_or_module
+paravirt_write_slot0(bundle_t *bundle, ia64_inst_t inst)
+{
+        bundle->quad0.slot0 = inst.l;
+}
+
+void __init_or_module
+paravirt_write_slot1(bundle_t *bundle, ia64_inst_t inst)
+{
+        bundle->quad0.slot1_p0 = inst.l;
+        bundle->quad1.slot1_p1 = inst.l >> 18UL;
+}
+
+void __init_or_module
+paravirt_write_slot2(bundle_t *bundle, ia64_inst_t inst)
+{
+        bundle->quad1.slot2 = inst.l;
+}
+
+void __init_or_module
+paravirt_write_inst(unsigned long tag, ia64_inst_t inst)
+{
+        bundle_t *bundle = paravirt_get_bundle(tag);
+        unsigned long slot = paravirt_get_slot(tag);
+
+        switch (slot) {
+        case 0:
+                paravirt_write_slot0(bundle, inst);
+                break;
+        case 1:
+                paravirt_write_slot1(bundle, inst);
+                break;
+        case 2:
+                paravirt_write_slot2(bundle, inst);
+                break;
+        default:
+                BUG();
+                break;
+        }
+        paravirt_flush_i_cache_range(bundle, sizeof(*bundle));
+}
+
+/* for debug */
+void
+paravirt_print_bundle(const bundle_t *bundle)
+{
+        const unsigned long *quad = (const unsigned long *)bundle;
+        ia64_inst_t slot0 = paravirt_read_slot0(bundle);
+        ia64_inst_t slot1 = paravirt_read_slot1(bundle);
+        ia64_inst_t slot2 = paravirt_read_slot2(bundle);
+
+        printk(KERN_DEBUG
+               "bundle 0x%p 0x%016lx 0x%016lx\n", bundle, quad[0], quad[1]);
+        printk(KERN_DEBUG
+               "bundle template 0x%x\n",
+               bundle->quad0.template);
+        printk(KERN_DEBUG
+               "slot0 0x%lx slot1_p0 0x%lx slot1_p1 0x%lx slot2 0x%lx\n",
+               (unsigned long)bundle->quad0.slot0,
+               (unsigned long)bundle->quad0.slot1_p0,
+               (unsigned long)bundle->quad1.slot1_p1,
+               (unsigned long)bundle->quad1.slot2);
+        printk(KERN_DEBUG
+               "slot0 0x%016llx slot1 0x%016llx slot2 0x%016llx\n",
+               slot0.l, slot1.l, slot2.l);
+}
+
+static int noreplace_paravirt __init_or_module = 0;
+
+static int __init setup_noreplace_paravirt(char *str)
+{
+        noreplace_paravirt = 1;
+        return 1;
+}
+__setup("noreplace-paravirt", setup_noreplace_paravirt);
+
+#ifdef ASM_SUPPORTED
+static void __init_or_module
+fill_nop_bundle(void *sbundle, void *ebundle)
+{
+        extern const char paravirt_nop_bundle[];
+        extern const unsigned long paravirt_nop_bundle_size;
+
+        void *bundle = sbundle;
+
+        BUG_ON((((unsigned long)sbundle) % sizeof(bundle_t)) != 0);
+        BUG_ON((((unsigned long)ebundle) % sizeof(bundle_t)) != 0);
+
+        while (bundle < ebundle) {
+                memcpy(bundle, paravirt_nop_bundle, paravirt_nop_bundle_size);
+
+                bundle += paravirt_nop_bundle_size;
+        }
+}
+
+/* helper function */
+unsigned long __init_or_module
+__paravirt_patch_apply_bundle(void *sbundle, void *ebundle, unsigned long type,
+                              const struct paravirt_patch_bundle_elem *elems,
+                              unsigned long nelems,
+                              const struct paravirt_patch_bundle_elem **found)
+{
+        unsigned long used = 0;
+        unsigned long i;
+
+        BUG_ON((((unsigned long)sbundle) % sizeof(bundle_t)) != 0);
+        BUG_ON((((unsigned long)ebundle) % sizeof(bundle_t)) != 0);
+
+        found = NULL;
+        for (i = 0; i < nelems; i++) {
+                const struct paravirt_patch_bundle_elem *p = &elems[i];
+                if (p->type == type) {
+                        unsigned long need = p->ebundle - p->sbundle;
+                        unsigned long room = ebundle - sbundle;
+
+                        if (found != NULL)
+                                *found = p;
+
+                        if (room < need) {
+                                /* no room to replace. skip it */
+                                printk(KERN_DEBUG
+                                       "the space is too small to put "
+                                       "bundles. type %ld need %ld room %ld\n",
+                                       type, need, room);
+                                break;
+                        }
+
+                        used = need;
+                        memcpy(sbundle, p->sbundle, used);
+                        break;
+                }
+        }
+
+        return used;
+}
+
+void __init_or_module
+paravirt_patch_apply_bundle(const struct paravirt_patch_site_bundle *start,
+                            const struct paravirt_patch_site_bundle *end)
+{
+        const struct paravirt_patch_site_bundle *p;
+
+        if (noreplace_paravirt)
+                return;
+        if (pv_init_ops.patch_bundle == NULL)
+                return;
+
+        for (p = start; p < end; p++) {
+                unsigned long used;
+
+                used = (*pv_init_ops.patch_bundle)(p->sbundle, p->ebundle,
+                                                   p->type);
+                if (used == 0)
+                        continue;
+
+                fill_nop_bundle(p->sbundle + used, p->ebundle);
+                paravirt_flush_i_cache_range(p->sbundle,
+                                             p->ebundle - p->sbundle);
+        }
+        ia64_sync_i();
+        ia64_srlz_i();
+}
+
+/*
+ * nop.i, nop.m, nop.f instruction are same format.
+ * but nop.b has differennt format.
+ * This doesn't support nop.b for now.
+ */
+static void __init_or_module
+fill_nop_inst(unsigned long stag, unsigned long etag)
+{
+        extern const bundle_t paravirt_nop_mfi_inst_bundle[];
+        unsigned long tag;
+        const ia64_inst_t nop_inst =
+                paravirt_read_slot0(paravirt_nop_mfi_inst_bundle);
+
+        for (tag = stag; tag < etag; tag = paravirt_get_next_tag(tag))
+                paravirt_write_inst(tag, nop_inst);
+}
+
+void __init_or_module
+paravirt_patch_apply_inst(const struct paravirt_patch_site_inst *start,
+                          const struct paravirt_patch_site_inst *end)
+{
+        const struct paravirt_patch_site_inst *p;
+
+        if (noreplace_paravirt)
+                return;
+        if (pv_init_ops.patch_inst == NULL)
+                return;
+
+        for (p = start; p < end; p++) {
+                unsigned long tag;
+                bundle_t *sbundle;
+                bundle_t *ebundle;
+
+                tag = (*pv_init_ops.patch_inst)(p->stag, p->etag, p->type);
+                if (tag == p->stag)
+                        continue;
+
+                fill_nop_inst(tag, p->etag);
+                sbundle = paravirt_get_bundle(p->stag);
+                ebundle = paravirt_get_bundle(p->etag) + 1;
+                paravirt_flush_i_cache_range(sbundle, (ebundle - sbundle) *
+                                             sizeof(bundle_t));
+        }
+        ia64_sync_i();
+        ia64_srlz_i();
+}
+#endif /* ASM_SUPPOTED */
+
+/* brl.cond.sptk.many <target64> X3 */
+typedef union inst_x3_op {
+        ia64_inst_t inst;
+        struct {
+                unsigned long qp: 6;
+                unsigned long btyp: 3;
+                unsigned long unused: 3;
+                unsigned long p: 1;
+                unsigned long imm20b: 20;
+                unsigned long wh: 2;
+                unsigned long d: 1;
+                unsigned long i: 1;
+                unsigned long opcode: 4;
+        };
+        unsigned long l;
+} inst_x3_op_t;
+
+typedef union inst_x3_imm {
+        ia64_inst_t inst;
+        struct {
+                unsigned long unused: 2;
+                unsigned long imm39: 39;
+        };
+        unsigned long l;
+} inst_x3_imm_t;
+
+void __init_or_module
+paravirt_patch_reloc_brl(unsigned long tag, const void *target)
+{
+        unsigned long tag_op = paravirt_get_next_tag(tag);
+        unsigned long tag_imm = tag;
+        bundle_t *bundle = paravirt_get_bundle(tag);
+
+        ia64_inst_t inst_op = paravirt_read_inst(tag_op);
+        ia64_inst_t inst_imm = paravirt_read_inst(tag_imm);
+
+        inst_x3_op_t inst_x3_op = { .l = inst_op.l };
+        inst_x3_imm_t inst_x3_imm = { .l = inst_imm.l };
+
+        unsigned long imm60 =
+                ((unsigned long)target - (unsigned long)bundle) >> 4;
+
+        BUG_ON(paravirt_get_slot(tag) != 1); /* MLX */
+        BUG_ON(((unsigned long)target & (sizeof(bundle_t) - 1)) != 0);
+
+        /* imm60[59] 1bit */
+        inst_x3_op.i = (imm60 >> 59) & 1;
+        /* imm60[19:0] 20bit */
+        inst_x3_op.imm20b = imm60 & ((1UL << 20) - 1);
+        /* imm60[58:20] 39bit */
+        inst_x3_imm.imm39 = (imm60 >> 20) & ((1UL << 39) - 1);
+
+        inst_op.l = inst_x3_op.l;
+        inst_imm.l = inst_x3_imm.l;
+
+        paravirt_write_inst(tag_op, inst_op);
+        paravirt_write_inst(tag_imm, inst_imm);
+}
+
+/* br.cond.sptk.many <target25> B1 */
+typedef union inst_b1 {
+        ia64_inst_t inst;
+        struct {
+                unsigned long qp: 6;
+                unsigned long btype: 3;
+                unsigned long unused: 3;
+                unsigned long p: 1;
+                unsigned long imm20b: 20;
+                unsigned long wh: 2;
+                unsigned long d: 1;
+                unsigned long s: 1;
+                unsigned long opcode: 4;
+        };
+        unsigned long l;
+} inst_b1_t;
+
+void __init
+paravirt_patch_reloc_br(unsigned long tag, const void *target)
+{
+        bundle_t *bundle = paravirt_get_bundle(tag);
+        ia64_inst_t inst = paravirt_read_inst(tag);
+        unsigned long target25 = (unsigned long)target - (unsigned long)bundle;
+        inst_b1_t inst_b1;
+
+        BUG_ON(((unsigned long)target & (sizeof(bundle_t) - 1)) != 0);
+
+        inst_b1.l = inst.l;
+        if (target25 & (1UL << 63))
+                inst_b1.s = 1;
+        else
+                inst_b1.s = 0;
+
+        inst_b1.imm20b = target25 >> 4;
+        inst.l = inst_b1.l;
+
+        paravirt_write_inst(tag, inst);
+}
+
+void __init
+__paravirt_patch_apply_branch(
+        unsigned long tag, unsigned long type,
+        const struct paravirt_patch_branch_target *entries,
+        unsigned int nr_entries)
+{
+        unsigned int i;
+        for (i = 0; i < nr_entries; i++) {
+                if (entries[i].type == type) {
+                        paravirt_patch_reloc_br(tag, entries[i].entry);
+                        break;
+                }
+        }
+}
+
+static void __init
+paravirt_patch_apply_branch(const struct paravirt_patch_site_branch *start,
+                            const struct paravirt_patch_site_branch *end)
+{
+        const struct paravirt_patch_site_branch *p;
+
+        if (noreplace_paravirt)
+                return;
+        if (pv_init_ops.patch_branch == NULL)
+                return;
+
+        for (p = start; p < end; p++)
+                (*pv_init_ops.patch_branch)(p->tag, p->type);
+
+        ia64_sync_i();
+        ia64_srlz_i();
+}
+
+void __init
+paravirt_patch_apply(void)
+{
+        extern const char __start_paravirt_bundles[];
+        extern const char __stop_paravirt_bundles[];
+        extern const char __start_paravirt_insts[];
+        extern const char __stop_paravirt_insts[];
+        extern const char __start_paravirt_branches[];
+        extern const char __stop_paravirt_branches[];
+
+        paravirt_patch_apply_bundle((const struct paravirt_patch_site_bundle *)
+                                    __start_paravirt_bundles,
+                                    (const struct paravirt_patch_site_bundle *)
+                                    __stop_paravirt_bundles);
+        paravirt_patch_apply_inst((const struct paravirt_patch_site_inst *)
+                                  __start_paravirt_insts,
+                                  (const struct paravirt_patch_site_inst *)
+                                  __stop_paravirt_insts);
+        paravirt_patch_apply_branch((const struct paravirt_patch_site_branch *)
+                                    __start_paravirt_branches,
+                                    (const struct paravirt_patch_site_branch *)
+                                    __stop_paravirt_branches);
+}
+
+/*
+ * Local variables:
+ * mode: C
+ * c-set-style: "linux"
+ * c-basic-offset: 8
+ * tab-width: 8
+ * indent-tabs-mode: t
+ * End:
+ */
diff --git a/arch/ia64/kernel/paravirt_patchlist.c b/arch/ia64/kernel/paravirt_patchlist.c
new file mode 100644
index 000000000000..b28082a95d45
--- /dev/null
+++ b/arch/ia64/kernel/paravirt_patchlist.c
@@ -0,0 +1,79 @@
+/******************************************************************************
+ * Copyright (c) 2008 Isaku Yamahata <yamahata at valinux co jp>
+ *                    VA Linux Systems Japan K.K.
+ *
+ * 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.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * 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/bug.h>
+#include <asm/paravirt.h>
+
+#define DECLARE(name)                                           \
+        extern unsigned long                                    \
+                __ia64_native_start_gate_##name##_patchlist[];  \
+        extern unsigned long                                    \
+                __ia64_native_end_gate_##name##_patchlist[]
+
+DECLARE(fsyscall);
+DECLARE(brl_fsys_bubble_down);
+DECLARE(vtop);
+DECLARE(mckinley_e9);
+
+extern unsigned long __start_gate_section[];
+
+#define ASSIGN(name)                                                        \
+        .start_##name##_patchlist =                                         \
+                (unsigned long)__ia64_native_start_gate_##name##_patchlist, \
+        .end_##name##_patchlist =                                           \
+                (unsigned long)__ia64_native_end_gate_##name##_patchlist
+
+struct pv_patchdata pv_patchdata __initdata = {
+        ASSIGN(fsyscall),
+        ASSIGN(brl_fsys_bubble_down),
+        ASSIGN(vtop),
+        ASSIGN(mckinley_e9),
+
+        .gate_section = (void*)__start_gate_section,
+};
+
+
+unsigned long __init
+paravirt_get_gate_patchlist(enum pv_gate_patchlist type)
+{
+
+#define CASE(NAME, name)                                        \
+        case PV_GATE_START_##NAME:                              \
+                return pv_patchdata.start_##name##_patchlist;   \
+        case PV_GATE_END_##NAME:                                \
+                return pv_patchdata.end_##name##_patchlist;     \
+
+        switch (type) {
+                CASE(FSYSCALL, fsyscall);
+                CASE(BRL_FSYS_BUBBLE_DOWN, brl_fsys_bubble_down);
+                CASE(VTOP, vtop);
+                CASE(MCKINLEY_E9, mckinley_e9);
+        default:
+                BUG();
+                break;
+        }
+        return 0;
+}
+
+void * __init
+paravirt_get_gate_section(void)
+{
+        return pv_patchdata.gate_section;
+}
diff --git a/arch/ia64/kernel/paravirt_patchlist.h b/arch/ia64/kernel/paravirt_patchlist.h
new file mode 100644
index 000000000000..0684aa6c6507
--- /dev/null
+++ b/arch/ia64/kernel/paravirt_patchlist.h
@@ -0,0 +1,28 @@
+/******************************************************************************
+ * linux/arch/ia64/xen/paravirt_patchlist.h
+ *
+ * Copyright (c) 2008 Isaku Yamahata <yamahata at valinux co jp>
+ *                    VA Linux Systems Japan K.K.
+ *
+ * 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.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ */
+
+#if defined(__IA64_GATE_PARAVIRTUALIZED_XEN)
+#include <asm/xen/patchlist.h>
+#else
+#include <asm/native/patchlist.h>
+#endif
+
diff --git a/arch/ia64/kernel/paravirtentry.S b/arch/ia64/kernel/paravirtentry.S
index 2f42fcb9776a..6158560d7f17 100644
--- a/arch/ia64/kernel/paravirtentry.S
+++ b/arch/ia64/kernel/paravirtentry.S
@@ -20,8 +20,11 @@
  *
  */
 
+#include <linux/init.h>
 #include <asm/asmmacro.h>
 #include <asm/asm-offsets.h>
+#include <asm/paravirt_privop.h>
+#include <asm/paravirt_patch.h>
 #include "entry.h"
 
 #define DATA8(sym, init_value)                  \
@@ -32,29 +35,87 @@
         data8 init_value ;                      \
         .popsection
 
-#define BRANCH(targ, reg, breg)         \
-        movl reg=targ ;                 \
-        ;;                              \
-        ld8 reg=[reg] ;                 \
-        ;;                              \
-        mov breg=reg ;                  \
+#define BRANCH(targ, reg, breg, type)                                   \
+        PARAVIRT_PATCH_SITE_BR(PARAVIRT_PATCH_TYPE_BR_ ## type) ;       \
+        ;;                                                              \
+        movl reg=targ ;                                                 \
+        ;;                                                              \
+        ld8 reg=[reg] ;                                                 \
+        ;;                                                              \
+        mov breg=reg ;                                                  \
         br.cond.sptk.many breg
 
-#define BRANCH_PROC(sym, reg, breg)                             \
-        DATA8(paravirt_ ## sym ## _targ, ia64_native_ ## sym) ; \
-        GLOBAL_ENTRY(paravirt_ ## sym) ;                        \
-                BRANCH(paravirt_ ## sym ## _targ, reg, breg) ;  \
+#define BRANCH_PROC(sym, reg, breg, type)                               \
+        DATA8(paravirt_ ## sym ## _targ, ia64_native_ ## sym) ;         \
+        GLOBAL_ENTRY(paravirt_ ## sym) ;                                \
+                BRANCH(paravirt_ ## sym ## _targ, reg, breg, type) ;    \
         END(paravirt_ ## sym)
 
-#define BRANCH_PROC_UNWINFO(sym, reg, breg)                     \
-        DATA8(paravirt_ ## sym ## _targ, ia64_native_ ## sym) ; \
-        GLOBAL_ENTRY(paravirt_ ## sym) ;                        \
-                PT_REGS_UNWIND_INFO(0) ;                        \
-                BRANCH(paravirt_ ## sym ## _targ, reg, breg) ;  \
+#define BRANCH_PROC_UNWINFO(sym, reg, breg, type)                       \
+        DATA8(paravirt_ ## sym ## _targ, ia64_native_ ## sym) ;         \
+        GLOBAL_ENTRY(paravirt_ ## sym) ;                                \
+                PT_REGS_UNWIND_INFO(0) ;                                \
+                BRANCH(paravirt_ ## sym ## _targ, reg, breg, type) ;    \
         END(paravirt_ ## sym)
 
 
-BRANCH_PROC(switch_to, r22, b7)
-BRANCH_PROC_UNWINFO(leave_syscall, r22, b7)
-BRANCH_PROC(work_processed_syscall, r2, b7)
-BRANCH_PROC_UNWINFO(leave_kernel, r22, b7)
+BRANCH_PROC(switch_to, r22, b7, SWITCH_TO)
+BRANCH_PROC_UNWINFO(leave_syscall, r22, b7, LEAVE_SYSCALL)
+BRANCH_PROC(work_processed_syscall, r2, b7, WORK_PROCESSED_SYSCALL)
+BRANCH_PROC_UNWINFO(leave_kernel, r22, b7, LEAVE_KERNEL)
+
+
+#ifdef CONFIG_MODULES
+#define __INIT_OR_MODULE        .text
+#define __INITDATA_OR_MODULE    .data
+#else
+#define __INIT_OR_MODULE        __INIT
+#define __INITDATA_OR_MODULE    __INITDATA
+#endif /* CONFIG_MODULES */
+
+        __INIT_OR_MODULE
+        GLOBAL_ENTRY(paravirt_fc_i)
+        fc.i r32
+        br.ret.sptk.many rp
+        END(paravirt_fc_i)
+        __FINIT
+
+        __INIT_OR_MODULE
+        .align 32
+        GLOBAL_ENTRY(paravirt_nop_b_inst_bundle)
+        {
+                nop.b 0
+                nop.b 0
+                nop.b 0
+        }
+        END(paravirt_nop_b_inst_bundle)
+        __FINIT
+
+        /* NOTE: nop.[mfi] has same format */
+        __INIT_OR_MODULE
+        GLOBAL_ENTRY(paravirt_nop_mfi_inst_bundle)
+        {
+                nop.m 0
+                nop.f 0
+                nop.i 0
+        }
+        END(paravirt_nop_mfi_inst_bundle)
+        __FINIT
+
+        __INIT_OR_MODULE
+        GLOBAL_ENTRY(paravirt_nop_bundle)
+paravirt_nop_bundle_start:
+        {
+                nop 0
+                nop 0
+                nop 0
+        }
+paravirt_nop_bundle_end:
+        END(paravirt_nop_bundle)
+        __FINIT
+
+        __INITDATA_OR_MODULE
+        .align 8
+        .global paravirt_nop_bundle_size
+paravirt_nop_bundle_size:
+        data8   paravirt_nop_bundle_end - paravirt_nop_bundle_start
diff --git a/arch/ia64/kernel/patch.c b/arch/ia64/kernel/patch.c
index b83b2c516008..68a1311db806 100644
--- a/arch/ia64/kernel/patch.c
+++ b/arch/ia64/kernel/patch.c
@@ -7,6 +7,7 @@
 #include <linux/init.h>
 #include <linux/string.h>
 
+#include <asm/paravirt.h>
 #include <asm/patch.h>
 #include <asm/processor.h>
 #include <asm/sections.h>
@@ -169,16 +170,35 @@ ia64_patch_mckinley_e9 (unsigned long start, unsigned long end)
         ia64_srlz_i();
 }
 
+extern unsigned long ia64_native_fsyscall_table[NR_syscalls];
+extern char ia64_native_fsys_bubble_down[];
+struct pv_fsys_data pv_fsys_data __initdata = {
+        .fsyscall_table = (unsigned long *)ia64_native_fsyscall_table,
+        .fsys_bubble_down = (void *)ia64_native_fsys_bubble_down,
+};
+
+unsigned long * __init
+paravirt_get_fsyscall_table(void)
+{
+        return pv_fsys_data.fsyscall_table;
+}
+
+char * __init
+paravirt_get_fsys_bubble_down(void)
+{
+        return pv_fsys_data.fsys_bubble_down;
+}
+
 static void __init
 patch_fsyscall_table (unsigned long start, unsigned long end)
 {
-        extern unsigned long fsyscall_table[NR_syscalls];
+        u64 fsyscall_table = (u64)paravirt_get_fsyscall_table();
         s32 *offp = (s32 *) start;
         u64 ip;
 
         while (offp < (s32 *) end) {
                 ip = (u64) ia64_imva((char *) offp + *offp);
-                ia64_patch_imm64(ip, (u64) fsyscall_table);
+                ia64_patch_imm64(ip, fsyscall_table);
                 ia64_fc((void *) ip);
                 ++offp;
         }
@@ -189,7 +209,7 @@ patch_fsyscall_table (unsigned long start, unsigned long end)
 static void __init
 patch_brl_fsys_bubble_down (unsigned long start, unsigned long end)
 {
-        extern char fsys_bubble_down[];
+        u64 fsys_bubble_down = (u64)paravirt_get_fsys_bubble_down();
         s32 *offp = (s32 *) start;
         u64 ip;
 
@@ -207,13 +227,13 @@ patch_brl_fsys_bubble_down (unsigned long start, unsigned long end)
 void __init
 ia64_patch_gate (void)
 {
-#       define START(name)      ((unsigned long) __start_gate_##name##_patchlist)
-#       define END(name)        ((unsigned long)__end_gate_##name##_patchlist)
+#       define START(name)      paravirt_get_gate_patchlist(PV_GATE_START_##name)
+#       define END(name)        paravirt_get_gate_patchlist(PV_GATE_END_##name)
 
-        patch_fsyscall_table(START(fsyscall), END(fsyscall));
-        patch_brl_fsys_bubble_down(START(brl_fsys_bubble_down), END(brl_fsys_bubble_down));
-        ia64_patch_vtop(START(vtop), END(vtop));
-        ia64_patch_mckinley_e9(START(mckinley_e9), END(mckinley_e9));
+        patch_fsyscall_table(START(FSYSCALL), END(FSYSCALL));
+        patch_brl_fsys_bubble_down(START(BRL_FSYS_BUBBLE_DOWN), END(BRL_FSYS_BUBBLE_DOWN));
+        ia64_patch_vtop(START(VTOP), END(VTOP));
+        ia64_patch_mckinley_e9(START(MCKINLEY_E9), END(MCKINLEY_E9));
 }
 
 void ia64_patch_phys_stack_reg(unsigned long val)
@@ -229,7 +249,7 @@ void ia64_patch_phys_stack_reg(unsigned long val)
         while (offp < end) {
                 ip = (u64) offp + *offp;
                 ia64_patch(ip, mask, imm);
-                ia64_fc(ip);
+                ia64_fc((void *)ip);
                 ++offp;
         }
         ia64_sync_i();
diff --git a/arch/ia64/kernel/perfmon.c b/arch/ia64/kernel/perfmon.c
index 5c0f408cfd71..8a06dc480594 100644
--- a/arch/ia64/kernel/perfmon.c
+++ b/arch/ia64/kernel/perfmon.c
@@ -5603,7 +5603,7 @@ pfm_interrupt_handler(int irq, void *arg)
  * /proc/perfmon interface, for debug only
  */
 
-#define PFM_PROC_SHOW_HEADER    ((void *)NR_CPUS+1)
+#define PFM_PROC_SHOW_HEADER    ((void *)nr_cpu_ids+1)
 
 static void *
 pfm_proc_start(struct seq_file *m, loff_t *pos)
@@ -5612,7 +5612,7 @@ pfm_proc_start(struct seq_file *m, loff_t *pos)
                 return PFM_PROC_SHOW_HEADER;
         }
 
-        while (*pos <= NR_CPUS) {
+        while (*pos <= nr_cpu_ids) {
                 if (cpu_online(*pos - 1)) {
                         return (void *)*pos;
                 }
diff --git a/arch/ia64/kernel/process.c b/arch/ia64/kernel/process.c
index c57162705147..5d7c0e5b9e76 100644
--- a/arch/ia64/kernel/process.c
+++ b/arch/ia64/kernel/process.c
@@ -413,7 +413,7 @@ ia64_load_extra (struct task_struct *task)
  * so there is nothing to worry about.
  */
 int
-copy_thread (int nr, unsigned long clone_flags,
+copy_thread(unsigned long clone_flags,
              unsigned long user_stack_base, unsigned long user_stack_size,
              struct task_struct *p, struct pt_regs *regs)
 {
diff --git a/arch/ia64/kernel/salinfo.c b/arch/ia64/kernel/salinfo.c
index ecb9eb78d687..7053c55b7649 100644
--- a/arch/ia64/kernel/salinfo.c
+++ b/arch/ia64/kernel/salinfo.c
@@ -317,7 +317,7 @@ retry:
         }
 
         n = data->cpu_check;
-        for (i = 0; i < NR_CPUS; i++) {
+        for (i = 0; i < nr_cpu_ids; i++) {
                 if (cpu_isset(n, data->cpu_event)) {
                         if (!cpu_online(n)) {
                                 cpu_clear(n, data->cpu_event);
@@ -326,7 +326,7 @@ retry:
                         cpu = n;
                         break;
                 }
-                if (++n == NR_CPUS)
+                if (++n == nr_cpu_ids)
                         n = 0;
         }
 
@@ -337,7 +337,7 @@ retry:
 
         /* for next read, start checking at next CPU */
         data->cpu_check = cpu;
-        if (++data->cpu_check == NR_CPUS)
+        if (++data->cpu_check == nr_cpu_ids)
                 data->cpu_check = 0;
 
         snprintf(cmd, sizeof(cmd), "read %d\n", cpu);
diff --git a/arch/ia64/kernel/setup.c b/arch/ia64/kernel/setup.c
index 865af27c7737..714066aeda7f 100644
--- a/arch/ia64/kernel/setup.c
+++ b/arch/ia64/kernel/setup.c
@@ -52,6 +52,7 @@
 #include <asm/meminit.h>
 #include <asm/page.h>
 #include <asm/paravirt.h>
+#include <asm/paravirt_patch.h>
 #include <asm/patch.h>
 #include <asm/pgtable.h>
 #include <asm/processor.h>
@@ -537,6 +538,7 @@ setup_arch (char **cmdline_p)
         paravirt_arch_setup_early();
 
         ia64_patch_vtop((u64) __start___vtop_patchlist, (u64) __end___vtop_patchlist);
+        paravirt_patch_apply();
 
         *cmdline_p = __va(ia64_boot_param->command_line);
         strlcpy(boot_command_line, *cmdline_p, COMMAND_LINE_SIZE);
@@ -730,10 +732,10 @@ static void *
 c_start (struct seq_file *m, loff_t *pos)
 {
 #ifdef CONFIG_SMP
-        while (*pos < NR_CPUS && !cpu_isset(*pos, cpu_online_map))
+        while (*pos < nr_cpu_ids && !cpu_online(*pos))
                 ++*pos;
 #endif
-        return *pos < NR_CPUS ? cpu_data(*pos) : NULL;
+        return *pos < nr_cpu_ids ? cpu_data(*pos) : NULL;
 }
 
 static void *
@@ -1016,8 +1018,7 @@ cpu_init (void)
                                         | IA64_DCR_DA | IA64_DCR_DD | IA64_DCR_LC));
         atomic_inc(&init_mm.mm_count);
         current->active_mm = &init_mm;
-        if (current->mm)
-                BUG();
+        BUG_ON(current->mm);
 
         ia64_mmu_init(ia64_imva(cpu_data));
         ia64_mca_cpu_init(ia64_imva(cpu_data));
diff --git a/arch/ia64/kernel/smp.c b/arch/ia64/kernel/smp.c
index da8f020d82c1..2ea4199d9c57 100644
--- a/arch/ia64/kernel/smp.c
+++ b/arch/ia64/kernel/smp.c
@@ -166,11 +166,11 @@ send_IPI_allbutself (int op)
  * Called with preemption disabled.
  */
 static inline void
-send_IPI_mask(cpumask_t mask, int op)
+send_IPI_mask(const struct cpumask *mask, int op)
 {
         unsigned int cpu;
 
-        for_each_cpu_mask(cpu, mask) {
+        for_each_cpu(cpu, mask) {
                         send_IPI_single(cpu, op);
         }
 }
@@ -316,7 +316,7 @@ void arch_send_call_function_single_ipi(int cpu)
         send_IPI_single(cpu, IPI_CALL_FUNC_SINGLE);
 }
 
-void arch_send_call_function_ipi(cpumask_t mask)
+void arch_send_call_function_ipi_mask(const struct cpumask *mask)
 {
         send_IPI_mask(mask, IPI_CALL_FUNC);
 }
diff --git a/arch/ia64/kernel/smpboot.c b/arch/ia64/kernel/smpboot.c
index 52290547c85b..7700e23034bb 100644
--- a/arch/ia64/kernel/smpboot.c
+++ b/arch/ia64/kernel/smpboot.c
@@ -581,14 +581,14 @@ smp_build_cpu_map (void)
 
         ia64_cpu_to_sapicid[0] = boot_cpu_id;
         cpus_clear(cpu_present_map);
-        cpu_set(0, cpu_present_map);
-        cpu_set(0, cpu_possible_map);
+        set_cpu_present(0, true);
+        set_cpu_possible(0, true);
         for (cpu = 1, i = 0; i < smp_boot_data.cpu_count; i++) {
                 sapicid = smp_boot_data.cpu_phys_id[i];
                 if (sapicid == boot_cpu_id)
                         continue;
-                cpu_set(cpu, cpu_present_map);
-                cpu_set(cpu, cpu_possible_map);
+                set_cpu_present(cpu, true);
+                set_cpu_possible(cpu, true);
                 ia64_cpu_to_sapicid[cpu] = sapicid;
                 cpu++;
         }
@@ -626,12 +626,9 @@ smp_prepare_cpus (unsigned int max_cpus)
          */
         if (!max_cpus) {
                 printk(KERN_INFO "SMP mode deactivated.\n");
-                cpus_clear(cpu_online_map);
-                cpus_clear(cpu_present_map);
-                cpus_clear(cpu_possible_map);
-                cpu_set(0, cpu_online_map);
-                cpu_set(0, cpu_present_map);
-                cpu_set(0, cpu_possible_map);
+                init_cpu_online(cpumask_of(0));
+                init_cpu_present(cpumask_of(0));
+                init_cpu_possible(cpumask_of(0));
                 return;
         }
 }
diff --git a/arch/ia64/kernel/time.c b/arch/ia64/kernel/time.c
index d6747bae52d8..641c8b61c4f1 100644
--- a/arch/ia64/kernel/time.c
+++ b/arch/ia64/kernel/time.c
@@ -51,6 +51,15 @@ EXPORT_SYMBOL(last_cli_ip);
 #endif
 
 #ifdef CONFIG_PARAVIRT
+/* We need to define a real function for sched_clock, to override the
+   weak default version */
+unsigned long long sched_clock(void)
+{
+        return paravirt_sched_clock();
+}
+#endif
+
+#ifdef CONFIG_PARAVIRT
 static void
 paravirt_clocksource_resume(void)
 {
diff --git a/arch/ia64/kernel/vmlinux.lds.S b/arch/ia64/kernel/vmlinux.lds.S
index 3765efc5f963..4a95e86b9ac2 100644
--- a/arch/ia64/kernel/vmlinux.lds.S
+++ b/arch/ia64/kernel/vmlinux.lds.S
@@ -169,6 +169,30 @@ SECTIONS
           __end___mckinley_e9_bundles = .;
         }
 
+#if defined(CONFIG_PARAVIRT)
+  . = ALIGN(16);
+  .paravirt_bundles : AT(ADDR(.paravirt_bundles) - LOAD_OFFSET)
+        {
+          __start_paravirt_bundles = .;
+          *(.paravirt_bundles)
+          __stop_paravirt_bundles = .;
+        }
+  . = ALIGN(16);
+  .paravirt_insts : AT(ADDR(.paravirt_insts) - LOAD_OFFSET)
+        {
+          __start_paravirt_insts = .;
+          *(.paravirt_insts)
+          __stop_paravirt_insts = .;
+        }
+  . = ALIGN(16);
+  .paravirt_branches : AT(ADDR(.paravirt_branches) - LOAD_OFFSET)
+        {
+          __start_paravirt_branches = .;
+          *(.paravirt_branches)
+          __stop_paravirt_branches = .;
+        }
+#endif
+
 #if defined(CONFIG_IA64_GENERIC)
   /* Machine Vector */
   . = ALIGN(16);
@@ -201,6 +225,12 @@ SECTIONS
           __start_gate_section = .;
           *(.data.gate)
           __stop_gate_section = .;
+#ifdef CONFIG_XEN
+          . = ALIGN(PAGE_SIZE);
+          __xen_start_gate_section = .;
+          *(.data.gate.xen)
+          __xen_stop_gate_section = .;
+#endif
         }
   . = ALIGN(PAGE_SIZE);         /* make sure the gate page doesn't expose
                                  * kernel data
diff --git a/arch/ia64/kvm/kvm-ia64.c b/arch/ia64/kvm/kvm-ia64.c
index 076b00d1dbff..28af6a731bb8 100644
--- a/arch/ia64/kvm/kvm-ia64.c
+++ b/arch/ia64/kvm/kvm-ia64.c
@@ -70,7 +70,7 @@ static void kvm_flush_icache(unsigned long start, unsigned long len)
         int l;
 
         for (l = 0; l < (len + 32); l += 32)
-                ia64_fc(start + l);
+                ia64_fc((void *)(start + l));
 
         ia64_sync_i();
         ia64_srlz_i();
diff --git a/arch/ia64/kvm/vcpu.c b/arch/ia64/kvm/vcpu.c
index d4d280505878..a18ee17b9192 100644
--- a/arch/ia64/kvm/vcpu.c
+++ b/arch/ia64/kvm/vcpu.c
@@ -386,7 +386,7 @@ void set_rse_reg(struct kvm_pt_regs *regs, unsigned long r1,
                 else
                         *rnat_addr = (*rnat_addr) & (~nat_mask);
 
-                ia64_setreg(_IA64_REG_AR_BSPSTORE, bspstore);
+                ia64_setreg(_IA64_REG_AR_BSPSTORE, (unsigned long)bspstore);
                 ia64_setreg(_IA64_REG_AR_RNAT, rnat);
         }
         local_irq_restore(psr);
diff --git a/arch/ia64/kvm/vtlb.c b/arch/ia64/kvm/vtlb.c
index 38232b37668b..2c2501f13159 100644
--- a/arch/ia64/kvm/vtlb.c
+++ b/arch/ia64/kvm/vtlb.c
@@ -210,6 +210,7 @@ void thash_vhpt_insert(struct kvm_vcpu *v, u64 pte, u64 itir, u64 va, int type)
                 phy_pte  &= ~PAGE_FLAGS_RV_MASK;
                 psr = ia64_clear_ic();
                 ia64_itc(type, va, phy_pte, itir_ps(itir));
+                paravirt_dv_serialize_data();
                 ia64_set_psr(psr);
         }
 
@@ -456,6 +457,7 @@ void  thash_purge_and_insert(struct kvm_vcpu *v, u64 pte, u64 itir,
                 phy_pte  &= ~PAGE_FLAGS_RV_MASK;
                 psr = ia64_clear_ic();
                 ia64_itc(type, ifa, phy_pte, ps);
+                paravirt_dv_serialize_data();
                 ia64_set_psr(psr);
         }
         if (!(pte&VTLB_PTE_IO))
diff --git a/arch/ia64/mm/init.c b/arch/ia64/mm/init.c
index 56e12903973c..c0f3bee69042 100644
--- a/arch/ia64/mm/init.c
+++ b/arch/ia64/mm/init.c
@@ -35,6 +35,7 @@
 #include <asm/uaccess.h>
 #include <asm/unistd.h>
 #include <asm/mca.h>
+#include <asm/paravirt.h>
 
 DEFINE_PER_CPU(struct mmu_gather, mmu_gathers);
 
@@ -259,6 +260,7 @@ put_kernel_page (struct page *page, unsigned long address, pgprot_t pgprot)
 static void __init
 setup_gate (void)
 {
+        void *gate_section;
         struct page *page;
 
         /*
@@ -266,10 +268,11 @@ setup_gate (void)
          * headers etc. and once execute-only page to enable
          * privilege-promotion via "epc":
          */
-        page = virt_to_page(ia64_imva(__start_gate_section));
+        gate_section = paravirt_get_gate_section();
+        page = virt_to_page(ia64_imva(gate_section));
         put_kernel_page(page, GATE_ADDR, PAGE_READONLY);
 #ifdef HAVE_BUGGY_SEGREL
-        page = virt_to_page(ia64_imva(__start_gate_section + PAGE_SIZE));
+        page = virt_to_page(ia64_imva(gate_section + PAGE_SIZE));
         put_kernel_page(page, GATE_ADDR + PAGE_SIZE, PAGE_GATE);
 #else
         put_kernel_page(page, GATE_ADDR + PERCPU_PAGE_SIZE, PAGE_GATE);
@@ -633,8 +636,7 @@ mem_init (void)
 #endif
 
 #ifdef CONFIG_FLATMEM
-        if (!mem_map)
-                BUG();
+        BUG_ON(!mem_map);
         max_mapnr = max_low_pfn;
 #endif
 
@@ -667,8 +669,8 @@ mem_init (void)
          * code can tell them apart.
          */
         for (i = 0; i < NR_syscalls; ++i) {
-                extern unsigned long fsyscall_table[NR_syscalls];
                 extern unsigned long sys_call_table[NR_syscalls];
+                unsigned long *fsyscall_table = paravirt_get_fsyscall_table();
 
                 if (!fsyscall_table[i] || nolwsys)
                         fsyscall_table[i] = sys_call_table[i] | 1;
diff --git a/arch/ia64/mm/tlb.c b/arch/ia64/mm/tlb.c
index bd9818a36b47..b9f3d7bbb338 100644
--- a/arch/ia64/mm/tlb.c
+++ b/arch/ia64/mm/tlb.c
@@ -309,7 +309,7 @@ flush_tlb_range (struct vm_area_struct *vma, unsigned long start,
 
         preempt_disable();
 #ifdef CONFIG_SMP
-        if (mm != current->active_mm || cpus_weight(mm->cpu_vm_mask) != 1) {
+        if (mm != current->active_mm || cpumask_weight(mm_cpumask(mm)) != 1) {
                 platform_global_tlb_purge(mm, start, end, nbits);
                 preempt_enable();
                 return;
diff --git a/arch/ia64/scripts/pvcheck.sed b/arch/ia64/scripts/pvcheck.sed
index ba66ac2e4c60..e59809a3fc01 100644
--- a/arch/ia64/scripts/pvcheck.sed
+++ b/arch/ia64/scripts/pvcheck.sed
@@ -17,6 +17,7 @@ s/mov.*=.*cr\.iip/.warning \"cr.iip should not used directly\"/g
 s/mov.*=.*cr\.ivr/.warning \"cr.ivr should not used directly\"/g
 s/mov.*=[^\.]*psr/.warning \"psr should not used directly\"/g   # avoid ar.fpsr
 s/mov.*=.*ar\.eflags/.warning \"ar.eflags should not used directly\"/g
+s/mov.*=.*ar\.itc.*/.warning \"ar.itc should not used directly\"/g
 s/mov.*cr\.ifa.*=.*/.warning \"cr.ifa should not used directly\"/g
 s/mov.*cr\.itir.*=.*/.warning \"cr.itir should not used directly\"/g
 s/mov.*cr\.iha.*=.*/.warning \"cr.iha should not used directly\"/g
diff --git a/arch/ia64/sn/kernel/io_common.c b/arch/ia64/sn/kernel/io_common.c
index 0d4ffa4da1da..57f280dd9def 100644
--- a/arch/ia64/sn/kernel/io_common.c
+++ b/arch/ia64/sn/kernel/io_common.c
@@ -135,8 +135,7 @@ static s64 sn_device_fixup_war(u64 nasid, u64 widget, int device,
         }
 
         war_list = kzalloc(DEV_PER_WIDGET * sizeof(*war_list), GFP_KERNEL);
-        if (!war_list)
-                BUG();
+        BUG_ON(!war_list);
 
         SAL_CALL_NOLOCK(isrv, SN_SAL_IOIF_GET_WIDGET_DMAFLUSH_LIST,
                         nasid, widget, __pa(war_list), 0, 0, 0 ,0);
@@ -180,23 +179,20 @@ sn_common_hubdev_init(struct hubdev_info *hubdev)
                 sizeof(struct sn_flush_device_kernel *);
         hubdev->hdi_flush_nasid_list.widget_p =
                 kzalloc(size, GFP_KERNEL);
-        if (!hubdev->hdi_flush_nasid_list.widget_p)
-                BUG();
+        BUG_ON(!hubdev->hdi_flush_nasid_list.widget_p);
 
         for (widget = 0; widget <= HUB_WIDGET_ID_MAX; widget++) {
                 size = DEV_PER_WIDGET *
                         sizeof(struct sn_flush_device_kernel);
                 sn_flush_device_kernel = kzalloc(size, GFP_KERNEL);
-                if (!sn_flush_device_kernel)
-                        BUG();
+                BUG_ON(!sn_flush_device_kernel);
 
                 dev_entry = sn_flush_device_kernel;
                 for (device = 0; device < DEV_PER_WIDGET;
                      device++, dev_entry++) {
                         size = sizeof(struct sn_flush_device_common);
                         dev_entry->common = kzalloc(size, GFP_KERNEL);
-                        if (!dev_entry->common)
-                                BUG();
+                        BUG_ON(!dev_entry->common);
                         if (sn_prom_feature_available(PRF_DEVICE_FLUSH_LIST))
                                 status = sal_get_device_dmaflush_list(
                                              hubdev->hdi_nasid, widget, device,
@@ -326,8 +322,7 @@ sn_common_bus_fixup(struct pci_bus *bus,
          */
         controller->platform_data = kzalloc(sizeof(struct sn_platform_data),
                                             GFP_KERNEL);
-        if (controller->platform_data == NULL)
-                BUG();
+        BUG_ON(controller->platform_data == NULL);
         sn_platform_data =
                         (struct sn_platform_data *) controller->platform_data;
         sn_platform_data->provider_soft = provider_soft;
diff --git a/arch/ia64/sn/kernel/io_init.c b/arch/ia64/sn/kernel/io_init.c
index e2eb2da60f96..ee774c366a06 100644
--- a/arch/ia64/sn/kernel/io_init.c
+++ b/arch/ia64/sn/kernel/io_init.c
@@ -128,8 +128,7 @@ sn_legacy_pci_window_fixup(struct pci_controller *controller,
 {
                 controller->window = kcalloc(2, sizeof(struct pci_window),
                                              GFP_KERNEL);
-                if (controller->window == NULL)
-                        BUG();
+                BUG_ON(controller->window == NULL);
                 controller->window[0].offset = legacy_io;
                 controller->window[0].resource.name = "legacy_io";
                 controller->window[0].resource.flags = IORESOURCE_IO;
@@ -168,8 +167,7 @@ sn_pci_window_fixup(struct pci_dev *dev, unsigned int count,
         idx = controller->windows;
         new_count = controller->windows + count;
         new_window = kcalloc(new_count, sizeof(struct pci_window), GFP_KERNEL);
-        if (new_window == NULL)
-                BUG();
+        BUG_ON(new_window == NULL);
         if (controller->window) {
                 memcpy(new_window, controller->window,
                        sizeof(struct pci_window) * controller->windows);
@@ -222,8 +220,7 @@ sn_io_slot_fixup(struct pci_dev *dev)
                 (u64) __pa(pcidev_info),
                 (u64) __pa(sn_irq_info));
 
-        if (status)
-                BUG(); /* Cannot get platform pci device information */
+        BUG_ON(status); /* Cannot get platform pci device information */
 
 
         /* Copy over PIO Mapped Addresses */
@@ -307,8 +304,7 @@ sn_pci_controller_fixup(int segment, int busnum, struct pci_bus *bus)
         prom_bussoft_ptr = __va(prom_bussoft_ptr);
 
         controller = kzalloc(sizeof(*controller), GFP_KERNEL);
-        if (!controller)
-                BUG();
+        BUG_ON(!controller);
         controller->segment = segment;
 
         /*
diff --git a/arch/ia64/sn/kernel/setup.c b/arch/ia64/sn/kernel/setup.c
index 02c5b8a9fb60..e456f062f241 100644
--- a/arch/ia64/sn/kernel/setup.c
+++ b/arch/ia64/sn/kernel/setup.c
@@ -732,8 +732,7 @@ void __init build_cnode_tables(void)
                 kl_config_hdr_t *klgraph_header;
                 nasid = cnodeid_to_nasid(node);
                 klgraph_header = ia64_sn_get_klconfig_addr(nasid);
-                if (klgraph_header == NULL)
-                        BUG();
+                BUG_ON(klgraph_header == NULL);
                 brd = NODE_OFFSET_TO_LBOARD(nasid, klgraph_header->ch_board_info);
                 while (brd) {
                         if (board_needs_cnode(brd->brd_type) && physical_node_map[brd->brd_nasid] < 0) {
@@ -750,7 +749,7 @@ nasid_slice_to_cpuid(int nasid, int slice)
 {
         long cpu;
 
-        for (cpu = 0; cpu < NR_CPUS; cpu++)
+        for (cpu = 0; cpu < nr_cpu_ids; cpu++)
                 if (cpuid_to_nasid(cpu) == nasid &&
                                         cpuid_to_slice(cpu) == slice)
                         return cpu;
diff --git a/arch/ia64/sn/kernel/sn2/sn2_smp.c b/arch/ia64/sn/kernel/sn2/sn2_smp.c
index e585f9a2afb9..1176506b2bae 100644
--- a/arch/ia64/sn/kernel/sn2/sn2_smp.c
+++ b/arch/ia64/sn/kernel/sn2/sn2_smp.c
@@ -133,7 +133,7 @@ sn2_ipi_flush_all_tlb(struct mm_struct *mm)
         unsigned long itc;
 
         itc = ia64_get_itc();
-        smp_flush_tlb_cpumask(mm->cpu_vm_mask);
+        smp_flush_tlb_cpumask(*mm_cpumask(mm));
         itc = ia64_get_itc() - itc;
         __get_cpu_var(ptcstats).shub_ipi_flushes_itc_clocks += itc;
         __get_cpu_var(ptcstats).shub_ipi_flushes++;
@@ -182,7 +182,7 @@ sn2_global_tlb_purge(struct mm_struct *mm, unsigned long start,
         nodes_clear(nodes_flushed);
         i = 0;
 
-        for_each_cpu_mask(cpu, mm->cpu_vm_mask) {
+        for_each_cpu(cpu, mm_cpumask(mm)) {
                 cnode = cpu_to_node(cpu);
                 node_set(cnode, nodes_flushed);
                 lcpu = cpu;
@@ -461,7 +461,7 @@ bool sn_cpu_disable_allowed(int cpu)
 
 static void *sn2_ptc_seq_start(struct seq_file *file, loff_t * offset)
 {
-        if (*offset < NR_CPUS)
+        if (*offset < nr_cpu_ids)
                 return offset;
         return NULL;
 }
@@ -469,7 +469,7 @@ static void *sn2_ptc_seq_start(struct seq_file *file, loff_t * offset)
 static void *sn2_ptc_seq_next(struct seq_file *file, void *data, loff_t * offset)
 {
         (*offset)++;
-        if (*offset < NR_CPUS)
+        if (*offset < nr_cpu_ids)
                 return offset;
         return NULL;
 }
@@ -491,7 +491,7 @@ static int sn2_ptc_seq_show(struct seq_file *file, void *data)
                 seq_printf(file, "# ptctest %d, flushopt %d\n", sn2_ptctest, sn2_flush_opt);
         }
 
-        if (cpu < NR_CPUS && cpu_online(cpu)) {
+        if (cpu < nr_cpu_ids && cpu_online(cpu)) {
                 stat = &per_cpu(ptcstats, cpu);
                 seq_printf(file, "cpu %d %ld %ld %ld %ld %ld %ld %ld %ld %ld %ld %ld %ld\n", cpu, stat->ptc_l,
                                 stat->change_rid, stat->shub_ptc_flushes, stat->nodes_flushed,
@@ -554,7 +554,7 @@ static int __init sn2_ptc_init(void)
 
         proc_sn2_ptc = proc_create(PTC_BASENAME, 0444,
                                    NULL, &proc_sn2_ptc_operations);
-        if (!&proc_sn2_ptc_operations) {
+        if (!proc_sn2_ptc) {
                 printk(KERN_ERR "unable to create %s proc entry", PTC_BASENAME);
                 return -EINVAL;
         }
diff --git a/arch/ia64/sn/kernel/sn2/sn_hwperf.c b/arch/ia64/sn/kernel/sn2/sn_hwperf.c
index be339477f906..9e6491cf72bd 100644
--- a/arch/ia64/sn/kernel/sn2/sn_hwperf.c
+++ b/arch/ia64/sn/kernel/sn2/sn_hwperf.c
@@ -275,8 +275,7 @@ static int sn_hwperf_get_nearest_node_objdata(struct sn_hwperf_object_info *objb
 
         /* get it's interconnect topology */
         sz = op->ports * sizeof(struct sn_hwperf_port_info);
-        if (sz > sizeof(ptdata))
-                BUG();
+        BUG_ON(sz > sizeof(ptdata));
         e = ia64_sn_hwperf_op(sn_hwperf_master_nasid,
                               SN_HWPERF_ENUM_PORTS, nodeobj->id, sz,
                               (u64)&ptdata, 0, 0, NULL);
@@ -310,8 +309,7 @@ static int sn_hwperf_get_nearest_node_objdata(struct sn_hwperf_object_info *objb
         if (router && (!found_cpu || !found_mem)) {
                 /* search for a node connected to the same router */
                 sz = router->ports * sizeof(struct sn_hwperf_port_info);
-                if (sz > sizeof(ptdata))
-                        BUG();
+                BUG_ON(sz > sizeof(ptdata));
                 e = ia64_sn_hwperf_op(sn_hwperf_master_nasid,
                                       SN_HWPERF_ENUM_PORTS, router->id, sz,
                                       (u64)&ptdata, 0, 0, NULL);
@@ -612,7 +610,7 @@ static int sn_hwperf_op_cpu(struct sn_hwperf_op_info *op_info)
         op_info->a->arg &= SN_HWPERF_ARG_OBJID_MASK;
 
         if (cpu != SN_HWPERF_ARG_ANY_CPU) {
-                if (cpu >= NR_CPUS || !cpu_online(cpu)) {
+                if (cpu >= nr_cpu_ids || !cpu_online(cpu)) {
                         r = -EINVAL;
                         goto out;
                 }
diff --git a/arch/ia64/sn/pci/pcibr/pcibr_dma.c b/arch/ia64/sn/pci/pcibr/pcibr_dma.c
index 060df4aa9916..c659ad5613a0 100644
--- a/arch/ia64/sn/pci/pcibr/pcibr_dma.c
+++ b/arch/ia64/sn/pci/pcibr/pcibr_dma.c
@@ -256,9 +256,7 @@ void sn_dma_flush(u64 addr)
 
         hubinfo = (NODEPDA(nasid_to_cnodeid(nasid)))->pdinfo;
 
-        if (!hubinfo) {
-                BUG();
-        }
+        BUG_ON(!hubinfo);
 
         flush_nasid_list = &hubinfo->hdi_flush_nasid_list;
         if (flush_nasid_list->widget_p == NULL)
diff --git a/arch/ia64/xen/Makefile b/arch/ia64/xen/Makefile
index 0ad0224693d9..e6f4a0a74228 100644
--- a/arch/ia64/xen/Makefile
+++ b/arch/ia64/xen/Makefile
@@ -3,14 +3,29 @@
 #
 
 obj-y := hypercall.o xenivt.o xensetup.o xen_pv_ops.o irq_xen.o \
-         hypervisor.o xencomm.o xcom_hcall.o grant-table.o time.o suspend.o
+         hypervisor.o xencomm.o xcom_hcall.o grant-table.o time.o suspend.o \
+         gate-data.o
 
 obj-$(CONFIG_IA64_GENERIC) += machvec.o
 
+# The gate DSO image is built using a special linker script.
+include $(srctree)/arch/ia64/kernel/Makefile.gate
+
+# tell compiled for xen
+CPPFLAGS_gate.lds += -D__IA64_GATE_PARAVIRTUALIZED_XEN
+AFLAGS_gate.o += -D__IA64_ASM_PARAVIRTUALIZED_XEN -D__IA64_GATE_PARAVIRTUALIZED_XEN
+
+# use same file of native.
+$(obj)/gate.o: $(src)/../kernel/gate.S FORCE
+        $(call if_changed_dep,as_o_S)
+$(obj)/gate.lds: $(src)/../kernel/gate.lds.S FORCE
+        $(call if_changed_dep,cpp_lds_S)
+
+
 AFLAGS_xenivt.o += -D__IA64_ASM_PARAVIRTUALIZED_XEN
 
 # xen multi compile
-ASM_PARAVIRT_MULTI_COMPILE_SRCS = ivt.S entry.S
+ASM_PARAVIRT_MULTI_COMPILE_SRCS = ivt.S entry.S fsys.S
 ASM_PARAVIRT_OBJS = $(addprefix xen-,$(ASM_PARAVIRT_MULTI_COMPILE_SRCS:.S=.o))
 obj-y += $(ASM_PARAVIRT_OBJS)
 define paravirtualized_xen
diff --git a/arch/ia64/xen/gate-data.S b/arch/ia64/xen/gate-data.S
new file mode 100644
index 000000000000..7d4830afc91d
--- /dev/null
+++ b/arch/ia64/xen/gate-data.S
@@ -0,0 +1,3 @@
+        .section .data.gate.xen, "aw"
+
+        .incbin "arch/ia64/xen/gate.so"
diff --git a/arch/ia64/xen/hypercall.S b/arch/ia64/xen/hypercall.S
index 45e02bb64a92..e32dae444dd6 100644
--- a/arch/ia64/xen/hypercall.S
+++ b/arch/ia64/xen/hypercall.S
@@ -9,6 +9,7 @@
 #include <asm/intrinsics.h>
 #include <asm/xen/privop.h>
 
+#ifdef __INTEL_COMPILER
 /*
  * Hypercalls without parameter.
  */
@@ -72,6 +73,7 @@ GLOBAL_ENTRY(xen_set_rr0_to_rr4)
         br.ret.sptk.many rp
         ;;
 END(xen_set_rr0_to_rr4)
+#endif
 
 GLOBAL_ENTRY(xen_send_ipi)
         mov r14=r32
diff --git a/arch/ia64/xen/time.c b/arch/ia64/xen/time.c
index 68d6204c3f16..fb8332690179 100644
--- a/arch/ia64/xen/time.c
+++ b/arch/ia64/xen/time.c
@@ -175,10 +175,58 @@ static void xen_itc_jitter_data_reset(void)
         } while (unlikely(ret != lcycle));
 }
 
+/* based on xen_sched_clock() in arch/x86/xen/time.c. */
+/*
+ * This relies on HAVE_UNSTABLE_SCHED_CLOCK. If it can't be defined,
+ * something similar logic should be implemented here.
+ */
+/*
+ * Xen sched_clock implementation.  Returns the number of unstolen
+ * nanoseconds, which is nanoseconds the VCPU spent in RUNNING+BLOCKED
+ * states.
+ */
+static unsigned long long xen_sched_clock(void)
+{
+        struct vcpu_runstate_info runstate;
+
+        unsigned long long now;
+        unsigned long long offset;
+        unsigned long long ret;
+
+        /*
+         * Ideally sched_clock should be called on a per-cpu basis
+         * anyway, so preempt should already be disabled, but that's
+         * not current practice at the moment.
+         */
+        preempt_disable();
+
+        /*
+         * both ia64_native_sched_clock() and xen's runstate are
+         * based on mAR.ITC. So difference of them makes sense.
+         */
+        now = ia64_native_sched_clock();
+
+        get_runstate_snapshot(&runstate);
+
+        WARN_ON(runstate.state != RUNSTATE_running);
+
+        offset = 0;
+        if (now > runstate.state_entry_time)
+                offset = now - runstate.state_entry_time;
+        ret = runstate.time[RUNSTATE_blocked] +
+                runstate.time[RUNSTATE_running] +
+                offset;
+
+        preempt_enable();
+
+        return ret;
+}
+
 struct pv_time_ops xen_time_ops __initdata = {
         .init_missing_ticks_accounting  = xen_init_missing_ticks_accounting,
         .do_steal_accounting            = xen_do_steal_accounting,
         .clocksource_resume             = xen_itc_jitter_data_reset,
+        .sched_clock                    = xen_sched_clock,
 };
 
 /* Called after suspend, to resume time.  */
diff --git a/arch/ia64/xen/xen_pv_ops.c b/arch/ia64/xen/xen_pv_ops.c
index 936cff3c96e0..5e2270a999fa 100644
--- a/arch/ia64/xen/xen_pv_ops.c
+++ b/arch/ia64/xen/xen_pv_ops.c
@@ -24,6 +24,7 @@
 #include <linux/irq.h>
 #include <linux/kernel.h>
 #include <linux/pm.h>
+#include <linux/unistd.h>
 
 #include <asm/xen/hypervisor.h>
 #include <asm/xen/xencomm.h>
@@ -153,6 +154,13 @@ xen_post_smp_prepare_boot_cpu(void)
         xen_setup_vcpu_info_placement();
 }
 
+#ifdef ASM_SUPPORTED
+static unsigned long __init_or_module
+xen_patch_bundle(void *sbundle, void *ebundle, unsigned long type);
+#endif
+static void __init
+xen_patch_branch(unsigned long tag, unsigned long type);
+
 static const struct pv_init_ops xen_init_ops __initconst = {
         .banner = xen_banner,
 
@@ -163,6 +171,53 @@ static const struct pv_init_ops xen_init_ops __initconst = {
         .arch_setup_nomca = xen_arch_setup_nomca,
 
         .post_smp_prepare_boot_cpu = xen_post_smp_prepare_boot_cpu,
+#ifdef ASM_SUPPORTED
+        .patch_bundle = xen_patch_bundle,
+#endif
+        .patch_branch = xen_patch_branch,
+};
+
+/***************************************************************************
+ * pv_fsys_data
+ * addresses for fsys
+ */
+
+extern unsigned long xen_fsyscall_table[NR_syscalls];
+extern char xen_fsys_bubble_down[];
+struct pv_fsys_data xen_fsys_data __initdata = {
+        .fsyscall_table = (unsigned long *)xen_fsyscall_table,
+        .fsys_bubble_down = (void *)xen_fsys_bubble_down,
+};
+
+/***************************************************************************
+ * pv_patchdata
+ * patchdata addresses
+ */
+
+#define DECLARE(name)                                                   \
+        extern unsigned long __xen_start_gate_##name##_patchlist[];     \
+        extern unsigned long __xen_end_gate_##name##_patchlist[]
+
+DECLARE(fsyscall);
+DECLARE(brl_fsys_bubble_down);
+DECLARE(vtop);
+DECLARE(mckinley_e9);
+
+extern unsigned long __xen_start_gate_section[];
+
+#define ASSIGN(name)                                                    \
+        .start_##name##_patchlist =                                     \
+                (unsigned long)__xen_start_gate_##name##_patchlist,     \
+        .end_##name##_patchlist =                                       \
+                (unsigned long)__xen_end_gate_##name##_patchlist
+
+static struct pv_patchdata xen_patchdata __initdata = {
+        ASSIGN(fsyscall),
+        ASSIGN(brl_fsys_bubble_down),
+        ASSIGN(vtop),
+        ASSIGN(mckinley_e9),
+
+        .gate_section = (void*)__xen_start_gate_section,
 };
 
 /***************************************************************************
@@ -170,6 +225,76 @@ static const struct pv_init_ops xen_init_ops __initconst = {
  * intrinsics hooks.
  */
 
+#ifndef ASM_SUPPORTED
+static void
+xen_set_itm_with_offset(unsigned long val)
+{
+        /* ia64_cpu_local_tick() calls this with interrupt enabled. */
+        /* WARN_ON(!irqs_disabled()); */
+        xen_set_itm(val - XEN_MAPPEDREGS->itc_offset);
+}
+
+static unsigned long
+xen_get_itm_with_offset(void)
+{
+        /* unused at this moment */
+        printk(KERN_DEBUG "%s is called.\n", __func__);
+
+        WARN_ON(!irqs_disabled());
+        return ia64_native_getreg(_IA64_REG_CR_ITM) +
+                XEN_MAPPEDREGS->itc_offset;
+}
+
+/* ia64_set_itc() is only called by
+ * cpu_init() with ia64_set_itc(0) and ia64_sync_itc().
+ * So XEN_MAPPEDRESG->itc_offset cal be considered as almost constant.
+ */
+static void
+xen_set_itc(unsigned long val)
+{
+        unsigned long mitc;
+
+        WARN_ON(!irqs_disabled());
+        mitc = ia64_native_getreg(_IA64_REG_AR_ITC);
+        XEN_MAPPEDREGS->itc_offset = val - mitc;
+        XEN_MAPPEDREGS->itc_last = val;
+}
+
+static unsigned long
+xen_get_itc(void)
+{
+        unsigned long res;
+        unsigned long itc_offset;
+        unsigned long itc_last;
+        unsigned long ret_itc_last;
+
+        itc_offset = XEN_MAPPEDREGS->itc_offset;
+        do {
+                itc_last = XEN_MAPPEDREGS->itc_last;
+                res = ia64_native_getreg(_IA64_REG_AR_ITC);
+                res += itc_offset;
+                if (itc_last >= res)
+                        res = itc_last + 1;
+                ret_itc_last = cmpxchg(&XEN_MAPPEDREGS->itc_last,
+                                       itc_last, res);
+        } while (unlikely(ret_itc_last != itc_last));
+        return res;
+
+#if 0
+        /* ia64_itc_udelay() calls ia64_get_itc() with interrupt enabled.
+           Should it be paravirtualized instead? */
+        WARN_ON(!irqs_disabled());
+        itc_offset = XEN_MAPPEDREGS->itc_offset;
+        itc_last = XEN_MAPPEDREGS->itc_last;
+        res = ia64_native_getreg(_IA64_REG_AR_ITC);
+        res += itc_offset;
+        if (itc_last >= res)
+                res = itc_last + 1;
+        XEN_MAPPEDREGS->itc_last = res;
+        return res;
+#endif
+}
+
 static void xen_setreg(int regnum, unsigned long val)
 {
         switch (regnum) {
@@ -181,11 +306,14 @@ static void xen_setreg(int regnum, unsigned long val)
                 xen_set_eflag(val);
                 break;
 #endif
+        case _IA64_REG_AR_ITC:
+                xen_set_itc(val);
+                break;
         case _IA64_REG_CR_TPR:
                 xen_set_tpr(val);
                 break;
         case _IA64_REG_CR_ITM:
-                xen_set_itm(val);
+                xen_set_itm_with_offset(val);
                 break;
         case _IA64_REG_CR_EOI:
                 xen_eoi(val);
@@ -209,6 +337,12 @@ static unsigned long xen_getreg(int regnum)
                 res = xen_get_eflag();
                 break;
 #endif
+        case _IA64_REG_AR_ITC:
+                res = xen_get_itc();
+                break;
+        case _IA64_REG_CR_ITM:
+                res = xen_get_itm_with_offset();
+                break;
         case _IA64_REG_CR_IVR:
                 res = xen_get_ivr();
                 break;
@@ -259,8 +393,417 @@ xen_intrin_local_irq_restore(unsigned long mask)
         else
                 xen_rsm_i();
 }
+#else
+#define __DEFINE_FUNC(name, code)                                       \
+        extern const char xen_ ## name ## _direct_start[];              \
+        extern const char xen_ ## name ## _direct_end[];                \
+        asm (".align 32\n"                                              \
+             ".proc xen_" #name "\n"                                    \
+             "xen_" #name ":\n"                                         \
+             "xen_" #name "_direct_start:\n"                            \
+             code                                                       \
+             "xen_" #name "_direct_end:\n"                              \
+             "br.cond.sptk.many b6\n"                                   \
+             ".endp xen_" #name "\n")
+
+#define DEFINE_VOID_FUNC0(name, code)           \
+        extern void                             \
+        xen_ ## name (void);                    \
+        __DEFINE_FUNC(name, code)
+
+#define DEFINE_VOID_FUNC1(name, code)           \
+        extern void                             \
+        xen_ ## name (unsigned long arg);       \
+        __DEFINE_FUNC(name, code)
+
+#define DEFINE_VOID_FUNC1_VOID(name, code)      \
+        extern void                             \
+        xen_ ## name (void *arg);               \
+        __DEFINE_FUNC(name, code)
+
+#define DEFINE_VOID_FUNC2(name, code)           \
+        extern void                             \
+        xen_ ## name (unsigned long arg0,       \
+                      unsigned long arg1);      \
+        __DEFINE_FUNC(name, code)
 
-static const struct pv_cpu_ops xen_cpu_ops __initdata = {
+#define DEFINE_FUNC0(name, code)                \
+        extern unsigned long                    \
+        xen_ ## name (void);                    \
+        __DEFINE_FUNC(name, code)
+
+#define DEFINE_FUNC1(name, type, code)          \
+        extern unsigned long                    \
+        xen_ ## name (type arg);                \
+        __DEFINE_FUNC(name, code)
+
+#define XEN_PSR_I_ADDR_ADDR     (XSI_BASE + XSI_PSR_I_ADDR_OFS)
+
+/*
+ * static void xen_set_itm_with_offset(unsigned long val)
+ *        xen_set_itm(val - XEN_MAPPEDREGS->itc_offset);
+ */
+/* 2 bundles */
+DEFINE_VOID_FUNC1(set_itm_with_offset,
+                  "mov r2 = " __stringify(XSI_BASE) " + "
+                  __stringify(XSI_ITC_OFFSET_OFS) "\n"
+                  ";;\n"
+                  "ld8 r3 = [r2]\n"
+                  ";;\n"
+                  "sub r8 = r8, r3\n"
+                  "break " __stringify(HYPERPRIVOP_SET_ITM) "\n");
+
+/*
+ * static unsigned long xen_get_itm_with_offset(void)
+ *    return ia64_native_getreg(_IA64_REG_CR_ITM) + XEN_MAPPEDREGS->itc_offset;
+ */
+/* 2 bundles */
+DEFINE_FUNC0(get_itm_with_offset,
+             "mov r2 = " __stringify(XSI_BASE) " + "
+             __stringify(XSI_ITC_OFFSET_OFS) "\n"
+             ";;\n"
+             "ld8 r3 = [r2]\n"
+             "mov r8 = cr.itm\n"
+             ";;\n"
+             "add r8 = r8, r2\n");
+
+/*
+ * static void xen_set_itc(unsigned long val)
+ *      unsigned long mitc;
+ *
+ *      WARN_ON(!irqs_disabled());
+ *      mitc = ia64_native_getreg(_IA64_REG_AR_ITC);
+ *      XEN_MAPPEDREGS->itc_offset = val - mitc;
+ *      XEN_MAPPEDREGS->itc_last = val;
+ */
+/* 2 bundles */
+DEFINE_VOID_FUNC1(set_itc,
+                  "mov r2 = " __stringify(XSI_BASE) " + "
+                  __stringify(XSI_ITC_LAST_OFS) "\n"
+                  "mov r3 = ar.itc\n"
+                  ";;\n"
+                  "sub r3 = r8, r3\n"
+                  "st8 [r2] = r8, "
+                  __stringify(XSI_ITC_LAST_OFS) " - "
+                  __stringify(XSI_ITC_OFFSET_OFS) "\n"
+                  ";;\n"
+                  "st8 [r2] = r3\n");
+
+/*
+ * static unsigned long xen_get_itc(void)
+ *      unsigned long res;
+ *      unsigned long itc_offset;
+ *      unsigned long itc_last;
+ *      unsigned long ret_itc_last;
+ *
+ *      itc_offset = XEN_MAPPEDREGS->itc_offset;
+ *      do {
+ *              itc_last = XEN_MAPPEDREGS->itc_last;
+ *              res = ia64_native_getreg(_IA64_REG_AR_ITC);
+ *              res += itc_offset;
+ *              if (itc_last >= res)
+ *                      res = itc_last + 1;
+ *              ret_itc_last = cmpxchg(&XEN_MAPPEDREGS->itc_last,
+ *                                     itc_last, res);
+ *      } while (unlikely(ret_itc_last != itc_last));
+ *      return res;
+ */
+/* 5 bundles */
+DEFINE_FUNC0(get_itc,
+             "mov r2 = " __stringify(XSI_BASE) " + "
+             __stringify(XSI_ITC_OFFSET_OFS) "\n"
+             ";;\n"
+             "ld8 r9 = [r2], " __stringify(XSI_ITC_LAST_OFS) " - "
+             __stringify(XSI_ITC_OFFSET_OFS) "\n"
+                                        /* r9 = itc_offset */
+                                        /* r2 = XSI_ITC_OFFSET */
+             "888:\n"
+             "mov r8 = ar.itc\n"        /* res = ar.itc */
+             ";;\n"
+             "ld8 r3 = [r2]\n"          /* r3 = itc_last */
+             "add r8 = r8, r9\n"        /* res = ar.itc + itc_offset */
+             ";;\n"
+             "cmp.gtu p6, p0 = r3, r8\n"
+             ";;\n"
+             "(p6) add r8 = 1, r3\n"    /* if (itc_last > res) itc_last + 1 */
+             ";;\n"
+             "mov ar.ccv = r8\n"
+             ";;\n"
+             "cmpxchg8.acq r10 = [r2], r8, ar.ccv\n"
+             ";;\n"
+             "cmp.ne p6, p0 = r10, r3\n"
+             "(p6) hint @pause\n"
+             "(p6) br.cond.spnt 888b\n");
+
+DEFINE_VOID_FUNC1_VOID(fc,
+                       "break " __stringify(HYPERPRIVOP_FC) "\n");
+
+/*
+ * psr_i_addr_addr = XEN_PSR_I_ADDR_ADDR
+ * masked_addr = *psr_i_addr_addr
+ * pending_intr_addr = masked_addr - 1
+ * if (val & IA64_PSR_I) {
+ *   masked = *masked_addr
+ *   *masked_addr = 0:xen_set_virtual_psr_i(1)
+ *   compiler barrier
+ *   if (masked) {
+ *      uint8_t pending = *pending_intr_addr;
+ *      if (pending)
+ *              XEN_HYPER_SSM_I
+ *   }
+ * } else {
+ *   *masked_addr = 1:xen_set_virtual_psr_i(0)
+ * }
+ */
+/* 6 bundles */
+DEFINE_VOID_FUNC1(intrin_local_irq_restore,
+                  /* r8 = input value: 0 or IA64_PSR_I
+                   * p6 =  (flags & IA64_PSR_I)
+                   *    = if clause
+                   * p7 = !(flags & IA64_PSR_I)
+                   *    = else clause
+                   */
+                  "cmp.ne p6, p7 = r8, r0\n"
+                  "mov r9 = " __stringify(XEN_PSR_I_ADDR_ADDR) "\n"
+                  ";;\n"
+                  /* r9 = XEN_PSR_I_ADDR */
+                  "ld8 r9 = [r9]\n"
+                  ";;\n"
+
+                  /* r10 = masked previous value */
+                  "(p6) ld1.acq r10 = [r9]\n"
+                  ";;\n"
+
+                  /* p8 = !masked interrupt masked previously? */
+                  "(p6) cmp.ne.unc p8, p0 = r10, r0\n"
+
+                  /* p7 = else clause */
+                  "(p7) mov r11 = 1\n"
+                  ";;\n"
+                  /* masked = 1 */
+                  "(p7) st1.rel [r9] = r11\n"
+
+                  /* p6 = if clause */
+                  /* masked = 0
+                   * r9 = masked_addr - 1
+                   *    = pending_intr_addr
+                   */
+                  "(p8) st1.rel [r9] = r0, -1\n"
+                  ";;\n"
+                  /* r8 = pending_intr */
+                  "(p8) ld1.acq r11 = [r9]\n"
+                  ";;\n"
+                  /* p9 = interrupt pending? */
+                  "(p8) cmp.ne.unc p9, p10 = r11, r0\n"
+                  ";;\n"
+                  "(p10) mf\n"
+                  /* issue hypercall to trigger interrupt */
+                  "(p9) break " __stringify(HYPERPRIVOP_SSM_I) "\n");
+
+DEFINE_VOID_FUNC2(ptcga,
+                  "break " __stringify(HYPERPRIVOP_PTC_GA) "\n");
+DEFINE_VOID_FUNC2(set_rr,
+                  "break " __stringify(HYPERPRIVOP_SET_RR) "\n");
+
+/*
+ * tmp = XEN_MAPPEDREGS->interrupt_mask_addr = XEN_PSR_I_ADDR_ADDR;
+ * tmp = *tmp
+ * tmp = *tmp;
+ * psr_i = tmp? 0: IA64_PSR_I;
+ */
+/* 4 bundles */
+DEFINE_FUNC0(get_psr_i,
+             "mov r9 = " __stringify(XEN_PSR_I_ADDR_ADDR) "\n"
+             ";;\n"
+             "ld8 r9 = [r9]\n"                  /* r9 = XEN_PSR_I_ADDR */
+             "mov r8 = 0\n"                     /* psr_i = 0 */
+             ";;\n"
+             "ld1.acq r9 = [r9]\n"              /* r9 = XEN_PSR_I */
+             ";;\n"
+             "cmp.eq.unc p6, p0 = r9, r0\n"     /* p6 = (XEN_PSR_I != 0) */
+             ";;\n"
+             "(p6) mov r8 = " __stringify(1 << IA64_PSR_I_BIT) "\n");
+
+DEFINE_FUNC1(thash, unsigned long,
+             "break " __stringify(HYPERPRIVOP_THASH) "\n");
+DEFINE_FUNC1(get_cpuid, int,
+             "break " __stringify(HYPERPRIVOP_GET_CPUID) "\n");
+DEFINE_FUNC1(get_pmd, int,
+             "break " __stringify(HYPERPRIVOP_GET_PMD) "\n");
+DEFINE_FUNC1(get_rr, unsigned long,
+             "break " __stringify(HYPERPRIVOP_GET_RR) "\n");
+
+/*
+ * void xen_privop_ssm_i(void)
+ *
+ * int masked = !xen_get_virtual_psr_i();
+ *      // masked = *(*XEN_MAPPEDREGS->interrupt_mask_addr)
+ * xen_set_virtual_psr_i(1)
+ *      // *(*XEN_MAPPEDREGS->interrupt_mask_addr) = 0
+ * // compiler barrier
+ * if (masked) {
+ *      uint8_t* pend_int_addr =
+ *              (uint8_t*)(*XEN_MAPPEDREGS->interrupt_mask_addr) - 1;
+ *      uint8_t pending = *pend_int_addr;
+ *      if (pending)
+ *              XEN_HYPER_SSM_I
+ * }
+ */
+/* 4 bundles */
+DEFINE_VOID_FUNC0(ssm_i,
+                  "mov r8 = " __stringify(XEN_PSR_I_ADDR_ADDR) "\n"
+                  ";;\n"
+                  "ld8 r8 = [r8]\n"             /* r8 = XEN_PSR_I_ADDR */
+                  ";;\n"
+                  "ld1.acq r9 = [r8]\n"         /* r9 = XEN_PSR_I */
+                  ";;\n"
+                  "st1.rel [r8] = r0, -1\n"     /* psr_i = 0. enable interrupt
+                                                 * r8 = XEN_PSR_I_ADDR - 1
+                                                 *    = pend_int_addr
+                                                 */
+                  "cmp.eq.unc p0, p6 = r9, r0\n"/* p6 = !XEN_PSR_I
+                                                 * previously interrupt
+                                                 * masked?
+                                                 */
+                  ";;\n"
+                  "(p6) ld1.acq r8 = [r8]\n"    /* r8 = xen_pend_int */
+                  ";;\n"
+                  "(p6) cmp.eq.unc p6, p7 = r8, r0\n"   /*interrupt pending?*/
+                  ";;\n"
+                  /* issue hypercall to get interrupt */
+                  "(p7) break " __stringify(HYPERPRIVOP_SSM_I) "\n"
+                  ";;\n");
+
+/*
+ * psr_i_addr_addr = XEN_MAPPEDREGS->interrupt_mask_addr
+ *                 = XEN_PSR_I_ADDR_ADDR;
+ * psr_i_addr = *psr_i_addr_addr;
+ * *psr_i_addr = 1;
+ */
+/* 2 bundles */
+DEFINE_VOID_FUNC0(rsm_i,
+                  "mov r8 = " __stringify(XEN_PSR_I_ADDR_ADDR) "\n"
+                                                /* r8 = XEN_PSR_I_ADDR */
+                  "mov r9 = 1\n"
+                  ";;\n"
+                  "ld8 r8 = [r8]\n"             /* r8 = XEN_PSR_I */
+                  ";;\n"
+                  "st1.rel [r8] = r9\n");       /* XEN_PSR_I = 1 */
+
+extern void
+xen_set_rr0_to_rr4(unsigned long val0, unsigned long val1,
+                   unsigned long val2, unsigned long val3,
+                   unsigned long val4);
+__DEFINE_FUNC(set_rr0_to_rr4,
+              "break " __stringify(HYPERPRIVOP_SET_RR0_TO_RR4) "\n");
+
+
+extern unsigned long xen_getreg(int regnum);
+#define __DEFINE_GET_REG(id, privop)                                    \
+        "mov r2 = " __stringify(_IA64_REG_ ## id) "\n"                  \
+        ";;\n"                                                          \
+        "cmp.eq p6, p0 = r2, r8\n"                                      \
+        ";;\n"                                                          \
+        "(p6) break " __stringify(HYPERPRIVOP_GET_ ## privop) "\n"      \
+        "(p6) br.cond.sptk.many b6\n"                                   \
+        ";;\n"
+
+__DEFINE_FUNC(getreg,
+              __DEFINE_GET_REG(PSR, PSR)
+#ifdef CONFIG_IA32_SUPPORT
+              __DEFINE_GET_REG(AR_EFLAG, EFLAG)
+#endif
+
+              /* get_itc */
+              "mov r2 = " __stringify(_IA64_REG_AR_ITC) "\n"
+              ";;\n"
+              "cmp.eq p6, p0 = r2, r8\n"
+              ";;\n"
+              "(p6) br.cond.spnt xen_get_itc\n"
+              ";;\n"
+
+              /* get itm */
+              "mov r2 = " __stringify(_IA64_REG_CR_ITM) "\n"
+              ";;\n"
+              "cmp.eq p6, p0 = r2, r8\n"
+              ";;\n"
+              "(p6) br.cond.spnt xen_get_itm_with_offset\n"
+              ";;\n"
+
+              __DEFINE_GET_REG(CR_IVR, IVR)
+              __DEFINE_GET_REG(CR_TPR, TPR)
+
+              /* fall back */
+              "movl r2 = ia64_native_getreg_func\n"
+              ";;\n"
+              "mov b7 = r2\n"
+              ";;\n"
+              "br.cond.sptk.many b7\n");
+
+extern void xen_setreg(int regnum, unsigned long val);
+#define __DEFINE_SET_REG(id, privop)                                    \
+        "mov r2 = " __stringify(_IA64_REG_ ## id) "\n"                  \
+        ";;\n"                                                          \
+        "cmp.eq p6, p0 = r2, r9\n"                                      \
+        ";;\n"                                                          \
+        "(p6) break " __stringify(HYPERPRIVOP_ ## privop) "\n"          \
+        "(p6) br.cond.sptk.many b6\n"                                   \
+        ";;\n"
+
+__DEFINE_FUNC(setreg,
+              /* kr0 .. kr 7*/
+              /*
+               * if (_IA64_REG_AR_KR0 <= regnum &&
+               *     regnum <= _IA64_REG_AR_KR7) {
+               *     register __index asm ("r8") = regnum - _IA64_REG_AR_KR0
+               *     register __val asm ("r9") = val
+               *    "break HYPERPRIVOP_SET_KR"
+               * }
+               */
+              "mov r17 = r9\n"
+              "mov r2 = " __stringify(_IA64_REG_AR_KR0) "\n"
+              ";;\n"
+              "cmp.ge p6, p0 = r9, r2\n"
+              "sub r17 = r17, r2\n"
+              ";;\n"
+              "(p6) cmp.ge.unc p7, p0 = "
+              __stringify(_IA64_REG_AR_KR7) " - " __stringify(_IA64_REG_AR_KR0)
+              ", r17\n"
+              ";;\n"
+              "(p7) mov r9 = r8\n"
+              ";;\n"
+              "(p7) mov r8 = r17\n"
+              "(p7) break " __stringify(HYPERPRIVOP_SET_KR) "\n"
+
+              /* set itm */
+              "mov r2 = " __stringify(_IA64_REG_CR_ITM) "\n"
+              ";;\n"
+              "cmp.eq p6, p0 = r2, r8\n"
+              ";;\n"
+              "(p6) br.cond.spnt xen_set_itm_with_offset\n"
+
+              /* set itc */
+              "mov r2 = " __stringify(_IA64_REG_AR_ITC) "\n"
+              ";;\n"
+              "cmp.eq p6, p0 = r2, r8\n"
+              ";;\n"
+              "(p6) br.cond.spnt xen_set_itc\n"
+
+#ifdef CONFIG_IA32_SUPPORT
+              __DEFINE_SET_REG(AR_EFLAG, SET_EFLAG)
+#endif
+              __DEFINE_SET_REG(CR_TPR, SET_TPR)
+              __DEFINE_SET_REG(CR_EOI, EOI)
+
+              /* fall back */
+              "movl r2 = ia64_native_setreg_func\n"
+              ";;\n"
+              "mov b7 = r2\n"
+              ";;\n"
+              "br.cond.sptk.many b7\n");
+#endif
+
+static const struct pv_cpu_ops xen_cpu_ops __initconst = {
         .fc             = xen_fc,
         .thash          = xen_thash,
         .get_cpuid      = xen_get_cpuid,
@@ -337,7 +880,7 @@ xen_iosapic_write(char __iomem *iosapic, unsigned int reg, u32 val)
         HYPERVISOR_physdev_op(PHYSDEVOP_apic_write, &apic_op);
 }
 
-static const struct pv_iosapic_ops xen_iosapic_ops __initconst = {
+static struct pv_iosapic_ops xen_iosapic_ops __initdata = {
         .pcat_compat_init = xen_pcat_compat_init,
         .__get_irq_chip = xen_iosapic_get_irq_chip,
 
@@ -355,6 +898,8 @@ xen_setup_pv_ops(void)
         xen_info_init();
         pv_info = xen_info;
         pv_init_ops = xen_init_ops;
+        pv_fsys_data = xen_fsys_data;
+        pv_patchdata = xen_patchdata;
         pv_cpu_ops = xen_cpu_ops;
         pv_iosapic_ops = xen_iosapic_ops;
         pv_irq_ops = xen_irq_ops;
@@ -362,3 +907,252 @@ xen_setup_pv_ops(void)
 
         paravirt_cpu_asm_init(&xen_cpu_asm_switch);
 }
+
+#ifdef ASM_SUPPORTED
+/***************************************************************************
+ * binary pacthing
+ * pv_init_ops.patch_bundle
+ */
+
+#define DEFINE_FUNC_GETREG(name, privop)                                \
+        DEFINE_FUNC0(get_ ## name,                                      \
+                     "break "__stringify(HYPERPRIVOP_GET_ ## privop) "\n")
+
+DEFINE_FUNC_GETREG(psr, PSR);
+DEFINE_FUNC_GETREG(eflag, EFLAG);
+DEFINE_FUNC_GETREG(ivr, IVR);
+DEFINE_FUNC_GETREG(tpr, TPR);
+
+#define DEFINE_FUNC_SET_KR(n)                                           \
+        DEFINE_VOID_FUNC0(set_kr ## n,                                  \
+                          ";;\n"                                        \
+                          "mov r9 = r8\n"                               \
+                          "mov r8 = " #n "\n"                           \
+                          "break " __stringify(HYPERPRIVOP_SET_KR) "\n")
+
+DEFINE_FUNC_SET_KR(0);
+DEFINE_FUNC_SET_KR(1);
+DEFINE_FUNC_SET_KR(2);
+DEFINE_FUNC_SET_KR(3);
+DEFINE_FUNC_SET_KR(4);
+DEFINE_FUNC_SET_KR(5);
+DEFINE_FUNC_SET_KR(6);
+DEFINE_FUNC_SET_KR(7);
+
+#define __DEFINE_FUNC_SETREG(name, privop)                              \
+        DEFINE_VOID_FUNC0(name,                                         \
+                          "break "__stringify(HYPERPRIVOP_ ## privop) "\n")
+
+#define DEFINE_FUNC_SETREG(name, privop)                        \
+        __DEFINE_FUNC_SETREG(set_ ## name, SET_ ## privop)
+
+DEFINE_FUNC_SETREG(eflag, EFLAG);
+DEFINE_FUNC_SETREG(tpr, TPR);
+__DEFINE_FUNC_SETREG(eoi, EOI);
+
+extern const char xen_check_events[];
+extern const char __xen_intrin_local_irq_restore_direct_start[];
+extern const char __xen_intrin_local_irq_restore_direct_end[];
+extern const unsigned long __xen_intrin_local_irq_restore_direct_reloc;
+
+asm (
+        ".align 32\n"
+        ".proc xen_check_events\n"
+        "xen_check_events:\n"
+        /* masked = 0
+         * r9 = masked_addr - 1
+         *    = pending_intr_addr
+         */
+        "st1.rel [r9] = r0, -1\n"
+        ";;\n"
+        /* r8 = pending_intr */
+        "ld1.acq r11 = [r9]\n"
+        ";;\n"
+        /* p9 = interrupt pending? */
+        "cmp.ne p9, p10 = r11, r0\n"
+        ";;\n"
+        "(p10) mf\n"
+        /* issue hypercall to trigger interrupt */
+        "(p9) break " __stringify(HYPERPRIVOP_SSM_I) "\n"
+        "br.cond.sptk.many b6\n"
+        ".endp xen_check_events\n"
+        "\n"
+        ".align 32\n"
+        ".proc __xen_intrin_local_irq_restore_direct\n"
+        "__xen_intrin_local_irq_restore_direct:\n"
+        "__xen_intrin_local_irq_restore_direct_start:\n"
+        "1:\n"
+        "{\n"
+        "cmp.ne p6, p7 = r8, r0\n"
+        "mov r17 = ip\n" /* get ip to calc return address */
+        "mov r9 = "__stringify(XEN_PSR_I_ADDR_ADDR) "\n"
+        ";;\n"
+        "}\n"
+        "{\n"
+        /* r9 = XEN_PSR_I_ADDR */
+        "ld8 r9 = [r9]\n"
+        ";;\n"
+        /* r10 = masked previous value */
+        "(p6) ld1.acq r10 = [r9]\n"
+        "adds r17 =  1f - 1b, r17\n" /* calculate return address */
+        ";;\n"
+        "}\n"
+        "{\n"
+        /* p8 = !masked interrupt masked previously? */
+        "(p6) cmp.ne.unc p8, p0 = r10, r0\n"
+        "\n"
+        /* p7 = else clause */
+        "(p7) mov r11 = 1\n"
+        ";;\n"
+        "(p8) mov b6 = r17\n" /* set return address */
+        "}\n"
+        "{\n"
+        /* masked = 1 */
+        "(p7) st1.rel [r9] = r11\n"
+        "\n"
+        "[99:]\n"
+        "(p8) brl.cond.dptk.few xen_check_events\n"
+        "}\n"
+        /* pv calling stub is 5 bundles. fill nop to adjust return address */
+        "{\n"
+        "nop 0\n"
+        "nop 0\n"
+        "nop 0\n"
+        "}\n"
+        "1:\n"
+        "__xen_intrin_local_irq_restore_direct_end:\n"
+        ".endp __xen_intrin_local_irq_restore_direct\n"
+        "\n"
+        ".align 8\n"
+        "__xen_intrin_local_irq_restore_direct_reloc:\n"
+        "data8 99b\n"
+);
+
+static struct paravirt_patch_bundle_elem xen_patch_bundle_elems[]
+__initdata_or_module =
+{
+#define XEN_PATCH_BUNDLE_ELEM(name, type)               \
+        {                                               \
+                (void*)xen_ ## name ## _direct_start,   \
+                (void*)xen_ ## name ## _direct_end,     \
+                PARAVIRT_PATCH_TYPE_ ## type,           \
+        }
+
+        XEN_PATCH_BUNDLE_ELEM(fc, FC),
+        XEN_PATCH_BUNDLE_ELEM(thash, THASH),
+        XEN_PATCH_BUNDLE_ELEM(get_cpuid, GET_CPUID),
+        XEN_PATCH_BUNDLE_ELEM(get_pmd, GET_PMD),
+        XEN_PATCH_BUNDLE_ELEM(ptcga, PTCGA),
+        XEN_PATCH_BUNDLE_ELEM(get_rr, GET_RR),
+        XEN_PATCH_BUNDLE_ELEM(set_rr, SET_RR),
+        XEN_PATCH_BUNDLE_ELEM(set_rr0_to_rr4, SET_RR0_TO_RR4),
+        XEN_PATCH_BUNDLE_ELEM(ssm_i, SSM_I),
+        XEN_PATCH_BUNDLE_ELEM(rsm_i, RSM_I),
+        XEN_PATCH_BUNDLE_ELEM(get_psr_i, GET_PSR_I),
+        {
+                (void*)__xen_intrin_local_irq_restore_direct_start,
+                (void*)__xen_intrin_local_irq_restore_direct_end,
+                PARAVIRT_PATCH_TYPE_INTRIN_LOCAL_IRQ_RESTORE,
+        },
+
+#define XEN_PATCH_BUNDLE_ELEM_GETREG(name, reg)                 \
+        {                                                       \
+                xen_get_ ## name ## _direct_start,              \
+                xen_get_ ## name ## _direct_end,                \
+                PARAVIRT_PATCH_TYPE_GETREG + _IA64_REG_ ## reg, \
+        }
+
+        XEN_PATCH_BUNDLE_ELEM_GETREG(psr, PSR),
+        XEN_PATCH_BUNDLE_ELEM_GETREG(eflag, AR_EFLAG),
+
+        XEN_PATCH_BUNDLE_ELEM_GETREG(ivr, CR_IVR),
+        XEN_PATCH_BUNDLE_ELEM_GETREG(tpr, CR_TPR),
+
+        XEN_PATCH_BUNDLE_ELEM_GETREG(itc, AR_ITC),
+        XEN_PATCH_BUNDLE_ELEM_GETREG(itm_with_offset, CR_ITM),
+
+
+#define __XEN_PATCH_BUNDLE_ELEM_SETREG(name, reg)               \
+        {                                                       \
+                xen_ ## name ## _direct_start,                  \
+                xen_ ## name ## _direct_end,                    \
+                PARAVIRT_PATCH_TYPE_SETREG + _IA64_REG_ ## reg, \
+        }
+
+#define XEN_PATCH_BUNDLE_ELEM_SETREG(name, reg)                 \
+        __XEN_PATCH_BUNDLE_ELEM_SETREG(set_ ## name, reg)
+
+        XEN_PATCH_BUNDLE_ELEM_SETREG(kr0, AR_KR0),
+        XEN_PATCH_BUNDLE_ELEM_SETREG(kr1, AR_KR1),
+        XEN_PATCH_BUNDLE_ELEM_SETREG(kr2, AR_KR2),
+        XEN_PATCH_BUNDLE_ELEM_SETREG(kr3, AR_KR3),
+        XEN_PATCH_BUNDLE_ELEM_SETREG(kr4, AR_KR4),
+        XEN_PATCH_BUNDLE_ELEM_SETREG(kr5, AR_KR5),
+        XEN_PATCH_BUNDLE_ELEM_SETREG(kr6, AR_KR6),
+        XEN_PATCH_BUNDLE_ELEM_SETREG(kr7, AR_KR7),
+
+        XEN_PATCH_BUNDLE_ELEM_SETREG(eflag, AR_EFLAG),
+        XEN_PATCH_BUNDLE_ELEM_SETREG(tpr, CR_TPR),
+        __XEN_PATCH_BUNDLE_ELEM_SETREG(eoi, CR_EOI),
+
+        XEN_PATCH_BUNDLE_ELEM_SETREG(itc, AR_ITC),
+        XEN_PATCH_BUNDLE_ELEM_SETREG(itm_with_offset, CR_ITM),
+};
+
+static unsigned long __init_or_module
+xen_patch_bundle(void *sbundle, void *ebundle, unsigned long type)
+{
+        const unsigned long nelems = sizeof(xen_patch_bundle_elems) /
+                sizeof(xen_patch_bundle_elems[0]);
+        unsigned long used;
+        const struct paravirt_patch_bundle_elem *found;
+
+        used = __paravirt_patch_apply_bundle(sbundle, ebundle, type,
+                                             xen_patch_bundle_elems, nelems,
+                                             &found);
+
+        if (found == NULL)
+                /* fallback */
+                return ia64_native_patch_bundle(sbundle, ebundle, type);
+        if (used == 0)
+                return used;
+
+        /* relocation */
+        switch (type) {
+        case PARAVIRT_PATCH_TYPE_INTRIN_LOCAL_IRQ_RESTORE: {
+                unsigned long reloc =
+                        __xen_intrin_local_irq_restore_direct_reloc;
+                unsigned long reloc_offset = reloc - (unsigned long)
+                        __xen_intrin_local_irq_restore_direct_start;
+                unsigned long tag = (unsigned long)sbundle + reloc_offset;
+                paravirt_patch_reloc_brl(tag, xen_check_events);
+                break;
+        }
+        default:
+                /* nothing */
+                break;
+        }
+        return used;
+}
+#endif /* ASM_SUPPOTED */
+
+const struct paravirt_patch_branch_target xen_branch_target[]
+__initconst = {
+#define PARAVIRT_BR_TARGET(name, type)                  \
+        {                                               \
+                &xen_ ## name,                          \
+                PARAVIRT_PATCH_TYPE_BR_ ## type,        \
+        }
+        PARAVIRT_BR_TARGET(switch_to, SWITCH_TO),
+        PARAVIRT_BR_TARGET(leave_syscall, LEAVE_SYSCALL),
+        PARAVIRT_BR_TARGET(work_processed_syscall, WORK_PROCESSED_SYSCALL),
+        PARAVIRT_BR_TARGET(leave_kernel, LEAVE_KERNEL),
+};
+
+static void __init
+xen_patch_branch(unsigned long tag, unsigned long type)
+{
+        const unsigned long nelem =
+                sizeof(xen_branch_target) / sizeof(xen_branch_target[0]);
+        __paravirt_patch_apply_branch(tag, type, xen_branch_target, nelem);
+}
diff --git a/arch/m32r/kernel/process.c b/arch/m32r/kernel/process.c
index 7103d91e1a2f..3e876f0baebc 100644
--- a/arch/m32r/kernel/process.c
+++ b/arch/m32r/kernel/process.c
@@ -225,7 +225,7 @@ int dump_fpu(struct pt_regs *regs, elf_fpregset_t *fpu)
         return 0; /* Task didn't use the fpu at all. */
 }
 
-int copy_thread(int nr, unsigned long clone_flags, unsigned long spu,
+int copy_thread(unsigned long clone_flags, unsigned long spu,
         unsigned long unused, struct task_struct *tsk, struct pt_regs *regs)
 {
         struct pt_regs *childregs = task_pt_regs(tsk);
diff --git a/arch/m68k/include/asm/bootinfo.h b/arch/m68k/include/asm/bootinfo.h
index fedf3e326121..fb8a06b9ab6a 100644
--- a/arch/m68k/include/asm/bootinfo.h
+++ b/arch/m68k/include/asm/bootinfo.h
@@ -1,5 +1,378 @@
-#ifdef __uClinux__
-#include "bootinfo_no.h"
-#else
-#include "bootinfo_mm.h"
+/*
+** asm/bootinfo.h -- Definition of the Linux/m68k boot information structure
+**
+** Copyright 1992 by Greg Harp
+**
+** This file is subject to the terms and conditions of the GNU General Public
+** License.  See the file COPYING in the main directory of this archive
+** for more details.
+**
+** Created 09/29/92 by Greg Harp
+**
+** 5/2/94 Roman Hodek:
+**   Added bi_atari part of the machine dependent union bi_un; for now it
+**   contains just a model field to distinguish between TT and Falcon.
+** 26/7/96 Roman Zippel:
+**   Renamed to setup.h; added some useful macros to allow gcc some
+**   optimizations if possible.
+** 5/10/96 Geert Uytterhoeven:
+**   Redesign of the boot information structure; renamed to bootinfo.h again
+** 27/11/96 Geert Uytterhoeven:
+**   Backwards compatibility with bootinfo interface version 1.0
+*/
+
+#ifndef _M68K_BOOTINFO_H
+#define _M68K_BOOTINFO_H
+
+
+    /*
+     *  Bootinfo definitions
+     *
+     *  This is an easily parsable and extendable structure containing all
+     *  information to be passed from the bootstrap to the kernel.
+     *
+     *  This way I hope to keep all future changes back/forewards compatible.
+     *  Thus, keep your fingers crossed...
+     *
+     *  This structure is copied right after the kernel bss by the bootstrap
+     *  routine.
+     */
+
+#ifndef __ASSEMBLY__
+
+struct bi_record {
+    unsigned short tag;                 /* tag ID */
+    unsigned short size;                /* size of record (in bytes) */
+    unsigned long data[0];              /* data */
+};
+
+#endif /* __ASSEMBLY__ */
+
+
+    /*
+     *  Tag Definitions
+     *
+     *  Machine independent tags start counting from 0x0000
+     *  Machine dependent tags start counting from 0x8000
+     */
+
+#define BI_LAST                 0x0000  /* last record (sentinel) */
+#define BI_MACHTYPE             0x0001  /* machine type (u_long) */
+#define BI_CPUTYPE              0x0002  /* cpu type (u_long) */
+#define BI_FPUTYPE              0x0003  /* fpu type (u_long) */
+#define BI_MMUTYPE              0x0004  /* mmu type (u_long) */
+#define BI_MEMCHUNK             0x0005  /* memory chunk address and size */
+                                        /* (struct mem_info) */
+#define BI_RAMDISK              0x0006  /* ramdisk address and size */
+                                        /* (struct mem_info) */
+#define BI_COMMAND_LINE         0x0007  /* kernel command line parameters */
+                                        /* (string) */
+
+    /*
+     *  Amiga-specific tags
+     */
+
+#define BI_AMIGA_MODEL          0x8000  /* model (u_long) */
+#define BI_AMIGA_AUTOCON        0x8001  /* AutoConfig device */
+                                        /* (struct ConfigDev) */
+#define BI_AMIGA_CHIP_SIZE      0x8002  /* size of Chip RAM (u_long) */
+#define BI_AMIGA_VBLANK         0x8003  /* VBLANK frequency (u_char) */
+#define BI_AMIGA_PSFREQ         0x8004  /* power supply frequency (u_char) */
+#define BI_AMIGA_ECLOCK         0x8005  /* EClock frequency (u_long) */
+#define BI_AMIGA_CHIPSET        0x8006  /* native chipset present (u_long) */
+#define BI_AMIGA_SERPER         0x8007  /* serial port period (u_short) */
+
+    /*
+     *  Atari-specific tags
+     */
+
+#define BI_ATARI_MCH_COOKIE     0x8000  /* _MCH cookie from TOS (u_long) */
+#define BI_ATARI_MCH_TYPE       0x8001  /* special machine type (u_long) */
+                                        /* (values are ATARI_MACH_* defines */
+
+/* mch_cookie values (upper word) */
+#define ATARI_MCH_ST            0
+#define ATARI_MCH_STE           1
+#define ATARI_MCH_TT            2
+#define ATARI_MCH_FALCON        3
+
+/* mch_type values */
+#define ATARI_MACH_NORMAL       0       /* no special machine type */
+#define ATARI_MACH_MEDUSA       1       /* Medusa 040 */
+#define ATARI_MACH_HADES        2       /* Hades 040 or 060 */
+#define ATARI_MACH_AB40         3       /* Afterburner040 on Falcon */
+
+    /*
+     *  VME-specific tags
+     */
+
+#define BI_VME_TYPE             0x8000  /* VME sub-architecture (u_long) */
+#define BI_VME_BRDINFO          0x8001  /* VME board information (struct) */
+
+/* BI_VME_TYPE codes */
+#define VME_TYPE_TP34V          0x0034  /* Tadpole TP34V */
+#define VME_TYPE_MVME147        0x0147  /* Motorola MVME147 */
+#define VME_TYPE_MVME162        0x0162  /* Motorola MVME162 */
+#define VME_TYPE_MVME166        0x0166  /* Motorola MVME166 */
+#define VME_TYPE_MVME167        0x0167  /* Motorola MVME167 */
+#define VME_TYPE_MVME172        0x0172  /* Motorola MVME172 */
+#define VME_TYPE_MVME177        0x0177  /* Motorola MVME177 */
+#define VME_TYPE_BVME4000       0x4000  /* BVM Ltd. BVME4000 */
+#define VME_TYPE_BVME6000       0x6000  /* BVM Ltd. BVME6000 */
+
+/* BI_VME_BRDINFO is a 32 byte struct as returned by the Bug code on
+ * Motorola VME boards.  Contains board number, Bug version, board
+ * configuration options, etc.  See include/asm/mvme16xhw.h for details.
+ */
+
+
+    /*
+     *  Macintosh-specific tags (all u_long)
+     */
+
+#define BI_MAC_MODEL            0x8000  /* Mac Gestalt ID (model type) */
+#define BI_MAC_VADDR            0x8001  /* Mac video base address */
+#define BI_MAC_VDEPTH           0x8002  /* Mac video depth */
+#define BI_MAC_VROW             0x8003  /* Mac video rowbytes */
+#define BI_MAC_VDIM             0x8004  /* Mac video dimensions */
+#define BI_MAC_VLOGICAL         0x8005  /* Mac video logical base */
+#define BI_MAC_SCCBASE          0x8006  /* Mac SCC base address */
+#define BI_MAC_BTIME            0x8007  /* Mac boot time */
+#define BI_MAC_GMTBIAS          0x8008  /* Mac GMT timezone offset */
+#define BI_MAC_MEMSIZE          0x8009  /* Mac RAM size (sanity check) */
+#define BI_MAC_CPUID            0x800a  /* Mac CPU type (sanity check) */
+#define BI_MAC_ROMBASE          0x800b  /* Mac system ROM base address */
+
+    /*
+     *  Macintosh hardware profile data - unused, see macintosh.h for
+     *  resonable type values
+     */
+
+#define BI_MAC_VIA1BASE         0x8010  /* Mac VIA1 base address (always present) */
+#define BI_MAC_VIA2BASE         0x8011  /* Mac VIA2 base address (type varies) */
+#define BI_MAC_VIA2TYPE         0x8012  /* Mac VIA2 type (VIA, RBV, OSS) */
+#define BI_MAC_ADBTYPE          0x8013  /* Mac ADB interface type */
+#define BI_MAC_ASCBASE          0x8014  /* Mac Apple Sound Chip base address */
+#define BI_MAC_SCSI5380         0x8015  /* Mac NCR 5380 SCSI (base address, multi) */
+#define BI_MAC_SCSIDMA          0x8016  /* Mac SCSI DMA (base address) */
+#define BI_MAC_SCSI5396         0x8017  /* Mac NCR 53C96 SCSI (base address, multi) */
+#define BI_MAC_IDETYPE          0x8018  /* Mac IDE interface type */
+#define BI_MAC_IDEBASE          0x8019  /* Mac IDE interface base address */
+#define BI_MAC_NUBUS            0x801a  /* Mac Nubus type (none, regular, pseudo) */
+#define BI_MAC_SLOTMASK         0x801b  /* Mac Nubus slots present */
+#define BI_MAC_SCCTYPE          0x801c  /* Mac SCC serial type (normal, IOP) */
+#define BI_MAC_ETHTYPE          0x801d  /* Mac builtin ethernet type (Sonic, MACE */
+#define BI_MAC_ETHBASE          0x801e  /* Mac builtin ethernet base address */
+#define BI_MAC_PMU              0x801f  /* Mac power management / poweroff hardware */
+#define BI_MAC_IOP_SWIM         0x8020  /* Mac SWIM floppy IOP */
+#define BI_MAC_IOP_ADB          0x8021  /* Mac ADB IOP */
+
+    /*
+     * Mac: compatibility with old booter data format (temporarily)
+     * Fields unused with the new bootinfo can be deleted now; instead of
+     * adding new fields the struct might be splitted into a hardware address
+     * part and a hardware type part
+     */
+
+#ifndef __ASSEMBLY__
+
+struct mac_booter_data
+{
+        unsigned long videoaddr;
+        unsigned long videorow;
+        unsigned long videodepth;
+        unsigned long dimensions;
+        unsigned long args;
+        unsigned long boottime;
+        unsigned long gmtbias;
+        unsigned long bootver;
+        unsigned long videological;
+        unsigned long sccbase;
+        unsigned long id;
+        unsigned long memsize;
+        unsigned long serialmf;
+        unsigned long serialhsk;
+        unsigned long serialgpi;
+        unsigned long printmf;
+        unsigned long printhsk;
+        unsigned long printgpi;
+        unsigned long cpuid;
+        unsigned long rombase;
+        unsigned long adbdelay;
+        unsigned long timedbra;
+};
+
+extern struct mac_booter_data
+        mac_bi_data;
+
 #endif
+
+    /*
+     *  Apollo-specific tags
+     */
+
+#define BI_APOLLO_MODEL         0x8000  /* model (u_long) */
+
+    /*
+     *  HP300-specific tags
+     */
+
+#define BI_HP300_MODEL          0x8000  /* model (u_long) */
+#define BI_HP300_UART_SCODE     0x8001  /* UART select code (u_long) */
+#define BI_HP300_UART_ADDR      0x8002  /* phys. addr of UART (u_long) */
+
+    /*
+     * Stuff for bootinfo interface versioning
+     *
+     * At the start of kernel code, a 'struct bootversion' is located.
+     * bootstrap checks for a matching version of the interface before booting
+     * a kernel, to avoid user confusion if kernel and bootstrap don't work
+     * together :-)
+     *
+     * If incompatible changes are made to the bootinfo interface, the major
+     * number below should be stepped (and the minor reset to 0) for the
+     * appropriate machine. If a change is backward-compatible, the minor
+     * should be stepped. "Backwards-compatible" means that booting will work,
+     * but certain features may not.
+     */
+
+#define BOOTINFOV_MAGIC                 0x4249561A      /* 'BIV^Z' */
+#define MK_BI_VERSION(major,minor)      (((major)<<16)+(minor))
+#define BI_VERSION_MAJOR(v)             (((v) >> 16) & 0xffff)
+#define BI_VERSION_MINOR(v)             ((v) & 0xffff)
+
+#ifndef __ASSEMBLY__
+
+struct bootversion {
+    unsigned short branch;
+    unsigned long magic;
+    struct {
+        unsigned long machtype;
+        unsigned long version;
+    } machversions[0];
+};
+
+#endif /* __ASSEMBLY__ */
+
+#define AMIGA_BOOTI_VERSION    MK_BI_VERSION( 2, 0 )
+#define ATARI_BOOTI_VERSION    MK_BI_VERSION( 2, 1 )
+#define MAC_BOOTI_VERSION      MK_BI_VERSION( 2, 0 )
+#define MVME147_BOOTI_VERSION  MK_BI_VERSION( 2, 0 )
+#define MVME16x_BOOTI_VERSION  MK_BI_VERSION( 2, 0 )
+#define BVME6000_BOOTI_VERSION MK_BI_VERSION( 2, 0 )
+#define Q40_BOOTI_VERSION      MK_BI_VERSION( 2, 0 )
+#define HP300_BOOTI_VERSION    MK_BI_VERSION( 2, 0 )
+
+#ifdef BOOTINFO_COMPAT_1_0
+
+    /*
+     *  Backwards compatibility with bootinfo interface version 1.0
+     */
+
+#define COMPAT_AMIGA_BOOTI_VERSION    MK_BI_VERSION( 1, 0 )
+#define COMPAT_ATARI_BOOTI_VERSION    MK_BI_VERSION( 1, 0 )
+#define COMPAT_MAC_BOOTI_VERSION      MK_BI_VERSION( 1, 0 )
+
+#include <linux/zorro.h>
+
+#define COMPAT_NUM_AUTO    16
+
+struct compat_bi_Amiga {
+    int model;
+    int num_autocon;
+    struct ConfigDev autocon[COMPAT_NUM_AUTO];
+    unsigned long chip_size;
+    unsigned char vblank;
+    unsigned char psfreq;
+    unsigned long eclock;
+    unsigned long chipset;
+    unsigned long hw_present;
+};
+
+struct compat_bi_Atari {
+    unsigned long hw_present;
+    unsigned long mch_cookie;
+};
+
+#ifndef __ASSEMBLY__
+
+struct compat_bi_Macintosh
+{
+        unsigned long videoaddr;
+        unsigned long videorow;
+        unsigned long videodepth;
+        unsigned long dimensions;
+        unsigned long args;
+        unsigned long boottime;
+        unsigned long gmtbias;
+        unsigned long bootver;
+        unsigned long videological;
+        unsigned long sccbase;
+        unsigned long id;
+        unsigned long memsize;
+        unsigned long serialmf;
+        unsigned long serialhsk;
+        unsigned long serialgpi;
+        unsigned long printmf;
+        unsigned long printhsk;
+        unsigned long printgpi;
+        unsigned long cpuid;
+        unsigned long rombase;
+        unsigned long adbdelay;
+        unsigned long timedbra;
+};
+
+#endif
+
+struct compat_mem_info {
+    unsigned long addr;
+    unsigned long size;
+};
+
+#define COMPAT_NUM_MEMINFO  4
+
+#define COMPAT_CPUB_68020 0
+#define COMPAT_CPUB_68030 1
+#define COMPAT_CPUB_68040 2
+#define COMPAT_CPUB_68060 3
+#define COMPAT_FPUB_68881 5
+#define COMPAT_FPUB_68882 6
+#define COMPAT_FPUB_68040 7
+#define COMPAT_FPUB_68060 8
+
+#define COMPAT_CPU_68020    (1<<COMPAT_CPUB_68020)
+#define COMPAT_CPU_68030    (1<<COMPAT_CPUB_68030)
+#define COMPAT_CPU_68040    (1<<COMPAT_CPUB_68040)
+#define COMPAT_CPU_68060    (1<<COMPAT_CPUB_68060)
+#define COMPAT_CPU_MASK     (31)
+#define COMPAT_FPU_68881    (1<<COMPAT_FPUB_68881)
+#define COMPAT_FPU_68882    (1<<COMPAT_FPUB_68882)
+#define COMPAT_FPU_68040    (1<<COMPAT_FPUB_68040)
+#define COMPAT_FPU_68060    (1<<COMPAT_FPUB_68060)
+#define COMPAT_FPU_MASK     (0xfe0)
+
+#define COMPAT_CL_SIZE      (256)
+
+struct compat_bootinfo {
+    unsigned long machtype;
+    unsigned long cputype;
+    struct compat_mem_info memory[COMPAT_NUM_MEMINFO];
+    int num_memory;
+    unsigned long ramdisk_size;
+    unsigned long ramdisk_addr;
+    char command_line[COMPAT_CL_SIZE];
+    union {
+        struct compat_bi_Amiga     bi_ami;
+        struct compat_bi_Atari     bi_ata;
+        struct compat_bi_Macintosh bi_mac;
+    } bi_un;
+};
+
+#define bi_amiga        bi_un.bi_ami
+#define bi_atari        bi_un.bi_ata
+#define bi_mac          bi_un.bi_mac
+
+#endif /* BOOTINFO_COMPAT_1_0 */
+
+
+#endif /* _M68K_BOOTINFO_H */
diff --git a/arch/m68k/include/asm/bootinfo_mm.h b/arch/m68k/include/asm/bootinfo_mm.h
deleted file mode 100644
index fb8a06b9ab6a..000000000000
--- a/arch/m68k/include/asm/bootinfo_mm.h
+++ /dev/null
@@ -1,378 +0,0 @@
-/*
-** asm/bootinfo.h -- Definition of the Linux/m68k boot information structure
-**
-** Copyright 1992 by Greg Harp
-**
-** This file is subject to the terms and conditions of the GNU General Public
-** License.  See the file COPYING in the main directory of this archive
-** for more details.
-**
-** Created 09/29/92 by Greg Harp
-**
-** 5/2/94 Roman Hodek:
-**   Added bi_atari part of the machine dependent union bi_un; for now it
-**   contains just a model field to distinguish between TT and Falcon.
-** 26/7/96 Roman Zippel:
-**   Renamed to setup.h; added some useful macros to allow gcc some
-**   optimizations if possible.
-** 5/10/96 Geert Uytterhoeven:
-**   Redesign of the boot information structure; renamed to bootinfo.h again
-** 27/11/96 Geert Uytterhoeven:
-**   Backwards compatibility with bootinfo interface version 1.0
-*/
-
-#ifndef _M68K_BOOTINFO_H
-#define _M68K_BOOTINFO_H
-
-
-    /*
-     *  Bootinfo definitions
-     *
-     *  This is an easily parsable and extendable structure containing all
-     *  information to be passed from the bootstrap to the kernel.
-     *
-     *  This way I hope to keep all future changes back/forewards compatible.
-     *  Thus, keep your fingers crossed...
-     *
-     *  This structure is copied right after the kernel bss by the bootstrap
-     *  routine.
-     */
-
-#ifndef __ASSEMBLY__
-
-struct bi_record {
-    unsigned short tag;                 /* tag ID */
-    unsigned short size;                /* size of record (in bytes) */
-    unsigned long data[0];              /* data */
-};
-
-#endif /* __ASSEMBLY__ */
-
-
-    /*
-     *  Tag Definitions
-     *
-     *  Machine independent tags start counting from 0x0000
-     *  Machine dependent tags start counting from 0x8000
-     */
-
-#define BI_LAST                 0x0000  /* last record (sentinel) */
-#define BI_MACHTYPE             0x0001  /* machine type (u_long) */
-#define BI_CPUTYPE              0x0002  /* cpu type (u_long) */
-#define BI_FPUTYPE              0x0003  /* fpu type (u_long) */
-#define BI_MMUTYPE              0x0004  /* mmu type (u_long) */
-#define BI_MEMCHUNK             0x0005  /* memory chunk address and size */
-                                        /* (struct mem_info) */
-#define BI_RAMDISK              0x0006  /* ramdisk address and size */
-                                        /* (struct mem_info) */
-#define BI_COMMAND_LINE         0x0007  /* kernel command line parameters */
-                                        /* (string) */
-
-    /*
-     *  Amiga-specific tags
-     */
-
-#define BI_AMIGA_MODEL          0x8000  /* model (u_long) */
-#define BI_AMIGA_AUTOCON        0x8001  /* AutoConfig device */
-                                        /* (struct ConfigDev) */
-#define BI_AMIGA_CHIP_SIZE      0x8002  /* size of Chip RAM (u_long) */
-#define BI_AMIGA_VBLANK         0x8003  /* VBLANK frequency (u_char) */
-#define BI_AMIGA_PSFREQ         0x8004  /* power supply frequency (u_char) */
-#define BI_AMIGA_ECLOCK         0x8005  /* EClock frequency (u_long) */
-#define BI_AMIGA_CHIPSET        0x8006  /* native chipset present (u_long) */
-#define BI_AMIGA_SERPER         0x8007  /* serial port period (u_short) */
-
-    /*
-     *  Atari-specific tags
-     */
-
-#define BI_ATARI_MCH_COOKIE     0x8000  /* _MCH cookie from TOS (u_long) */
-#define BI_ATARI_MCH_TYPE       0x8001  /* special machine type (u_long) */
-                                        /* (values are ATARI_MACH_* defines */
-
-/* mch_cookie values (upper word) */
-#define ATARI_MCH_ST            0
-#define ATARI_MCH_STE           1
-#define ATARI_MCH_TT            2
-#define ATARI_MCH_FALCON        3
-
-/* mch_type values */
-#define ATARI_MACH_NORMAL       0       /* no special machine type */
-#define ATARI_MACH_MEDUSA       1       /* Medusa 040 */
-#define ATARI_MACH_HADES        2       /* Hades 040 or 060 */
-#define ATARI_MACH_AB40         3       /* Afterburner040 on Falcon */
-
-    /*
-     *  VME-specific tags
-     */
-
-#define BI_VME_TYPE             0x8000  /* VME sub-architecture (u_long) */
-#define BI_VME_BRDINFO          0x8001  /* VME board information (struct) */
-
-/* BI_VME_TYPE codes */
-#define VME_TYPE_TP34V          0x0034  /* Tadpole TP34V */
-#define VME_TYPE_MVME147        0x0147  /* Motorola MVME147 */
-#define VME_TYPE_MVME162        0x0162  /* Motorola MVME162 */
-#define VME_TYPE_MVME166        0x0166  /* Motorola MVME166 */
-#define VME_TYPE_MVME167        0x0167  /* Motorola MVME167 */
-#define VME_TYPE_MVME172        0x0172  /* Motorola MVME172 */
-#define VME_TYPE_MVME177        0x0177  /* Motorola MVME177 */
-#define VME_TYPE_BVME4000       0x4000  /* BVM Ltd. BVME4000 */
-#define VME_TYPE_BVME6000       0x6000  /* BVM Ltd. BVME6000 */
-
-/* BI_VME_BRDINFO is a 32 byte struct as returned by the Bug code on
- * Motorola VME boards.  Contains board number, Bug version, board
- * configuration options, etc.  See include/asm/mvme16xhw.h for details.
- */
-
-
-    /*
-     *  Macintosh-specific tags (all u_long)
-     */
-
-#define BI_MAC_MODEL            0x8000  /* Mac Gestalt ID (model type) */
-#define BI_MAC_VADDR            0x8001  /* Mac video base address */
-#define BI_MAC_VDEPTH           0x8002  /* Mac video depth */
-#define BI_MAC_VROW             0x8003  /* Mac video rowbytes */
-#define BI_MAC_VDIM             0x8004  /* Mac video dimensions */
-#define BI_MAC_VLOGICAL         0x8005  /* Mac video logical base */
-#define BI_MAC_SCCBASE          0x8006  /* Mac SCC base address */
-#define BI_MAC_BTIME            0x8007  /* Mac boot time */
-#define BI_MAC_GMTBIAS          0x8008  /* Mac GMT timezone offset */
-#define BI_MAC_MEMSIZE          0x8009  /* Mac RAM size (sanity check) */
-#define BI_MAC_CPUID            0x800a  /* Mac CPU type (sanity check) */
-#define BI_MAC_ROMBASE          0x800b  /* Mac system ROM base address */
-
-    /*
-     *  Macintosh hardware profile data - unused, see macintosh.h for
-     *  resonable type values
-     */
-
-#define BI_MAC_VIA1BASE         0x8010  /* Mac VIA1 base address (always present) */
-#define BI_MAC_VIA2BASE         0x8011  /* Mac VIA2 base address (type varies) */
-#define BI_MAC_VIA2TYPE         0x8012  /* Mac VIA2 type (VIA, RBV, OSS) */
-#define BI_MAC_ADBTYPE          0x8013  /* Mac ADB interface type */
-#define BI_MAC_ASCBASE          0x8014  /* Mac Apple Sound Chip base address */
-#define BI_MAC_SCSI5380         0x8015  /* Mac NCR 5380 SCSI (base address, multi) */
-#define BI_MAC_SCSIDMA          0x8016  /* Mac SCSI DMA (base address) */
-#define BI_MAC_SCSI5396         0x8017  /* Mac NCR 53C96 SCSI (base address, multi) */
-#define BI_MAC_IDETYPE          0x8018  /* Mac IDE interface type */
-#define BI_MAC_IDEBASE          0x8019  /* Mac IDE interface base address */
-#define BI_MAC_NUBUS            0x801a  /* Mac Nubus type (none, regular, pseudo) */
-#define BI_MAC_SLOTMASK         0x801b  /* Mac Nubus slots present */
-#define BI_MAC_SCCTYPE          0x801c  /* Mac SCC serial type (normal, IOP) */
-#define BI_MAC_ETHTYPE          0x801d  /* Mac builtin ethernet type (Sonic, MACE */
-#define BI_MAC_ETHBASE          0x801e  /* Mac builtin ethernet base address */
-#define BI_MAC_PMU              0x801f  /* Mac power management / poweroff hardware */
-#define BI_MAC_IOP_SWIM         0x8020  /* Mac SWIM floppy IOP */
-#define BI_MAC_IOP_ADB          0x8021  /* Mac ADB IOP */
-
-    /*
-     * Mac: compatibility with old booter data format (temporarily)
-     * Fields unused with the new bootinfo can be deleted now; instead of
-     * adding new fields the struct might be splitted into a hardware address
-     * part and a hardware type part
-     */
-
-#ifndef __ASSEMBLY__
-
-struct mac_booter_data
-{
-        unsigned long videoaddr;
-        unsigned long videorow;
-        unsigned long videodepth;
-        unsigned long dimensions;
-        unsigned long args;
-        unsigned long boottime;
-        unsigned long gmtbias;
-        unsigned long bootver;
-        unsigned long videological;
-        unsigned long sccbase;
-        unsigned long id;
-        unsigned long memsize;
-        unsigned long serialmf;
-        unsigned long serialhsk;
-        unsigned long serialgpi;
-        unsigned long printmf;
-        unsigned long printhsk;
-        unsigned long printgpi;
-        unsigned long cpuid;
-        unsigned long rombase;
-        unsigned long adbdelay;
-        unsigned long timedbra;
-};
-
-extern struct mac_booter_data
-        mac_bi_data;
-
-#endif
-
-    /*
-     *  Apollo-specific tags
-     */
-
-#define BI_APOLLO_MODEL         0x8000  /* model (u_long) */
-
-    /*
-     *  HP300-specific tags
-     */
-
-#define BI_HP300_MODEL          0x8000  /* model (u_long) */
-#define BI_HP300_UART_SCODE     0x8001  /* UART select code (u_long) */
-#define BI_HP300_UART_ADDR      0x8002  /* phys. addr of UART (u_long) */
-
-    /*
-     * Stuff for bootinfo interface versioning
-     *
-     * At the start of kernel code, a 'struct bootversion' is located.
-     * bootstrap checks for a matching version of the interface before booting
-     * a kernel, to avoid user confusion if kernel and bootstrap don't work
-     * together :-)
-     *
-     * If incompatible changes are made to the bootinfo interface, the major
-     * number below should be stepped (and the minor reset to 0) for the
-     * appropriate machine. If a change is backward-compatible, the minor
-     * should be stepped. "Backwards-compatible" means that booting will work,
-     * but certain features may not.
-     */
-
-#define BOOTINFOV_MAGIC                 0x4249561A      /* 'BIV^Z' */
-#define MK_BI_VERSION(major,minor)      (((major)<<16)+(minor))
-#define BI_VERSION_MAJOR(v)             (((v) >> 16) & 0xffff)
-#define BI_VERSION_MINOR(v)             ((v) & 0xffff)
-
-#ifndef __ASSEMBLY__
-
-struct bootversion {
-    unsigned short branch;
-    unsigned long magic;
-    struct {
-        unsigned long machtype;
-        unsigned long version;
-    } machversions[0];
-};
-
-#endif /* __ASSEMBLY__ */
-
-#define AMIGA_BOOTI_VERSION    MK_BI_VERSION( 2, 0 )
-#define ATARI_BOOTI_VERSION    MK_BI_VERSION( 2, 1 )
-#define MAC_BOOTI_VERSION      MK_BI_VERSION( 2, 0 )
-#define MVME147_BOOTI_VERSION  MK_BI_VERSION( 2, 0 )
-#define MVME16x_BOOTI_VERSION  MK_BI_VERSION( 2, 0 )
-#define BVME6000_BOOTI_VERSION MK_BI_VERSION( 2, 0 )
-#define Q40_BOOTI_VERSION      MK_BI_VERSION( 2, 0 )
-#define HP300_BOOTI_VERSION    MK_BI_VERSION( 2, 0 )
-
-#ifdef BOOTINFO_COMPAT_1_0
-
-    /*
-     *  Backwards compatibility with bootinfo interface version 1.0
-     */
-
-#define COMPAT_AMIGA_BOOTI_VERSION    MK_BI_VERSION( 1, 0 )
-#define COMPAT_ATARI_BOOTI_VERSION    MK_BI_VERSION( 1, 0 )
-#define COMPAT_MAC_BOOTI_VERSION      MK_BI_VERSION( 1, 0 )
-
-#include <linux/zorro.h>
-
-#define COMPAT_NUM_AUTO    16
-
-struct compat_bi_Amiga {
-    int model;
-    int num_autocon;
-    struct ConfigDev autocon[COMPAT_NUM_AUTO];
-    unsigned long chip_size;
-    unsigned char vblank;
-    unsigned char psfreq;
-    unsigned long eclock;
-    unsigned long chipset;
-    unsigned long hw_present;
-};
-
-struct compat_bi_Atari {
-    unsigned long hw_present;
-    unsigned long mch_cookie;
-};
-
-#ifndef __ASSEMBLY__
-
-struct compat_bi_Macintosh
-{
-        unsigned long videoaddr;
-        unsigned long videorow;
-        unsigned long videodepth;
-        unsigned long dimensions;
-        unsigned long args;
-        unsigned long boottime;
-        unsigned long gmtbias;
-        unsigned long bootver;
-        unsigned long videological;
-        unsigned long sccbase;
-        unsigned long id;
-        unsigned long memsize;
-        unsigned long serialmf;
-        unsigned long serialhsk;
-        unsigned long serialgpi;
-        unsigned long printmf;
-        unsigned long printhsk;
-        unsigned long printgpi;
-        unsigned long cpuid;
-        unsigned long rombase;
-        unsigned long adbdelay;
-        unsigned long timedbra;
-};
-
-#endif
-
-struct compat_mem_info {
-    unsigned long addr;
-    unsigned long size;
-};
-
-#define COMPAT_NUM_MEMINFO  4
-
-#define COMPAT_CPUB_68020 0
-#define COMPAT_CPUB_68030 1
-#define COMPAT_CPUB_68040 2
-#define COMPAT_CPUB_68060 3
-#define COMPAT_FPUB_68881 5
-#define COMPAT_FPUB_68882 6
-#define COMPAT_FPUB_68040 7
-#define COMPAT_FPUB_68060 8
-
-#define COMPAT_CPU_68020    (1<<COMPAT_CPUB_68020)
-#define COMPAT_CPU_68030    (1<<COMPAT_CPUB_68030)
-#define COMPAT_CPU_68040    (1<<COMPAT_CPUB_68040)
-#define COMPAT_CPU_68060    (1<<COMPAT_CPUB_68060)
-#define COMPAT_CPU_MASK     (31)
-#define COMPAT_FPU_68881    (1<<COMPAT_FPUB_68881)
-#define COMPAT_FPU_68882    (1<<COMPAT_FPUB_68882)
-#define COMPAT_FPU_68040    (1<<COMPAT_FPUB_68040)
-#define COMPAT_FPU_68060    (1<<COMPAT_FPUB_68060)
-#define COMPAT_FPU_MASK     (0xfe0)
-
-#define COMPAT_CL_SIZE      (256)
-
-struct compat_bootinfo {
-    unsigned long machtype;
-    unsigned long cputype;
-    struct compat_mem_info memory[COMPAT_NUM_MEMINFO];
-    int num_memory;
-    unsigned long ramdisk_size;
-    unsigned long ramdisk_addr;
-    char command_line[COMPAT_CL_SIZE];
-    union {
-        struct compat_bi_Amiga     bi_ami;
-        struct compat_bi_Atari     bi_ata;
-        struct compat_bi_Macintosh bi_mac;
-    } bi_un;
-};
-
-#define bi_amiga        bi_un.bi_ami
-#define bi_atari        bi_un.bi_ata
-#define bi_mac          bi_un.bi_mac
-
-#endif /* BOOTINFO_COMPAT_1_0 */
-
-
-#endif /* _M68K_BOOTINFO_H */
diff --git a/arch/m68k/include/asm/bootinfo_no.h b/arch/m68k/include/asm/bootinfo_no.h
deleted file mode 100644
index c12e526f5189..000000000000
--- a/arch/m68k/include/asm/bootinfo_no.h
+++ /dev/null
@@ -1,2 +0,0 @@
-
-/* Nothing for m68knommu */
diff --git a/arch/m68k/include/asm/bug.h b/arch/m68k/include/asm/bug.h
index 997e0944ebc1..ef9a2e47352f 100644
--- a/arch/m68k/include/asm/bug.h
+++ b/arch/m68k/include/asm/bug.h
@@ -1,5 +1,30 @@
-#ifdef __uClinux__
-#include "bug_no.h"
+#ifndef _M68K_BUG_H
+#define _M68K_BUG_H
+
+#ifdef CONFIG_MMU
+#ifdef CONFIG_BUG
+#ifdef CONFIG_DEBUG_BUGVERBOSE
+#ifndef CONFIG_SUN3
+#define BUG() do { \
+        printk("kernel BUG at %s:%d!\n", __FILE__, __LINE__); \
+        __builtin_trap(); \
+} while (0)
 #else
-#include "bug_mm.h"
+#define BUG() do { \
+        printk("kernel BUG at %s:%d!\n", __FILE__, __LINE__); \
+        panic("BUG!"); \
+} while (0)
+#endif
+#else
+#define BUG() do { \
+        __builtin_trap(); \
+} while (0)
+#endif
+
+#define HAVE_ARCH_BUG
+#endif
+#endif /* CONFIG_MMU */
+
+#include <asm-generic/bug.h>
+
 #endif
diff --git a/arch/m68k/include/asm/bug_mm.h b/arch/m68k/include/asm/bug_mm.h
deleted file mode 100644
index e5b528deb8a8..000000000000
--- a/arch/m68k/include/asm/bug_mm.h
+++ /dev/null
@@ -1,29 +0,0 @@
-#ifndef _M68K_BUG_H
-#define _M68K_BUG_H
-
-
-#ifdef CONFIG_BUG
-#ifdef CONFIG_DEBUG_BUGVERBOSE
-#ifndef CONFIG_SUN3
-#define BUG() do { \
-        printk("kernel BUG at %s:%d!\n", __FILE__, __LINE__); \
-        __builtin_trap(); \
-} while (0)
-#else
-#define BUG() do { \
-        printk("kernel BUG at %s:%d!\n", __FILE__, __LINE__); \
-        panic("BUG!"); \
-} while (0)
-#endif
-#else
-#define BUG() do { \
-        __builtin_trap(); \
-} while (0)
-#endif
-
-#define HAVE_ARCH_BUG
-#endif
-
-#include <asm-generic/bug.h>
-
-#endif
diff --git a/arch/m68k/include/asm/bug_no.h b/arch/m68k/include/asm/bug_no.h
deleted file mode 100644
index 70e7dc0af21a..000000000000
--- a/arch/m68k/include/asm/bug_no.h
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _M68KNOMMU_BUG_H
-#define _M68KNOMMU_BUG_H
-#include <asm-generic/bug.h>
-#endif
diff --git a/arch/m68k/include/asm/bugs.h b/arch/m68k/include/asm/bugs.h
index 01f047d784ec..d06207b9ba5a 100644
--- a/arch/m68k/include/asm/bugs.h
+++ b/arch/m68k/include/asm/bugs.h
@@ -1,5 +1,20 @@
-#ifdef __uClinux__
-#include "bugs_no.h"
+/*
+ *  include/asm-m68k/bugs.h
+ *
+ *  Copyright (C) 1994  Linus Torvalds
+ */
+
+/*
+ * This is included by init/main.c to check for architecture-dependent bugs.
+ *
+ * Needs:
+ *      void check_bugs(void);
+ */
+
+#ifdef CONFIG_MMU
+extern void check_bugs(void);   /* in arch/m68k/kernel/setup.c */
 #else
-#include "bugs_mm.h"
+static void check_bugs(void)
+{
+}
 #endif
diff --git a/arch/m68k/include/asm/bugs_mm.h b/arch/m68k/include/asm/bugs_mm.h
deleted file mode 100644
index d01935592410..000000000000
--- a/arch/m68k/include/asm/bugs_mm.h
+++ /dev/null
@@ -1,14 +0,0 @@
-/*
- *  include/asm-m68k/bugs.h
- *
- *  Copyright (C) 1994  Linus Torvalds
- */
-
-/*
- * This is included by init/main.c to check for architecture-dependent bugs.
- *
- * Needs:
- *      void check_bugs(void);
- */
-
-extern void check_bugs(void);   /* in arch/m68k/kernel/setup.c */
diff --git a/arch/m68k/include/asm/bugs_no.h b/arch/m68k/include/asm/bugs_no.h
deleted file mode 100644
index 5f382dac3a60..000000000000
--- a/arch/m68k/include/asm/bugs_no.h
+++ /dev/null
@@ -1,16 +0,0 @@
-/*
- *  include/asm-m68k/bugs.h
- *
- *  Copyright (C) 1994  Linus Torvalds
- */
-
-/*
- * This is included by init/main.c to check for architecture-dependent bugs.
- *
- * Needs:
- *      void check_bugs(void);
- */
-
-static void check_bugs(void)
-{
-}
diff --git a/arch/m68k/include/asm/cache.h b/arch/m68k/include/asm/cache.h
index 599c29bc8f40..fed3fd30de7e 100644
--- a/arch/m68k/include/asm/cache.h
+++ b/arch/m68k/include/asm/cache.h
@@ -1,5 +1,11 @@
-#ifdef __uClinux__
-#include "cache_no.h"
-#else
-#include "cache_mm.h"
+/*
+ * include/asm-m68k/cache.h
+ */
+#ifndef __ARCH_M68K_CACHE_H
+#define __ARCH_M68K_CACHE_H
+
+/* bytes per L1 cache line */
+#define        L1_CACHE_SHIFT  4
+#define        L1_CACHE_BYTES  (1<< L1_CACHE_SHIFT)
+
 #endif
diff --git a/arch/m68k/include/asm/cache_mm.h b/arch/m68k/include/asm/cache_mm.h
deleted file mode 100644
index fed3fd30de7e..000000000000
--- a/arch/m68k/include/asm/cache_mm.h
+++ /dev/null
@@ -1,11 +0,0 @@
-/*
- * include/asm-m68k/cache.h
- */
-#ifndef __ARCH_M68K_CACHE_H
-#define __ARCH_M68K_CACHE_H
-
-/* bytes per L1 cache line */
-#define        L1_CACHE_SHIFT  4
-#define        L1_CACHE_BYTES  (1<< L1_CACHE_SHIFT)
-
-#endif
diff --git a/arch/m68k/include/asm/cache_no.h b/arch/m68k/include/asm/cache_no.h
deleted file mode 100644
index 24e9eace5f8c..000000000000
--- a/arch/m68k/include/asm/cache_no.h
+++ /dev/null
@@ -1,12 +0,0 @@
-#ifndef __ARCH_M68KNOMMU_CACHE_H
-#define __ARCH_M68KNOMMU_CACHE_H
-
-/* bytes per L1 cache line */
-#define        L1_CACHE_BYTES  16       /* this need to be at least 1 */
-
-/* m68k-elf-gcc  2.95.2 doesn't like these */
-
-#define __cacheline_aligned
-#define ____cacheline_aligned
-
-#endif
diff --git a/arch/m68k/include/asm/current.h b/arch/m68k/include/asm/current.h
index 51b056dfaedd..91fcc5358cfe 100644
--- a/arch/m68k/include/asm/current.h
+++ b/arch/m68k/include/asm/current.h
@@ -1,5 +1,28 @@
-#ifdef __uClinux__
-#include "current_no.h"
+#ifndef _M68K_CURRENT_H
+#define _M68K_CURRENT_H
+
+#ifdef CONFIG_MMU
+
+register struct task_struct *current __asm__("%a2");
+
 #else
-#include "current_mm.h"
-#endif
+
+/*
+ *      Rather than dedicate a register (as the m68k source does), we
+ *      just keep a global,  we should probably just change it all to be
+ *      current and lose _current_task.
+ */
+#include <linux/thread_info.h>
+
+struct task_struct;
+
+static inline struct task_struct *get_current(void)
+{
+        return(current_thread_info()->task);
+}
+
+#define current get_current()
+
+#endif /* CONFNIG_MMU */
+
+#endif /* !(_M68K_CURRENT_H) */
diff --git a/arch/m68k/include/asm/current_mm.h b/arch/m68k/include/asm/current_mm.h
deleted file mode 100644
index 8de8f8ceda61..000000000000
--- a/arch/m68k/include/asm/current_mm.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef _M68K_CURRENT_H
-#define _M68K_CURRENT_H
-
-register struct task_struct *current __asm__("%a2");
-
-#endif /* !(_M68K_CURRENT_H) */
diff --git a/arch/m68k/include/asm/current_no.h b/arch/m68k/include/asm/current_no.h
deleted file mode 100644
index 53ee0f9f7cef..000000000000
--- a/arch/m68k/include/asm/current_no.h
+++ /dev/null
@@ -1,24 +0,0 @@
-#ifndef _M68KNOMMU_CURRENT_H
-#define _M68KNOMMU_CURRENT_H
-/*
- *      current.h
- *      (C) Copyright 2000, Lineo, David McCullough <davidm@uclinux.org>
- *      (C) Copyright 2002, Greg Ungerer (gerg@snapgear.com)
- *
- *      rather than dedicate a register (as the m68k source does), we
- *      just keep a global,  we should probably just change it all to be
- *      current and lose _current_task.
- */
-
-#include <linux/thread_info.h>
-
-struct task_struct;
-
-static inline struct task_struct *get_current(void)
-{
-        return(current_thread_info()->task);
-}
-
-#define current get_current()
-
-#endif /* _M68KNOMMU_CURRENT_H */
diff --git a/arch/m68k/include/asm/div64.h b/arch/m68k/include/asm/div64.h
index d211d9f54276..edb66148a71d 100644
--- a/arch/m68k/include/asm/div64.h
+++ b/arch/m68k/include/asm/div64.h
@@ -1,5 +1,34 @@
-#ifdef __uClinux__
-#include "div64_no.h"
+#ifndef _M68K_DIV64_H
+#define _M68K_DIV64_H
+
+#ifdef CONFIG_MMU
+
+#include <linux/types.h>
+
+/* n = n / base; return rem; */
+
+#define do_div(n, base) ({                                      \
+        union {                                                 \
+                unsigned long n32[2];                           \
+                unsigned long long n64;                         \
+        } __n;                                                  \
+        unsigned long __rem, __upper;                           \
+                                                                \
+        __n.n64 = (n);                                          \
+        if ((__upper = __n.n32[0])) {                           \
+                asm ("divul.l %2,%1:%0"                         \
+                        : "=d" (__n.n32[0]), "=d" (__upper)     \
+                        : "d" (base), "0" (__n.n32[0]));        \
+        }                                                       \
+        asm ("divu.l %2,%1:%0"                                  \
+                : "=d" (__n.n32[1]), "=d" (__rem)               \
+                : "d" (base), "1" (__upper), "0" (__n.n32[1])); \
+        (n) = __n.n64;                                          \
+        __rem;                                                  \
+})
+
 #else
-#include "div64_mm.h"
-#endif
+#include <asm-generic/div64.h>
+#endif /* CONFIG_MMU */
+
+#endif /* _M68K_DIV64_H */
diff --git a/arch/m68k/include/asm/div64_mm.h b/arch/m68k/include/asm/div64_mm.h
deleted file mode 100644
index 8243c931b5c0..000000000000
--- a/arch/m68k/include/asm/div64_mm.h
+++ /dev/null
@@ -1,28 +0,0 @@
-#ifndef _M68K_DIV64_H
-#define _M68K_DIV64_H
-
-#include <linux/types.h>
-
-/* n = n / base; return rem; */
-
-#define do_div(n, base) ({                                      \
-        union {                                                 \
-                unsigned long n32[2];                           \
-                unsigned long long n64;                         \
-        } __n;                                                  \
-        unsigned long __rem, __upper;                           \
-                                                                \
-        __n.n64 = (n);                                          \
-        if ((__upper = __n.n32[0])) {                           \
-                asm ("divul.l %2,%1:%0"                         \
-                        : "=d" (__n.n32[0]), "=d" (__upper)     \
-                        : "d" (base), "0" (__n.n32[0]));        \
-        }                                                       \
-        asm ("divu.l %2,%1:%0"                                  \
-                : "=d" (__n.n32[1]), "=d" (__rem)               \
-                : "d" (base), "1" (__upper), "0" (__n.n32[1])); \
-        (n) = __n.n64;                                          \
-        __rem;                                                  \
-})
-
-#endif /* _M68K_DIV64_H */
diff --git a/arch/m68k/include/asm/div64_no.h b/arch/m68k/include/asm/div64_no.h
deleted file mode 100644
index 6cd978cefb28..000000000000
--- a/arch/m68k/include/asm/div64_no.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-generic/div64.h>
diff --git a/arch/m68k/include/asm/dma-mapping.h b/arch/m68k/include/asm/dma-mapping.h
index f4a4c7638f89..26f505488c11 100644
--- a/arch/m68k/include/asm/dma-mapping.h
+++ b/arch/m68k/include/asm/dma-mapping.h
@@ -1,5 +1,112 @@
-#ifdef __uClinux__
-#include "dma-mapping_no.h"
+#ifndef _M68K_DMA_MAPPING_H
+#define _M68K_DMA_MAPPING_H
+
+#include <asm/cache.h>
+
+struct scatterlist;
+
+#ifndef CONFIG_MMU_SUN3
+static inline int dma_supported(struct device *dev, u64 mask)
+{
+        return 1;
+}
+
+static inline int dma_set_mask(struct device *dev, u64 mask)
+{
+        return 0;
+}
+
+static inline int dma_get_cache_alignment(void)
+{
+        return 1 << L1_CACHE_SHIFT;
+}
+
+static inline int dma_is_consistent(struct device *dev, dma_addr_t dma_addr)
+{
+        return 0;
+}
+
+extern void *dma_alloc_coherent(struct device *, size_t,
+                                dma_addr_t *, gfp_t);
+extern void dma_free_coherent(struct device *, size_t,
+                              void *, dma_addr_t);
+
+static inline void *dma_alloc_noncoherent(struct device *dev, size_t size,
+                                          dma_addr_t *handle, gfp_t flag)
+{
+        return dma_alloc_coherent(dev, size, handle, flag);
+}
+static inline void dma_free_noncoherent(struct device *dev, size_t size,
+                                        void *addr, dma_addr_t handle)
+{
+        dma_free_coherent(dev, size, addr, handle);
+}
+static inline void dma_cache_sync(struct device *dev, void *vaddr, size_t size,
+                                  enum dma_data_direction dir)
+{
+        /* we use coherent allocation, so not much to do here. */
+}
+
+extern dma_addr_t dma_map_single(struct device *, void *, size_t,
+                                 enum dma_data_direction);
+static inline void dma_unmap_single(struct device *dev, dma_addr_t addr,
+                                    size_t size, enum dma_data_direction dir)
+{
+}
+
+extern dma_addr_t dma_map_page(struct device *, struct page *,
+                               unsigned long, size_t size,
+                               enum dma_data_direction);
+static inline void dma_unmap_page(struct device *dev, dma_addr_t address,
+                                  size_t size, enum dma_data_direction dir)
+{
+}
+
+extern int dma_map_sg(struct device *, struct scatterlist *, int,
+                      enum dma_data_direction);
+static inline void dma_unmap_sg(struct device *dev, struct scatterlist *sg,
+                                int nhwentries, enum dma_data_direction dir)
+{
+}
+
+extern void dma_sync_single_for_device(struct device *, dma_addr_t, size_t,
+                                       enum dma_data_direction);
+extern void dma_sync_sg_for_device(struct device *, struct scatterlist *, int,
+                                   enum dma_data_direction);
+
+static inline void dma_sync_single_range_for_device(struct device *dev,
+                dma_addr_t dma_handle, unsigned long offset, size_t size,
+                enum dma_data_direction direction)
+{
+        /* just sync everything for now */
+        dma_sync_single_for_device(dev, dma_handle, offset + size, direction);
+}
+
+static inline void dma_sync_single_for_cpu(struct device *dev, dma_addr_t handle,
+                                           size_t size, enum dma_data_direction dir)
+{
+}
+
+static inline void dma_sync_sg_for_cpu(struct device *dev, struct scatterlist *sg,
+                                       int nents, enum dma_data_direction dir)
+{
+}
+
+static inline void dma_sync_single_range_for_cpu(struct device *dev,
+                dma_addr_t dma_handle, unsigned long offset, size_t size,
+                enum dma_data_direction direction)
+{
+        /* just sync everything for now */
+        dma_sync_single_for_cpu(dev, dma_handle, offset + size, direction);
+}
+
+static inline int dma_mapping_error(struct device *dev, dma_addr_t handle)
+{
+        return 0;
+}
+
 #else
-#include "dma-mapping_mm.h"
+#include <asm-generic/dma-mapping-broken.h>
 #endif
+
+#endif  /* _M68K_DMA_MAPPING_H */
diff --git a/arch/m68k/include/asm/dma-mapping_mm.h b/arch/m68k/include/asm/dma-mapping_mm.h
deleted file mode 100644
index 26f505488c11..000000000000
--- a/arch/m68k/include/asm/dma-mapping_mm.h
+++ /dev/null
@@ -1,112 +0,0 @@
-#ifndef _M68K_DMA_MAPPING_H
-#define _M68K_DMA_MAPPING_H
-
-#include <asm/cache.h>
-
-struct scatterlist;
-
-#ifndef CONFIG_MMU_SUN3
-static inline int dma_supported(struct device *dev, u64 mask)
-{
-        return 1;
-}
-
-static inline int dma_set_mask(struct device *dev, u64 mask)
-{
-        return 0;
-}
-
-static inline int dma_get_cache_alignment(void)
-{
-        return 1 << L1_CACHE_SHIFT;
-}
-
-static inline int dma_is_consistent(struct device *dev, dma_addr_t dma_addr)
-{
-        return 0;
-}
-
-extern void *dma_alloc_coherent(struct device *, size_t,
-                                dma_addr_t *, gfp_t);
-extern void dma_free_coherent(struct device *, size_t,
-                              void *, dma_addr_t);
-
-static inline void *dma_alloc_noncoherent(struct device *dev, size_t size,
-                                          dma_addr_t *handle, gfp_t flag)
-{
-        return dma_alloc_coherent(dev, size, handle, flag);
-}
-static inline void dma_free_noncoherent(struct device *dev, size_t size,
-                                        void *addr, dma_addr_t handle)
-{
-        dma_free_coherent(dev, size, addr, handle);
-}
-static inline void dma_cache_sync(struct device *dev, void *vaddr, size_t size,
-                                  enum dma_data_direction dir)
-{
-        /* we use coherent allocation, so not much to do here. */
-}
-
-extern dma_addr_t dma_map_single(struct device *, void *, size_t,
-                                 enum dma_data_direction);
-static inline void dma_unmap_single(struct device *dev, dma_addr_t addr,
-                                    size_t size, enum dma_data_direction dir)
-{
-}
-
-extern dma_addr_t dma_map_page(struct device *, struct page *,
-                               unsigned long, size_t size,
-                               enum dma_data_direction);
-static inline void dma_unmap_page(struct device *dev, dma_addr_t address,
-                                  size_t size, enum dma_data_direction dir)
-{
-}
-
-extern int dma_map_sg(struct device *, struct scatterlist *, int,
-                      enum dma_data_direction);
-static inline void dma_unmap_sg(struct device *dev, struct scatterlist *sg,
-                                int nhwentries, enum dma_data_direction dir)
-{
-}
-
-extern void dma_sync_single_for_device(struct device *, dma_addr_t, size_t,
-                                       enum dma_data_direction);
-extern void dma_sync_sg_for_device(struct device *, struct scatterlist *, int,
-                                   enum dma_data_direction);
-
-static inline void dma_sync_single_range_for_device(struct device *dev,
-                dma_addr_t dma_handle, unsigned long offset, size_t size,
-                enum dma_data_direction direction)
-{
-        /* just sync everything for now */
-        dma_sync_single_for_device(dev, dma_handle, offset + size, direction);
-}
-
-static inline void dma_sync_single_for_cpu(struct device *dev, dma_addr_t handle,
-                                           size_t size, enum dma_data_direction dir)
-{
-}
-
-static inline void dma_sync_sg_for_cpu(struct device *dev, struct scatterlist *sg,
-                                       int nents, enum dma_data_direction dir)
-{
-}
-
-static inline void dma_sync_single_range_for_cpu(struct device *dev,
-                dma_addr_t dma_handle, unsigned long offset, size_t size,
-                enum dma_data_direction direction)
-{
-        /* just sync everything for now */
-        dma_sync_single_for_cpu(dev, dma_handle, offset + size, direction);
-}
-
-static inline int dma_mapping_error(struct device *dev, dma_addr_t handle)
-{
-        return 0;
-}
-
-#else
-#include <asm-generic/dma-mapping-broken.h>
-#endif
-
-#endif  /* _M68K_DMA_MAPPING_H */
diff --git a/arch/m68k/include/asm/dma-mapping_no.h b/arch/m68k/include/asm/dma-mapping_no.h
deleted file mode 100644
index 1748f2bca940..000000000000
--- a/arch/m68k/include/asm/dma-mapping_no.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef _M68KNOMMU_DMA_MAPPING_H
-#define _M68KNOMMU_DMA_MAPPING_H
-
-#include <asm-generic/dma-mapping-broken.h>
-
-#endif  /* _M68KNOMMU_DMA_MAPPING_H */
diff --git a/arch/m68k/include/asm/elf.h b/arch/m68k/include/asm/elf.h
index 04ce488bc63f..0b0f49eb876b 100644
--- a/arch/m68k/include/asm/elf.h
+++ b/arch/m68k/include/asm/elf.h
@@ -1,5 +1,119 @@
-#ifdef __uClinux__
-#include "elf_no.h"
+#ifndef __ASMm68k_ELF_H
+#define __ASMm68k_ELF_H
+
+/*
+ * ELF register definitions..
+ */
+
+#include <asm/ptrace.h>
+#include <asm/user.h>
+
+/*
+ * 68k ELF relocation types
+ */
+#define R_68K_NONE      0
+#define R_68K_32        1
+#define R_68K_16        2
+#define R_68K_8         3
+#define R_68K_PC32      4
+#define R_68K_PC16      5
+#define R_68K_PC8       6
+#define R_68K_GOT32     7
+#define R_68K_GOT16     8
+#define R_68K_GOT8      9
+#define R_68K_GOT32O    10
+#define R_68K_GOT16O    11
+#define R_68K_GOT8O     12
+#define R_68K_PLT32     13
+#define R_68K_PLT16     14
+#define R_68K_PLT8      15
+#define R_68K_PLT32O    16
+#define R_68K_PLT16O    17
+#define R_68K_PLT8O     18
+#define R_68K_COPY      19
+#define R_68K_GLOB_DAT  20
+#define R_68K_JMP_SLOT  21
+#define R_68K_RELATIVE  22
+
+typedef unsigned long elf_greg_t;
+
+#define ELF_NGREG (sizeof(struct user_regs_struct) / sizeof(elf_greg_t))
+typedef elf_greg_t elf_gregset_t[ELF_NGREG];
+
+typedef struct user_m68kfp_struct elf_fpregset_t;
+
+/*
+ * This is used to ensure we don't load something for the wrong architecture.
+ */
+#define elf_check_arch(x) ((x)->e_machine == EM_68K)
+
+/*
+ * These are used to set parameters in the core dumps.
+ */
+#define ELF_CLASS       ELFCLASS32
+#define ELF_DATA        ELFDATA2MSB
+#define ELF_ARCH        EM_68K
+
+/* For SVR4/m68k the function pointer to be registered with `atexit' is
+   passed in %a1.  Although my copy of the ABI has no such statement, it
+   is actually used on ASV.  */
+#define ELF_PLAT_INIT(_r, load_addr)    _r->a1 = 0
+
+#define USE_ELF_CORE_DUMP
+#ifndef CONFIG_SUN3
+#define ELF_EXEC_PAGESIZE       4096
 #else
-#include "elf_mm.h"
+#define ELF_EXEC_PAGESIZE       8192
+#endif
+
+/* This is the location that an ET_DYN program is loaded if exec'ed.  Typical
+   use of this is to invoke "./ld.so someprog" to test out a new version of
+   the loader.  We need to make sure that it is out of the way of the program
+   that it will "exec", and that there is sufficient room for the brk.  */
+
+#ifndef CONFIG_SUN3
+#define ELF_ET_DYN_BASE         0xD0000000UL
+#else
+#define ELF_ET_DYN_BASE         0x0D800000UL
+#endif
+
+#define ELF_CORE_COPY_REGS(pr_reg, regs)                                \
+        /* Bleech. */                                                   \
+        pr_reg[0] = regs->d1;                                           \
+        pr_reg[1] = regs->d2;                                           \
+        pr_reg[2] = regs->d3;                                           \
+        pr_reg[3] = regs->d4;                                           \
+        pr_reg[4] = regs->d5;                                           \
+        pr_reg[7] = regs->a0;                                           \
+        pr_reg[8] = regs->a1;                                           \
+        pr_reg[9] = regs->a2;                                           \
+        pr_reg[14] = regs->d0;                                          \
+        pr_reg[15] = rdusp();                                           \
+        pr_reg[16] = regs->orig_d0;                                     \
+        pr_reg[17] = regs->sr;                                          \
+        pr_reg[18] = regs->pc;                                          \
+        pr_reg[19] = (regs->format << 12) | regs->vector;               \
+        {                                                               \
+          struct switch_stack *sw = ((struct switch_stack *)regs) - 1;  \
+          pr_reg[5] = sw->d6;                                           \
+          pr_reg[6] = sw->d7;                                           \
+          pr_reg[10] = sw->a3;                                          \
+          pr_reg[11] = sw->a4;                                          \
+          pr_reg[12] = sw->a5;                                          \
+          pr_reg[13] = sw->a6;                                          \
+        }
+
+/* This yields a mask that user programs can use to figure out what
+   instruction set this cpu supports.  */
+
+#define ELF_HWCAP       (0)
+
+/* This yields a string that ld.so will use to load implementation
+   specific libraries for optimization.  This is more specific in
+   intent than poking at uname or /proc/cpuinfo.  */
+
+#define ELF_PLATFORM  (NULL)
+
+#define SET_PERSONALITY(ex) set_personality(PER_LINUX)
+
 #endif
diff --git a/arch/m68k/include/asm/elf_mm.h b/arch/m68k/include/asm/elf_mm.h
deleted file mode 100644
index 0b0f49eb876b..000000000000
--- a/arch/m68k/include/asm/elf_mm.h
+++ /dev/null
@@ -1,119 +0,0 @@
-#ifndef __ASMm68k_ELF_H
-#define __ASMm68k_ELF_H
-
-/*
- * ELF register definitions..
- */
-
-#include <asm/ptrace.h>
-#include <asm/user.h>
-
-/*
- * 68k ELF relocation types
- */
-#define R_68K_NONE      0
-#define R_68K_32        1
-#define R_68K_16        2
-#define R_68K_8         3
-#define R_68K_PC32      4
-#define R_68K_PC16      5
-#define R_68K_PC8       6
-#define R_68K_GOT32     7
-#define R_68K_GOT16     8
-#define R_68K_GOT8      9
-#define R_68K_GOT32O    10
-#define R_68K_GOT16O    11
-#define R_68K_GOT8O     12
-#define R_68K_PLT32     13
-#define R_68K_PLT16     14
-#define R_68K_PLT8      15
-#define R_68K_PLT32O    16
-#define R_68K_PLT16O    17
-#define R_68K_PLT8O     18
-#define R_68K_COPY      19
-#define R_68K_GLOB_DAT  20
-#define R_68K_JMP_SLOT  21
-#define R_68K_RELATIVE  22
-
-typedef unsigned long elf_greg_t;
-
-#define ELF_NGREG (sizeof(struct user_regs_struct) / sizeof(elf_greg_t))
-typedef elf_greg_t elf_gregset_t[ELF_NGREG];
-
-typedef struct user_m68kfp_struct elf_fpregset_t;
-
-/*
- * This is used to ensure we don't load something for the wrong architecture.
- */
-#define elf_check_arch(x) ((x)->e_machine == EM_68K)
-
-/*
- * These are used to set parameters in the core dumps.
- */
-#define ELF_CLASS       ELFCLASS32
-#define ELF_DATA        ELFDATA2MSB
-#define ELF_ARCH        EM_68K
-
-/* For SVR4/m68k the function pointer to be registered with `atexit' is
-   passed in %a1.  Although my copy of the ABI has no such statement, it
-   is actually used on ASV.  */
-#define ELF_PLAT_INIT(_r, load_addr)    _r->a1 = 0
-
-#define USE_ELF_CORE_DUMP
-#ifndef CONFIG_SUN3
-#define ELF_EXEC_PAGESIZE       4096
-#else
-#define ELF_EXEC_PAGESIZE       8192
-#endif
-
-/* This is the location that an ET_DYN program is loaded if exec'ed.  Typical
-   use of this is to invoke "./ld.so someprog" to test out a new version of
-   the loader.  We need to make sure that it is out of the way of the program
-   that it will "exec", and that there is sufficient room for the brk.  */
-
-#ifndef CONFIG_SUN3
-#define ELF_ET_DYN_BASE         0xD0000000UL
-#else
-#define ELF_ET_DYN_BASE         0x0D800000UL
-#endif
-
-#define ELF_CORE_COPY_REGS(pr_reg, regs)                                \
-        /* Bleech. */                                                   \
-        pr_reg[0] = regs->d1;                                           \
-        pr_reg[1] = regs->d2;                                           \
-        pr_reg[2] = regs->d3;                                           \
-        pr_reg[3] = regs->d4;                                           \
-        pr_reg[4] = regs->d5;                                           \
-        pr_reg[7] = regs->a0;                                           \
-        pr_reg[8] = regs->a1;                                           \
-        pr_reg[9] = regs->a2;                                           \
-        pr_reg[14] = regs->d0;                                          \
-        pr_reg[15] = rdusp();                                           \
-        pr_reg[16] = regs->orig_d0;                                     \
-        pr_reg[17] = regs->sr;                                          \
-        pr_reg[18] = regs->pc;                                          \
-        pr_reg[19] = (regs->format << 12) | regs->vector;               \
-        {                                                               \
-          struct switch_stack *sw = ((struct switch_stack *)regs) - 1;  \
-          pr_reg[5] = sw->d6;                                           \
-          pr_reg[6] = sw->d7;                                           \
-          pr_reg[10] = sw->a3;                                          \
-          pr_reg[11] = sw->a4;                                          \
-          pr_reg[12] = sw->a5;                                          \
-          pr_reg[13] = sw->a6;                                          \
-        }
-
-/* This yields a mask that user programs can use to figure out what
-   instruction set this cpu supports.  */
-
-#define ELF_HWCAP       (0)
-
-/* This yields a string that ld.so will use to load implementation
-   specific libraries for optimization.  This is more specific in
-   intent than poking at uname or /proc/cpuinfo.  */
-
-#define ELF_PLATFORM  (NULL)
-
-#define SET_PERSONALITY(ex) set_personality(PER_LINUX)
-
-#endif
diff --git a/arch/m68k/include/asm/elf_no.h b/arch/m68k/include/asm/elf_no.h
deleted file mode 100644
index b8046837f384..000000000000
--- a/arch/m68k/include/asm/elf_no.h
+++ /dev/null
@@ -1,110 +0,0 @@
-#ifndef __ASMm68k_ELF_H
-#define __ASMm68k_ELF_H
-
-/*
- * ELF register definitions..
- */
-
-#include <asm/ptrace.h>
-#include <asm/user.h>
-
-/*
- * 68k ELF relocation types
- */
-#define R_68K_NONE  0
-#define R_68K_32    1
-#define R_68K_16    2
-#define R_68K_8     3
-#define R_68K_PC32  4
-#define R_68K_PC16  5
-#define R_68K_PC8   6
-#define R_68K_GOT32 7
-#define R_68K_GOT16 8
-#define R_68K_GOT8  9
-#define R_68K_GOT32O    10
-#define R_68K_GOT16O    11
-#define R_68K_GOT8O 12
-#define R_68K_PLT32 13
-#define R_68K_PLT16 14
-#define R_68K_PLT8  15
-#define R_68K_PLT32O    16
-#define R_68K_PLT16O    17
-#define R_68K_PLT8O 18
-#define R_68K_COPY  19
-#define R_68K_GLOB_DAT  20
-#define R_68K_JMP_SLOT  21
-#define R_68K_RELATIVE  22
-
-typedef unsigned long elf_greg_t;
-
-#define ELF_NGREG (sizeof(struct user_regs_struct) / sizeof(elf_greg_t))
-typedef elf_greg_t elf_gregset_t[ELF_NGREG];
-
-typedef struct user_m68kfp_struct elf_fpregset_t;
-
-/*
- * This is used to ensure we don't load something for the wrong architecture.
- */
-#define elf_check_arch(x) ((x)->e_machine == EM_68K)
-
-/*
- * These are used to set parameters in the core dumps.
- */
-#define ELF_CLASS       ELFCLASS32
-#define ELF_DATA        ELFDATA2MSB
-#define ELF_ARCH        EM_68K
-
-/* For SVR4/m68k the function pointer to be registered with `atexit' is
-   passed in %a1.  Although my copy of the ABI has no such statement, it
-   is actually used on ASV.  */
-#define ELF_PLAT_INIT(_r, load_addr)    _r->a1 = 0
-
-#define USE_ELF_CORE_DUMP
-#define ELF_EXEC_PAGESIZE       4096
-
-/* This is the location that an ET_DYN program is loaded if exec'ed.  Typical
-   use of this is to invoke "./ld.so someprog" to test out a new version of
-   the loader.  We need to make sure that it is out of the way of the program
-   that it will "exec", and that there is sufficient room for the brk.  */
-
-#define ELF_ET_DYN_BASE         0xD0000000UL
-
-#define ELF_CORE_COPY_REGS(pr_reg, regs)                                \
-        /* Bleech. */                                                   \
-        pr_reg[0] = regs->d1;                                           \
-        pr_reg[1] = regs->d2;                                           \
-        pr_reg[2] = regs->d3;                                           \
-        pr_reg[3] = regs->d4;                                           \
-        pr_reg[4] = regs->d5;                                           \
-        pr_reg[7] = regs->a0;                                           \
-        pr_reg[8] = regs->a1;                                           \
-        pr_reg[14] = regs->d0;                                          \
-        pr_reg[15] = rdusp();                                           \
-        pr_reg[16] = 0 /* regs->orig_d0 */;                             \
-        pr_reg[17] = regs->sr;                                          \
-        pr_reg[18] = regs->pc;                                          \
-        /* pr_reg[19] = (regs->format << 12) | regs->vector; */         \
-        {                                                               \
-          struct switch_stack *sw = ((struct switch_stack *)regs) - 1;  \
-          pr_reg[5] = sw->d6;                                           \
-          pr_reg[6] = sw->d7;                                           \
-          pr_reg[10] = sw->a3;                                          \
-          pr_reg[11] = sw->a4;                                          \
-          pr_reg[12] = sw->a5;                                          \
-          pr_reg[13] = sw->a6;                                          \
-        }
-
-/* This yields a mask that user programs can use to figure out what
-   instruction set this cpu supports.  */
-
-#define ELF_HWCAP       (0)
-
-/* This yields a string that ld.so will use to load implementation
-   specific libraries for optimization.  This is more specific in
-   intent than poking at uname or /proc/cpuinfo.  */
-
-#define ELF_PLATFORM  (NULL)
-
-#define SET_PERSONALITY(ex) set_personality(PER_LINUX)
-
-#endif
diff --git a/arch/m68k/include/asm/fb.h b/arch/m68k/include/asm/fb.h
index 97bcaefd2064..be4e4c6797e8 100644
--- a/arch/m68k/include/asm/fb.h
+++ b/arch/m68k/include/asm/fb.h
@@ -1,5 +1,38 @@
-#ifdef __uClinux__
-#include "fb_no.h"
+#ifndef _ASM_FB_H_
+#define _ASM_FB_H_
+
+#include <linux/fb.h>
+#include <linux/fs.h>
+#include <asm/page.h>
+#include <asm/setup.h>
+
+#ifdef CONFIG_MMU
+#ifdef CONFIG_SUN3
+static inline void fb_pgprotect(struct file *file, struct vm_area_struct *vma,
+                                unsigned long off)
+{
+        pgprot_val(vma->vm_page_prot) |= SUN3_PAGE_NOCACHE;
+}
 #else
-#include "fb_mm.h"
-#endif
+static inline void fb_pgprotect(struct file *file, struct vm_area_struct *vma,
+                                unsigned long off)
+{
+        if (CPU_IS_020_OR_030)
+                pgprot_val(vma->vm_page_prot) |= _PAGE_NOCACHE030;
+        if (CPU_IS_040_OR_060) {
+                pgprot_val(vma->vm_page_prot) &= _CACHEMASK040;
+                /* Use no-cache mode, serialized */
+                pgprot_val(vma->vm_page_prot) |= _PAGE_NOCACHE_S;
+        }
+}
+#endif /* CONFIG_SUN3 */
+#else
+#define fb_pgprotect(...) do {} while (0)
+#endif /* CONFIG_MMU */
+
+static inline int fb_is_primary_device(struct fb_info *info)
+{
+        return 0;
+}
+
+#endif /* _ASM_FB_H_ */
diff --git a/arch/m68k/include/asm/fb_mm.h b/arch/m68k/include/asm/fb_mm.h
deleted file mode 100644
index 380b97ae8157..000000000000
--- a/arch/m68k/include/asm/fb_mm.h
+++ /dev/null
@@ -1,34 +0,0 @@
-#ifndef _ASM_FB_H_
-#define _ASM_FB_H_
-
-#include <linux/fb.h>
-#include <linux/fs.h>
-#include <asm/page.h>
-#include <asm/setup.h>
-
-#ifdef CONFIG_SUN3
-static inline void fb_pgprotect(struct file *file, struct vm_area_struct *vma,
-                                unsigned long off)
-{
-        pgprot_val(vma->vm_page_prot) |= SUN3_PAGE_NOCACHE;
-}
-#else
-static inline void fb_pgprotect(struct file *file, struct vm_area_struct *vma,
-                                unsigned long off)
-{
-        if (CPU_IS_020_OR_030)
-                pgprot_val(vma->vm_page_prot) |= _PAGE_NOCACHE030;
-        if (CPU_IS_040_OR_060) {
-                pgprot_val(vma->vm_page_prot) &= _CACHEMASK040;
-                /* Use no-cache mode, serialized */
-                pgprot_val(vma->vm_page_prot) |= _PAGE_NOCACHE_S;
-        }
-}
-#endif /* CONFIG_SUN3 */
-
-static inline int fb_is_primary_device(struct fb_info *info)
-{
-        return 0;
-}
-
-#endif /* _ASM_FB_H_ */
diff --git a/arch/m68k/include/asm/fb_no.h b/arch/m68k/include/asm/fb_no.h
deleted file mode 100644
index c7df38030992..000000000000
--- a/arch/m68k/include/asm/fb_no.h
+++ /dev/null
@@ -1,12 +0,0 @@
-#ifndef _ASM_FB_H_
-#define _ASM_FB_H_
-#include <linux/fb.h>
-
-#define fb_pgprotect(...) do {} while (0)
-
-static inline int fb_is_primary_device(struct fb_info *info)
-{
-        return 0;
-}
-
-#endif /* _ASM_FB_H_ */
diff --git a/arch/m68k/include/asm/fpu.h b/arch/m68k/include/asm/fpu.h
index e19bc5ed9c37..ffb6b8cfc6d5 100644
--- a/arch/m68k/include/asm/fpu.h
+++ b/arch/m68k/include/asm/fpu.h
@@ -1,5 +1,21 @@
-#ifdef __uClinux__
-#include "fpu_no.h"
+#ifndef __M68K_FPU_H
+#define __M68K_FPU_H
+
+
+/*
+ * MAX floating point unit state size (FSAVE/FRESTORE)
+ */
+
+#if defined(CONFIG_M68020) || defined(CONFIG_M68030)
+#define FPSTATESIZE (216)
+#elif defined(CONFIG_M68040)
+#define FPSTATESIZE (96)
+#elif defined(CONFIG_M68KFPU_EMU)
+#define FPSTATESIZE (28)
+#elif defined(CONFIG_M68060)
+#define FPSTATESIZE (12)
 #else
-#include "fpu_mm.h"
+#define FPSTATESIZE (0)
 #endif
+
+#endif /* __M68K_FPU_H */
diff --git a/arch/m68k/include/asm/fpu_mm.h b/arch/m68k/include/asm/fpu_mm.h
deleted file mode 100644
index ffb6b8cfc6d5..000000000000
--- a/arch/m68k/include/asm/fpu_mm.h
+++ /dev/null
@@ -1,21 +0,0 @@
-#ifndef __M68K_FPU_H
-#define __M68K_FPU_H
-
-
-/*
- * MAX floating point unit state size (FSAVE/FRESTORE)
- */
-
-#if defined(CONFIG_M68020) || defined(CONFIG_M68030)
-#define FPSTATESIZE (216)
-#elif defined(CONFIG_M68040)
-#define FPSTATESIZE (96)
-#elif defined(CONFIG_M68KFPU_EMU)
-#define FPSTATESIZE (28)
-#elif defined(CONFIG_M68060)
-#define FPSTATESIZE (12)
-#else
-#define FPSTATESIZE (0)
-#endif
-
-#endif /* __M68K_FPU_H */
diff --git a/arch/m68k/include/asm/fpu_no.h b/arch/m68k/include/asm/fpu_no.h
deleted file mode 100644
index b16b2e4fca2a..000000000000
--- a/arch/m68k/include/asm/fpu_no.h
+++ /dev/null
@@ -1,21 +0,0 @@
-#ifndef __M68KNOMMU_FPU_H
-#define __M68KNOMMU_FPU_H
-
-
-/*
- * MAX floating point unit state size (FSAVE/FRESTORE)
- */
-#if defined(CONFIG_M68020) || defined(CONFIG_M68030)
-#define FPSTATESIZE (216/sizeof(unsigned char))
-#elif defined(CONFIG_M68040)
-#define FPSTATESIZE (96/sizeof(unsigned char))
-#elif defined(CONFIG_M68KFPU_EMU)
-#define FPSTATESIZE (28/sizeof(unsigned char))
-#elif defined(CONFIG_M68060)
-#define FPSTATESIZE (12/sizeof(unsigned char))
-#else
-/* Assume no FP unit present then... */
-#define FPSTATESIZE (2) /* dummy size */
-#endif
-
-#endif /* __M68K_FPU_H */
diff --git a/arch/m68k/include/asm/hw_irq.h b/arch/m68k/include/asm/hw_irq.h
index e19526015890..eacef0951fbf 100644
--- a/arch/m68k/include/asm/hw_irq.h
+++ b/arch/m68k/include/asm/hw_irq.h
@@ -1,5 +1,6 @@
-#ifdef __uClinux__
-#include "hw_irq_no.h"
-#else
-#include "hw_irq_mm.h"
+#ifndef __ASM_M68K_HW_IRQ_H
+#define __ASM_M68K_HW_IRQ_H
+
+/* Dummy include. */
+
 #endif
diff --git a/arch/m68k/include/asm/hw_irq_mm.h b/arch/m68k/include/asm/hw_irq_mm.h
deleted file mode 100644
index eacef0951fbf..000000000000
--- a/arch/m68k/include/asm/hw_irq_mm.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef __ASM_M68K_HW_IRQ_H
-#define __ASM_M68K_HW_IRQ_H
-
-/* Dummy include. */
-
-#endif
diff --git a/arch/m68k/include/asm/hw_irq_no.h b/arch/m68k/include/asm/hw_irq_no.h
deleted file mode 100644
index f3ec9e5ae049..000000000000
--- a/arch/m68k/include/asm/hw_irq_no.h
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef __M68KNOMMU_HW_IRQ_H__
-#define __M68KNOMMU_HW_IRQ_H__
-
-#endif /* __M68KNOMMU_HW_IRQ_H__ */
diff --git a/arch/m68k/include/asm/kmap_types.h b/arch/m68k/include/asm/kmap_types.h
index 045d9fd122a2..c843c63d3801 100644
--- a/arch/m68k/include/asm/kmap_types.h
+++ b/arch/m68k/include/asm/kmap_types.h
@@ -1,5 +1,21 @@
-#ifdef __uClinux__
-#include "kmap_types_no.h"
-#else
-#include "kmap_types_mm.h"
-#endif
+#ifndef __ASM_M68K_KMAP_TYPES_H
+#define __ASM_M68K_KMAP_TYPES_H
+
+enum km_type {
+        KM_BOUNCE_READ,
+        KM_SKB_SUNRPC_DATA,
+        KM_SKB_DATA_SOFTIRQ,
+        KM_USER0,
+        KM_USER1,
+        KM_BIO_SRC_IRQ,
+        KM_BIO_DST_IRQ,
+        KM_PTE0,
+        KM_PTE1,
+        KM_IRQ0,
+        KM_IRQ1,
+        KM_SOFTIRQ0,
+        KM_SOFTIRQ1,
+        KM_TYPE_NR
+};
+
+#endif  /* __ASM_M68K_KMAP_TYPES_H */
diff --git a/arch/m68k/include/asm/kmap_types_mm.h b/arch/m68k/include/asm/kmap_types_mm.h
deleted file mode 100644
index c843c63d3801..000000000000
--- a/arch/m68k/include/asm/kmap_types_mm.h
+++ /dev/null
@@ -1,21 +0,0 @@
-#ifndef __ASM_M68K_KMAP_TYPES_H
-#define __ASM_M68K_KMAP_TYPES_H
-
-enum km_type {
-        KM_BOUNCE_READ,
-        KM_SKB_SUNRPC_DATA,
-        KM_SKB_DATA_SOFTIRQ,
-        KM_USER0,
-        KM_USER1,
-        KM_BIO_SRC_IRQ,
-        KM_BIO_DST_IRQ,
-        KM_PTE0,
-        KM_PTE1,
-        KM_IRQ0,
-        KM_IRQ1,
-        KM_SOFTIRQ0,
-        KM_SOFTIRQ1,
-        KM_TYPE_NR
-};
-
-#endif  /* __ASM_M68K_KMAP_TYPES_H */
diff --git a/arch/m68k/include/asm/kmap_types_no.h b/arch/m68k/include/asm/kmap_types_no.h
deleted file mode 100644
index bfb6707575d1..000000000000
--- a/arch/m68k/include/asm/kmap_types_no.h
+++ /dev/null
@@ -1,21 +0,0 @@
-#ifndef __ASM_M68K_KMAP_TYPES_H
-#define __ASM_M68K_KMAP_TYPES_H
-
-enum km_type {
-        KM_BOUNCE_READ,
-        KM_SKB_SUNRPC_DATA,
-        KM_SKB_DATA_SOFTIRQ,
-        KM_USER0,
-        KM_USER1,
-        KM_BIO_SRC_IRQ,
-        KM_BIO_DST_IRQ,
-        KM_PTE0,
-        KM_PTE1,
-        KM_IRQ0,
-        KM_IRQ1,
-        KM_SOFTIRQ0,
-        KM_SOFTIRQ1,
-        KM_TYPE_NR
-};
-
-#endif
diff --git a/arch/m68k/include/asm/m532xsim.h b/arch/m68k/include/asm/m532xsim.h
index 1835fd20a82c..ce603451b55e 100644
--- a/arch/m68k/include/asm/m532xsim.h
+++ b/arch/m68k/include/asm/m532xsim.h
@@ -16,6 +16,7 @@
 #define MCFINT_VECBASE      64
 #define MCFINT_UART0        26          /* Interrupt number for UART0 */
 #define MCFINT_UART1        27          /* Interrupt number for UART1 */
+#define MCFINT_UART2        28          /* Interrupt number for UART2 */
 
 #define MCF_WTM_WCR     MCF_REG16(0xFC098000)
 
diff --git a/arch/m68k/include/asm/mc146818rtc.h b/arch/m68k/include/asm/mc146818rtc.h
index fb90dcf78426..9f70a01f73dc 100644
--- a/arch/m68k/include/asm/mc146818rtc.h
+++ b/arch/m68k/include/asm/mc146818rtc.h
@@ -1,5 +1,26 @@
-#ifdef __uClinux__
-#include "mc146818rtc_no.h"
-#else
-#include "mc146818rtc_mm.h"
-#endif
+/*
+ * Machine dependent access functions for RTC registers.
+ */
+#ifndef _ASM_MC146818RTC_H
+#define _ASM_MC146818RTC_H
+
+
+#ifdef CONFIG_ATARI
+/* RTC in Atari machines */
+
+#include <asm/atarihw.h>
+
+#define RTC_PORT(x)     (TT_RTC_BAS + 2*(x))
+#define RTC_ALWAYS_BCD  0
+
+#define CMOS_READ(addr) ({ \
+atari_outb_p((addr),RTC_PORT(0)); \
+atari_inb_p(RTC_PORT(1)); \
+})
+#define CMOS_WRITE(val, addr) ({ \
+atari_outb_p((addr),RTC_PORT(0)); \
+atari_outb_p((val),RTC_PORT(1)); \
+})
+#endif /* CONFIG_ATARI */
+
+#endif /* _ASM_MC146818RTC_H */
diff --git a/arch/m68k/include/asm/mc146818rtc_mm.h b/arch/m68k/include/asm/mc146818rtc_mm.h
deleted file mode 100644
index 9f70a01f73dc..000000000000
--- a/arch/m68k/include/asm/mc146818rtc_mm.h
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * Machine dependent access functions for RTC registers.
- */
-#ifndef _ASM_MC146818RTC_H
-#define _ASM_MC146818RTC_H
-
-
-#ifdef CONFIG_ATARI
-/* RTC in Atari machines */
-
-#include <asm/atarihw.h>
-
-#define RTC_PORT(x)     (TT_RTC_BAS + 2*(x))
-#define RTC_ALWAYS_BCD  0
-
-#define CMOS_READ(addr) ({ \
-atari_outb_p((addr),RTC_PORT(0)); \
-atari_inb_p(RTC_PORT(1)); \
-})
-#define CMOS_WRITE(val, addr) ({ \
-atari_outb_p((addr),RTC_PORT(0)); \
-atari_outb_p((val),RTC_PORT(1)); \
-})
-#endif /* CONFIG_ATARI */
-
-#endif /* _ASM_MC146818RTC_H */
diff --git a/arch/m68k/include/asm/mc146818rtc_no.h b/arch/m68k/include/asm/mc146818rtc_no.h
deleted file mode 100644
index 907a0481a140..000000000000
--- a/arch/m68k/include/asm/mc146818rtc_no.h
+++ /dev/null
@@ -1,9 +0,0 @@
-/*
- * Machine dependent access functions for RTC registers.
- */
-#ifndef _M68KNOMMU_MC146818RTC_H
-#define _M68KNOMMU_MC146818RTC_H
-
-/* empty include file to satisfy the include in genrtc.c/ide-geometry.c */
-
-#endif /* _M68KNOMMU_MC146818RTC_H */
diff --git a/arch/m68k/include/asm/mcfpci.h b/arch/m68k/include/asm/mcfpci.h
deleted file mode 100644
index f1507dd06ec6..000000000000
--- a/arch/m68k/include/asm/mcfpci.h
+++ /dev/null
@@ -1,119 +0,0 @@
-/****************************************************************************/
-
-/*
- *      mcfpci.h -- PCI bridge on ColdFire eval boards.
- *
- *      (C) Copyright 2000, Greg Ungerer (gerg@snapgear.com)
- *      (C) Copyright 2000, Lineo Inc. (www.lineo.com)
- */
-
-/****************************************************************************/
-#ifndef mcfpci_h
-#define mcfpci_h
-/****************************************************************************/
-
-
-#ifdef CONFIG_PCI
-
-/*
- *      Address regions in the PCI address space are not mapped into the
- *      normal memory space of the ColdFire. They must be accessed via
- *      handler routines. This is easy for I/O space (inb/outb/etc) but
- *      needs some code changes to support ordinary memory. Interrupts
- *      also need to be vectored through the PCI handler first, then it
- *      will call the actual driver sub-handlers.
- */
-
-/*
- *      Un-define all the standard I/O access routines.
- */
-#undef  inb
-#undef  inw
-#undef  inl
-#undef  inb_p
-#undef  inw_p
-#undef  insb
-#undef  insw
-#undef  insl
-#undef  outb
-#undef  outw
-#undef  outl
-#undef  outb_p
-#undef  outw_p
-#undef  outsb
-#undef  outsw
-#undef  outsl
-
-#undef  request_irq
-#undef  free_irq
-
-#undef  bus_to_virt
-#undef  virt_to_bus
-
-
-/*
- *      Re-direct all I/O memory accesses functions to PCI specific ones.
- */
-#define inb     pci_inb
-#define inw     pci_inw
-#define inl     pci_inl
-#define inb_p   pci_inb
-#define inw_p   pci_inw
-#define insb    pci_insb
-#define insw    pci_insw
-#define insl    pci_insl
-
-#define outb    pci_outb
-#define outw    pci_outw
-#define outl    pci_outl
-#define outb_p  pci_outb
-#define outw_p  pci_outw
-#define outsb   pci_outsb
-#define outsw   pci_outsw
-#define outsl   pci_outsl
-
-#define request_irq     pci_request_irq
-#define free_irq        pci_free_irq
-
-#define virt_to_bus     pci_virt_to_bus
-#define bus_to_virt     pci_bus_to_virt
-
-#define CONFIG_COMEMPCI 1
-
-
-/*
- *      Prototypes of the real PCI functions (defined in bios32.c).
- */
-unsigned char   pci_inb(unsigned int addr);
-unsigned short  pci_inw(unsigned int addr);
-unsigned int    pci_inl(unsigned int addr);
-void            pci_insb(void *addr, void *buf, int len);
-void            pci_insw(void *addr, void *buf, int len);
-void            pci_insl(void *addr, void *buf, int len);
-
-void            pci_outb(unsigned char val, unsigned int addr);
-void            pci_outw(unsigned short val, unsigned int addr);
-void            pci_outl(unsigned int val, unsigned int addr);
-void            pci_outsb(void *addr, void *buf, int len);
-void            pci_outsw(void *addr, void *buf, int len);
-void            pci_outsl(void *addr, void *buf, int len);
-
-int             pci_request_irq(unsigned int irq,
-                        void (*handler)(int, void *, struct pt_regs *),
-                        unsigned long flags,
-                        const char *device,
-                        void *dev_id);
-void            pci_free_irq(unsigned int irq, void *dev_id);
-
-void            *pci_bmalloc(int size);
-void            pci_bmfree(void *bmp, int len);
-void            pci_copytoshmem(unsigned long bmp, void *src, int size);
-void            pci_copyfromshmem(void *dst, unsigned long bmp, int size);
-unsigned long   pci_virt_to_bus(volatile void *address);
-void            *pci_bus_to_virt(unsigned long address);
-void            pci_bmcpyto(void *dst, void *src, int len);
-void            pci_bmcpyfrom(void *dst, void *src, int len);
-
-#endif /* CONFIG_PCI */
-/****************************************************************************/
-#endif  /* mcfpci_h */
diff --git a/arch/m68k/include/asm/mmu.h b/arch/m68k/include/asm/mmu.h
index a81d3946675f..8a11a63ee15a 100644
--- a/arch/m68k/include/asm/mmu.h
+++ b/arch/m68k/include/asm/mmu.h
@@ -1,5 +1,13 @@
-#ifdef __uClinux__
-#include "mmu_no.h"
+#ifndef __MMU_H
+#define __MMU_H
+
+#ifdef CONFIG_MMU
+/* Default "unsigned long" context */
+typedef unsigned long mm_context_t;
 #else
-#include "mmu_mm.h"
+typedef struct {
+        unsigned long           end_brk;
+} mm_context_t;
+#endif
+
 #endif
diff --git a/arch/m68k/include/asm/mmu_context.h b/arch/m68k/include/asm/mmu_context.h
index b440928fc6c7..7d4341e55a99 100644
--- a/arch/m68k/include/asm/mmu_context.h
+++ b/arch/m68k/include/asm/mmu_context.h
@@ -1,5 +1,175 @@
-#ifdef __uClinux__
-#include "mmu_context_no.h"
+#ifndef __M68K_MMU_CONTEXT_H
+#define __M68K_MMU_CONTEXT_H
+
+#include <asm-generic/mm_hooks.h>
+
+static inline void enter_lazy_tlb(struct mm_struct *mm, struct task_struct *tsk)
+{
+}
+
+#ifdef CONFIG_MMU
+#ifndef CONFIG_SUN3
+
+#include <asm/setup.h>
+#include <asm/page.h>
+#include <asm/pgalloc.h>
+
+static inline int init_new_context(struct task_struct *tsk,
+                                   struct mm_struct *mm)
+{
+        mm->context = virt_to_phys(mm->pgd);
+        return 0;
+}
+
+#define destroy_context(mm)             do { } while(0)
+
+static inline void switch_mm_0230(struct mm_struct *mm)
+{
+        unsigned long crp[2] = {
+                0x80000000 | _PAGE_TABLE, mm->context
+        };
+        unsigned long tmp;
+
+        asm volatile (".chip 68030");
+
+        /* flush MC68030/MC68020 caches (they are virtually addressed) */
+        asm volatile (
+                "movec %%cacr,%0;"
+                "orw %1,%0; "
+                "movec %0,%%cacr"
+                : "=d" (tmp) : "di" (FLUSH_I_AND_D));
+
+        /* Switch the root pointer. For a 030-only kernel,
+         * avoid flushing the whole ATC, we only need to
+         * flush the user entries. The 68851 does this by
+         * itself. Avoid a runtime check here.
+         */
+        asm volatile (
+#ifdef CPU_M68030_ONLY
+                "pmovefd %0,%%crp; "
+                "pflush #0,#4"
 #else
-#include "mmu_context_mm.h"
+                "pmove %0,%%crp"
 #endif
+                : : "m" (crp[0]));
+
+        asm volatile (".chip 68k");
+}
+
+static inline void switch_mm_0460(struct mm_struct *mm)
+{
+        asm volatile (".chip 68040");
+
+        /* flush address translation cache (user entries) */
+        asm volatile ("pflushan");
+
+        /* switch the root pointer */
+        asm volatile ("movec %0,%%urp" : : "r" (mm->context));
+
+        if (CPU_IS_060) {
+                unsigned long tmp;
+
+                /* clear user entries in the branch cache */
+                asm volatile (
+                        "movec %%cacr,%0; "
+                        "orl %1,%0; "
+                        "movec %0,%%cacr"
+                        : "=d" (tmp): "di" (0x00200000));
+        }
+
+        asm volatile (".chip 68k");
+}
+
+static inline void switch_mm(struct mm_struct *prev, struct mm_struct *next, struct task_struct *tsk)
+{
+        if (prev != next) {
+                if (CPU_IS_020_OR_030)
+                        switch_mm_0230(next);
+                else
+                        switch_mm_0460(next);
+        }
+}
+
+#define deactivate_mm(tsk,mm)   do { } while (0)
+
+static inline void activate_mm(struct mm_struct *prev_mm,
+                               struct mm_struct *next_mm)
+{
+        next_mm->context = virt_to_phys(next_mm->pgd);
+
+        if (CPU_IS_020_OR_030)
+                switch_mm_0230(next_mm);
+        else
+                switch_mm_0460(next_mm);
+}
+
+#else  /* CONFIG_SUN3 */
+#include <asm/sun3mmu.h>
+#include <linux/sched.h>
+
+extern unsigned long get_free_context(struct mm_struct *mm);
+extern void clear_context(unsigned long context);
+
+/* set the context for a new task to unmapped */
+static inline int init_new_context(struct task_struct *tsk, struct mm_struct *mm)
+{
+        mm->context = SUN3_INVALID_CONTEXT;
+        return 0;
+}
+
+/* find the context given to this process, and if it hasn't already
+   got one, go get one for it. */
+static inline void get_mmu_context(struct mm_struct *mm)
+{
+        if(mm->context == SUN3_INVALID_CONTEXT)
+                mm->context = get_free_context(mm);
+}
+
+/* flush context if allocated... */
+static inline void destroy_context(struct mm_struct *mm)
+{
+        if(mm->context != SUN3_INVALID_CONTEXT)
+                clear_context(mm->context);
+}
+
+static inline void activate_context(struct mm_struct *mm)
+{
+        get_mmu_context(mm);
+        sun3_put_context(mm->context);
+}
+
+static inline void switch_mm(struct mm_struct *prev, struct mm_struct *next, struct task_struct *tsk)
+{
+        activate_context(tsk->mm);
+}
+
+#define deactivate_mm(tsk,mm)   do { } while (0)
+
+static inline void activate_mm(struct mm_struct *prev_mm,
+                               struct mm_struct *next_mm)
+{
+        activate_context(next_mm);
+}
+
+#endif
+#else /* !CONFIG_MMU */
+
+static inline int init_new_context(struct task_struct *tsk, struct mm_struct *mm)
+{
+        return 0;
+}
+
+
+static inline void switch_mm(struct mm_struct *prev, struct mm_struct *next, struct task_struct *tsk)
+{
+}
+
+#define destroy_context(mm)     do { } while (0)
+#define deactivate_mm(tsk,mm)   do { } while (0)
+
+static inline void activate_mm(struct mm_struct *prev_mm, struct mm_struct *next_mm)
+{
+}
+
+#endif /* CONFIG_MMU */
+#endif /* __M68K_MMU_CONTEXT_H */
diff --git a/arch/m68k/include/asm/mmu_context_mm.h b/arch/m68k/include/asm/mmu_context_mm.h
deleted file mode 100644
index 894dacbcee14..000000000000
--- a/arch/m68k/include/asm/mmu_context_mm.h
+++ /dev/null
@@ -1,154 +0,0 @@
-#ifndef __M68K_MMU_CONTEXT_H
-#define __M68K_MMU_CONTEXT_H
-
-#include <asm-generic/mm_hooks.h>
-
-static inline void enter_lazy_tlb(struct mm_struct *mm, struct task_struct *tsk)
-{
-}
-
-#ifndef CONFIG_SUN3
-
-#include <asm/setup.h>
-#include <asm/page.h>
-#include <asm/pgalloc.h>
-
-static inline int init_new_context(struct task_struct *tsk,
-                                   struct mm_struct *mm)
-{
-        mm->context = virt_to_phys(mm->pgd);
-        return 0;
-}
-
-#define destroy_context(mm)             do { } while(0)
-
-static inline void switch_mm_0230(struct mm_struct *mm)
-{
-        unsigned long crp[2] = {
-                0x80000000 | _PAGE_TABLE, mm->context
-        };
-        unsigned long tmp;
-
-        asm volatile (".chip 68030");
-
-        /* flush MC68030/MC68020 caches (they are virtually addressed) */
-        asm volatile (
-                "movec %%cacr,%0;"
-                "orw %1,%0; "
-                "movec %0,%%cacr"
-                : "=d" (tmp) : "di" (FLUSH_I_AND_D));
-
-        /* Switch the root pointer. For a 030-only kernel,
-         * avoid flushing the whole ATC, we only need to
-         * flush the user entries. The 68851 does this by
-         * itself. Avoid a runtime check here.
-         */
-        asm volatile (
-#ifdef CPU_M68030_ONLY
-                "pmovefd %0,%%crp; "
-                "pflush #0,#4"
-#else
-                "pmove %0,%%crp"
-#endif
-                : : "m" (crp[0]));
-
-        asm volatile (".chip 68k");
-}
-
-static inline void switch_mm_0460(struct mm_struct *mm)
-{
-        asm volatile (".chip 68040");
-
-        /* flush address translation cache (user entries) */
-        asm volatile ("pflushan");
-
-        /* switch the root pointer */
-        asm volatile ("movec %0,%%urp" : : "r" (mm->context));
-
-        if (CPU_IS_060) {
-                unsigned long tmp;
-
-                /* clear user entries in the branch cache */
-                asm volatile (
-                        "movec %%cacr,%0; "
-                        "orl %1,%0; "
-                        "movec %0,%%cacr"
-                        : "=d" (tmp): "di" (0x00200000));
-        }
-
-        asm volatile (".chip 68k");
-}
-
-static inline void switch_mm(struct mm_struct *prev, struct mm_struct *next, struct task_struct *tsk)
-{
-        if (prev != next) {
-                if (CPU_IS_020_OR_030)
-                        switch_mm_0230(next);
-                else
-                        switch_mm_0460(next);
-        }
-}
-
-#define deactivate_mm(tsk,mm)   do { } while (0)
-
-static inline void activate_mm(struct mm_struct *prev_mm,
-                               struct mm_struct *next_mm)
-{
-        next_mm->context = virt_to_phys(next_mm->pgd);
-
-        if (CPU_IS_020_OR_030)
-                switch_mm_0230(next_mm);
-        else
-                switch_mm_0460(next_mm);
-}
-
-#else  /* CONFIG_SUN3 */
-#include <asm/sun3mmu.h>
-#include <linux/sched.h>
-
-extern unsigned long get_free_context(struct mm_struct *mm);
-extern void clear_context(unsigned long context);
-
-/* set the context for a new task to unmapped */
-static inline int init_new_context(struct task_struct *tsk, struct mm_struct *mm)
-{
-        mm->context = SUN3_INVALID_CONTEXT;
-        return 0;
-}
-
-/* find the context given to this process, and if it hasn't already
-   got one, go get one for it. */
-static inline void get_mmu_context(struct mm_struct *mm)
-{
-        if(mm->context == SUN3_INVALID_CONTEXT)
-                mm->context = get_free_context(mm);
-}
-
-/* flush context if allocated... */
-static inline void destroy_context(struct mm_struct *mm)
-{
-        if(mm->context != SUN3_INVALID_CONTEXT)
-                clear_context(mm->context);
-}
-
-static inline void activate_context(struct mm_struct *mm)
-{
-        get_mmu_context(mm);
-        sun3_put_context(mm->context);
-}
-
-static inline void switch_mm(struct mm_struct *prev, struct mm_struct *next, struct task_struct *tsk)
-{
-        activate_context(tsk->mm);
-}
-
-#define deactivate_mm(tsk,mm)   do { } while (0)
-
-static inline void activate_mm(struct mm_struct *prev_mm,
-                               struct mm_struct *next_mm)
-{
-        activate_context(next_mm);
-}
-
-#endif
-#endif
diff --git a/arch/m68k/include/asm/mmu_context_no.h b/arch/m68k/include/asm/mmu_context_no.h
deleted file mode 100644
index 9ccee4278c97..000000000000
--- a/arch/m68k/include/asm/mmu_context_no.h
+++ /dev/null
@@ -1,33 +0,0 @@
-#ifndef __M68KNOMMU_MMU_CONTEXT_H
-#define __M68KNOMMU_MMU_CONTEXT_H
-
-#include <asm/setup.h>
-#include <asm/page.h>
-#include <asm/pgalloc.h>
-#include <asm-generic/mm_hooks.h>
-
-static inline void enter_lazy_tlb(struct mm_struct *mm, struct task_struct *tsk)
-{
-}
-
-static inline int
-init_new_context(struct task_struct *tsk, struct mm_struct *mm)
-{
-        // mm->context = virt_to_phys(mm->pgd);
-        return(0);
-}
-
-#define destroy_context(mm)             do { } while(0)
-
-static inline void switch_mm(struct mm_struct *prev, struct mm_struct *next, struct task_struct *tsk)
-{
-}
-
-#define deactivate_mm(tsk,mm)   do { } while (0)
-
-static inline void activate_mm(struct mm_struct *prev_mm,
-                               struct mm_struct *next_mm)
-{
-}
-
-#endif
diff --git a/arch/m68k/include/asm/mmu_mm.h b/arch/m68k/include/asm/mmu_mm.h
deleted file mode 100644
index ccd36d26615a..000000000000
--- a/arch/m68k/include/asm/mmu_mm.h
+++ /dev/null
@@ -1,7 +0,0 @@
-#ifndef __MMU_H
-#define __MMU_H
-
-/* Default "unsigned long" context */
-typedef unsigned long mm_context_t;
-
-#endif
diff --git a/arch/m68k/include/asm/mmu_no.h b/arch/m68k/include/asm/mmu_no.h
deleted file mode 100644
index e2da1e6f09fe..000000000000
--- a/arch/m68k/include/asm/mmu_no.h
+++ /dev/null
@@ -1,10 +0,0 @@
-#ifndef __M68KNOMMU_MMU_H
-#define __M68KNOMMU_MMU_H
-
-/* Copyright (C) 2002, David McCullough <davidm@snapgear.com> */
-
-typedef struct {
-        unsigned long           end_brk;
-} mm_context_t;
-
-#endif /* __M68KNOMMU_MMU_H */
diff --git a/arch/m68k/include/asm/module.h b/arch/m68k/include/asm/module.h
index 79b59d137dd0..5f21e11071bd 100644
--- a/arch/m68k/include/asm/module.h
+++ b/arch/m68k/include/asm/module.h
@@ -1,5 +1,48 @@
-#ifdef __uClinux__
-#include "module_no.h"
+#ifndef _ASM_M68K_MODULE_H
+#define _ASM_M68K_MODULE_H
+
+#ifdef CONFIG_MMU
+
+struct mod_arch_specific {
+        struct m68k_fixup_info *fixup_start, *fixup_end;
+};
+
+#define MODULE_ARCH_INIT {                              \
+        .fixup_start            = __start_fixup,        \
+        .fixup_end              = __stop_fixup,         \
+}
+
+
+enum m68k_fixup_type {
+        m68k_fixup_memoffset,
+        m68k_fixup_vnode_shift,
+};
+
+struct m68k_fixup_info {
+        enum m68k_fixup_type type;
+        void *addr;
+};
+
+#define m68k_fixup(type, addr)                  \
+        "       .section \".m68k_fixup\",\"aw\"\n"      \
+        "       .long " #type "," #addr "\n"    \
+        "       .previous\n"
+
+extern struct m68k_fixup_info __start_fixup[], __stop_fixup[];
+
+struct module;
+extern void module_fixup(struct module *mod, struct m68k_fixup_info *start,
+                         struct m68k_fixup_info *end);
+
 #else
-#include "module_mm.h"
-#endif
+
+struct mod_arch_specific {
+};
+
+#endif /* CONFIG_MMU */
+
+#define Elf_Shdr Elf32_Shdr
+#define Elf_Sym Elf32_Sym
+#define Elf_Ehdr Elf32_Ehdr
+
+#endif /* _ASM_M68K_MODULE_H */
diff --git a/arch/m68k/include/asm/module_mm.h b/arch/m68k/include/asm/module_mm.h
deleted file mode 100644
index 382d20a6fc18..000000000000
--- a/arch/m68k/include/asm/module_mm.h
+++ /dev/null
@@ -1,39 +0,0 @@
-#ifndef _ASM_M68K_MODULE_H
-#define _ASM_M68K_MODULE_H
-
-struct mod_arch_specific {
-        struct m68k_fixup_info *fixup_start, *fixup_end;
-};
-
-#define MODULE_ARCH_INIT {                              \
-        .fixup_start            = __start_fixup,        \
-        .fixup_end              = __stop_fixup,         \
-}
-
-#define Elf_Shdr Elf32_Shdr
-#define Elf_Sym Elf32_Sym
-#define Elf_Ehdr Elf32_Ehdr
-
-
-enum m68k_fixup_type {
-        m68k_fixup_memoffset,
-        m68k_fixup_vnode_shift,
-};
-
-struct m68k_fixup_info {
-        enum m68k_fixup_type type;
-        void *addr;
-};
-
-#define m68k_fixup(type, addr)                  \
-        "       .section \".m68k_fixup\",\"aw\"\n"      \
-        "       .long " #type "," #addr "\n"    \
-        "       .previous\n"
-
-extern struct m68k_fixup_info __start_fixup[], __stop_fixup[];
-
-struct module;
-extern void module_fixup(struct module *mod, struct m68k_fixup_info *start,
-                         struct m68k_fixup_info *end);
-
-#endif /* _ASM_M68K_MODULE_H */
diff --git a/arch/m68k/include/asm/module_no.h b/arch/m68k/include/asm/module_no.h
deleted file mode 100644
index 2e45ab50b232..000000000000
--- a/arch/m68k/include/asm/module_no.h
+++ /dev/null
@@ -1,11 +0,0 @@
-#ifndef ASM_M68KNOMMU_MODULE_H
-#define ASM_M68KNOMMU_MODULE_H
-
-struct mod_arch_specific {
-};
-
-#define Elf_Shdr Elf32_Shdr
-#define Elf_Sym Elf32_Sym
-#define Elf_Ehdr Elf32_Ehdr
-
-#endif /* ASM_M68KNOMMU_MODULE_H */
diff --git a/arch/m68k/include/asm/page_offset.h b/arch/m68k/include/asm/page_offset.h
index 66455c849fbb..1780152d81da 100644
--- a/arch/m68k/include/asm/page_offset.h
+++ b/arch/m68k/include/asm/page_offset.h
@@ -1,5 +1,11 @@
-#ifdef __uClinux__
-#include "page_offset_no.h"
+/* This handles the memory map.. */
+
+#ifdef CONFIG_MMU
+#ifndef CONFIG_SUN3
+#define PAGE_OFFSET_RAW         0x00000000
 #else
-#include "page_offset_mm.h"
+#define PAGE_OFFSET_RAW         0x0E000000
+#endif
+#else
+#define PAGE_OFFSET_RAW         CONFIG_RAMBASE
 #endif
diff --git a/arch/m68k/include/asm/page_offset_mm.h b/arch/m68k/include/asm/page_offset_mm.h
deleted file mode 100644
index 1cbdb7f30ac2..000000000000
--- a/arch/m68k/include/asm/page_offset_mm.h
+++ /dev/null
@@ -1,8 +0,0 @@
-
-/* This handles the memory map.. */
-#ifndef CONFIG_SUN3
-#define PAGE_OFFSET_RAW         0x00000000
-#else
-#define PAGE_OFFSET_RAW         0x0E000000
-#endif
-
diff --git a/arch/m68k/include/asm/page_offset_no.h b/arch/m68k/include/asm/page_offset_no.h
deleted file mode 100644
index d4e73e0ba646..000000000000
--- a/arch/m68k/include/asm/page_offset_no.h
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
-/* This handles the memory map.. */
-#define PAGE_OFFSET_RAW         CONFIG_RAMBASE
-
diff --git a/arch/m68k/include/asm/pci.h b/arch/m68k/include/asm/pci.h
index dbea95373080..4ad0aea48ab4 100644
--- a/arch/m68k/include/asm/pci.h
+++ b/arch/m68k/include/asm/pci.h
@@ -1,5 +1,12 @@
-#ifdef __uClinux__
-#include "pci_no.h"
-#else
-#include "pci_mm.h"
-#endif
+#ifndef _ASM_M68K_PCI_H
+#define _ASM_M68K_PCI_H
+
+#include <asm-generic/pci-dma-compat.h>
+
+/* The PCI address space does equal the physical memory
+ * address space.  The networking and block device layers use
+ * this boolean for bounce buffer decisions.
+ */
+#define PCI_DMA_BUS_IS_PHYS     (1)
+
+#endif /* _ASM_M68K_PCI_H */
diff --git a/arch/m68k/include/asm/pci_mm.h b/arch/m68k/include/asm/pci_mm.h
deleted file mode 100644
index 4ad0aea48ab4..000000000000
--- a/arch/m68k/include/asm/pci_mm.h
+++ /dev/null
@@ -1,12 +0,0 @@
-#ifndef _ASM_M68K_PCI_H
-#define _ASM_M68K_PCI_H
-
-#include <asm-generic/pci-dma-compat.h>
-
-/* The PCI address space does equal the physical memory
- * address space.  The networking and block device layers use
- * this boolean for bounce buffer decisions.
- */
-#define PCI_DMA_BUS_IS_PHYS     (1)
-
-#endif /* _ASM_M68K_PCI_H */
diff --git a/arch/m68k/include/asm/pci_no.h b/arch/m68k/include/asm/pci_no.h
deleted file mode 100644
index 9abbc03c73ee..000000000000
--- a/arch/m68k/include/asm/pci_no.h
+++ /dev/null
@@ -1,29 +0,0 @@
-#ifndef M68KNOMMU_PCI_H
-#define M68KNOMMU_PCI_H
-
-#include <asm/pci_mm.h>
-
-#ifdef CONFIG_COMEMPCI
-/*
- *      These are pretty much arbitary with the CoMEM implementation.
- *      We have the whole address space to ourselves.
- */
-#define PCIBIOS_MIN_IO          0x100
-#define PCIBIOS_MIN_MEM         0x00010000
-
-#define pcibios_scan_all_fns(a, b)      0
-
-/*
- * Return whether the given PCI device DMA address mask can
- * be supported properly.  For example, if your device can
- * only drive the low 24-bits during PCI bus mastering, then
- * you would pass 0x00ffffff as the mask to this function.
- */
-static inline int pci_dma_supported(struct pci_dev *hwdev, u64 mask)
-{
-        return 1;
-}
-
-#endif /* CONFIG_COMEMPCI */
-
-#endif /* M68KNOMMU_PCI_H */
diff --git a/arch/m68k/include/asm/pgalloc.h b/arch/m68k/include/asm/pgalloc.h
index 059cb73e78fc..c294aad8a900 100644
--- a/arch/m68k/include/asm/pgalloc.h
+++ b/arch/m68k/include/asm/pgalloc.h
@@ -1,5 +1,19 @@
-#ifdef __uClinux__
-#include "pgalloc_no.h"
+#ifndef M68K_PGALLOC_H
+#define M68K_PGALLOC_H
+
+#include <linux/mm.h>
+#include <linux/highmem.h>
+#include <asm/setup.h>
+
+#ifdef CONFIG_MMU
+#include <asm/virtconvert.h>
+#ifdef CONFIG_SUN3
+#include <asm/sun3_pgalloc.h>
 #else
-#include "pgalloc_mm.h"
+#include <asm/motorola_pgalloc.h>
 #endif
+
+extern void m68k_setup_node(int node);
+#endif
+
+#endif /* M68K_PGALLOC_H */
diff --git a/arch/m68k/include/asm/pgalloc_mm.h b/arch/m68k/include/asm/pgalloc_mm.h
deleted file mode 100644
index 4cb1a57ab763..000000000000
--- a/arch/m68k/include/asm/pgalloc_mm.h
+++ /dev/null
@@ -1,19 +0,0 @@
-
-#ifndef M68K_PGALLOC_H
-#define M68K_PGALLOC_H
-
-#include <linux/mm.h>
-#include <linux/highmem.h>
-#include <asm/setup.h>
-#include <asm/virtconvert.h>
-
-
-#ifdef CONFIG_SUN3
-#include <asm/sun3_pgalloc.h>
-#else
-#include <asm/motorola_pgalloc.h>
-#endif
-
-extern void m68k_setup_node(int node);
-
-#endif /* M68K_PGALLOC_H */
diff --git a/arch/m68k/include/asm/pgalloc_no.h b/arch/m68k/include/asm/pgalloc_no.h
deleted file mode 100644
index d6352f671ec0..000000000000
--- a/arch/m68k/include/asm/pgalloc_no.h
+++ /dev/null
@@ -1,8 +0,0 @@
-#ifndef _M68KNOMMU_PGALLOC_H
-#define _M68KNOMMU_PGALLOC_H
-
-#include <asm/setup.h>
-
-#define check_pgt_cache()       do { } while (0)
-
-#endif /* _M68KNOMMU_PGALLOC_H */
diff --git a/arch/m68k/include/asm/pgtable_no.h b/arch/m68k/include/asm/pgtable_no.h
index 46251016e821..bf86b29fe64a 100644
--- a/arch/m68k/include/asm/pgtable_no.h
+++ b/arch/m68k/include/asm/pgtable_no.h
@@ -67,4 +67,6 @@ extern unsigned int kobjsize(const void *objp);
 
 #include <asm-generic/pgtable.h>
 
+#define check_pgt_cache()       do { } while (0)
+
 #endif /* _M68KNOMMU_PGTABLE_H */
diff --git a/arch/m68k/include/asm/rtc.h b/arch/m68k/include/asm/rtc.h
index 5d3e03859844..a4d08ea122ee 100644
--- a/arch/m68k/include/asm/rtc.h
+++ b/arch/m68k/include/asm/rtc.h
@@ -36,13 +36,16 @@ static inline unsigned int get_rtc_time(struct rtc_time *time)
          * RTC has RTC_DAY_OF_WEEK, we ignore it, as it is only updated
          * by the RTC when initially set to a non-zero value.
          */
-        mach_hwclk(0, time);
+        if (mach_hwclk)
+                mach_hwclk(0, time);
         return RTC_24H;
 }
 
 static inline int set_rtc_time(struct rtc_time *time)
 {
-        return mach_hwclk(1, time);
+        if (mach_hwclk)
+                return mach_hwclk(1, time);
+        return -EINVAL;
 }
 
 static inline unsigned int get_rtc_ss(void)
diff --git a/arch/m68k/include/asm/scatterlist.h b/arch/m68k/include/asm/scatterlist.h
index b7e528636252..e27ad902b1cf 100644
--- a/arch/m68k/include/asm/scatterlist.h
+++ b/arch/m68k/include/asm/scatterlist.h
@@ -1,5 +1,23 @@
-#ifdef __uClinux__
-#include "scatterlist_no.h"
-#else
-#include "scatterlist_mm.h"
+#ifndef _M68K_SCATTERLIST_H
+#define _M68K_SCATTERLIST_H
+
+#include <linux/types.h>
+
+struct scatterlist {
+#ifdef CONFIG_DEBUG_SG
+        unsigned long sg_magic;
 #endif
+        unsigned long page_link;
+        unsigned int offset;
+        unsigned int length;
+
+        dma_addr_t dma_address; /* A place to hang host-specific addresses at. */
+};
+
+/* This is bogus and should go away. */
+#define ISA_DMA_THRESHOLD (0x00ffffff)
+
+#define sg_dma_address(sg)      ((sg)->dma_address)
+#define sg_dma_len(sg)          ((sg)->length)
+
+#endif /* !(_M68K_SCATTERLIST_H) */
diff --git a/arch/m68k/include/asm/scatterlist_mm.h b/arch/m68k/include/asm/scatterlist_mm.h
deleted file mode 100644
index d3a7a0edfeca..000000000000
--- a/arch/m68k/include/asm/scatterlist_mm.h
+++ /dev/null
@@ -1,23 +0,0 @@
-#ifndef _M68K_SCATTERLIST_H
-#define _M68K_SCATTERLIST_H
-
-#include <linux/types.h>
-
-struct scatterlist {
-#ifdef CONFIG_DEBUG_SG
-        unsigned long sg_magic;
-#endif
-        unsigned long page_link;
-        unsigned int offset;
-        unsigned int length;
-
-        __u32 dma_address;      /* A place to hang host-specific addresses at. */
-};
-
-/* This is bogus and should go away. */
-#define ISA_DMA_THRESHOLD (0x00ffffff)
-
-#define sg_dma_address(sg)      ((sg)->dma_address)
-#define sg_dma_len(sg)          ((sg)->length)
-
-#endif /* !(_M68K_SCATTERLIST_H) */
diff --git a/arch/m68k/include/asm/scatterlist_no.h b/arch/m68k/include/asm/scatterlist_no.h
deleted file mode 100644
index afc4788b0d2c..000000000000
--- a/arch/m68k/include/asm/scatterlist_no.h
+++ /dev/null
@@ -1,22 +0,0 @@
-#ifndef _M68KNOMMU_SCATTERLIST_H
-#define _M68KNOMMU_SCATTERLIST_H
-
-#include <linux/mm.h>
-#include <asm/types.h>
-
-struct scatterlist {
-#ifdef CONFIG_DEBUG_SG
-        unsigned long   sg_magic;
-#endif
-        unsigned long   page_link;
-        unsigned int    offset;
-        dma_addr_t      dma_address;
-        unsigned int    length;
-};
-
-#define sg_dma_address(sg)      ((sg)->dma_address)
-#define sg_dma_len(sg)          ((sg)->length)
-
-#define ISA_DMA_THRESHOLD       (0xffffffff)
-
-#endif /* !(_M68KNOMMU_SCATTERLIST_H) */
diff --git a/arch/m68k/include/asm/segment.h b/arch/m68k/include/asm/segment.h
index 82583bc004bd..ee959219fdfe 100644
--- a/arch/m68k/include/asm/segment.h
+++ b/arch/m68k/include/asm/segment.h
@@ -1,5 +1,63 @@
-#ifdef __uClinux__
-#include "segment_no.h"
+#ifndef _M68K_SEGMENT_H
+#define _M68K_SEGMENT_H
+
+/* define constants */
+/* Address spaces (FC0-FC2) */
+#define USER_DATA     (1)
+#ifndef __USER_DS
+#define __USER_DS     (USER_DATA)
+#endif
+#define USER_PROGRAM  (2)
+#define SUPER_DATA    (5)
+#ifndef __KERNEL_DS
+#define __KERNEL_DS   (SUPER_DATA)
+#endif
+#define SUPER_PROGRAM (6)
+#define CPU_SPACE     (7)
+
+#ifndef __ASSEMBLY__
+
+typedef struct {
+        unsigned long seg;
+} mm_segment_t;
+
+#define MAKE_MM_SEG(s)  ((mm_segment_t) { (s) })
+#define USER_DS         MAKE_MM_SEG(__USER_DS)
+#define KERNEL_DS       MAKE_MM_SEG(__KERNEL_DS)
+
+/*
+ * Get/set the SFC/DFC registers for MOVES instructions
+ */
+
+static inline mm_segment_t get_fs(void)
+{
+#ifdef CONFIG_MMU
+        mm_segment_t _v;
+        __asm__ ("movec %/dfc,%0":"=r" (_v.seg):);
+
+        return _v;
 #else
-#include "segment_mm.h"
+        return USER_DS;
+#endif
+}
+
+static inline mm_segment_t get_ds(void)
+{
+    /* return the supervisor data space code */
+    return KERNEL_DS;
+}
+
+static inline void set_fs(mm_segment_t val)
+{
+#ifdef CONFIG_MMU
+        __asm__ __volatile__ ("movec %0,%/sfc\n\t"
+                              "movec %0,%/dfc\n\t"
+                              : /* no outputs */ : "r" (val.seg) : "memory");
 #endif
+}
+
+#define segment_eq(a,b) ((a).seg == (b).seg)
+
+#endif /* __ASSEMBLY__ */
+
+#endif /* _M68K_SEGMENT_H */
diff --git a/arch/m68k/include/asm/segment_mm.h b/arch/m68k/include/asm/segment_mm.h
deleted file mode 100644
index 7b0b2d3127f9..000000000000
--- a/arch/m68k/include/asm/segment_mm.h
+++ /dev/null
@@ -1,57 +0,0 @@
-#ifndef _M68K_SEGMENT_H
-#define _M68K_SEGMENT_H
-
-/* define constants */
-/* Address spaces (FC0-FC2) */
-#define USER_DATA     (1)
-#ifndef __USER_DS
-#define __USER_DS     (USER_DATA)
-#endif
-#define USER_PROGRAM  (2)
-#define SUPER_DATA    (5)
-#ifndef __KERNEL_DS
-#define __KERNEL_DS   (SUPER_DATA)
-#endif
-#define SUPER_PROGRAM (6)
-#define CPU_SPACE     (7)
-
-#ifndef __ASSEMBLY__
-
-typedef struct {
-        unsigned long seg;
-} mm_segment_t;
-
-#define MAKE_MM_SEG(s)  ((mm_segment_t) { (s) })
-#define USER_DS         MAKE_MM_SEG(__USER_DS)
-#define KERNEL_DS       MAKE_MM_SEG(__KERNEL_DS)
-
-/*
- * Get/set the SFC/DFC registers for MOVES instructions
- */
-
-static inline mm_segment_t get_fs(void)
-{
-        mm_segment_t _v;
-        __asm__ ("movec %/dfc,%0":"=r" (_v.seg):);
-
-        return _v;
-}
-
-static inline mm_segment_t get_ds(void)
-{
-    /* return the supervisor data space code */
-    return KERNEL_DS;
-}
-
-static inline void set_fs(mm_segment_t val)
-{
-        __asm__ __volatile__ ("movec %0,%/sfc\n\t"
-                              "movec %0,%/dfc\n\t"
-                              : /* no outputs */ : "r" (val.seg) : "memory");
-}
-
-#define segment_eq(a,b) ((a).seg == (b).seg)
-
-#endif /* __ASSEMBLY__ */
-
-#endif /* _M68K_SEGMENT_H */
diff --git a/arch/m68k/include/asm/segment_no.h b/arch/m68k/include/asm/segment_no.h
deleted file mode 100644
index 42318ebec7ec..000000000000
--- a/arch/m68k/include/asm/segment_no.h
+++ /dev/null
@@ -1,51 +0,0 @@
-#ifndef _M68K_SEGMENT_H
-#define _M68K_SEGMENT_H
-
-/* define constants */
-/* Address spaces (FC0-FC2) */
-#define USER_DATA     (1)
-#ifndef __USER_DS
-#define __USER_DS     (USER_DATA)
-#endif
-#define USER_PROGRAM  (2)
-#define SUPER_DATA    (5)
-#ifndef __KERNEL_DS
-#define __KERNEL_DS   (SUPER_DATA)
-#endif
-#define SUPER_PROGRAM (6)
-#define CPU_SPACE     (7)
-
-#ifndef __ASSEMBLY__
-
-typedef struct {
-        unsigned long seg;
-} mm_segment_t;
-
-#define MAKE_MM_SEG(s)  ((mm_segment_t) { (s) })
-#define USER_DS         MAKE_MM_SEG(__USER_DS)
-#define KERNEL_DS       MAKE_MM_SEG(__KERNEL_DS)
-
-/*
- * Get/set the SFC/DFC registers for MOVES instructions
- */
-
-static inline mm_segment_t get_fs(void)
-{
-    return USER_DS;
-}
-
-static inline mm_segment_t get_ds(void)
-{
-    /* return the supervisor data space code */
-    return KERNEL_DS;
-}
-
-static inline void set_fs(mm_segment_t val)
-{
-}
-
-#define segment_eq(a,b) ((a).seg == (b).seg)
-
-#endif /* __ASSEMBLY__ */
-
-#endif /* _M68K_SEGMENT_H */
diff --git a/arch/m68k/include/asm/timex.h b/arch/m68k/include/asm/timex.h
index 719762980578..b87f2f278f67 100644
--- a/arch/m68k/include/asm/timex.h
+++ b/arch/m68k/include/asm/timex.h
@@ -1,5 +1,18 @@
-#ifdef __uClinux__
-#include "timex_no.h"
-#else
-#include "timex_mm.h"
+/*
+ * linux/include/asm-m68k/timex.h
+ *
+ * m68k architecture timex specifications
+ */
+#ifndef _ASMm68k_TIMEX_H
+#define _ASMm68k_TIMEX_H
+
+#define CLOCK_TICK_RATE 1193180 /* Underlying HZ */
+
+typedef unsigned long cycles_t;
+
+static inline cycles_t get_cycles(void)
+{
+        return 0;
+}
+
 #endif
diff --git a/arch/m68k/include/asm/timex_mm.h b/arch/m68k/include/asm/timex_mm.h
deleted file mode 100644
index b87f2f278f67..000000000000
--- a/arch/m68k/include/asm/timex_mm.h
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
- * linux/include/asm-m68k/timex.h
- *
- * m68k architecture timex specifications
- */
-#ifndef _ASMm68k_TIMEX_H
-#define _ASMm68k_TIMEX_H
-
-#define CLOCK_TICK_RATE 1193180 /* Underlying HZ */
-
-typedef unsigned long cycles_t;
-
-static inline cycles_t get_cycles(void)
-{
-        return 0;
-}
-
-#endif
diff --git a/arch/m68k/include/asm/timex_no.h b/arch/m68k/include/asm/timex_no.h
deleted file mode 100644
index 109050f3fe91..000000000000
--- a/arch/m68k/include/asm/timex_no.h
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * linux/include/asm-m68knommu/timex.h
- *
- * m68knommu architecture timex specifications
- */
-#ifndef _ASM_M68KNOMMU_TIMEX_H
-#define _ASM_M68KNOMMU_TIMEX_H
-
-#ifdef CONFIG_COLDFIRE
-#include <asm/coldfire.h>
-#define CLOCK_TICK_RATE MCF_CLK
-#else
-#define CLOCK_TICK_RATE 1193180 /* Underlying HZ */
-#endif
-
-typedef unsigned long cycles_t;
-
-static inline cycles_t get_cycles(void)
-{
-        return 0;
-}
-
-#endif
diff --git a/arch/m68k/include/asm/tlbflush.h b/arch/m68k/include/asm/tlbflush.h
index b6f93b30951e..a6b4ed4fc90f 100644
--- a/arch/m68k/include/asm/tlbflush.h
+++ b/arch/m68k/include/asm/tlbflush.h
@@ -1,5 +1,267 @@
-#ifdef __uClinux__
-#include "tlbflush_no.h"
+#ifndef _M68K_TLBFLUSH_H
+#define _M68K_TLBFLUSH_H
+
+#ifdef CONFIG_MMU
+#ifndef CONFIG_SUN3
+
+#include <asm/current.h>
+
+static inline void flush_tlb_kernel_page(void *addr)
+{
+        if (CPU_IS_040_OR_060) {
+                mm_segment_t old_fs = get_fs();
+                set_fs(KERNEL_DS);
+                __asm__ __volatile__(".chip 68040\n\t"
+                                     "pflush (%0)\n\t"
+                                     ".chip 68k"
+                                     : : "a" (addr));
+                set_fs(old_fs);
+        } else if (CPU_IS_020_OR_030)
+                __asm__ __volatile__("pflush #4,#4,(%0)" : : "a" (addr));
+}
+
+/*
+ * flush all user-space atc entries.
+ */
+static inline void __flush_tlb(void)
+{
+        if (CPU_IS_040_OR_060)
+                __asm__ __volatile__(".chip 68040\n\t"
+                                     "pflushan\n\t"
+                                     ".chip 68k");
+        else if (CPU_IS_020_OR_030)
+                __asm__ __volatile__("pflush #0,#4");
+}
+
+static inline void __flush_tlb040_one(unsigned long addr)
+{
+        __asm__ __volatile__(".chip 68040\n\t"
+                             "pflush (%0)\n\t"
+                             ".chip 68k"
+                             : : "a" (addr));
+}
+
+static inline void __flush_tlb_one(unsigned long addr)
+{
+        if (CPU_IS_040_OR_060)
+                __flush_tlb040_one(addr);
+        else if (CPU_IS_020_OR_030)
+                __asm__ __volatile__("pflush #0,#4,(%0)" : : "a" (addr));
+}
+
+#define flush_tlb() __flush_tlb()
+
+/*
+ * flush all atc entries (both kernel and user-space entries).
+ */
+static inline void flush_tlb_all(void)
+{
+        if (CPU_IS_040_OR_060)
+                __asm__ __volatile__(".chip 68040\n\t"
+                                     "pflusha\n\t"
+                                     ".chip 68k");
+        else if (CPU_IS_020_OR_030)
+                __asm__ __volatile__("pflusha");
+}
+
+static inline void flush_tlb_mm(struct mm_struct *mm)
+{
+        if (mm == current->active_mm)
+                __flush_tlb();
+}
+
+static inline void flush_tlb_page(struct vm_area_struct *vma, unsigned long addr)
+{
+        if (vma->vm_mm == current->active_mm) {
+                mm_segment_t old_fs = get_fs();
+                set_fs(USER_DS);
+                __flush_tlb_one(addr);
+                set_fs(old_fs);
+        }
+}
+
+static inline void flush_tlb_range(struct vm_area_struct *vma,
+                                   unsigned long start, unsigned long end)
+{
+        if (vma->vm_mm == current->active_mm)
+                __flush_tlb();
+}
+
+static inline void flush_tlb_kernel_range(unsigned long start, unsigned long end)
+{
+        flush_tlb_all();
+}
+
 #else
-#include "tlbflush_mm.h"
+
+
+/* Reserved PMEGs. */
+extern char sun3_reserved_pmeg[SUN3_PMEGS_NUM];
+extern unsigned long pmeg_vaddr[SUN3_PMEGS_NUM];
+extern unsigned char pmeg_alloc[SUN3_PMEGS_NUM];
+extern unsigned char pmeg_ctx[SUN3_PMEGS_NUM];
+
+/* Flush all userspace mappings one by one...  (why no flush command,
+   sun?) */
+static inline void flush_tlb_all(void)
+{
+       unsigned long addr;
+       unsigned char ctx, oldctx;
+
+       oldctx = sun3_get_context();
+       for(addr = 0x00000000; addr < TASK_SIZE; addr += SUN3_PMEG_SIZE) {
+               for(ctx = 0; ctx < 8; ctx++) {
+                       sun3_put_context(ctx);
+                       sun3_put_segmap(addr, SUN3_INVALID_PMEG);
+               }
+       }
+
+       sun3_put_context(oldctx);
+       /* erase all of the userspace pmeg maps, we've clobbered them
+          all anyway */
+       for(addr = 0; addr < SUN3_INVALID_PMEG; addr++) {
+               if(pmeg_alloc[addr] == 1) {
+                       pmeg_alloc[addr] = 0;
+                       pmeg_ctx[addr] = 0;
+                       pmeg_vaddr[addr] = 0;
+               }
+       }
+
+}
+
+/* Clear user TLB entries within the context named in mm */
+static inline void flush_tlb_mm (struct mm_struct *mm)
+{
+     unsigned char oldctx;
+     unsigned char seg;
+     unsigned long i;
+
+     oldctx = sun3_get_context();
+     sun3_put_context(mm->context);
+
+     for(i = 0; i < TASK_SIZE; i += SUN3_PMEG_SIZE) {
+             seg = sun3_get_segmap(i);
+             if(seg == SUN3_INVALID_PMEG)
+                     continue;
+
+             sun3_put_segmap(i, SUN3_INVALID_PMEG);
+             pmeg_alloc[seg] = 0;
+             pmeg_ctx[seg] = 0;
+             pmeg_vaddr[seg] = 0;
+     }
+
+     sun3_put_context(oldctx);
+
+}
+
+/* Flush a single TLB page. In this case, we're limited to flushing a
+   single PMEG */
+static inline void flush_tlb_page (struct vm_area_struct *vma,
+                                   unsigned long addr)
+{
+        unsigned char oldctx;
+        unsigned char i;
+
+        oldctx = sun3_get_context();
+        sun3_put_context(vma->vm_mm->context);
+        addr &= ~SUN3_PMEG_MASK;
+        if((i = sun3_get_segmap(addr)) != SUN3_INVALID_PMEG)
+        {
+                pmeg_alloc[i] = 0;
+                pmeg_ctx[i] = 0;
+                pmeg_vaddr[i] = 0;
+                sun3_put_segmap (addr,  SUN3_INVALID_PMEG);
+        }
+        sun3_put_context(oldctx);
+
+}
+/* Flush a range of pages from TLB. */
+
+static inline void flush_tlb_range (struct vm_area_struct *vma,
+                      unsigned long start, unsigned long end)
+{
+        struct mm_struct *mm = vma->vm_mm;
+        unsigned char seg, oldctx;
+
+        start &= ~SUN3_PMEG_MASK;
+
+        oldctx = sun3_get_context();
+        sun3_put_context(mm->context);
+
+        while(start < end)
+        {
+                if((seg = sun3_get_segmap(start)) == SUN3_INVALID_PMEG)
+                     goto next;
+                if(pmeg_ctx[seg] == mm->context) {
+                        pmeg_alloc[seg] = 0;
+                        pmeg_ctx[seg] = 0;
+                        pmeg_vaddr[seg] = 0;
+                }
+                sun3_put_segmap(start, SUN3_INVALID_PMEG);
+        next:
+                start += SUN3_PMEG_SIZE;
+        }
+}
+
+static inline void flush_tlb_kernel_range(unsigned long start, unsigned long end)
+{
+        flush_tlb_all();
+}
+
+/* Flush kernel page from TLB. */
+static inline void flush_tlb_kernel_page (unsigned long addr)
+{
+        sun3_put_segmap (addr & ~(SUN3_PMEG_SIZE - 1), SUN3_INVALID_PMEG);
+}
+
 #endif
+
+#else /* !CONFIG_MMU */
+
+/*
+ * flush all user-space atc entries.
+ */
+static inline void __flush_tlb(void)
+{
+        BUG();
+}
+
+static inline void __flush_tlb_one(unsigned long addr)
+{
+        BUG();
+}
+
+#define flush_tlb() __flush_tlb()
+
+/*
+ * flush all atc entries (both kernel and user-space entries).
+ */
+static inline void flush_tlb_all(void)
+{
+        BUG();
+}
+
+static inline void flush_tlb_mm(struct mm_struct *mm)
+{
+        BUG();
+}
+
+static inline void flush_tlb_page(struct vm_area_struct *vma, unsigned long addr)
+{
+        BUG();
+}
+
+static inline void flush_tlb_range(struct mm_struct *mm,
+                                   unsigned long start, unsigned long end)
+{
+        BUG();
+}
+
+static inline void flush_tlb_kernel_page(unsigned long addr)
+{
+        BUG();
+}
+
+#endif /* CONFIG_MMU */
+
+#endif /* _M68K_TLBFLUSH_H */
diff --git a/arch/m68k/include/asm/tlbflush_mm.h b/arch/m68k/include/asm/tlbflush_mm.h
deleted file mode 100644
index acb6bf21a321..000000000000
--- a/arch/m68k/include/asm/tlbflush_mm.h
+++ /dev/null
@@ -1,219 +0,0 @@
-#ifndef _M68K_TLBFLUSH_H
-#define _M68K_TLBFLUSH_H
-
-
-#ifndef CONFIG_SUN3
-
-#include <asm/current.h>
-
-static inline void flush_tlb_kernel_page(void *addr)
-{
-        if (CPU_IS_040_OR_060) {
-                mm_segment_t old_fs = get_fs();
-                set_fs(KERNEL_DS);
-                __asm__ __volatile__(".chip 68040\n\t"
-                                     "pflush (%0)\n\t"
-                                     ".chip 68k"
-                                     : : "a" (addr));
-                set_fs(old_fs);
-        } else if (CPU_IS_020_OR_030)
-                __asm__ __volatile__("pflush #4,#4,(%0)" : : "a" (addr));
-}
-
-/*
- * flush all user-space atc entries.
- */
-static inline void __flush_tlb(void)
-{
-        if (CPU_IS_040_OR_060)
-                __asm__ __volatile__(".chip 68040\n\t"
-                                     "pflushan\n\t"
-                                     ".chip 68k");
-        else if (CPU_IS_020_OR_030)
-                __asm__ __volatile__("pflush #0,#4");
-}
-
-static inline void __flush_tlb040_one(unsigned long addr)
-{
-        __asm__ __volatile__(".chip 68040\n\t"
-                             "pflush (%0)\n\t"
-                             ".chip 68k"
-                             : : "a" (addr));
-}
-
-static inline void __flush_tlb_one(unsigned long addr)
-{
-        if (CPU_IS_040_OR_060)
-                __flush_tlb040_one(addr);
-        else if (CPU_IS_020_OR_030)
-                __asm__ __volatile__("pflush #0,#4,(%0)" : : "a" (addr));
-}
-
-#define flush_tlb() __flush_tlb()
-
-/*
- * flush all atc entries (both kernel and user-space entries).
- */
-static inline void flush_tlb_all(void)
-{
-        if (CPU_IS_040_OR_060)
-                __asm__ __volatile__(".chip 68040\n\t"
-                                     "pflusha\n\t"
-                                     ".chip 68k");
-        else if (CPU_IS_020_OR_030)
-                __asm__ __volatile__("pflusha");
-}
-
-static inline void flush_tlb_mm(struct mm_struct *mm)
-{
-        if (mm == current->active_mm)
-                __flush_tlb();
-}
-
-static inline void flush_tlb_page(struct vm_area_struct *vma, unsigned long addr)
-{
-        if (vma->vm_mm == current->active_mm) {
-                mm_segment_t old_fs = get_fs();
-                set_fs(USER_DS);
-                __flush_tlb_one(addr);
-                set_fs(old_fs);
-        }
-}
-
-static inline void flush_tlb_range(struct vm_area_struct *vma,
-                                   unsigned long start, unsigned long end)
-{
-        if (vma->vm_mm == current->active_mm)
-                __flush_tlb();
-}
-
-static inline void flush_tlb_kernel_range(unsigned long start, unsigned long end)
-{
-        flush_tlb_all();
-}
-
-#else
-
-
-/* Reserved PMEGs. */
-extern char sun3_reserved_pmeg[SUN3_PMEGS_NUM];
-extern unsigned long pmeg_vaddr[SUN3_PMEGS_NUM];
-extern unsigned char pmeg_alloc[SUN3_PMEGS_NUM];
-extern unsigned char pmeg_ctx[SUN3_PMEGS_NUM];
-
-/* Flush all userspace mappings one by one...  (why no flush command,
-   sun?) */
-static inline void flush_tlb_all(void)
-{
-       unsigned long addr;
-       unsigned char ctx, oldctx;
-
-       oldctx = sun3_get_context();
-       for(addr = 0x00000000; addr < TASK_SIZE; addr += SUN3_PMEG_SIZE) {
-               for(ctx = 0; ctx < 8; ctx++) {
-                       sun3_put_context(ctx);
-                       sun3_put_segmap(addr, SUN3_INVALID_PMEG);
-               }
-       }
-
-       sun3_put_context(oldctx);
-       /* erase all of the userspace pmeg maps, we've clobbered them
-          all anyway */
-       for(addr = 0; addr < SUN3_INVALID_PMEG; addr++) {
-               if(pmeg_alloc[addr] == 1) {
-                       pmeg_alloc[addr] = 0;
-                       pmeg_ctx[addr] = 0;
-                       pmeg_vaddr[addr] = 0;
-               }
-       }
-
-}
-
-/* Clear user TLB entries within the context named in mm */
-static inline void flush_tlb_mm (struct mm_struct *mm)
-{
-     unsigned char oldctx;
-     unsigned char seg;
-     unsigned long i;
-
-     oldctx = sun3_get_context();
-     sun3_put_context(mm->context);
-
-     for(i = 0; i < TASK_SIZE; i += SUN3_PMEG_SIZE) {
-             seg = sun3_get_segmap(i);
-             if(seg == SUN3_INVALID_PMEG)
-                     continue;
-
-             sun3_put_segmap(i, SUN3_INVALID_PMEG);
-             pmeg_alloc[seg] = 0;
-             pmeg_ctx[seg] = 0;
-             pmeg_vaddr[seg] = 0;
-     }
-
-     sun3_put_context(oldctx);
-
-}
-
-/* Flush a single TLB page. In this case, we're limited to flushing a
-   single PMEG */
-static inline void flush_tlb_page (struct vm_area_struct *vma,
-                                   unsigned long addr)
-{
-        unsigned char oldctx;
-        unsigned char i;
-
-        oldctx = sun3_get_context();
-        sun3_put_context(vma->vm_mm->context);
-        addr &= ~SUN3_PMEG_MASK;
-        if((i = sun3_get_segmap(addr)) != SUN3_INVALID_PMEG)
-        {
-                pmeg_alloc[i] = 0;
-                pmeg_ctx[i] = 0;
-                pmeg_vaddr[i] = 0;
-                sun3_put_segmap (addr,  SUN3_INVALID_PMEG);
-        }
-        sun3_put_context(oldctx);
-
-}
-/* Flush a range of pages from TLB. */
-
-static inline void flush_tlb_range (struct vm_area_struct *vma,
-                      unsigned long start, unsigned long end)
-{
-        struct mm_struct *mm = vma->vm_mm;
-        unsigned char seg, oldctx;
-
-        start &= ~SUN3_PMEG_MASK;
-
-        oldctx = sun3_get_context();
-        sun3_put_context(mm->context);
-
-        while(start < end)
-        {
-                if((seg = sun3_get_segmap(start)) == SUN3_INVALID_PMEG)
-                     goto next;
-                if(pmeg_ctx[seg] == mm->context) {
-                        pmeg_alloc[seg] = 0;
-                        pmeg_ctx[seg] = 0;
-                        pmeg_vaddr[seg] = 0;
-                }
-                sun3_put_segmap(start, SUN3_INVALID_PMEG);
-        next:
-                start += SUN3_PMEG_SIZE;
-        }
-}
-
-static inline void flush_tlb_kernel_range(unsigned long start, unsigned long end)
-{
-        flush_tlb_all();
-}
-
-/* Flush kernel page from TLB. */
-static inline void flush_tlb_kernel_page (unsigned long addr)
-{
-        sun3_put_segmap (addr & ~(SUN3_PMEG_SIZE - 1), SUN3_INVALID_PMEG);
-}
-
-#endif
-
-#endif /* _M68K_TLBFLUSH_H */
diff --git a/arch/m68k/include/asm/tlbflush_no.h b/arch/m68k/include/asm/tlbflush_no.h
deleted file mode 100644
index a470cfb803eb..000000000000
--- a/arch/m68k/include/asm/tlbflush_no.h
+++ /dev/null
@@ -1,55 +0,0 @@
-#ifndef _M68KNOMMU_TLBFLUSH_H
-#define _M68KNOMMU_TLBFLUSH_H
-
-/*
- * Copyright (C) 2000 Lineo, David McCullough <davidm@uclinux.org>
- * Copyright (C) 2000-2002, Greg Ungerer <gerg@snapgear.com>
- */
-
-#include <asm/setup.h>
-
-/*
- * flush all user-space atc entries.
- */
-static inline void __flush_tlb(void)
-{
-        BUG();
-}
-
-static inline void __flush_tlb_one(unsigned long addr)
-{
-        BUG();
-}
-
-#define flush_tlb() __flush_tlb()
-
-/*
- * flush all atc entries (both kernel and user-space entries).
- */
-static inline void flush_tlb_all(void)
-{
-        BUG();
-}
-
-static inline void flush_tlb_mm(struct mm_struct *mm)
-{
-        BUG();
-}
-
-static inline void flush_tlb_page(struct vm_area_struct *vma, unsigned long addr)
-{
-        BUG();
-}
-
-static inline void flush_tlb_range(struct mm_struct *mm,
-                                   unsigned long start, unsigned long end)
-{
-        BUG();
-}
-
-static inline void flush_tlb_kernel_page(unsigned long addr)
-{
-        BUG();
-}
-
-#endif /* _M68KNOMMU_TLBFLUSH_H */
diff --git a/arch/m68k/include/asm/ucontext.h b/arch/m68k/include/asm/ucontext.h
index b53cd160c0b3..e4e22669edc0 100644
--- a/arch/m68k/include/asm/ucontext.h
+++ b/arch/m68k/include/asm/ucontext.h
@@ -1,5 +1,30 @@
-#ifdef __uClinux__
-#include "ucontext_no.h"
-#else
-#include "ucontext_mm.h"
+#ifndef _M68K_UCONTEXT_H
+#define _M68K_UCONTEXT_H
+
+typedef int greg_t;
+#define NGREG 18
+typedef greg_t gregset_t[NGREG];
+
+typedef struct fpregset {
+        int f_fpcntl[3];
+        int f_fpregs[8*3];
+} fpregset_t;
+
+struct mcontext {
+        int version;
+        gregset_t gregs;
+        fpregset_t fpregs;
+};
+
+#define MCONTEXT_VERSION 2
+
+struct ucontext {
+        unsigned long     uc_flags;
+        struct ucontext  *uc_link;
+        stack_t           uc_stack;
+        struct mcontext   uc_mcontext;
+        unsigned long     uc_filler[80];
+        sigset_t          uc_sigmask;   /* mask last for extensibility */
+};
+
 #endif
diff --git a/arch/m68k/include/asm/ucontext_mm.h b/arch/m68k/include/asm/ucontext_mm.h
deleted file mode 100644
index e4e22669edc0..000000000000
--- a/arch/m68k/include/asm/ucontext_mm.h
+++ /dev/null
@@ -1,30 +0,0 @@
-#ifndef _M68K_UCONTEXT_H
-#define _M68K_UCONTEXT_H
-
-typedef int greg_t;
-#define NGREG 18
-typedef greg_t gregset_t[NGREG];
-
-typedef struct fpregset {
-        int f_fpcntl[3];
-        int f_fpregs[8*3];
-} fpregset_t;
-
-struct mcontext {
-        int version;
-        gregset_t gregs;
-        fpregset_t fpregs;
-};
-
-#define MCONTEXT_VERSION 2
-
-struct ucontext {
-        unsigned long     uc_flags;
-        struct ucontext  *uc_link;
-        stack_t           uc_stack;
-        struct mcontext   uc_mcontext;
-        unsigned long     uc_filler[80];
-        sigset_t          uc_sigmask;   /* mask last for extensibility */
-};
-
-#endif
diff --git a/arch/m68k/include/asm/ucontext_no.h b/arch/m68k/include/asm/ucontext_no.h
deleted file mode 100644
index 713a27f901cd..000000000000
--- a/arch/m68k/include/asm/ucontext_no.h
+++ /dev/null
@@ -1,32 +0,0 @@
-#ifndef _M68KNOMMU_UCONTEXT_H
-#define _M68KNOMMU_UCONTEXT_H
-
-typedef int greg_t;
-#define NGREG 18
-typedef greg_t gregset_t[NGREG];
-
-typedef struct fpregset {
-        int f_pcr;
-        int f_psr;
-        int f_fpiaddr;
-        int f_fpregs[8][3];
-} fpregset_t;
-
-struct mcontext {
-        int version;
-        gregset_t gregs;
-        fpregset_t fpregs;
-};
-
-#define MCONTEXT_VERSION 2
-
-struct ucontext {
-        unsigned long     uc_flags;
-        struct ucontext  *uc_link;
-        stack_t           uc_stack;
-        struct mcontext   uc_mcontext;
-        unsigned long     uc_filler[80];
-        sigset_t          uc_sigmask;   /* mask last for extensibility */
-};
-
-#endif
diff --git a/arch/m68k/include/asm/unaligned.h b/arch/m68k/include/asm/unaligned.h
index c640bba3bdf4..019caa740c21 100644
--- a/arch/m68k/include/asm/unaligned.h
+++ b/arch/m68k/include/asm/unaligned.h
@@ -1,5 +1,25 @@
-#ifdef __uClinux__
-#include "unaligned_no.h"
+#ifndef _ASM_M68K_UNALIGNED_H
+#define _ASM_M68K_UNALIGNED_H
+
+
+#ifdef CONFIG_COLDFIRE
+#include <linux/unaligned/be_struct.h>
+#include <linux/unaligned/le_byteshift.h>
+#include <linux/unaligned/generic.h>
+
+#define get_unaligned   __get_unaligned_be
+#define put_unaligned   __put_unaligned_be
+
 #else
-#include "unaligned_mm.h"
+/*
+ * The m68k can do unaligned accesses itself. 
+ */
+#include <linux/unaligned/access_ok.h>
+#include <linux/unaligned/generic.h>
+
+#define get_unaligned   __get_unaligned_be
+#define put_unaligned   __put_unaligned_be
+
 #endif
+
+#endif /* _ASM_M68K_UNALIGNED_H */
diff --git a/arch/m68k/include/asm/unaligned_mm.h b/arch/m68k/include/asm/unaligned_mm.h
deleted file mode 100644
index 77698f2dc33c..000000000000
--- a/arch/m68k/include/asm/unaligned_mm.h
+++ /dev/null
@@ -1,13 +0,0 @@
-#ifndef _ASM_M68K_UNALIGNED_H
-#define _ASM_M68K_UNALIGNED_H
-
-/*
- * The m68k can do unaligned accesses itself.
- */
-#include <linux/unaligned/access_ok.h>
-#include <linux/unaligned/generic.h>
-
-#define get_unaligned   __get_unaligned_be
-#define put_unaligned   __put_unaligned_be
-
-#endif /* _ASM_M68K_UNALIGNED_H */
diff --git a/arch/m68k/include/asm/unaligned_no.h b/arch/m68k/include/asm/unaligned_no.h
deleted file mode 100644
index eb1ea4cb9a59..000000000000
--- a/arch/m68k/include/asm/unaligned_no.h
+++ /dev/null
@@ -1,25 +0,0 @@
-#ifndef _ASM_M68KNOMMU_UNALIGNED_H
-#define _ASM_M68KNOMMU_UNALIGNED_H
-
-
-#ifdef CONFIG_COLDFIRE
-#include <linux/unaligned/be_struct.h>
-#include <linux/unaligned/le_byteshift.h>
-#include <linux/unaligned/generic.h>
-
-#define get_unaligned   __get_unaligned_be
-#define put_unaligned   __put_unaligned_be
-
-#else
-/*
- * The m68k can do unaligned accesses itself. 
- */
-#include <linux/unaligned/access_ok.h>
-#include <linux/unaligned/generic.h>
-
-#define get_unaligned   __get_unaligned_be
-#define put_unaligned   __put_unaligned_be
-
-#endif
-
-#endif /* _ASM_M68KNOMMU_UNALIGNED_H */
diff --git a/arch/m68k/kernel/process.c b/arch/m68k/kernel/process.c
index 632ce016014d..ec37fb56c127 100644
--- a/arch/m68k/kernel/process.c
+++ b/arch/m68k/kernel/process.c
@@ -233,7 +233,7 @@ asmlinkage int m68k_clone(struct pt_regs *regs)
                        parent_tidptr, child_tidptr);
 }
 
-int copy_thread(int nr, unsigned long clone_flags, unsigned long usp,
+int copy_thread(unsigned long clone_flags, unsigned long usp,
                  unsigned long unused,
                  struct task_struct * p, struct pt_regs * regs)
 {
diff --git a/arch/m68k/kernel/time.c b/arch/m68k/kernel/time.c
index 7db41594d7b6..54d980795fc4 100644
--- a/arch/m68k/kernel/time.c
+++ b/arch/m68k/kernel/time.c
@@ -18,6 +18,7 @@
 #include <linux/string.h>
 #include <linux/mm.h>
 #include <linux/rtc.h>
+#include <linux/platform_device.h>
 
 #include <asm/machdep.h>
 #include <asm/io.h>
@@ -159,3 +160,20 @@ int do_settimeofday(struct timespec *tv)
 }
 
 EXPORT_SYMBOL(do_settimeofday);
+
+
+static int __init rtc_init(void)
+{
+        struct platform_device *pdev;
+
+        if (!mach_hwclk)
+                return -ENODEV;
+
+        pdev = platform_device_register_simple("rtc-generic", -1, NULL, 0);
+        if (IS_ERR(pdev))
+                return PTR_ERR(pdev);
+
+        return 0;
+}
+
+module_init(rtc_init);
diff --git a/arch/m68knommu/Makefile b/arch/m68knommu/Makefile
index fd0fb303d885..ce404bc9ccbd 100644
--- a/arch/m68knommu/Makefile
+++ b/arch/m68knommu/Makefile
@@ -88,18 +88,18 @@ export PLATFORM BOARD MODEL CPUCLASS
 #
 # Some CFLAG additions based on specific CPU type.
 #
-cflags-$(CONFIG_M5206)          := -m5200
-cflags-$(CONFIG_M5206e)         := -m5200
-cflags-$(CONFIG_M520x)          := -m5307
+cflags-$(CONFIG_M5206)          := $(call cc-option,-mcpu=5206,-m5200)
+cflags-$(CONFIG_M5206e)         := $(call cc-option,-m5206e,-m5200)
+cflags-$(CONFIG_M520x)          := $(call cc-option,-mcpu=5208,-m5200)
 cflags-$(CONFIG_M523x)          := $(call cc-option,-mcpu=523x,-m5307)
-cflags-$(CONFIG_M5249)          := -m5200
+cflags-$(CONFIG_M5249)          := $(call cc-option,-mcpu=5249,-m5200)
 cflags-$(CONFIG_M5271)          := $(call cc-option,-mcpu=5271,-m5307)
-cflags-$(CONFIG_M5272)          := -m5307
+cflags-$(CONFIG_M5272)          := $(call cc-option,-mcpu=5271,-m5200)
 cflags-$(CONFIG_M5275)          := $(call cc-option,-mcpu=5275,-m5307)
 cflags-$(CONFIG_M528x)          := $(call cc-option,-m528x,-m5307)
-cflags-$(CONFIG_M5307)          := -m5307
+cflags-$(CONFIG_M5307)          := $(call cc-option,-m5307,-m5200)
 cflags-$(CONFIG_M532x)          := $(call cc-option,-mcpu=532x,-m5307)
-cflags-$(CONFIG_M5407)          := -m5200
+cflags-$(CONFIG_M5407)          := $(call cc-option,-m5407,-m5200)
 cflags-$(CONFIG_M68328)         := -m68000
 cflags-$(CONFIG_M68EZ328)       := -m68000
 cflags-$(CONFIG_M68VZ328)       := -m68000
diff --git a/arch/m68knommu/kernel/dma.c b/arch/m68knommu/kernel/dma.c
index e10eafc52789..936125806638 100644
--- a/arch/m68knommu/kernel/dma.c
+++ b/arch/m68knommu/kernel/dma.c
@@ -9,10 +9,11 @@
 #include <linux/mm.h>
 #include <linux/string.h>
 #include <linux/device.h>
+#include <linux/dma-mapping.h>
 #include <asm/io.h>
 
 void *dma_alloc_coherent(struct device *dev, size_t size,
-                           dma_addr_t *dma_handle, int gfp)
+                           dma_addr_t *dma_handle, gfp_t gfp)
 {
         void *ret;
         /* ignore region specifiers */
@@ -34,3 +35,8 @@ void dma_free_coherent(struct device *dev, size_t size,
 {
         free_pages((unsigned long)vaddr, get_order(size));
 }
+
+void dma_sync_single_for_cpu(struct device *dev, dma_addr_t handle, size_t size, enum dma_data_direction dir)
+{
+}
+
diff --git a/arch/m68knommu/kernel/irq.c b/arch/m68knommu/kernel/irq.c
index bba1bb48a21f..56e0f4c55a67 100644
--- a/arch/m68knommu/kernel/irq.c
+++ b/arch/m68knommu/kernel/irq.c
@@ -23,7 +23,7 @@ asmlinkage void do_IRQ(int irq, struct pt_regs *regs)
         struct pt_regs *oldregs = set_irq_regs(regs);
 
         irq_enter();
-        __do_IRQ(irq);
+        generic_handle_irq(irq);
         irq_exit();
 
         set_irq_regs(oldregs);
diff --git a/arch/m68knommu/kernel/process.c b/arch/m68knommu/kernel/process.c
index 3f2d7745f31e..1e96c6eb6312 100644
--- a/arch/m68knommu/kernel/process.c
+++ b/arch/m68knommu/kernel/process.c
@@ -199,7 +199,7 @@ asmlinkage int m68k_clone(struct pt_regs *regs)
         return do_fork(clone_flags, newsp, regs, 0, NULL, NULL);
 }
 
-int copy_thread(int nr, unsigned long clone_flags,
+int copy_thread(unsigned long clone_flags,
                 unsigned long usp, unsigned long topstk,
                 struct task_struct * p, struct pt_regs * regs)
 {
diff --git a/arch/m68knommu/mm/init.c b/arch/m68knommu/mm/init.c
index 3bf249c53e41..7befc0c357e0 100644
--- a/arch/m68knommu/mm/init.c
+++ b/arch/m68knommu/mm/init.c
@@ -111,11 +111,7 @@ void __init paging_init(void)
         {
                 unsigned long zones_size[MAX_NR_ZONES] = {0, };
 
-                zones_size[ZONE_DMA] = 0 >> PAGE_SHIFT;
-                zones_size[ZONE_NORMAL] = (end_mem - PAGE_OFFSET) >> PAGE_SHIFT;
-#ifdef CONFIG_HIGHMEM
-                zones_size[ZONE_HIGHMEM] = 0;
-#endif
+                zones_size[ZONE_DMA] = (end_mem - PAGE_OFFSET) >> PAGE_SHIFT;
                 free_area_init(zones_size);
         }
 }
diff --git a/arch/m68knommu/platform/5249/config.c b/arch/m68knommu/platform/5249/config.c
index d299f7b8768a..9eab19d01eb1 100644
--- a/arch/m68knommu/platform/5249/config.c
+++ b/arch/m68knommu/platform/5249/config.c
@@ -32,7 +32,8 @@ static struct mcf_platform_uart m5249_uart_platform[] = {
         {
                 .mapbase        = MCF_MBAR + MCFUART_BASE2,
                 .irq            = 74,
-        }
+        },
+        { },
 };
 
 static struct platform_device m5249_uart = {
@@ -50,12 +51,12 @@ static struct platform_device *m5249_devices[] __initdata = {
 static void __init m5249_uart_init_line(int line, int irq)
 {
         if (line == 0) {
-                writel(MCFSIM_ICR_LEVEL6 | MCFSIM_ICR_PRI1, MCF_MBAR + MCFSIM_UART1ICR);
-                writeb(irq, MCFUART_BASE1 + MCFUART_UIVR);
+                writeb(MCFSIM_ICR_LEVEL6 | MCFSIM_ICR_PRI1, MCF_MBAR + MCFSIM_UART1ICR);
+                writeb(irq, MCF_MBAR + MCFUART_BASE1 + MCFUART_UIVR);
                 mcf_setimr(mcf_getimr() & ~MCFSIM_IMR_UART1);
         } else if (line == 1) {
-                writel(MCFSIM_ICR_LEVEL6 | MCFSIM_ICR_PRI2, MCF_MBAR + MCFSIM_UART2ICR);
-                writeb(irq, MCFUART_BASE2 + MCFUART_UIVR);
+                writeb(MCFSIM_ICR_LEVEL6 | MCFSIM_ICR_PRI2, MCF_MBAR + MCFSIM_UART2ICR);
+                writeb(irq, MCF_MBAR + MCFUART_BASE2 + MCFUART_UIVR);
                 mcf_setimr(mcf_getimr() & ~MCFSIM_IMR_UART2);
         }
 }
diff --git a/arch/m68knommu/platform/5307/config.c b/arch/m68knommu/platform/5307/config.c
index 724faf05852a..44803bf70a6e 100644
--- a/arch/m68knommu/platform/5307/config.c
+++ b/arch/m68knommu/platform/5307/config.c
@@ -65,12 +65,12 @@ static struct platform_device *m5307_devices[] __initdata = {
 static void __init m5307_uart_init_line(int line, int irq)
 {
         if (line == 0) {
-                writel(MCFSIM_ICR_LEVEL6 | MCFSIM_ICR_PRI1, MCF_MBAR + MCFSIM_UART1ICR);
-                writeb(irq, MCFUART_BASE1 + MCFUART_UIVR);
+                writeb(MCFSIM_ICR_LEVEL6 | MCFSIM_ICR_PRI1, MCF_MBAR + MCFSIM_UART1ICR);
+                writeb(irq, MCF_MBAR + MCFUART_BASE1 + MCFUART_UIVR);
                 mcf_setimr(mcf_getimr() & ~MCFSIM_IMR_UART1);
         } else if (line == 1) {
-                writel(MCFSIM_ICR_LEVEL6 | MCFSIM_ICR_PRI2, MCF_MBAR + MCFSIM_UART2ICR);
-                writeb(irq, MCFUART_BASE2 + MCFUART_UIVR);
+                writeb(MCFSIM_ICR_LEVEL6 | MCFSIM_ICR_PRI2, MCF_MBAR + MCFSIM_UART2ICR);
+                writeb(irq, MCF_MBAR + MCFUART_BASE2 + MCFUART_UIVR);
                 mcf_setimr(mcf_getimr() & ~MCFSIM_IMR_UART2);
         }
 }
diff --git a/arch/m68knommu/platform/5407/config.c b/arch/m68knommu/platform/5407/config.c
index 648b8b778211..0ee8c1a200c8 100644
--- a/arch/m68knommu/platform/5407/config.c
+++ b/arch/m68knommu/platform/5407/config.c
@@ -56,12 +56,12 @@ static struct platform_device *m5407_devices[] __initdata = {
 static void __init m5407_uart_init_line(int line, int irq)
 {
         if (line == 0) {
-                writel(MCFSIM_ICR_LEVEL6 | MCFSIM_ICR_PRI1, MCF_MBAR + MCFSIM_UART1ICR);
-                writeb(irq, MCFUART_BASE1 + MCFUART_UIVR);
+                writeb(MCFSIM_ICR_LEVEL6 | MCFSIM_ICR_PRI1, MCF_MBAR + MCFSIM_UART1ICR);
+                writeb(irq, MCF_MBAR + MCFUART_BASE1 + MCFUART_UIVR);
                 mcf_setimr(mcf_getimr() & ~MCFSIM_IMR_UART1);
         } else if (line == 1) {
-                writel(MCFSIM_ICR_LEVEL6 | MCFSIM_ICR_PRI2, MCF_MBAR + MCFSIM_UART2ICR);
-                writeb(irq, MCFUART_BASE2 + MCFUART_UIVR);
+                writeb(MCFSIM_ICR_LEVEL6 | MCFSIM_ICR_PRI2, MCF_MBAR + MCFSIM_UART2ICR);
+                writeb(irq, MCF_MBAR + MCFUART_BASE2 + MCFUART_UIVR);
                 mcf_setimr(mcf_getimr() & ~MCFSIM_IMR_UART2);
         }
 }
diff --git a/arch/m68knommu/platform/coldfire/Makefile b/arch/m68knommu/platform/coldfire/Makefile
index 4f416a91a829..1bcb9372353f 100644
--- a/arch/m68knommu/platform/coldfire/Makefile
+++ b/arch/m68knommu/platform/coldfire/Makefile
@@ -14,7 +14,7 @@
 
 asflags-$(CONFIG_FULLDEBUG) := -DDEBUGGER_COMPATIBLE_CACHE=1
 
-obj-$(CONFIG_COLDFIRE)  += dma.o entry.o vectors.o
+obj-$(CONFIG_COLDFIRE)  += clk.o dma.o entry.o vectors.o
 obj-$(CONFIG_M5206)     += timers.o
 obj-$(CONFIG_M5206e)    += timers.o
 obj-$(CONFIG_M520x)     += pit.o
diff --git a/arch/m68knommu/platform/coldfire/clk.c b/arch/m68knommu/platform/coldfire/clk.c
new file mode 100644
index 000000000000..7cdbf445b28f
--- /dev/null
+++ b/arch/m68knommu/platform/coldfire/clk.c
@@ -0,0 +1,40 @@
+/***************************************************************************/
+
+/*
+ *      clk.c -- general ColdFire CPU kernel clk handling
+ *
+ *      Copyright (C) 2009, Greg Ungerer (gerg@snapgear.com)
+ */
+
+/***************************************************************************/
+
+#include <linux/kernel.h>
+#include <linux/clk.h>
+#include <asm/coldfire.h>
+
+/***************************************************************************/
+
+struct clk *clk_get(struct device *dev, const char *id)
+{
+        return NULL;
+}
+
+int clk_enable(struct clk *clk)
+{
+        return 0;
+}
+
+void clk_disable(struct clk *clk)
+{
+}
+
+void clk_put(struct clk *clk)
+{
+}
+
+unsigned long clk_get_rate(struct clk *clk)
+{
+        return MCF_CLK;
+}
+
+/***************************************************************************/
diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig
index dc787190430a..998e5db8cc0f 100644
--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
@@ -134,7 +134,7 @@ config MACH_JAZZ
         help
          This a family of machines based on the MIPS R4030 chipset which was
          used by several vendors to build RISC/os and Windows NT workstations.
-         Members include the Acer PICA, MIPS Magnum 4000, MIPS Millenium and
+         Members include the Acer PICA, MIPS Magnum 4000, MIPS Millennium and
          Olivetti M700-10 workstations.
 
 config LASAT
diff --git a/arch/mips/include/asm/spinlock.h b/arch/mips/include/asm/spinlock.h
index 10e82441b496..5b60a09a0f08 100644
--- a/arch/mips/include/asm/spinlock.h
+++ b/arch/mips/include/asm/spinlock.h
@@ -480,6 +480,8 @@ static inline int __raw_write_trylock(raw_rwlock_t *rw)
         return ret;
 }
 
+#define __raw_read_lock_flags(lock, flags) __raw_read_lock(lock)
+#define __raw_write_lock_flags(lock, flags) __raw_write_lock(lock)
 
 #define _raw_spin_relax(lock)   cpu_relax()
 #define _raw_read_relax(lock)   cpu_relax()
diff --git a/arch/mips/include/asm/unistd.h b/arch/mips/include/asm/unistd.h
index a73e1531e151..40005010827c 100644
--- a/arch/mips/include/asm/unistd.h
+++ b/arch/mips/include/asm/unistd.h
@@ -350,16 +350,18 @@
 #define __NR_dup3                       (__NR_Linux + 327)
 #define __NR_pipe2                      (__NR_Linux + 328)
 #define __NR_inotify_init1              (__NR_Linux + 329)
+#define __NR_preadv                     (__NR_Linux + 330)
+#define __NR_pwritev                    (__NR_Linux + 331)
 
 /*
  * Offset of the last Linux o32 flavoured syscall
  */
-#define __NR_Linux_syscalls             329
+#define __NR_Linux_syscalls             331
 
 #endif /* _MIPS_SIM == _MIPS_SIM_ABI32 */
 
 #define __NR_O32_Linux                  4000
-#define __NR_O32_Linux_syscalls         329
+#define __NR_O32_Linux_syscalls         331
 
 #if _MIPS_SIM == _MIPS_SIM_ABI64
 
@@ -656,16 +658,18 @@
 #define __NR_dup3                       (__NR_Linux + 286)
 #define __NR_pipe2                      (__NR_Linux + 287)
 #define __NR_inotify_init1              (__NR_Linux + 288)
+#define __NR_preadv                     (__NR_Linux + 289)
+#define __NR_pwritev                    (__NR_Linux + 290)
 
 /*
  * Offset of the last Linux 64-bit flavoured syscall
  */
-#define __NR_Linux_syscalls             288
+#define __NR_Linux_syscalls             290
 
 #endif /* _MIPS_SIM == _MIPS_SIM_ABI64 */
 
 #define __NR_64_Linux                   5000
-#define __NR_64_Linux_syscalls          288
+#define __NR_64_Linux_syscalls          290
 
 #if _MIPS_SIM == _MIPS_SIM_NABI32
 
@@ -966,16 +970,18 @@
 #define __NR_dup3                       (__NR_Linux + 290)
 #define __NR_pipe2                      (__NR_Linux + 291)
 #define __NR_inotify_init1              (__NR_Linux + 292)
+#define __NR_preadv                     (__NR_Linux + 293)
+#define __NR_pwritev                    (__NR_Linux + 294)
 
 /*
  * Offset of the last N32 flavoured syscall
  */
-#define __NR_Linux_syscalls             292
+#define __NR_Linux_syscalls             294
 
 #endif /* _MIPS_SIM == _MIPS_SIM_NABI32 */
 
 #define __NR_N32_Linux                  6000
-#define __NR_N32_Linux_syscalls         292
+#define __NR_N32_Linux_syscalls         294
 
 #ifdef __KERNEL__
 
diff --git a/arch/mips/kernel/process.c b/arch/mips/kernel/process.c
index ca2e4026ad20..1eaaa450e20c 100644
--- a/arch/mips/kernel/process.c
+++ b/arch/mips/kernel/process.c
@@ -99,7 +99,7 @@ void flush_thread(void)
 {
 }
 
-int copy_thread(int nr, unsigned long clone_flags, unsigned long usp,
+int copy_thread(unsigned long clone_flags, unsigned long usp,
         unsigned long unused, struct task_struct *p, struct pt_regs *regs)
 {
         struct thread_info *ti = task_thread_info(p);
diff --git a/arch/mips/kernel/scall32-o32.S b/arch/mips/kernel/scall32-o32.S
index 9ab70c3b5be6..0b31b9bda048 100644
--- a/arch/mips/kernel/scall32-o32.S
+++ b/arch/mips/kernel/scall32-o32.S
@@ -650,6 +650,8 @@ einval:	li	v0, -ENOSYS
         sys     sys_dup3                3
         sys     sys_pipe2               2
         sys     sys_inotify_init1       1
+        sys     sys_preadv              6       /* 4330 */
+        sys     sys_pwritev             6
         .endm
 
         /* We pre-compute the number of _instruction_ bytes needed to
diff --git a/arch/mips/kernel/scall64-64.S b/arch/mips/kernel/scall64-64.S
index 9b4698667154..c647fd6e722f 100644
--- a/arch/mips/kernel/scall64-64.S
+++ b/arch/mips/kernel/scall64-64.S
@@ -487,4 +487,6 @@ sys_call_table:
         PTR     sys_dup3
         PTR     sys_pipe2
         PTR     sys_inotify_init1
+        PTR     sys_preadv
+        PTR     sys_pwritev                     /* 5390 */
         .size   sys_call_table,.-sys_call_table
diff --git a/arch/mips/kernel/scall64-n32.S b/arch/mips/kernel/scall64-n32.S
index f61d6b0e5731..c2c16ef9218f 100644
--- a/arch/mips/kernel/scall64-n32.S
+++ b/arch/mips/kernel/scall64-n32.S
@@ -413,4 +413,6 @@ EXPORT(sysn32_call_table)
         PTR     sys_dup3                        /* 5290 */
         PTR     sys_pipe2
         PTR     sys_inotify_init1
+        PTR     sys_preadv
+        PTR     sys_pwritev
         .size   sysn32_call_table,.-sysn32_call_table
diff --git a/arch/mips/kernel/scall64-o32.S b/arch/mips/kernel/scall64-o32.S
index 60997f1f69d4..002fac27021e 100644
--- a/arch/mips/kernel/scall64-o32.S
+++ b/arch/mips/kernel/scall64-o32.S
@@ -533,4 +533,6 @@ sys_call_table:
         PTR     sys_dup3
         PTR     sys_pipe2
         PTR     sys_inotify_init1
+        PTR     compat_sys_preadv               /* 4330 */
+        PTR     compat_sys_pwritev
         .size   sys_call_table,.-sys_call_table
diff --git a/arch/mips/sgi-ip27/ip27-smp.c b/arch/mips/sgi-ip27/ip27-smp.c
index 5b47d6b65275..cbcd7eb83bd1 100644
--- a/arch/mips/sgi-ip27/ip27-smp.c
+++ b/arch/mips/sgi-ip27/ip27-smp.c
@@ -221,7 +221,7 @@ static void __init ip27_smp_setup(void)
          * Assumption to be fixed: we're always booted on logical / physical
          * processor 0.  While we're always running on logical processor 0
          * this still means this is physical processor zero; it might for
-         * example be disabled in the firwware.
+         * example be disabled in the firmware.
          */
         alloc_cpupda(0, 0);
 }
diff --git a/arch/mn10300/kernel/process.c b/arch/mn10300/kernel/process.c
index b28c9a60445b..234cf344cdce 100644
--- a/arch/mn10300/kernel/process.c
+++ b/arch/mn10300/kernel/process.c
@@ -193,7 +193,7 @@ void prepare_to_copy(struct task_struct *tsk)
  * set up the kernel stack for a new thread and copy arch-specific thread
  * control information
  */
-int copy_thread(int nr, unsigned long clone_flags,
+int copy_thread(unsigned long clone_flags,
                 unsigned long c_usp, unsigned long ustk_size,
                 struct task_struct *p, struct pt_regs *kregs)
 {
diff --git a/arch/parisc/Kconfig b/arch/parisc/Kconfig
index aacf11d33723..9038f39d9d73 100644
--- a/arch/parisc/Kconfig
+++ b/arch/parisc/Kconfig
@@ -9,9 +9,13 @@ config PARISC
         def_bool y
         select HAVE_IDE
         select HAVE_OPROFILE
+        select HAVE_FUNCTION_TRACER if 64BIT
+        select HAVE_FUNCTION_GRAPH_TRACER if 64BIT
+        select HAVE_FUNCTION_TRACE_MCOUNT_TEST if 64BIT
         select RTC_CLASS
-        select RTC_DRV_PARISC
+        select RTC_DRV_GENERIC
         select INIT_ALL_POSSIBLE
+        select BUG
         help
           The PA-RISC microprocessor is designed by Hewlett-Packard and used
           in many of their workstations & servers (HP9000 700 and 800 series,
@@ -75,6 +79,9 @@ config GENERIC_HARDIRQS
 config GENERIC_IRQ_PROBE
         def_bool y
 
+config HAVE_LATENCYTOP_SUPPORT
+        def_bool y
+
 config IRQ_PER_CPU
         bool
         default y
@@ -83,6 +90,9 @@ config IRQ_PER_CPU
 config PM
         bool
 
+config STACKTRACE_SUPPORT
+        def_bool y
+
 config ISA_DMA_API
         bool
 
diff --git a/arch/parisc/Makefile b/arch/parisc/Makefile
index 0d428278356d..da6f66901c92 100644
--- a/arch/parisc/Makefile
+++ b/arch/parisc/Makefile
@@ -56,7 +56,9 @@ cflags-y	+= -mdisable-fpregs
 
 # Without this, "ld -r" results in .text sections that are too big
 # (> 0x40000) for branches to reach stubs.
-cflags-y        += -ffunction-sections
+ifndef CONFIG_FUNCTION_TRACER
+  cflags-y      += -ffunction-sections
+endif
 
 # select which processor to optimise for
 cflags-$(CONFIG_PA7100)         += -march=1.1 -mschedule=7100
diff --git a/arch/parisc/include/asm/atomic.h b/arch/parisc/include/asm/atomic.h
index edbfe25c5fc1..ada3e5364d82 100644
--- a/arch/parisc/include/asm/atomic.h
+++ b/arch/parisc/include/asm/atomic.h
@@ -25,7 +25,7 @@
  * Since "a" is usually an address, use one spinlock per cacheline.
  */
 #  define ATOMIC_HASH_SIZE 4
-#  define ATOMIC_HASH(a) (&(__atomic_hash[ (((unsigned long) a)/L1_CACHE_BYTES) & (ATOMIC_HASH_SIZE-1) ]))
+#  define ATOMIC_HASH(a) (&(__atomic_hash[ (((unsigned long) (a))/L1_CACHE_BYTES) & (ATOMIC_HASH_SIZE-1) ]))
 
 extern raw_spinlock_t __atomic_hash[ATOMIC_HASH_SIZE] __lock_aligned;
 
@@ -222,13 +222,13 @@ static __inline__ int atomic_add_unless(atomic_t *v, int a, int u)
 
 #define atomic_inc_not_zero(v) atomic_add_unless((v), 1, 0)
 
-#define atomic_add(i,v) ((void)(__atomic_add_return( ((int)i),(v))))
-#define atomic_sub(i,v) ((void)(__atomic_add_return(-((int)i),(v))))
+#define atomic_add(i,v) ((void)(__atomic_add_return( ((int)(i)),(v))))
+#define atomic_sub(i,v) ((void)(__atomic_add_return(-((int)(i)),(v))))
 #define atomic_inc(v)   ((void)(__atomic_add_return(   1,(v))))
 #define atomic_dec(v)   ((void)(__atomic_add_return(  -1,(v))))
 
-#define atomic_add_return(i,v)  (__atomic_add_return( ((int)i),(v)))
-#define atomic_sub_return(i,v)  (__atomic_add_return(-((int)i),(v)))
+#define atomic_add_return(i,v)  (__atomic_add_return( ((int)(i)),(v)))
+#define atomic_sub_return(i,v)  (__atomic_add_return(-((int)(i)),(v)))
 #define atomic_inc_return(v)    (__atomic_add_return(   1,(v)))
 #define atomic_dec_return(v)    (__atomic_add_return(  -1,(v)))
 
@@ -289,13 +289,13 @@ atomic64_read(const atomic64_t *v)
         return v->counter;
 }
 
-#define atomic64_add(i,v)       ((void)(__atomic64_add_return( ((s64)i),(v))))
-#define atomic64_sub(i,v)       ((void)(__atomic64_add_return(-((s64)i),(v))))
+#define atomic64_add(i,v)       ((void)(__atomic64_add_return( ((s64)(i)),(v))))
+#define atomic64_sub(i,v)       ((void)(__atomic64_add_return(-((s64)(i)),(v))))
 #define atomic64_inc(v)         ((void)(__atomic64_add_return(   1,(v))))
 #define atomic64_dec(v)         ((void)(__atomic64_add_return(  -1,(v))))
 
-#define atomic64_add_return(i,v)        (__atomic64_add_return( ((s64)i),(v)))
-#define atomic64_sub_return(i,v)        (__atomic64_add_return(-((s64)i),(v)))
+#define atomic64_add_return(i,v)        (__atomic64_add_return( ((s64)(i)),(v)))
+#define atomic64_sub_return(i,v)        (__atomic64_add_return(-((s64)(i)),(v)))
 #define atomic64_inc_return(v)          (__atomic64_add_return(   1,(v)))
 #define atomic64_dec_return(v)          (__atomic64_add_return(  -1,(v)))
 
diff --git a/arch/parisc/include/asm/cacheflush.h b/arch/parisc/include/asm/cacheflush.h
index b7ca6dc7fddc..724395143f26 100644
--- a/arch/parisc/include/asm/cacheflush.h
+++ b/arch/parisc/include/asm/cacheflush.h
@@ -97,6 +97,9 @@ void mark_rodata_ro(void);
 
 #ifdef CONFIG_PA8X00
 /* Only pa8800, pa8900 needs this */
+
+#include <asm/kmap_types.h>
+
 #define ARCH_HAS_KMAP
 
 void kunmap_parisc(void *addr);
diff --git a/arch/parisc/include/asm/elf.h b/arch/parisc/include/asm/elf.h
index 7fa675799e6d..9c802eb4be84 100644
--- a/arch/parisc/include/asm/elf.h
+++ b/arch/parisc/include/asm/elf.h
@@ -168,6 +168,16 @@ typedef struct elf64_fdesc {
         __u64   gp;
 } Elf64_Fdesc;
 
+#ifdef __KERNEL__
+
+#ifdef CONFIG_64BIT
+#define Elf_Fdesc       Elf64_Fdesc
+#else
+#define Elf_Fdesc       Elf32_Fdesc
+#endif /*CONFIG_64BIT*/
+
+#endif /*__KERNEL__*/
+
 /* Legal values for p_type field of Elf32_Phdr/Elf64_Phdr.  */
 
 #define PT_HP_TLS               (PT_LOOS + 0x0)
diff --git a/arch/parisc/include/asm/ftrace.h b/arch/parisc/include/asm/ftrace.h
index 40a8c178f10d..2fa05dd6aeee 100644
--- a/arch/parisc/include/asm/ftrace.h
+++ b/arch/parisc/include/asm/ftrace.h
@@ -1 +1,25 @@
-/* empty */
+#ifndef _ASM_PARISC_FTRACE_H
+#define _ASM_PARISC_FTRACE_H
+
+#ifndef __ASSEMBLY__
+extern void mcount(void);
+
+/*
+ * Stack of return addresses for functions of a thread.
+ * Used in struct thread_info
+ */
+struct ftrace_ret_stack {
+        unsigned long ret;
+        unsigned long func;
+        unsigned long long calltime;
+};
+
+/*
+ * Primary handler of a function return.
+ * It relays on ftrace_return_to_handler.
+ * Defined in entry.S
+ */
+extern void return_to_handler(void);
+#endif /* __ASSEMBLY__ */
+
+#endif /* _ASM_PARISC_FTRACE_H */
diff --git a/arch/parisc/include/asm/page.h b/arch/parisc/include/asm/page.h
index c3941f09a878..7bc5125d7d4c 100644
--- a/arch/parisc/include/asm/page.h
+++ b/arch/parisc/include/asm/page.h
@@ -36,16 +36,7 @@ void clear_user_page(void *page, unsigned long vaddr, struct page *pg);
  */
 #define STRICT_MM_TYPECHECKS
 #ifdef STRICT_MM_TYPECHECKS
-typedef struct { unsigned long pte;
-#if !defined(CONFIG_64BIT)
-                 unsigned long future_flags;
- /* XXX: it's possible to remove future_flags and change BITS_PER_PTE_ENTRY
-         to 2, but then strangely the identical 32bit kernel boots on a
-         c3000(pa20), but not any longer on a 715(pa11).
-         Still investigating... HelgeD.
-  */
-#endif
-} pte_t; /* either 32 or 64bit */
+typedef struct { unsigned long pte; } pte_t; /* either 32 or 64bit */
 
 /* NOTE: even on 64 bits, these entries are __u32 because we allocate
  * the pmd and pgd in ZONE_DMA (i.e. under 4GB) */
@@ -111,7 +102,7 @@ extern int npmem_ranges;
 #define BITS_PER_PMD_ENTRY      2
 #define BITS_PER_PGD_ENTRY      2
 #else
-#define BITS_PER_PTE_ENTRY      3
+#define BITS_PER_PTE_ENTRY      2
 #define BITS_PER_PMD_ENTRY      2
 #define BITS_PER_PGD_ENTRY      BITS_PER_PMD_ENTRY
 #endif
diff --git a/arch/parisc/include/asm/pdc.h b/arch/parisc/include/asm/pdc.h
index 430f1aeea0b8..4ca510b3c6f8 100644
--- a/arch/parisc/include/asm/pdc.h
+++ b/arch/parisc/include/asm/pdc.h
@@ -49,6 +49,8 @@
 #define PDC_MODEL_CPU_ID        6       /* returns cpu-id (only newer machines!) */
 #define PDC_MODEL_CAPABILITIES  7       /* returns OS32/OS64-flags      */
 /* Values for PDC_MODEL_CAPABILITIES non-equivalent virtual aliasing support */
+#define  PDC_MODEL_OS64                 (1 << 0)
+#define  PDC_MODEL_OS32                 (1 << 1)
 #define  PDC_MODEL_IOPDIR_FDC           (1 << 2)
 #define  PDC_MODEL_NVA_MASK             (3 << 4)
 #define  PDC_MODEL_NVA_SUPPORTED        (0 << 4)
@@ -341,6 +343,8 @@
 
 #ifdef __KERNEL__
 
+#include <asm/page.h> /* for __PAGE_OFFSET */
+
 extern int pdc_type;
 
 /* Values for pdc_type */
diff --git a/arch/parisc/include/asm/pgtable.h b/arch/parisc/include/asm/pgtable.h
index 470a4b88124d..a27d2e200fb2 100644
--- a/arch/parisc/include/asm/pgtable.h
+++ b/arch/parisc/include/asm/pgtable.h
@@ -50,11 +50,7 @@
         printk("%s:%d: bad pgd %08lx.\n", __FILE__, __LINE__, (unsigned long)pgd_val(e))
 
 /* This is the size of the initially mapped kernel memory */
-#ifdef CONFIG_64BIT
 #define KERNEL_INITIAL_ORDER    24      /* 0 to 1<<24 = 16MB */
-#else
-#define KERNEL_INITIAL_ORDER    23      /* 0 to 1<<23 = 8MB */
-#endif
 #define KERNEL_INITIAL_SIZE     (1 << KERNEL_INITIAL_ORDER)
 
 #if defined(CONFIG_64BIT) && defined(CONFIG_PARISC_PAGE_SIZE_4KB)
@@ -91,16 +87,25 @@
 
 /* Definitions for 1st level */
 #define PGDIR_SHIFT     (PMD_SHIFT + BITS_PER_PMD)
+#if (PGDIR_SHIFT + PAGE_SHIFT + PGD_ORDER - BITS_PER_PGD_ENTRY) > BITS_PER_LONG
+#define BITS_PER_PGD    (BITS_PER_LONG - PGDIR_SHIFT)
+#else
 #define BITS_PER_PGD    (PAGE_SHIFT + PGD_ORDER - BITS_PER_PGD_ENTRY)
+#endif
 #define PGDIR_SIZE      (1UL << PGDIR_SHIFT)
 #define PGDIR_MASK      (~(PGDIR_SIZE-1))
 #define PTRS_PER_PGD    (1UL << BITS_PER_PGD)
 #define USER_PTRS_PER_PGD       PTRS_PER_PGD
 
+#ifdef CONFIG_64BIT
 #define MAX_ADDRBITS    (PGDIR_SHIFT + BITS_PER_PGD)
 #define MAX_ADDRESS     (1UL << MAX_ADDRBITS)
-
 #define SPACEID_SHIFT   (MAX_ADDRBITS - 32)
+#else
+#define MAX_ADDRBITS    (BITS_PER_LONG)
+#define MAX_ADDRESS     (1UL << MAX_ADDRBITS)
+#define SPACEID_SHIFT   0
+#endif
 
 /* This calculates the number of initial pages we need for the initial
  * page tables */
diff --git a/arch/parisc/include/asm/smp.h b/arch/parisc/include/asm/smp.h
index 6ef4b7867b1b..21eb45a52629 100644
--- a/arch/parisc/include/asm/smp.h
+++ b/arch/parisc/include/asm/smp.h
@@ -29,7 +29,8 @@ extern void smp_send_reschedule(int cpu);
 extern void smp_send_all_nop(void);
 
 extern void arch_send_call_function_single_ipi(int cpu);
-extern void arch_send_call_function_ipi(cpumask_t mask);
+extern void arch_send_call_function_ipi_mask(const struct cpumask *mask);
+#define arch_send_call_function_ipi_mask arch_send_call_function_ipi_mask
 
 #endif /* !ASSEMBLY */
 
diff --git a/arch/parisc/include/asm/spinlock.h b/arch/parisc/include/asm/spinlock.h
index f3d2090a18dc..fae03e136fa8 100644
--- a/arch/parisc/include/asm/spinlock.h
+++ b/arch/parisc/include/asm/spinlock.h
@@ -187,6 +187,9 @@ static __inline__ int __raw_write_can_lock(raw_rwlock_t *rw)
         return !rw->counter;
 }
 
+#define __raw_read_lock_flags(lock, flags) __raw_read_lock(lock)
+#define __raw_write_lock_flags(lock, flags) __raw_write_lock(lock)
+
 #define _raw_spin_relax(lock)   cpu_relax()
 #define _raw_read_relax(lock)   cpu_relax()
 #define _raw_write_relax(lock)  cpu_relax()
diff --git a/arch/parisc/kernel/Makefile b/arch/parisc/kernel/Makefile
index 016d3fc4111c..67db0722e6ca 100644
--- a/arch/parisc/kernel/Makefile
+++ b/arch/parisc/kernel/Makefile
@@ -11,10 +11,25 @@ obj-y	     	:= cache.o pacache.o setup.o traps.o time.o irq.o \
                    process.o processor.o pdc_cons.o pdc_chassis.o unwind.o \
                    topology.o
 
+ifdef CONFIG_FUNCTION_TRACER
+# Do not profile debug and lowlevel utilities
+CFLAGS_REMOVE_ftrace.o = -pg
+CFLAGS_REMOVE_cache.o = -pg
+CFLAGS_REMOVE_irq.o = -pg
+CFLAGS_REMOVE_pacache.o = -pg
+CFLAGS_REMOVE_perf.o = -pg
+CFLAGS_REMOVE_traps.o = -pg
+CFLAGS_REMOVE_unaligned.o = -pg
+CFLAGS_REMOVE_unwind.o = -pg
+endif
+
 obj-$(CONFIG_SMP)       += smp.o
 obj-$(CONFIG_PA11)      += pci-dma.o
 obj-$(CONFIG_PCI)       += pci.o
 obj-$(CONFIG_MODULES)   += module.o
 obj-$(CONFIG_64BIT)     += binfmt_elf32.o sys_parisc32.o signal32.o
+obj-$(CONFIG_STACKTRACE)+= stacktrace.o
 # only supported for PCX-W/U in 64-bit mode at the moment
 obj-$(CONFIG_64BIT)     += perf.o perf_asm.o
+obj-$(CONFIG_FUNCTION_TRACER)           += ftrace.o
+obj-$(CONFIG_FUNCTION_GRAPH_TRACER)     += ftrace.o
diff --git a/arch/parisc/kernel/entry.S b/arch/parisc/kernel/entry.S
index 0db9fdcb7709..ae3e70cd1e14 100644
--- a/arch/parisc/kernel/entry.S
+++ b/arch/parisc/kernel/entry.S
@@ -505,6 +505,18 @@
         STREG           \pte,0(\ptep)
         .endm
 
+        /* bitshift difference between a PFN (based on kernel's PAGE_SIZE)
+         * to a CPU TLB 4k PFN (4k => 12 bits to shift) */
+        #define PAGE_ADD_SHIFT  (PAGE_SHIFT-12)
+
+        /* Drop prot bits and convert to page addr for iitlbt and idtlbt */
+        .macro          convert_for_tlb_insert20 pte
+        extrd,u         \pte,(63-ASM_PFN_PTE_SHIFT)+(63-58)+PAGE_ADD_SHIFT,\
+                                64-PAGE_SHIFT-PAGE_ADD_SHIFT,\pte
+        depdi           _PAGE_SIZE_ENCODING_DEFAULT,63,\
+                                (63-58)+PAGE_ADD_SHIFT,\pte
+        .endm
+
         /* Convert the pte and prot to tlb insertion values.  How
          * this happens is quite subtle, read below */
         .macro          make_insert_tlb spc,pte,prot
@@ -544,8 +556,7 @@
         depi            1,12,1,\prot
 
         /* Drop prot bits and convert to page addr for iitlbt and idtlbt */
-        extrd,u         \pte,(63-ASM_PFN_PTE_SHIFT)+(63-58),64-PAGE_SHIFT,\pte
-        depdi           _PAGE_SIZE_ENCODING_DEFAULT,63,63-58,\pte
+        convert_for_tlb_insert20 \pte
         .endm
 
         /* Identical macro to make_insert_tlb above, except it
@@ -563,8 +574,8 @@
 
         /* Get rid of prot bits and convert to page addr for iitlba */
 
-        depi            _PAGE_SIZE_ENCODING_DEFAULT,31,ASM_PFN_PTE_SHIFT,\pte
-        extru           \pte,24,25,\pte
+        depi            0,31,ASM_PFN_PTE_SHIFT,\pte
+        SHRREG          \pte,(ASM_PFN_PTE_SHIFT-(31-26)),\pte
         .endm
 
         /* This is for ILP32 PA2.0 only.  The TLB insertion needs
@@ -1244,10 +1255,9 @@ nadtlb_check_flush_20w:
         depdi,z         7,7,3,prot
         depdi           1,10,1,prot
 
-        /* Get rid of prot bits and convert to page addr for idtlbt */
+        /* Drop prot bits from pte and convert to page addr for idtlbt */
+        convert_for_tlb_insert20 pte
 
-        depdi           0,63,12,pte
-        extrd,u         pte,56,52,pte
         idtlbt          pte,prot
 
         rfir
@@ -1337,8 +1347,8 @@ nadtlb_check_flush_11:
 
         /* Get rid of prot bits and convert to page addr for idtlba */
 
-        depi            0,31,12,pte
-        extru           pte,24,25,pte
+        depi            0,31,ASM_PFN_PTE_SHIFT,pte
+        SHRREG          pte,(ASM_PFN_PTE_SHIFT-(31-26)),pte
 
         mfsp            %sr1,t0  /* Save sr1 so we can use it in tlb inserts */
         mtsp            spc,%sr1
@@ -1403,10 +1413,9 @@ nadtlb_check_flush_20:
         depdi,z         7,7,3,prot
         depdi           1,10,1,prot
 
-        /* Get rid of prot bits and convert to page addr for idtlbt */
+        /* Drop prot bits from pte and convert to page addr for idtlbt */
+        convert_for_tlb_insert20 pte
 
-        depdi           0,63,12,pte
-        extrd,u         pte,56,32,pte
         idtlbt          pte,prot
 
         rfir
@@ -2176,6 +2185,33 @@ syscall_do_resched:
 ENDPROC(syscall_exit)
 
 
+#ifdef CONFIG_FUNCTION_TRACER
+        .import ftrace_function_trampoline,code
+ENTRY(_mcount)
+        copy    %r3, %arg2
+        b       ftrace_function_trampoline
+        nop
+ENDPROC(_mcount)
+
+ENTRY(return_to_handler)
+        load32  return_trampoline, %rp
+        copy    %ret0, %arg0
+        copy    %ret1, %arg1
+        b       ftrace_return_to_handler
+        nop
+return_trampoline:
+        copy    %ret0, %rp
+        copy    %r23, %ret0
+        copy    %r24, %ret1
+
+.globl ftrace_stub
+ftrace_stub:
+        bv      %r0(%rp)
+        nop
+ENDPROC(return_to_handler)
+#endif  /* CONFIG_FUNCTION_TRACER */
+
+
 get_register:
         /*
          * get_register is used by the non access tlb miss handlers to
diff --git a/arch/parisc/kernel/firmware.c b/arch/parisc/kernel/firmware.c
index f6d241238a78..4c247e02d9b1 100644
--- a/arch/parisc/kernel/firmware.c
+++ b/arch/parisc/kernel/firmware.c
@@ -527,7 +527,11 @@ int pdc_model_capabilities(unsigned long *capabilities)
         pdc_result[0] = 0; /* preset zero (call may not be implemented!) */
         retval = mem_pdc_call(PDC_MODEL, PDC_MODEL_CAPABILITIES, __pa(pdc_result), 0);
         convert_to_wide(pdc_result);
-        *capabilities = pdc_result[0];
+        if (retval == PDC_OK) {
+                *capabilities = pdc_result[0];
+        } else {
+                *capabilities = PDC_MODEL_OS32;
+        }
         spin_unlock_irqrestore(&pdc_lock, flags);
 
         return retval;
diff --git a/arch/parisc/kernel/ftrace.c b/arch/parisc/kernel/ftrace.c
new file mode 100644
index 000000000000..9877372ffdba
--- /dev/null
+++ b/arch/parisc/kernel/ftrace.c
@@ -0,0 +1,185 @@
+/*
+ * Code for tracing calls in Linux kernel.
+ * Copyright (C) 2009 Helge Deller <deller@gmx.de>
+ *
+ * based on code for x86 which is:
+ * Copyright (C) 2007-2008 Steven Rostedt <srostedt@redhat.com>
+ *
+ * future possible enhancements:
+ *      - add CONFIG_DYNAMIC_FTRACE
+ *      - add CONFIG_STACK_TRACER
+ */
+
+#include <linux/init.h>
+#include <linux/ftrace.h>
+
+#include <asm/sections.h>
+#include <asm/ftrace.h>
+
+
+
+#ifdef CONFIG_FUNCTION_GRAPH_TRACER
+
+/* Add a function return address to the trace stack on thread info.*/
+static int push_return_trace(unsigned long ret, unsigned long long time,
+                                unsigned long func, int *depth)
+{
+        int index;
+
+        if (!current->ret_stack)
+                return -EBUSY;
+
+        /* The return trace stack is full */
+        if (current->curr_ret_stack == FTRACE_RETFUNC_DEPTH - 1) {
+                atomic_inc(&current->trace_overrun);
+                return -EBUSY;
+        }
+
+        index = ++current->curr_ret_stack;
+        barrier();
+        current->ret_stack[index].ret = ret;
+        current->ret_stack[index].func = func;
+        current->ret_stack[index].calltime = time;
+        *depth = index;
+
+        return 0;
+}
+
+/* Retrieve a function return address to the trace stack on thread info.*/
+static void pop_return_trace(struct ftrace_graph_ret *trace, unsigned long *ret)
+{
+        int index;
+
+        index = current->curr_ret_stack;
+
+        if (unlikely(index < 0)) {
+                ftrace_graph_stop();
+                WARN_ON(1);
+                /* Might as well panic, otherwise we have no where to go */
+                *ret = (unsigned long)
+                        dereference_function_descriptor(&panic);
+                return;
+        }
+
+        *ret = current->ret_stack[index].ret;
+        trace->func = current->ret_stack[index].func;
+        trace->calltime = current->ret_stack[index].calltime;
+        trace->overrun = atomic_read(&current->trace_overrun);
+        trace->depth = index;
+        barrier();
+        current->curr_ret_stack--;
+
+}
+
+/*
+ * Send the trace to the ring-buffer.
+ * @return the original return address.
+ */
+unsigned long ftrace_return_to_handler(unsigned long retval0,
+                                       unsigned long retval1)
+{
+        struct ftrace_graph_ret trace;
+        unsigned long ret;
+
+        pop_return_trace(&trace, &ret);
+        trace.rettime = cpu_clock(raw_smp_processor_id());
+        ftrace_graph_return(&trace);
+
+        if (unlikely(!ret)) {
+                ftrace_graph_stop();
+                WARN_ON(1);
+                /* Might as well panic. What else to do? */
+                ret = (unsigned long)
+                        dereference_function_descriptor(&panic);
+        }
+
+        /* HACK: we hand over the old functions' return values
+           in %r23 and %r24. Assembly in entry.S will take care
+           and move those to their final registers %ret0 and %ret1 */
+        asm( "copy %0, %%r23 \n\t"
+             "copy %1, %%r24 \n" : : "r" (retval0), "r" (retval1) );
+
+        return ret;
+}
+
+/*
+ * Hook the return address and push it in the stack of return addrs
+ * in current thread info.
+ */
+void prepare_ftrace_return(unsigned long *parent, unsigned long self_addr)
+{
+        unsigned long old;
+        unsigned long long calltime;
+        struct ftrace_graph_ent trace;
+
+        if (unlikely(atomic_read(&current->tracing_graph_pause)))
+                return;
+
+        old = *parent;
+        *parent = (unsigned long)
+                  dereference_function_descriptor(&return_to_handler);
+
+        if (unlikely(!__kernel_text_address(old))) {
+                ftrace_graph_stop();
+                *parent = old;
+                WARN_ON(1);
+                return;
+        }
+
+        calltime = cpu_clock(raw_smp_processor_id());
+
+        if (push_return_trace(old, calltime,
+                                self_addr, &trace.depth) == -EBUSY) {
+                *parent = old;
+                return;
+        }
+
+        trace.func = self_addr;
+
+        /* Only trace if the calling function expects to */
+        if (!ftrace_graph_entry(&trace)) {
+                current->curr_ret_stack--;
+                *parent = old;
+        }
+}
+
+#endif /* CONFIG_FUNCTION_GRAPH_TRACER */
+
+
+void ftrace_function_trampoline(unsigned long parent,
+                                unsigned long self_addr,
+                                unsigned long org_sp_gr3)
+{
+        extern ftrace_func_t ftrace_trace_function;
+
+        if (function_trace_stop)
+                return;
+
+        if (ftrace_trace_function != ftrace_stub) {
+                ftrace_trace_function(parent, self_addr);
+                return;
+        }
+#ifdef CONFIG_FUNCTION_GRAPH_TRACER
+        if (ftrace_graph_entry && ftrace_graph_return) {
+                unsigned long sp;
+                unsigned long *parent_rp;
+
+                asm volatile ("copy %%r30, %0" : "=r"(sp));
+                /* sanity check: is stack pointer which we got from
+                   assembler function in entry.S in a reasonable
+                   range compared to current stack pointer? */
+                if ((sp - org_sp_gr3) > 0x400)
+                        return;
+
+                /* calculate pointer to %rp in stack */
+                parent_rp = (unsigned long *) org_sp_gr3 - 0x10;
+                /* sanity check: parent_rp should hold parent */
+                if (*parent_rp != parent)
+                        return;
+                
+                prepare_ftrace_return(parent_rp, self_addr);
+                return;
+        }
+#endif
+}
+
diff --git a/arch/parisc/kernel/irq.c b/arch/parisc/kernel/irq.c
index 1c740f5cbd63..4ea4229d765c 100644
--- a/arch/parisc/kernel/irq.c
+++ b/arch/parisc/kernel/irq.c
@@ -311,12 +311,12 @@ unsigned long txn_alloc_addr(unsigned int virt_irq)
         next_cpu++; /* assign to "next" CPU we want this bugger on */
 
         /* validate entry */
-        while ((next_cpu < NR_CPUS) &&
+        while ((next_cpu < nr_cpu_ids) &&
                 (!per_cpu(cpu_data, next_cpu).txn_addr ||
                  !cpu_online(next_cpu)))
                 next_cpu++;
 
-        if (next_cpu >= NR_CPUS) 
+        if (next_cpu >= nr_cpu_ids) 
                 next_cpu = 0;   /* nothing else, assign monarch */
 
         return txn_affinity_addr(virt_irq, next_cpu);
diff --git a/arch/parisc/kernel/module.c b/arch/parisc/kernel/module.c
index 9013243cecca..ecd1c5024447 100644
--- a/arch/parisc/kernel/module.c
+++ b/arch/parisc/kernel/module.c
@@ -61,9 +61,7 @@
 #include <linux/string.h>
 #include <linux/kernel.h>
 #include <linux/bug.h>
-#include <linux/uaccess.h>
 
-#include <asm/sections.h>
 #include <asm/unwind.h>
 
 #if 0
@@ -115,8 +113,6 @@ struct got_entry {
         Elf32_Addr addr;
 };
 
-#define Elf_Fdesc       Elf32_Fdesc
-
 struct stub_entry {
         Elf32_Word insns[2]; /* each stub entry has two insns */
 };
@@ -125,8 +121,6 @@ struct got_entry {
         Elf64_Addr addr;
 };
 
-#define Elf_Fdesc       Elf64_Fdesc
-
 struct stub_entry {
         Elf64_Word insns[4]; /* each stub entry has four insns */
 };
@@ -916,15 +910,3 @@ void module_arch_cleanup(struct module *mod)
         deregister_unwind_table(mod);
         module_bug_cleanup(mod);
 }
-
-#ifdef CONFIG_64BIT
-void *dereference_function_descriptor(void *ptr)
-{
-        Elf64_Fdesc *desc = ptr;
-        void *p;
-
-        if (!probe_kernel_address(&desc->addr, p))
-                ptr = p;
-        return ptr;
-}
-#endif
diff --git a/arch/parisc/kernel/parisc_ksyms.c b/arch/parisc/kernel/parisc_ksyms.c
index 0eecfbbc59cd..df653663d3db 100644
--- a/arch/parisc/kernel/parisc_ksyms.c
+++ b/arch/parisc/kernel/parisc_ksyms.c
@@ -153,5 +153,10 @@ EXPORT_SYMBOL(node_data);
 EXPORT_SYMBOL(pfnnid_map);
 #endif
 
+#ifdef CONFIG_FUNCTION_TRACER
+extern void _mcount(void);
+EXPORT_SYMBOL(_mcount);
+#endif
+
 /* from pacache.S -- needed for copy_page */
 EXPORT_SYMBOL(copy_user_page_asm);
diff --git a/arch/parisc/kernel/process.c b/arch/parisc/kernel/process.c
index b80e02a4d81d..6f69101f90bb 100644
--- a/arch/parisc/kernel/process.c
+++ b/arch/parisc/kernel/process.c
@@ -46,14 +46,15 @@
 #include <linux/stddef.h>
 #include <linux/unistd.h>
 #include <linux/kallsyms.h>
+#include <linux/uaccess.h>
 
 #include <asm/io.h>
 #include <asm/asm-offsets.h>
 #include <asm/pdc.h>
 #include <asm/pdc_chassis.h>
 #include <asm/pgalloc.h>
-#include <asm/uaccess.h>
 #include <asm/unwind.h>
+#include <asm/sections.h>
 
 /*
  * The idle thread. There's no useful work to be
@@ -231,8 +232,8 @@ sys_clone(unsigned long clone_flags, unsigned long usp,
            
            However, these last 3 args are only examined
            if the proper flags are set. */
-        int __user *child_tidptr;
-        int __user *parent_tidptr;
+        int __user *parent_tidptr = (int __user *)regs->gr[24];
+        int __user *child_tidptr  = (int __user *)regs->gr[22];
 
         /* usp must be word aligned.  This also prevents users from
          * passing in the value 1 (which is the signal for a special
@@ -243,16 +244,6 @@ sys_clone(unsigned long clone_flags, unsigned long usp,
         if (usp == 0)
           usp = regs->gr[30];
 
-        if (clone_flags & CLONE_PARENT_SETTID)
-          parent_tidptr = (int __user *)regs->gr[24];
-        else
-          parent_tidptr = NULL;
-        
-        if (clone_flags & (CLONE_CHILD_SETTID | CLONE_CHILD_CLEARTID))
-          child_tidptr = (int __user *)regs->gr[22];
-        else
-          child_tidptr = NULL;
-
         return do_fork(clone_flags, usp, regs, 0, parent_tidptr, child_tidptr);
 }
 
@@ -263,7 +254,7 @@ sys_vfork(struct pt_regs *regs)
 }
 
 int
-copy_thread(int nr, unsigned long clone_flags, unsigned long usp,
+copy_thread(unsigned long clone_flags, unsigned long usp,
             unsigned long unused,       /* in ia64 this is "user_stack_size" */
             struct task_struct * p, struct pt_regs * pregs)
 {
@@ -400,3 +391,15 @@ get_wchan(struct task_struct *p)
         } while (count++ < 16);
         return 0;
 }
+
+#ifdef CONFIG_64BIT
+void *dereference_function_descriptor(void *ptr)
+{
+        Elf64_Fdesc *desc = ptr;
+        void *p;
+
+        if (!probe_kernel_address(&desc->addr, p))
+                ptr = p;
+        return ptr;
+}
+#endif
diff --git a/arch/parisc/kernel/processor.c b/arch/parisc/kernel/processor.c
index ecb609342feb..e09d0f7fb6b0 100644
--- a/arch/parisc/kernel/processor.c
+++ b/arch/parisc/kernel/processor.c
@@ -100,8 +100,8 @@ static int __cpuinit processor_probe(struct parisc_device *dev)
         struct cpuinfo_parisc *p;
 
 #ifdef CONFIG_SMP
-        if (num_online_cpus() >= NR_CPUS) {
-                printk(KERN_INFO "num_online_cpus() >= NR_CPUS\n");
+        if (num_online_cpus() >= nr_cpu_ids) {
+                printk(KERN_INFO "num_online_cpus() >= nr_cpu_ids\n");
                 return 1;
         }
 #else
@@ -214,7 +214,7 @@ static int __cpuinit processor_probe(struct parisc_device *dev)
          */
 #ifdef CONFIG_SMP
         if (cpuid) {
-                cpu_set(cpuid, cpu_present_map);
+                set_cpu_present(cpuid, true);
                 cpu_up(cpuid);
         }
 #endif
@@ -364,6 +364,13 @@ show_cpuinfo (struct seq_file *m, void *v)
                                  boot_cpu_data.cpu_hz / 1000000,
                                  boot_cpu_data.cpu_hz % 1000000  );
 
+                seq_printf(m, "capabilities\t:");
+                if (boot_cpu_data.pdc.capabilities & PDC_MODEL_OS32)
+                        seq_printf(m, " os32");
+                if (boot_cpu_data.pdc.capabilities & PDC_MODEL_OS64)
+                        seq_printf(m, " os64");
+                seq_printf(m, "\n");
+
                 seq_printf(m, "model\t\t: %s\n"
                                 "model name\t: %s\n",
                                  boot_cpu_data.pdc.sys_model_name,
diff --git a/arch/parisc/kernel/smp.c b/arch/parisc/kernel/smp.c
index 9995d7ed5819..1fd0f0cec037 100644
--- a/arch/parisc/kernel/smp.c
+++ b/arch/parisc/kernel/smp.c
@@ -31,6 +31,7 @@
 #include <linux/err.h>
 #include <linux/delay.h>
 #include <linux/bitops.h>
+#include <linux/ftrace.h>
 
 #include <asm/system.h>
 #include <asm/atomic.h>
@@ -113,14 +114,14 @@ halt_processor(void)
 {
         /* REVISIT : redirect I/O Interrupts to another CPU? */
         /* REVISIT : does PM *know* this CPU isn't available? */
-        cpu_clear(smp_processor_id(), cpu_online_map);
+        set_cpu_online(smp_processor_id(), false);
         local_irq_disable();
         for (;;)
                 ;
 }
 
 
-irqreturn_t
+irqreturn_t __irq_entry
 ipi_interrupt(int irq, void *dev_id) 
 {
         int this_cpu = smp_processor_id();
@@ -214,11 +215,11 @@ ipi_send(int cpu, enum ipi_message_type op)
 }
 
 static void
-send_IPI_mask(cpumask_t mask, enum ipi_message_type op)
+send_IPI_mask(const struct cpumask *mask, enum ipi_message_type op)
 {
         int cpu;
 
-        for_each_cpu_mask(cpu, mask)
+        for_each_cpu(cpu, mask)
                 ipi_send(cpu, op);
 }
 
@@ -257,7 +258,7 @@ smp_send_all_nop(void)
         send_IPI_allbutself(IPI_NOP);
 }
 
-void arch_send_call_function_ipi(cpumask_t mask)
+void arch_send_call_function_ipi_mask(const struct cpumask *mask)
 {
         send_IPI_mask(mask, IPI_CALL_FUNC);
 }
@@ -296,13 +297,14 @@ smp_cpu_init(int cpunum)
         mb();
 
         /* Well, support 2.4 linux scheme as well. */
-        if (cpu_test_and_set(cpunum, cpu_online_map))
+        if (cpu_isset(cpunum, cpu_online_map))
         {
                 extern void machine_halt(void); /* arch/parisc.../process.c */
 
                 printk(KERN_CRIT "CPU#%d already initialized!\n", cpunum);
                 machine_halt();
         }  
+        set_cpu_online(cpunum, true);
 
         /* Initialise the idle task for this CPU */
         atomic_inc(&init_mm.mm_count);
@@ -424,8 +426,8 @@ void __init smp_prepare_boot_cpu(void)
         /* Setup BSP mappings */
         printk(KERN_INFO "SMP: bootstrap CPU ID is %d\n", bootstrap_processor);
 
-        cpu_set(bootstrap_processor, cpu_online_map);
-        cpu_set(bootstrap_processor, cpu_present_map);
+        set_cpu_online(bootstrap_processor, true);
+        set_cpu_present(bootstrap_processor, true);
 }
 
 
@@ -436,8 +438,7 @@ void __init smp_prepare_boot_cpu(void)
 */
 void __init smp_prepare_cpus(unsigned int max_cpus)
 {
-        cpus_clear(cpu_present_map);
-        cpu_set(0, cpu_present_map);
+        init_cpu_present(cpumask_of(0));
 
         parisc_max_cpus = max_cpus;
         if (!max_cpus)
diff --git a/arch/parisc/kernel/stacktrace.c b/arch/parisc/kernel/stacktrace.c
new file mode 100644
index 000000000000..2fe914c5f533
--- /dev/null
+++ b/arch/parisc/kernel/stacktrace.c
@@ -0,0 +1,63 @@
+/*
+ * Stack trace management functions
+ *
+ *  Copyright (C) 2009 Helge Deller <deller@gmx.de>
+ *  based on arch/x86/kernel/stacktrace.c by Ingo Molnar <mingo@redhat.com>
+ *  and parisc unwind functions by Randolph Chung <tausq@debian.org>
+ *
+ *  TODO: Userspace stacktrace (CONFIG_USER_STACKTRACE_SUPPORT)
+ */
+#include <linux/module.h>
+#include <linux/stacktrace.h>
+
+#include <asm/unwind.h>
+
+static void dump_trace(struct task_struct *task, struct stack_trace *trace)
+{
+        struct unwind_frame_info info;
+
+        /* initialize unwind info */
+        if (task == current) {
+                unsigned long sp;
+                struct pt_regs r;
+HERE:
+                asm volatile ("copy %%r30, %0" : "=r"(sp));
+                memset(&r, 0, sizeof(struct pt_regs));
+                r.iaoq[0] = (unsigned long)&&HERE;
+                r.gr[2] = (unsigned long)__builtin_return_address(0);
+                r.gr[30] = sp;
+                unwind_frame_init(&info, task, &r);
+        } else {
+                unwind_frame_init_from_blocked_task(&info, task);
+        }
+
+        /* unwind stack and save entries in stack_trace struct */
+        trace->nr_entries = 0;
+        while (trace->nr_entries < trace->max_entries) {
+                if (unwind_once(&info) < 0 || info.ip == 0)
+                        break;
+
+                if (__kernel_text_address(info.ip))
+                        trace->entries[trace->nr_entries++] = info.ip;
+        }
+}
+
+
+/*
+ * Save stack-backtrace addresses into a stack_trace buffer.
+ */
+void save_stack_trace(struct stack_trace *trace)
+{
+        dump_trace(current, trace);
+        if (trace->nr_entries < trace->max_entries)
+                trace->entries[trace->nr_entries++] = ULONG_MAX;
+}
+EXPORT_SYMBOL_GPL(save_stack_trace);
+
+void save_stack_trace_tsk(struct task_struct *tsk, struct stack_trace *trace)
+{
+        dump_trace(tsk, trace);
+        if (trace->nr_entries < trace->max_entries)
+                trace->entries[trace->nr_entries++] = ULONG_MAX;
+}
+EXPORT_SYMBOL_GPL(save_stack_trace_tsk);
diff --git a/arch/parisc/kernel/syscall.S b/arch/parisc/kernel/syscall.S
index 69b6eebc466e..59fc1a43ec3e 100644
--- a/arch/parisc/kernel/syscall.S
+++ b/arch/parisc/kernel/syscall.S
@@ -365,17 +365,51 @@ tracesys_sigexit:
 
 
         /*********************************************************
-                Light-weight-syscall code
+                32/64-bit Light-Weight-Syscall ABI
 
-                r20 - lws number
-                r26,r25,r24,r23,r22 - Input registers
-                r28 - Function return register
-                r21 - Error code.
+                * - Indicates a hint for userspace inline asm
+                implementations.
 
-                Scracth: Any of the above that aren't being
-                currently used, including r1. 
+                Syscall number (caller-saves)
+                - %r20
+                * In asm clobber.
 
-                Return pointer: r31 (Not usable)
+                Argument registers (caller-saves)
+                - %r26, %r25, %r24, %r23, %r22
+                * In asm input.
+
+                Return registers (caller-saves)
+                - %r28 (return), %r21 (errno)
+                * In asm output.
+
+                Caller-saves registers
+                - %r1, %r27, %r29
+                - %r2 (return pointer)
+                - %r31 (ble link register)
+                * In asm clobber.
+
+                Callee-saves registers
+                - %r3-%r18
+                - %r30 (stack pointer)
+                * Not in asm clobber.
+
+                If userspace is 32-bit:
+                Callee-saves registers
+                - %r19 (32-bit PIC register)
+
+                Differences from 32-bit calling convention:
+                - Syscall number in %r20
+                - Additional argument register %r22 (arg4)
+                - Callee-saves %r19.
+
+                If userspace is 64-bit:
+                Callee-saves registers
+                - %r27 (64-bit PIC register)
+
+                Differences from 64-bit calling convention:
+                - Syscall number in %r20
+                - Additional argument register %r22 (arg4)
+                - Callee-saves %r27.
 
                 Error codes returned by entry path:
 
@@ -473,7 +507,8 @@ lws_compare_and_swap64:
         b,n     lws_compare_and_swap
 #else
         /* If we are not a 64-bit kernel, then we don't
-         * implement having 64-bit input registers
+         * have 64-bit input registers, and calling
+         * the 64-bit LWS CAS returns ENOSYS.
          */
         b,n     lws_exit_nosys
 #endif
@@ -635,12 +670,15 @@ END(sys_call_table64)
         /*
                 All light-weight-syscall atomic operations 
                 will use this set of locks 
+
+                NOTE: The lws_lock_start symbol must be
+                at least 16-byte aligned for safe use
+                with ldcw.
         */
         .section .data
         .align  PAGE_SIZE
 ENTRY(lws_lock_start)
         /* lws locks */
-        .align 16
         .rept 16
         /* Keep locks aligned at 16-bytes */
         .word 1
diff --git a/arch/parisc/kernel/time.c b/arch/parisc/kernel/time.c
index e75cae6072c5..d4dd05674c62 100644
--- a/arch/parisc/kernel/time.c
+++ b/arch/parisc/kernel/time.c
@@ -24,6 +24,7 @@
 #include <linux/profile.h>
 #include <linux/clocksource.h>
 #include <linux/platform_device.h>
+#include <linux/ftrace.h>
 
 #include <asm/uaccess.h>
 #include <asm/io.h>
@@ -53,7 +54,7 @@ static unsigned long clocktick __read_mostly;	/* timer cycles per tick */
  * held off for an arbitrarily long period of time by interrupts being
  * disabled, so we may miss one or more ticks.
  */
-irqreturn_t timer_interrupt(int irq, void *dev_id)
+irqreturn_t __irq_entry timer_interrupt(int irq, void *dev_id)
 {
         unsigned long now;
         unsigned long next_tick;
@@ -216,14 +217,14 @@ void __init start_cpu_itimer(void)
         per_cpu(cpu_data, cpu).it_value = next_tick;
 }
 
-static struct platform_device rtc_parisc_dev = {
-        .name = "rtc-parisc",
+static struct platform_device rtc_generic_dev = {
+        .name = "rtc-generic",
         .id = -1,
 };
 
 static int __init rtc_init(void)
 {
-        if (platform_device_register(&rtc_parisc_dev) < 0)
+        if (platform_device_register(&rtc_generic_dev) < 0)
                 printk(KERN_ERR "unable to register rtc device...\n");
 
         /* not necessarily an error */
diff --git a/arch/parisc/kernel/traps.c b/arch/parisc/kernel/traps.c
index ba658d2086f7..c32f5d6d778e 100644
--- a/arch/parisc/kernel/traps.c
+++ b/arch/parisc/kernel/traps.c
@@ -247,6 +247,8 @@ void die_if_kernel(char *str, struct pt_regs *regs, long err)
 
         oops_in_progress = 1;
 
+        oops_enter();
+
         /* Amuse the user in a SPARC fashion */
         if (err) printk(
 KERN_CRIT "      _______________________________ \n"
@@ -293,6 +295,7 @@ KERN_CRIT "                     ||     ||\n");
                 panic("Fatal exception");
         }
 
+        oops_exit();
         do_exit(SIGSEGV);
 }
 
@@ -494,7 +497,7 @@ void parisc_terminate(char *msg, struct pt_regs *regs, int code, unsigned long o
         panic(msg);
 }
 
-void handle_interruption(int code, struct pt_regs *regs)
+void notrace handle_interruption(int code, struct pt_regs *regs)
 {
         unsigned long fault_address = 0;
         unsigned long fault_space = 0;
diff --git a/arch/parisc/kernel/vmlinux.lds.S b/arch/parisc/kernel/vmlinux.lds.S
index 1a3b6ccd3620..fd2cc4fd2b65 100644
--- a/arch/parisc/kernel/vmlinux.lds.S
+++ b/arch/parisc/kernel/vmlinux.lds.S
@@ -54,6 +54,8 @@ SECTIONS
                 TEXT_TEXT
                 SCHED_TEXT
                 LOCK_TEXT
+                KPROBES_TEXT
+                IRQENTRY_TEXT
                 *(.text.do_softirq)
                 *(.text.sys_exit)
                 *(.text.do_sigaltstack)
diff --git a/arch/parisc/mm/init.c b/arch/parisc/mm/init.c
index 9d704d9831d1..4356ceb1e366 100644
--- a/arch/parisc/mm/init.c
+++ b/arch/parisc/mm/init.c
@@ -456,6 +456,13 @@ void __init mem_init(void)
 {
         int codesize, reservedpages, datasize, initsize;
 
+        /* Do sanity checks on page table constants */
+        BUILD_BUG_ON(PTE_ENTRY_SIZE != sizeof(pte_t));
+        BUILD_BUG_ON(PMD_ENTRY_SIZE != sizeof(pmd_t));
+        BUILD_BUG_ON(PGD_ENTRY_SIZE != sizeof(pgd_t));
+        BUILD_BUG_ON(PAGE_SHIFT + BITS_PER_PTE + BITS_PER_PMD + BITS_PER_PGD
+                        > BITS_PER_LONG);
+
         high_memory = __va((max_pfn << PAGE_SHIFT));
 
 #ifndef CONFIG_DISCONTIGMEM
diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig
index 45192dce65c4..9e08d8a69fdf 100644
--- a/arch/powerpc/Kconfig
+++ b/arch/powerpc/Kconfig
@@ -346,7 +346,7 @@ config PHYP_DUMP
         help
           Hypervisor-assisted dump is meant to be a kdump replacement
           offering robustness and speed not possible without system
-          hypervisor assistence.
+          hypervisor assistance.
 
           If unsure, say "N"
 
diff --git a/arch/powerpc/Kconfig.debug b/arch/powerpc/Kconfig.debug
index 6aa0b5e087cd..a1098e23221f 100644
--- a/arch/powerpc/Kconfig.debug
+++ b/arch/powerpc/Kconfig.debug
@@ -27,16 +27,6 @@ config DEBUG_STACK_USAGE
 
           This option will slow down process creation somewhat.
 
-config DEBUG_PAGEALLOC
-        bool "Debug page memory allocations"
-        depends on DEBUG_KERNEL && !HIBERNATION
-        depends on ARCH_SUPPORTS_DEBUG_PAGEALLOC
-        help
-          Unmap pages from the kernel linear mapping after free_pages().
-          This results in a large slowdown, but helps to find certain types
-          of memory corruptions.
-
-
 config HCALL_STATS
         bool "Hypervisor call instrumentation"
         depends on PPC_PSERIES && DEBUG_FS
diff --git a/arch/powerpc/include/asm/mmzone.h b/arch/powerpc/include/asm/mmzone.h
index 19f299b7e256..35acac90c8ca 100644
--- a/arch/powerpc/include/asm/mmzone.h
+++ b/arch/powerpc/include/asm/mmzone.h
@@ -8,6 +8,7 @@
 #define _ASM_MMZONE_H_
 #ifdef __KERNEL__
 
+#include <linux/cpumask.h>
 
 /*
  * generic non-linear memory support:
diff --git a/arch/powerpc/include/asm/ps3.h b/arch/powerpc/include/asm/ps3.h
index 67f1812698d2..cdb6fd814de8 100644
--- a/arch/powerpc/include/asm/ps3.h
+++ b/arch/powerpc/include/asm/ps3.h
@@ -50,6 +50,9 @@ enum ps3_param_av_multi_out {
 
 enum ps3_param_av_multi_out ps3_os_area_get_av_multi_out(void);
 
+extern u64 ps3_os_area_get_rtc_diff(void);
+extern void ps3_os_area_set_rtc_diff(u64 rtc_diff);
+
 /* dma routines */
 
 enum ps3_dma_page_size {
diff --git a/arch/powerpc/include/asm/spinlock.h b/arch/powerpc/include/asm/spinlock.h
index 36864364e601..c3b193121f81 100644
--- a/arch/powerpc/include/asm/spinlock.h
+++ b/arch/powerpc/include/asm/spinlock.h
@@ -287,6 +287,9 @@ static inline void __raw_write_unlock(raw_rwlock_t *rw)
         rw->lock = 0;
 }
 
+#define __raw_read_lock_flags(lock, flags) __raw_read_lock(lock)
+#define __raw_write_lock_flags(lock, flags) __raw_write_lock(lock)
+
 #define _raw_spin_relax(lock)   __spin_yield(lock)
 #define _raw_read_relax(lock)   __rw_yield(lock)
 #define _raw_write_relax(lock)  __rw_yield(lock)
diff --git a/arch/powerpc/kernel/process.c b/arch/powerpc/kernel/process.c
index eac064948780..7b44a33f03c2 100644
--- a/arch/powerpc/kernel/process.c
+++ b/arch/powerpc/kernel/process.c
@@ -598,7 +598,7 @@ void prepare_to_copy(struct task_struct *tsk)
 /*
  * Copy a thread..
  */
-int copy_thread(int nr, unsigned long clone_flags, unsigned long usp,
+int copy_thread(unsigned long clone_flags, unsigned long usp,
                 unsigned long unused, struct task_struct *p,
                 struct pt_regs *regs)
 {
diff --git a/arch/powerpc/kernel/time.c b/arch/powerpc/kernel/time.c
index c9564031a2a9..926ea864e34f 100644
--- a/arch/powerpc/kernel/time.c
+++ b/arch/powerpc/kernel/time.c
@@ -1127,3 +1127,19 @@ void div128_by_32(u64 dividend_high, u64 dividend_low,
         dr->result_low  = ((u64)y << 32) + z;
 
 }
+
+static int __init rtc_init(void)
+{
+        struct platform_device *pdev;
+
+        if (!ppc_md.get_rtc_time)
+                return -ENODEV;
+
+        pdev = platform_device_register_simple("rtc-generic", -1, NULL, 0);
+        if (IS_ERR(pdev))
+                return PTR_ERR(pdev);
+
+        return 0;
+}
+
+module_init(rtc_init);
diff --git a/arch/powerpc/kernel/vio.c b/arch/powerpc/kernel/vio.c
index d3694498f3af..819e59f6f7c7 100644
--- a/arch/powerpc/kernel/vio.c
+++ b/arch/powerpc/kernel/vio.c
@@ -482,7 +482,7 @@ static void vio_cmo_balance(struct work_struct *work)
         cmo->excess.size = cmo->entitled - cmo->reserve.size;
         cmo->excess.free = cmo->excess.size - need;
 
-        cancel_delayed_work(container_of(work, struct delayed_work, work));
+        cancel_delayed_work(to_delayed_work(work));
         spin_unlock_irqrestore(&vio_cmo.lock, flags);
 }
 
diff --git a/arch/powerpc/platforms/Kconfig b/arch/powerpc/platforms/Kconfig
index ffa2a9fd53d0..e3e87078d03f 100644
--- a/arch/powerpc/platforms/Kconfig
+++ b/arch/powerpc/platforms/Kconfig
@@ -293,7 +293,7 @@ config CPM
 config OF_RTC
         bool
         help
-          Uses information from the OF or flattened device tree to instatiate
+          Uses information from the OF or flattened device tree to instantiate
           platform devices for direct mapped RTC chips like the DS1742 or DS1743.
 
 source "arch/powerpc/sysdev/bestcomm/Kconfig"
diff --git a/arch/powerpc/platforms/cell/spufs/inode.c b/arch/powerpc/platforms/cell/spufs/inode.c
index 64f068540d0d..706eb5c7e2ee 100644
--- a/arch/powerpc/platforms/cell/spufs/inode.c
+++ b/arch/powerpc/platforms/cell/spufs/inode.c
@@ -635,7 +635,7 @@ long spufs_create(struct nameidata *nd, unsigned int flags, mode_t mode,
         if (dentry->d_inode)
                 goto out_dput;
 
-        mode &= ~current->fs->umask;
+        mode &= ~current_umask();
 
         if (flags & SPU_CREATE_GANG)
                 ret = spufs_create_gang(nd->path.dentry->d_inode,
diff --git a/arch/powerpc/platforms/ps3/os-area.c b/arch/powerpc/platforms/ps3/os-area.c
index e1c83c23b435..86e392b1b049 100644
--- a/arch/powerpc/platforms/ps3/os-area.c
+++ b/arch/powerpc/platforms/ps3/os-area.c
@@ -808,6 +808,7 @@ u64 ps3_os_area_get_rtc_diff(void)
 {
         return saved_params.rtc_diff;
 }
+EXPORT_SYMBOL(ps3_os_area_get_rtc_diff);
 
 /**
  * ps3_os_area_set_rtc_diff - Set the rtc diff value.
@@ -823,6 +824,7 @@ void ps3_os_area_set_rtc_diff(u64 rtc_diff)
                 os_area_queue_work();
         }
 }
+EXPORT_SYMBOL(ps3_os_area_set_rtc_diff);
 
 /**
  * ps3_os_area_get_av_multi_out - Returns the default video mode.
diff --git a/arch/powerpc/platforms/ps3/platform.h b/arch/powerpc/platforms/ps3/platform.h
index 235c13ebacd9..136aa0637d9c 100644
--- a/arch/powerpc/platforms/ps3/platform.h
+++ b/arch/powerpc/platforms/ps3/platform.h
@@ -64,8 +64,6 @@ int ps3_set_rtc_time(struct rtc_time *time);
 
 void __init ps3_os_area_save_params(void);
 void __init ps3_os_area_init(void);
-u64 ps3_os_area_get_rtc_diff(void);
-void ps3_os_area_set_rtc_diff(u64 rtc_diff);
 
 /* spu */
 
diff --git a/arch/powerpc/platforms/ps3/setup.c b/arch/powerpc/platforms/ps3/setup.c
index 3331ccbb8d38..66181821322a 100644
--- a/arch/powerpc/platforms/ps3/setup.c
+++ b/arch/powerpc/platforms/ps3/setup.c
@@ -270,8 +270,6 @@ define_machine(ps3) {
         .init_IRQ                       = ps3_init_IRQ,
         .panic                          = ps3_panic,
         .get_boot_time                  = ps3_get_boot_time,
-        .set_rtc_time                   = ps3_set_rtc_time,
-        .get_rtc_time                   = ps3_get_rtc_time,
         .set_dabr                       = ps3_set_dabr,
         .calibrate_decr                 = ps3_calibrate_decr,
         .progress                       = ps3_progress,
diff --git a/arch/powerpc/platforms/ps3/time.c b/arch/powerpc/platforms/ps3/time.c
index d0daf7d6d3b2..b178a1e66c91 100644
--- a/arch/powerpc/platforms/ps3/time.c
+++ b/arch/powerpc/platforms/ps3/time.c
@@ -19,6 +19,7 @@
  */
 
 #include <linux/kernel.h>
+#include <linux/platform_device.h>
 
 #include <asm/rtc.h>
 #include <asm/lv1call.h>
@@ -74,23 +75,20 @@ static u64 read_rtc(void)
         return rtc_val;
 }
 
-int ps3_set_rtc_time(struct rtc_time *tm)
+unsigned long __init ps3_get_boot_time(void)
 {
-        u64 now = mktime(tm->tm_year + 1900, tm->tm_mon + 1, tm->tm_mday,
-                tm->tm_hour, tm->tm_min, tm->tm_sec);
-
-        ps3_os_area_set_rtc_diff(now - read_rtc());
-        return 0;
+        return read_rtc() + ps3_os_area_get_rtc_diff();
 }
 
-void ps3_get_rtc_time(struct rtc_time *tm)
+static int __init ps3_rtc_init(void)
 {
-        to_tm(read_rtc() + ps3_os_area_get_rtc_diff(), tm);
-        tm->tm_year -= 1900;
-        tm->tm_mon -= 1;
-}
+        struct platform_device *pdev;
 
-unsigned long __init ps3_get_boot_time(void)
-{
-        return read_rtc() + ps3_os_area_get_rtc_diff();
+        pdev = platform_device_register_simple("rtc-ps3", -1, NULL, 0);
+        if (IS_ERR(pdev))
+                return PTR_ERR(pdev);
+
+        return 0;
 }
+
+module_init(ps3_rtc_init);
diff --git a/arch/powerpc/sysdev/bestcomm/Kconfig b/arch/powerpc/sysdev/bestcomm/Kconfig
index 0b192a1c429d..29e427085efb 100644
--- a/arch/powerpc/sysdev/bestcomm/Kconfig
+++ b/arch/powerpc/sysdev/bestcomm/Kconfig
@@ -9,8 +9,8 @@ config PPC_BESTCOMM
         select PPC_LIB_RHEAP
         help
           BestComm is the name of the communication coprocessor found
-          on the Freescale MPC5200 family of processor. It's usage is
-          optionnal for some drivers (like ATA), but required for
+          on the Freescale MPC5200 family of processor.  Its usage is
+          optional for some drivers (like ATA), but required for
           others (like FEC).
 
           If you want to use drivers that require DMA operations,
diff --git a/arch/s390/Kconfig.debug b/arch/s390/Kconfig.debug
index 7e297a3cde34..2283933a9a93 100644
--- a/arch/s390/Kconfig.debug
+++ b/arch/s390/Kconfig.debug
@@ -6,13 +6,4 @@ config TRACE_IRQFLAGS_SUPPORT
 
 source "lib/Kconfig.debug"
 
-config DEBUG_PAGEALLOC
-        bool "Debug page memory allocations"
-        depends on DEBUG_KERNEL
-        depends on ARCH_SUPPORTS_DEBUG_PAGEALLOC
-        help
-          Unmap pages from the kernel linear mapping after free_pages().
-          This results in a slowdown, but helps to find certain types of
-          memory corruptions.
-
 endmenu
diff --git a/arch/s390/include/asm/smp.h b/arch/s390/include/asm/smp.h
index 2009158a4502..72137bc907ac 100644
--- a/arch/s390/include/asm/smp.h
+++ b/arch/s390/include/asm/smp.h
@@ -92,12 +92,6 @@ extern void arch_send_call_function_ipi(cpumask_t mask);
 #endif
 
 #ifndef CONFIG_SMP
-static inline void smp_send_stop(void)
-{
-        /* Disable all interrupts/machine checks */
-        __load_psw_mask(psw_kernel_bits & ~PSW_MASK_MCHECK);
-}
-
 #define hard_smp_processor_id()         0
 #define smp_cpu_not_running(cpu)        1
 #endif
diff --git a/arch/s390/include/asm/spinlock.h b/arch/s390/include/asm/spinlock.h
index df84ae96915f..f3861b09ebb0 100644
--- a/arch/s390/include/asm/spinlock.h
+++ b/arch/s390/include/asm/spinlock.h
@@ -172,6 +172,9 @@ static inline int __raw_write_trylock(raw_rwlock_t *rw)
         return _raw_write_trylock_retry(rw);
 }
 
+#define __raw_read_lock_flags(lock, flags) __raw_read_lock(lock)
+#define __raw_write_lock_flags(lock, flags) __raw_write_lock(lock)
+
 #define _raw_read_relax(lock)   cpu_relax()
 #define _raw_write_relax(lock)  cpu_relax()
 
diff --git a/arch/s390/kernel/process.c b/arch/s390/kernel/process.c
index b48e961a38f6..a3acd8e60aff 100644
--- a/arch/s390/kernel/process.c
+++ b/arch/s390/kernel/process.c
@@ -160,7 +160,7 @@ void release_thread(struct task_struct *dead_task)
 {
 }
 
-int copy_thread(int nr, unsigned long clone_flags, unsigned long new_stackp,
+int copy_thread(unsigned long clone_flags, unsigned long new_stackp,
                 unsigned long unused,
                 struct task_struct *p, struct pt_regs *regs)
 {
diff --git a/arch/sh/Kconfig b/arch/sh/Kconfig
index 8d50d527c595..2d52b515c241 100644
--- a/arch/sh/Kconfig
+++ b/arch/sh/Kconfig
@@ -640,10 +640,10 @@ config GUSA_RB
         depends on GUSA && CPU_SH3 || (CPU_SH4 && !CPU_SH4A)
         help
           Enabling this option will allow the kernel to implement some
-          atomic operations using a software implemention of load-locked/
+          atomic operations using a software implementation of load-locked/
           store-conditional (LLSC). On machines which do not have hardware
           LLSC, this should be more efficient than the other alternative of
-          disabling insterrupts around the atomic sequence.
+          disabling interrupts around the atomic sequence.
 
 endmenu
 
diff --git a/arch/sh/include/asm/spinlock.h b/arch/sh/include/asm/spinlock.h
index e793181d64da..60283565f89b 100644
--- a/arch/sh/include/asm/spinlock.h
+++ b/arch/sh/include/asm/spinlock.h
@@ -216,6 +216,9 @@ static inline int __raw_write_trylock(raw_rwlock_t *rw)
         return (oldval > (RW_LOCK_BIAS - 1));
 }
 
+#define __raw_read_lock_flags(lock, flags) __raw_read_lock(lock)
+#define __raw_write_lock_flags(lock, flags) __raw_write_lock(lock)
+
 #define _raw_spin_relax(lock)   cpu_relax()
 #define _raw_read_relax(lock)   cpu_relax()
 #define _raw_write_relax(lock)  cpu_relax()
diff --git a/arch/sh/kernel/process_32.c b/arch/sh/kernel/process_32.c
index ddafbbbab2ab..694bc15f84fd 100644
--- a/arch/sh/kernel/process_32.c
+++ b/arch/sh/kernel/process_32.c
@@ -170,7 +170,7 @@ int dump_fpu(struct pt_regs *regs, elf_fpregset_t *fpu)
 
 asmlinkage void ret_from_fork(void);
 
-int copy_thread(int nr, unsigned long clone_flags, unsigned long usp,
+int copy_thread(unsigned long clone_flags, unsigned long usp,
                 unsigned long unused,
                 struct task_struct *p, struct pt_regs *regs)
 {
diff --git a/arch/sh/kernel/process_64.c b/arch/sh/kernel/process_64.c
index c90c7e5e5fee..96be839040f8 100644
--- a/arch/sh/kernel/process_64.c
+++ b/arch/sh/kernel/process_64.c
@@ -425,7 +425,7 @@ int dump_fpu(struct pt_regs *regs, elf_fpregset_t *fpu)
 
 asmlinkage void ret_from_fork(void);
 
-int copy_thread(int nr, unsigned long clone_flags, unsigned long usp,
+int copy_thread(unsigned long clone_flags, unsigned long usp,
                 unsigned long unused,
                 struct task_struct *p, struct pt_regs *regs)
 {
diff --git a/arch/sparc/Kconfig.debug b/arch/sparc/Kconfig.debug
index d001b42041a5..90d5fe223a74 100644
--- a/arch/sparc/Kconfig.debug
+++ b/arch/sparc/Kconfig.debug
@@ -22,15 +22,6 @@ config DEBUG_DCFLUSH
 config STACK_DEBUG
         bool "Stack Overflow Detection Support"
 
-config DEBUG_PAGEALLOC
-        bool "Debug page memory allocations"
-        depends on DEBUG_KERNEL && !HIBERNATION
-        depends on ARCH_SUPPORTS_DEBUG_PAGEALLOC
-        help
-          Unmap pages from the kernel linear mapping after free_pages().
-          This results in a large slowdown, but helps to find certain types
-          of memory corruptions.
-
 config MCOUNT
         bool
         depends on SPARC64
diff --git a/arch/sparc/include/asm/mmzone.h b/arch/sparc/include/asm/mmzone.h
index ebf5986c12ed..e8c648741ed4 100644
--- a/arch/sparc/include/asm/mmzone.h
+++ b/arch/sparc/include/asm/mmzone.h
@@ -3,6 +3,8 @@
 
 #ifdef CONFIG_NEED_MULTIPLE_NODES
 
+#include <linux/cpumask.h>
+
 extern struct pglist_data *node_data[];
 
 #define NODE_DATA(nid)          (node_data[nid])
diff --git a/arch/sparc/include/asm/spinlock_32.h b/arch/sparc/include/asm/spinlock_32.h
index bf2d532593e3..46f91ab66a50 100644
--- a/arch/sparc/include/asm/spinlock_32.h
+++ b/arch/sparc/include/asm/spinlock_32.h
@@ -177,6 +177,8 @@ static inline int __read_trylock(raw_rwlock_t *rw)
 #define __raw_write_unlock(rw)  do { (rw)->lock = 0; } while(0)
 
 #define __raw_spin_lock_flags(lock, flags) __raw_spin_lock(lock)
+#define __raw_read_lock_flags(rw, flags)   __raw_read_lock(rw)
+#define __raw_write_lock_flags(rw, flags)  __raw_write_lock(rw)
 
 #define _raw_spin_relax(lock)   cpu_relax()
 #define _raw_read_relax(lock)   cpu_relax()
diff --git a/arch/sparc/include/asm/spinlock_64.h b/arch/sparc/include/asm/spinlock_64.h
index c4d274d330e9..f6b2b92ad8d2 100644
--- a/arch/sparc/include/asm/spinlock_64.h
+++ b/arch/sparc/include/asm/spinlock_64.h
@@ -211,9 +211,11 @@ static int inline __write_trylock(raw_rwlock_t *lock)
 }
 
 #define __raw_read_lock(p)      __read_lock(p)
+#define __raw_read_lock_flags(p, f) __read_lock(p)
 #define __raw_read_trylock(p)   __read_trylock(p)
 #define __raw_read_unlock(p)    __read_unlock(p)
 #define __raw_write_lock(p)     __write_lock(p)
+#define __raw_write_lock_flags(p, f) __write_lock(p)
 #define __raw_write_unlock(p)   __write_unlock(p)
 #define __raw_write_trylock(p)  __write_trylock(p)
 
diff --git a/arch/sparc/kernel/head_64.S b/arch/sparc/kernel/head_64.S
index a46c3a21e26d..3a1b7bf03cff 100644
--- a/arch/sparc/kernel/head_64.S
+++ b/arch/sparc/kernel/head_64.S
@@ -686,7 +686,7 @@ tlb_fixup_done:
          * point.
          *
          * There used to be enormous complexity wrt. transferring
-         * over from the firwmare's trap table to the Linux kernel's.
+         * over from the firmware's trap table to the Linux kernel's.
          * For example, there was a chicken & egg problem wrt. building
          * the OBP page tables, yet needing to be on the Linux kernel
          * trap table (to translate PAGE_OFFSET addresses) in order to
diff --git a/arch/sparc/kernel/process_32.c b/arch/sparc/kernel/process_32.c
index f4bee35a1b46..2830b415e214 100644
--- a/arch/sparc/kernel/process_32.c
+++ b/arch/sparc/kernel/process_32.c
@@ -455,7 +455,7 @@ asmlinkage int sparc_do_fork(unsigned long clone_flags,
  */
 extern void ret_from_fork(void);
 
-int copy_thread(int nr, unsigned long clone_flags, unsigned long sp,
+int copy_thread(unsigned long clone_flags, unsigned long sp,
                 unsigned long unused,
                 struct task_struct *p, struct pt_regs *regs)
 {
diff --git a/arch/sparc/kernel/process_64.c b/arch/sparc/kernel/process_64.c
index a73954b87f0a..4041f94e7724 100644
--- a/arch/sparc/kernel/process_64.c
+++ b/arch/sparc/kernel/process_64.c
@@ -561,7 +561,7 @@ asmlinkage long sparc_do_fork(unsigned long clone_flags,
  * Parent -->  %o0 == childs  pid, %o1 == 0
  * Child  -->  %o0 == parents pid, %o1 == 1
  */
-int copy_thread(int nr, unsigned long clone_flags, unsigned long sp,
+int copy_thread(unsigned long clone_flags, unsigned long sp,
                 unsigned long unused,
                 struct task_struct *p, struct pt_regs *regs)
 {
diff --git a/arch/um/drivers/net_kern.c b/arch/um/drivers/net_kern.c
index 434224e2229f..434ba121e3c5 100644
--- a/arch/um/drivers/net_kern.c
+++ b/arch/um/drivers/net_kern.c
@@ -757,7 +757,7 @@ static int uml_inetaddr_event(struct notifier_block *this, unsigned long event,
         void (*proc)(unsigned char *, unsigned char *, void *);
         unsigned char addr_buf[4], netmask_buf[4];
 
-        if (dev->open != uml_net_open)
+        if (dev->netdev_ops->ndo_open != uml_net_open)
                 return NOTIFY_DONE;
 
         lp = netdev_priv(dev);
diff --git a/arch/um/drivers/ubd_kern.c b/arch/um/drivers/ubd_kern.c
index d42f826a8ab9..f934225fd8ef 100644
--- a/arch/um/drivers/ubd_kern.c
+++ b/arch/um/drivers/ubd_kern.c
@@ -22,6 +22,7 @@
 #include "linux/kernel.h"
 #include "linux/module.h"
 #include "linux/blkdev.h"
+#include "linux/ata.h"
 #include "linux/hdreg.h"
 #include "linux/init.h"
 #include "linux/cdrom.h"
@@ -1308,16 +1309,15 @@ static int ubd_ioctl(struct block_device *bdev, fmode_t mode,
                      unsigned int cmd, unsigned long arg)
 {
         struct ubd *ubd_dev = bdev->bd_disk->private_data;
-        struct hd_driveid ubd_id = {
-                .cyls           = 0,
-                .heads          = 128,
-                .sectors        = 32,
-        };
+        u16 ubd_id[ATA_ID_WORDS];
 
         switch (cmd) {
                 struct cdrom_volctrl volume;
         case HDIO_GET_IDENTITY:
-                ubd_id.cyls = ubd_dev->size / (128 * 32 * 512);
+                memset(&ubd_id, 0, ATA_ID_WORDS * 2);
+                ubd_id[ATA_ID_CYLS]     = ubd_dev->size / (128 * 32 * 512);
+                ubd_id[ATA_ID_HEADS]    = 128;
+                ubd_id[ATA_ID_SECTORS]  = 32;
                 if(copy_to_user((char __user *) arg, (char *) &ubd_id,
                                  sizeof(ubd_id)))
                         return -EFAULT;
diff --git a/arch/um/kernel/process.c b/arch/um/kernel/process.c
index a1c6d07cac3e..4a28a1568d85 100644
--- a/arch/um/kernel/process.c
+++ b/arch/um/kernel/process.c
@@ -179,7 +179,7 @@ void fork_handler(void)
         userspace(&current->thread.regs.regs);
 }
 
-int copy_thread(int nr, unsigned long clone_flags, unsigned long sp,
+int copy_thread(unsigned long clone_flags, unsigned long sp,
                 unsigned long stack_top, struct task_struct * p,
                 struct pt_regs *regs)
 {
diff --git a/arch/um/kernel/syscall.c b/arch/um/kernel/syscall.c
index c4df705b8359..a4625c7b2bf9 100644
--- a/arch/um/kernel/syscall.c
+++ b/arch/um/kernel/syscall.c
@@ -127,7 +127,8 @@ int kernel_execve(const char *filename, char *const argv[], char *const envp[])
 
         fs = get_fs();
         set_fs(KERNEL_DS);
-        ret = um_execve(filename, argv, envp);
+        ret = um_execve((char *)filename, (char __user *__user *)argv,
+                        (char __user *__user *) envp);
         set_fs(fs);
 
         return ret;
diff --git a/arch/um/sys-i386/sys_call_table.S b/arch/um/sys-i386/sys_call_table.S
index 00e5f5203eea..c6260dd6ebb9 100644
--- a/arch/um/sys-i386/sys_call_table.S
+++ b/arch/um/sys-i386/sys_call_table.S
@@ -9,6 +9,17 @@
 
 #define old_mmap old_mmap_i386
 
+#define ptregs_fork sys_fork
+#define ptregs_execve sys_execve
+#define ptregs_iopl sys_iopl
+#define ptregs_vm86old sys_vm86old
+#define ptregs_sigreturn sys_sigreturn
+#define ptregs_clone sys_clone
+#define ptregs_vm86 sys_vm86
+#define ptregs_rt_sigreturn sys_rt_sigreturn
+#define ptregs_sigaltstack sys_sigaltstack
+#define ptregs_vfork sys_vfork
+
 .section .rodata,"a"
 
 #include "../../x86/kernel/syscall_table_32.S"
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
index 0885245e6808..5b2196ab8168 100644
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@ -1146,7 +1146,7 @@ config NODES_SHIFT
         depends on NEED_MULTIPLE_NODES
         ---help---
           Specify the maximum number of NUMA Nodes available on the target
-          system.  Increases memory reserved to accomodate various tables.
+          system.  Increases memory reserved to accommodate various tables.
 
 config HAVE_ARCH_BOOTMEM
         def_bool y
@@ -1324,7 +1324,7 @@ config MTRR_SANITIZER
           add writeback entries.
 
           Can be disabled with disable_mtrr_cleanup on the kernel command line.
-          The largest mtrr entry size for a continous block can be set with
+          The largest mtrr entry size for a continuous block can be set with
           mtrr_chunk_size.
 
           If unsure, say Y.
@@ -1839,8 +1839,8 @@ config PCI_MMCONFIG
 
 config DMAR
         bool "Support for DMA Remapping Devices (EXPERIMENTAL)"
-        depends on X86_64 && PCI_MSI && ACPI && EXPERIMENTAL
-        ---help---
+        depends on PCI_MSI && ACPI && EXPERIMENTAL
+        help
           DMA remapping (DMAR) devices support enables independent address
           translations for Direct Memory Access (DMA) from devices.
           These DMA remapping devices are reported via ACPI tables
diff --git a/arch/x86/Kconfig.debug b/arch/x86/Kconfig.debug
index a345cb5447a8..d8359e73317f 100644
--- a/arch/x86/Kconfig.debug
+++ b/arch/x86/Kconfig.debug
@@ -72,15 +72,6 @@ config DEBUG_STACK_USAGE
 
           This option will slow down process creation somewhat.
 
-config DEBUG_PAGEALLOC
-        bool "Debug page memory allocations"
-        depends on DEBUG_KERNEL
-        depends on ARCH_SUPPORTS_DEBUG_PAGEALLOC
-        ---help---
-          Unmap pages from the kernel linear mapping after free_pages().
-          This results in a large slowdown, but helps to find certain types
-          of memory corruptions.
-
 config DEBUG_PER_CPU_MAPS
         bool "Debug access to per_cpu maps"
         depends on DEBUG_KERNEL
diff --git a/arch/x86/boot/Makefile b/arch/x86/boot/Makefile
index fb737ce5888d..6633b6e7505a 100644
--- a/arch/x86/boot/Makefile
+++ b/arch/x86/boot/Makefile
@@ -57,6 +57,7 @@ $(obj)/cpustr.h: $(obj)/mkcpustr FORCE
 # How to compile the 16-bit code.  Note we always compile for -march=i386,
 # that way we can complain to the user if the CPU is insufficient.
 KBUILD_CFLAGS   := $(LINUXINCLUDE) -g -Os -D_SETUP -D__KERNEL__ \
+                   -DDISABLE_BRANCH_PROFILING \
                    -Wall -Wstrict-prototypes \
                    -march=i386 -mregparm=3 \
                    -include $(srctree)/$(src)/code16gcc.h \
@@ -66,7 +67,7 @@ KBUILD_CFLAGS	:= $(LINUXINCLUDE) -g -Os -D_SETUP -D__KERNEL__ \
                         $(call cc-option, -fno-unit-at-a-time)) \
                    $(call cc-option, -fno-stack-protector) \
                    $(call cc-option, -mpreferred-stack-boundary=2)
-KBUILD_CFLAGS +=   $(call cc-option,-m32)
+KBUILD_CFLAGS   += $(call cc-option, -m32)
 KBUILD_AFLAGS   := $(KBUILD_CFLAGS) -D__ASSEMBLY__
 
 $(obj)/bzImage: asflags-y  := $(SVGA_MODE)
diff --git a/arch/x86/boot/compressed/Makefile b/arch/x86/boot/compressed/Makefile
index 3ca4c194b8e5..65551c9f8571 100644
--- a/arch/x86/boot/compressed/Makefile
+++ b/arch/x86/boot/compressed/Makefile
@@ -8,6 +8,7 @@ targets := vmlinux vmlinux.bin vmlinux.bin.gz vmlinux.bin.bz2 vmlinux.bin.lzma h
 
 KBUILD_CFLAGS := -m$(BITS) -D__KERNEL__ $(LINUX_INCLUDE) -O2
 KBUILD_CFLAGS += -fno-strict-aliasing -fPIC
+KBUILD_CFLAGS += -DDISABLE_BRANCH_PROFILING
 cflags-$(CONFIG_X86_64) := -mcmodel=small
 KBUILD_CFLAGS += $(cflags-y)
 KBUILD_CFLAGS += $(call cc-option,-ffreestanding)
diff --git a/arch/x86/boot/memory.c b/arch/x86/boot/memory.c
index 8c3c25f35578..5054c2ddd1a0 100644
--- a/arch/x86/boot/memory.c
+++ b/arch/x86/boot/memory.c
@@ -2,6 +2,7 @@
  *
  *   Copyright (C) 1991, 1992 Linus Torvalds
  *   Copyright 2007 rPath, Inc. - All Rights Reserved
+ *   Copyright 2009 Intel Corporation; author H. Peter Anvin
  *
  *   This file is part of the Linux kernel, and is made available under
  *   the terms of the GNU General Public License version 2.
@@ -16,24 +17,38 @@
 
 #define SMAP    0x534d4150      /* ASCII "SMAP" */
 
+struct e820_ext_entry {
+        struct e820entry std;
+        u32 ext_flags;
+} __attribute__((packed));
+
 static int detect_memory_e820(void)
 {
         int count = 0;
         u32 next = 0;
-        u32 size, id;
+        u32 size, id, edi;
         u8 err;
         struct e820entry *desc = boot_params.e820_map;
+        static struct e820_ext_entry buf; /* static so it is zeroed */
+
+        /*
+         * Set this here so that if the BIOS doesn't change this field
+         * but still doesn't change %ecx, we're still okay...
+         */
+        buf.ext_flags = 1;
 
         do {
-                size = sizeof(struct e820entry);
+                size = sizeof buf;
 
-                /* Important: %edx is clobbered by some BIOSes,
-                   so it must be either used for the error output
-                   or explicitly marked clobbered. */
-                asm("int $0x15; setc %0"
+                /* Important: %edx and %esi are clobbered by some BIOSes,
+                   so they must be either used for the error output
+                   or explicitly marked clobbered.  Given that, assume there
+                   is something out there clobbering %ebp and %edi, too. */
+                asm("pushl %%ebp; int $0x15; popl %%ebp; setc %0"
                     : "=d" (err), "+b" (next), "=a" (id), "+c" (size),
-                      "=m" (*desc)
-                    : "D" (desc), "d" (SMAP), "a" (0xe820));
+                      "=D" (edi), "+m" (buf)
+                    : "D" (&buf), "d" (SMAP), "a" (0xe820)
+                    : "esi");
 
                 /* BIOSes which terminate the chain with CF = 1 as opposed
                    to %ebx = 0 don't always report the SMAP signature on
@@ -51,8 +66,14 @@ static int detect_memory_e820(void)
                         break;
                 }
 
+                /* ACPI 3.0 added the extended flags support.  If bit 0
+                   in the extended flags is zero, we're supposed to simply
+                   ignore the entry -- a backwards incompatible change! */
+                if (size > 20 && !(buf.ext_flags & 1))
+                        continue;
+
+                *desc++ = buf.std;
                 count++;
-                desc++;
         } while (next && count < ARRAY_SIZE(boot_params.e820_map));
 
         return boot_params.e820_entries = count;
diff --git a/arch/x86/ia32/ia32entry.S b/arch/x86/ia32/ia32entry.S
index db0c803170ab..a505202086e8 100644
--- a/arch/x86/ia32/ia32entry.S
+++ b/arch/x86/ia32/ia32entry.S
@@ -828,4 +828,6 @@ ia32_sys_call_table:
         .quad sys_dup3                  /* 330 */
         .quad sys_pipe2
         .quad sys_inotify_init1
+        .quad compat_sys_preadv
+        .quad compat_sys_pwritev
 ia32_syscall_end:
diff --git a/arch/x86/include/asm/cpumask.h b/arch/x86/include/asm/cpumask.h
index a7f3c75f8ad7..61c852fa346b 100644
--- a/arch/x86/include/asm/cpumask.h
+++ b/arch/x86/include/asm/cpumask.h
@@ -3,8 +3,6 @@
 #ifndef __ASSEMBLY__
 #include <linux/cpumask.h>
 
-#ifdef CONFIG_X86_64
-
 extern cpumask_var_t cpu_callin_mask;
 extern cpumask_var_t cpu_callout_mask;
 extern cpumask_var_t cpu_initialized_mask;
@@ -12,21 +10,5 @@ extern cpumask_var_t cpu_sibling_setup_mask;
 
 extern void setup_cpu_local_masks(void);
 
-#else /* CONFIG_X86_32 */
-
-extern cpumask_t cpu_callin_map;
-extern cpumask_t cpu_callout_map;
-extern cpumask_t cpu_initialized;
-extern cpumask_t cpu_sibling_setup_map;
-
-#define cpu_callin_mask         ((struct cpumask *)&cpu_callin_map)
-#define cpu_callout_mask        ((struct cpumask *)&cpu_callout_map)
-#define cpu_initialized_mask    ((struct cpumask *)&cpu_initialized)
-#define cpu_sibling_setup_mask  ((struct cpumask *)&cpu_sibling_setup_map)
-
-static inline void setup_cpu_local_masks(void) { }
-
-#endif /* CONFIG_X86_32 */
-
 #endif /* __ASSEMBLY__ */
 #endif /* _ASM_X86_CPUMASK_H */
diff --git a/arch/x86/include/asm/pci.h b/arch/x86/include/asm/pci.h
index a0301bfeb954..b51a1e8b0baf 100644
--- a/arch/x86/include/asm/pci.h
+++ b/arch/x86/include/asm/pci.h
@@ -89,12 +89,40 @@ extern void pci_iommu_alloc(void);
 /* MSI arch hook */
 #define arch_setup_msi_irqs arch_setup_msi_irqs
 
-#endif  /* __KERNEL__ */
+#define PCI_DMA_BUS_IS_PHYS (dma_ops->is_phys)
+
+#if defined(CONFIG_X86_64) || defined(CONFIG_DMA_API_DEBUG)
+
+#define DECLARE_PCI_UNMAP_ADDR(ADDR_NAME)       \
+                dma_addr_t ADDR_NAME;
+#define DECLARE_PCI_UNMAP_LEN(LEN_NAME)         \
+                __u32 LEN_NAME;
+#define pci_unmap_addr(PTR, ADDR_NAME)                  \
+                ((PTR)->ADDR_NAME)
+#define pci_unmap_addr_set(PTR, ADDR_NAME, VAL)         \
+                (((PTR)->ADDR_NAME) = (VAL))
+#define pci_unmap_len(PTR, LEN_NAME)                    \
+                ((PTR)->LEN_NAME)
+#define pci_unmap_len_set(PTR, LEN_NAME, VAL)           \
+                (((PTR)->LEN_NAME) = (VAL))
 
-#ifdef CONFIG_X86_32
-# include "pci_32.h"
 #else
-# include "pci_64.h"
+
+#define DECLARE_PCI_UNMAP_ADDR(ADDR_NAME)       dma_addr_t ADDR_NAME[0];
+#define DECLARE_PCI_UNMAP_LEN(LEN_NAME) unsigned LEN_NAME[0];
+#define pci_unmap_addr(PTR, ADDR_NAME)  sizeof((PTR)->ADDR_NAME)
+#define pci_unmap_addr_set(PTR, ADDR_NAME, VAL) \
+                do { break; } while (pci_unmap_addr(PTR, ADDR_NAME))
+#define pci_unmap_len(PTR, LEN_NAME)            sizeof((PTR)->LEN_NAME)
+#define pci_unmap_len_set(PTR, LEN_NAME, VAL) \
+                do { break; } while (pci_unmap_len(PTR, LEN_NAME))
+
+#endif
+
+#endif  /* __KERNEL__ */
+
+#ifdef CONFIG_X86_64
+#include "pci_64.h"
 #endif
 
 /* implement the pci_ DMA API in terms of the generic device dma_ one */
@@ -112,11 +140,6 @@ static inline int __pcibus_to_node(const struct pci_bus *bus)
         return sd->node;
 }
 
-static inline cpumask_t __pcibus_to_cpumask(struct pci_bus *bus)
-{
-        return node_to_cpumask(__pcibus_to_node(bus));
-}
-
 static inline const struct cpumask *
 cpumask_of_pcibus(const struct pci_bus *bus)
 {
diff --git a/arch/x86/include/asm/pci_32.h b/arch/x86/include/asm/pci_32.h
deleted file mode 100644
index 6f1213a6ef4f..000000000000
--- a/arch/x86/include/asm/pci_32.h
+++ /dev/null
@@ -1,34 +0,0 @@
-#ifndef _ASM_X86_PCI_32_H
-#define _ASM_X86_PCI_32_H
-
-
-#ifdef __KERNEL__
-
-
-/* Dynamic DMA mapping stuff.
- * i386 has everything mapped statically.
- */
-
-struct pci_dev;
-
-/* The PCI address space does equal the physical memory
- * address space.  The networking and block device layers use
- * this boolean for bounce buffer decisions.
- */
-#define PCI_DMA_BUS_IS_PHYS     (1)
-
-/* pci_unmap_{page,single} is a nop so... */
-#define DECLARE_PCI_UNMAP_ADDR(ADDR_NAME)       dma_addr_t ADDR_NAME[0];
-#define DECLARE_PCI_UNMAP_LEN(LEN_NAME) unsigned LEN_NAME[0];
-#define pci_unmap_addr(PTR, ADDR_NAME)  sizeof((PTR)->ADDR_NAME)
-#define pci_unmap_addr_set(PTR, ADDR_NAME, VAL) \
-        do { break; } while (pci_unmap_addr(PTR, ADDR_NAME))
-#define pci_unmap_len(PTR, LEN_NAME)            sizeof((PTR)->LEN_NAME)
-#define pci_unmap_len_set(PTR, LEN_NAME, VAL) \
-        do { break; } while (pci_unmap_len(PTR, LEN_NAME))
-
-
-#endif /* __KERNEL__ */
-
-
-#endif /* _ASM_X86_PCI_32_H */
diff --git a/arch/x86/include/asm/pci_64.h b/arch/x86/include/asm/pci_64.h
index 4da207982777..ae5e40f67daf 100644
--- a/arch/x86/include/asm/pci_64.h
+++ b/arch/x86/include/asm/pci_64.h
@@ -24,28 +24,6 @@ extern int (*pci_config_write)(int seg, int bus, int dev, int fn,
 
 extern void dma32_reserve_bootmem(void);
 
-/* The PCI address space does equal the physical memory
- * address space.  The networking and block device layers use
- * this boolean for bounce buffer decisions
- *
- * On AMD64 it mostly equals, but we set it to zero if a hardware
- * IOMMU (gart) of sotware IOMMU (swiotlb) is available.
- */
-#define PCI_DMA_BUS_IS_PHYS (dma_ops->is_phys)
-
-#define DECLARE_PCI_UNMAP_ADDR(ADDR_NAME)       \
-        dma_addr_t ADDR_NAME;
-#define DECLARE_PCI_UNMAP_LEN(LEN_NAME)         \
-        __u32 LEN_NAME;
-#define pci_unmap_addr(PTR, ADDR_NAME)                  \
-        ((PTR)->ADDR_NAME)
-#define pci_unmap_addr_set(PTR, ADDR_NAME, VAL)         \
-        (((PTR)->ADDR_NAME) = (VAL))
-#define pci_unmap_len(PTR, LEN_NAME)                    \
-        ((PTR)->LEN_NAME)
-#define pci_unmap_len_set(PTR, LEN_NAME, VAL)           \
-        (((PTR)->LEN_NAME) = (VAL))
-
 #endif /* __KERNEL__ */
 
 #endif /* _ASM_X86_PCI_64_H */
diff --git a/arch/x86/include/asm/processor.h b/arch/x86/include/asm/processor.h
index ae85a8d66a30..34c52370f2fe 100644
--- a/arch/x86/include/asm/processor.h
+++ b/arch/x86/include/asm/processor.h
@@ -94,7 +94,7 @@ struct cpuinfo_x86 {
         unsigned long           loops_per_jiffy;
 #ifdef CONFIG_SMP
         /* cpus sharing the last level cache: */
-        cpumask_t               llc_shared_map;
+        cpumask_var_t           llc_shared_map;
 #endif
         /* cpuid returned max cores value: */
         u16                      x86_max_cores;
@@ -736,6 +736,7 @@ static inline void __sti_mwait(unsigned long eax, unsigned long ecx)
 extern void mwait_idle_with_hints(unsigned long eax, unsigned long ecx);
 
 extern void select_idle_routine(const struct cpuinfo_x86 *c);
+extern void init_c1e_mask(void);
 
 extern unsigned long            boot_option_idle_override;
 extern unsigned long            idle_halt;
diff --git a/arch/x86/include/asm/smp.h b/arch/x86/include/asm/smp.h
index 47d0e21f2b9e..19e0d88b966d 100644
--- a/arch/x86/include/asm/smp.h
+++ b/arch/x86/include/asm/smp.h
@@ -21,19 +21,19 @@
 extern int smp_num_siblings;
 extern unsigned int num_processors;
 
-DECLARE_PER_CPU(cpumask_t, cpu_sibling_map);
-DECLARE_PER_CPU(cpumask_t, cpu_core_map);
+DECLARE_PER_CPU(cpumask_var_t, cpu_sibling_map);
+DECLARE_PER_CPU(cpumask_var_t, cpu_core_map);
 DECLARE_PER_CPU(u16, cpu_llc_id);
 DECLARE_PER_CPU(int, cpu_number);
 
 static inline struct cpumask *cpu_sibling_mask(int cpu)
 {
-        return &per_cpu(cpu_sibling_map, cpu);
+        return per_cpu(cpu_sibling_map, cpu);
 }
 
 static inline struct cpumask *cpu_core_mask(int cpu)
 {
-        return &per_cpu(cpu_core_map, cpu);
+        return per_cpu(cpu_core_map, cpu);
 }
 
 DECLARE_EARLY_PER_CPU(u16, x86_cpu_to_apicid);
@@ -121,9 +121,10 @@ static inline void arch_send_call_function_single_ipi(int cpu)
         smp_ops.send_call_func_single_ipi(cpu);
 }
 
-static inline void arch_send_call_function_ipi(cpumask_t mask)
+#define arch_send_call_function_ipi_mask arch_send_call_function_ipi_mask
+static inline void arch_send_call_function_ipi_mask(const struct cpumask *mask)
 {
-        smp_ops.send_call_func_ipi(&mask);
+        smp_ops.send_call_func_ipi(mask);
 }
 
 void cpu_disable_common(void);
diff --git a/arch/x86/include/asm/spinlock.h b/arch/x86/include/asm/spinlock.h
index 3a5696656680..e5e6caffec87 100644
--- a/arch/x86/include/asm/spinlock.h
+++ b/arch/x86/include/asm/spinlock.h
@@ -295,6 +295,9 @@ static inline void __raw_write_unlock(raw_rwlock_t *rw)
                      : "+m" (rw->lock) : "i" (RW_LOCK_BIAS) : "memory");
 }
 
+#define __raw_read_lock_flags(lock, flags) __raw_read_lock(lock)
+#define __raw_write_lock_flags(lock, flags) __raw_write_lock(lock)
+
 #define _raw_spin_relax(lock)   cpu_relax()
 #define _raw_read_relax(lock)   cpu_relax()
 #define _raw_write_relax(lock)  cpu_relax()
diff --git a/arch/x86/include/asm/topology.h b/arch/x86/include/asm/topology.h
index 744299c0b774..892b119dba6f 100644
--- a/arch/x86/include/asm/topology.h
+++ b/arch/x86/include/asm/topology.h
@@ -44,9 +44,6 @@
 
 #ifdef CONFIG_X86_32
 
-/* Mappings between node number and cpus on that node. */
-extern cpumask_t node_to_cpumask_map[];
-
 /* Mappings between logical cpu number and node number */
 extern int cpu_to_node_map[];
 
@@ -57,30 +54,8 @@ static inline int cpu_to_node(int cpu)
 }
 #define early_cpu_to_node(cpu)  cpu_to_node(cpu)
 
-/* Returns a bitmask of CPUs on Node 'node'.
- *
- * Side note: this function creates the returned cpumask on the stack
- * so with a high NR_CPUS count, excessive stack space is used.  The
- * cpumask_of_node function should be used whenever possible.
- */
-static inline cpumask_t node_to_cpumask(int node)
-{
-        return node_to_cpumask_map[node];
-}
-
-/* Returns a bitmask of CPUs on Node 'node'. */
-static inline const struct cpumask *cpumask_of_node(int node)
-{
-        return &node_to_cpumask_map[node];
-}
-
-static inline void setup_node_to_cpumask_map(void) { }
-
 #else /* CONFIG_X86_64 */
 
-/* Mappings between node number and cpus on that node. */
-extern cpumask_t *node_to_cpumask_map;
-
 /* Mappings between logical cpu number and node number */
 DECLARE_EARLY_PER_CPU(int, x86_cpu_to_node_map);
 
@@ -91,8 +66,6 @@ DECLARE_PER_CPU(int, node_number);
 #ifdef CONFIG_DEBUG_PER_CPU_MAPS
 extern int cpu_to_node(int cpu);
 extern int early_cpu_to_node(int cpu);
-extern const cpumask_t *cpumask_of_node(int node);
-extern cpumask_t node_to_cpumask(int node);
 
 #else   /* !CONFIG_DEBUG_PER_CPU_MAPS */
 
@@ -108,42 +81,32 @@ static inline int early_cpu_to_node(int cpu)
         return early_per_cpu(x86_cpu_to_node_map, cpu);
 }
 
-/* Returns a pointer to the cpumask of CPUs on Node 'node'. */
-static inline const cpumask_t *cpumask_of_node(int node)
-{
-        return &node_to_cpumask_map[node];
-}
+#endif /* !CONFIG_DEBUG_PER_CPU_MAPS */
+
+#endif /* CONFIG_X86_64 */
 
-/* Returns a bitmask of CPUs on Node 'node'. */
-static inline cpumask_t node_to_cpumask(int node)
+/* Mappings between node number and cpus on that node. */
+extern cpumask_var_t node_to_cpumask_map[MAX_NUMNODES];
+
+#ifdef CONFIG_DEBUG_PER_CPU_MAPS
+extern const struct cpumask *cpumask_of_node(int node);
+#else
+/* Returns a pointer to the cpumask of CPUs on Node 'node'. */
+static inline const struct cpumask *cpumask_of_node(int node)
 {
         return node_to_cpumask_map[node];
 }
-
-#endif /* !CONFIG_DEBUG_PER_CPU_MAPS */
+#endif
 
 extern void setup_node_to_cpumask_map(void);
 
 /*
- * Replace default node_to_cpumask_ptr with optimized version
- * Deprecated: use "const struct cpumask *mask = cpumask_of_node(node)"
- */
-#define node_to_cpumask_ptr(v, node)            \
-                const cpumask_t *v = cpumask_of_node(node)
-
-#define node_to_cpumask_ptr_next(v, node)       \
-                           v = cpumask_of_node(node)
-
-#endif /* CONFIG_X86_64 */
-
-/*
  * Returns the number of the node containing Node 'node'. This
  * architecture is flat, so it is a pretty simple function!
  */
 #define parent_node(node) (node)
 
 #define pcibus_to_node(bus) __pcibus_to_node(bus)
-#define pcibus_to_cpumask(bus) __pcibus_to_cpumask(bus)
 
 #ifdef CONFIG_X86_32
 extern unsigned long node_start_pfn[];
@@ -209,40 +172,24 @@ static inline int early_cpu_to_node(int cpu)
         return 0;
 }
 
-static inline const cpumask_t *cpumask_of_node(int node)
-{
-        return &cpu_online_map;
-}
-static inline cpumask_t node_to_cpumask(int node)
+static inline const struct cpumask *cpumask_of_node(int node)
 {
-        return cpu_online_map;
+        return cpu_online_mask;
 }
 
 static inline void setup_node_to_cpumask_map(void) { }
 
-/*
- * Replace default node_to_cpumask_ptr with optimized version
- * Deprecated: use "const struct cpumask *mask = cpumask_of_node(node)"
- */
-#define node_to_cpumask_ptr(v, node)            \
-                const cpumask_t *v = cpumask_of_node(node)
-
-#define node_to_cpumask_ptr_next(v, node)       \
-                           v = cpumask_of_node(node)
 #endif
 
 #include <asm-generic/topology.h>
 
-extern cpumask_t cpu_coregroup_map(int cpu);
 extern const struct cpumask *cpu_coregroup_mask(int cpu);
 
 #ifdef ENABLE_TOPO_DEFINES
 #define topology_physical_package_id(cpu)       (cpu_data(cpu).phys_proc_id)
 #define topology_core_id(cpu)                   (cpu_data(cpu).cpu_core_id)
-#define topology_core_siblings(cpu)             (per_cpu(cpu_core_map, cpu))
-#define topology_thread_siblings(cpu)           (per_cpu(cpu_sibling_map, cpu))
-#define topology_core_cpumask(cpu)              (&per_cpu(cpu_core_map, cpu))
-#define topology_thread_cpumask(cpu)            (&per_cpu(cpu_sibling_map, cpu))
+#define topology_core_cpumask(cpu)              (per_cpu(cpu_core_map, cpu))
+#define topology_thread_cpumask(cpu)            (per_cpu(cpu_sibling_map, cpu))
 
 /* indicates that pointers to the topology cpumask_t maps are valid */
 #define arch_provides_topology_pointers         yes
@@ -256,7 +203,7 @@ struct pci_bus;
 void set_pci_bus_resources_arch_default(struct pci_bus *b);
 
 #ifdef CONFIG_SMP
-#define mc_capable()    (cpus_weight(per_cpu(cpu_core_map, 0)) != nr_cpu_ids)
+#define mc_capable()    (cpumask_weight(cpu_core_mask(0)) != nr_cpu_ids)
 #define smt_capable()                   (smp_num_siblings > 1)
 #endif
 
diff --git a/arch/x86/include/asm/unistd_32.h b/arch/x86/include/asm/unistd_32.h
index f2bba78430a4..6e72d74cf8dc 100644
--- a/arch/x86/include/asm/unistd_32.h
+++ b/arch/x86/include/asm/unistd_32.h
@@ -338,6 +338,8 @@
 #define __NR_dup3               330
 #define __NR_pipe2              331
 #define __NR_inotify_init1      332
+#define __NR_preadv             333
+#define __NR_pwritev            334
 
 #ifdef __KERNEL__
 
diff --git a/arch/x86/include/asm/unistd_64.h b/arch/x86/include/asm/unistd_64.h
index d2e415e6666f..f81829462325 100644
--- a/arch/x86/include/asm/unistd_64.h
+++ b/arch/x86/include/asm/unistd_64.h
@@ -653,6 +653,10 @@ __SYSCALL(__NR_dup3, sys_dup3)
 __SYSCALL(__NR_pipe2, sys_pipe2)
 #define __NR_inotify_init1                      294
 __SYSCALL(__NR_inotify_init1, sys_inotify_init1)
+#define __NR_preadv                             295
+__SYSCALL(__NR_preadv, sys_preadv)
+#define __NR_pwritev                            296
+__SYSCALL(__NR_pwritev, sys_pwritev)
 
 
 #ifndef __NO_STUBS
diff --git a/arch/x86/include/asm/uv/uv_hub.h b/arch/x86/include/asm/uv/uv_hub.h
index 9f4dfba33b28..d3a98ea1062e 100644
--- a/arch/x86/include/asm/uv/uv_hub.h
+++ b/arch/x86/include/asm/uv/uv_hub.h
@@ -11,11 +11,13 @@
 #ifndef _ASM_X86_UV_UV_HUB_H
 #define _ASM_X86_UV_UV_HUB_H
 
+#ifdef CONFIG_X86_64
 #include <linux/numa.h>
 #include <linux/percpu.h>
 #include <linux/timer.h>
 #include <asm/types.h>
 #include <asm/percpu.h>
+#include <asm/uv/uv_mmrs.h>
 
 
 /*
@@ -397,6 +399,7 @@ static inline void uv_set_scir_bits(unsigned char value)
                 uv_write_local_mmr8(uv_hub_info->scir.offset, value);
         }
 }
+
 static inline void uv_set_cpu_scir_bits(int cpu, unsigned char value)
 {
         if (uv_cpu_hub_info(cpu)->scir.state != value) {
@@ -405,4 +408,15 @@ static inline void uv_set_cpu_scir_bits(int cpu, unsigned char value)
         }
 }
 
+static inline void uv_hub_send_ipi(int pnode, int apicid, int vector)
+{
+        unsigned long val;
+
+        val = (1UL << UVH_IPI_INT_SEND_SHFT) |
+                        ((apicid & 0x3f) << UVH_IPI_INT_APIC_ID_SHFT) |
+                        (vector << UVH_IPI_INT_VECTOR_SHFT);
+        uv_write_global_mmr64(pnode, UVH_IPI_INT, val);
+}
+
+#endif /* CONFIG_X86_64 */
 #endif /* _ASM_X86_UV_UV_HUB_H */
diff --git a/arch/x86/include/asm/uv/uv_mmrs.h b/arch/x86/include/asm/uv/uv_mmrs.h
index dd627793a234..db68ac8a5ac2 100644
--- a/arch/x86/include/asm/uv/uv_mmrs.h
+++ b/arch/x86/include/asm/uv/uv_mmrs.h
@@ -1,3 +1,4 @@
+
 /*
  * This file is subject to the terms and conditions of the GNU General Public
  * License.  See the file "COPYING" in the main directory of this archive
@@ -243,6 +244,158 @@ union uvh_event_occurred0_u {
 #define UVH_EVENT_OCCURRED0_ALIAS_32 0x005f0
 
 /* ========================================================================= */
+/*                         UVH_GR0_TLB_INT0_CONFIG                           */
+/* ========================================================================= */
+#define UVH_GR0_TLB_INT0_CONFIG 0x61b00UL
+
+#define UVH_GR0_TLB_INT0_CONFIG_VECTOR_SHFT 0
+#define UVH_GR0_TLB_INT0_CONFIG_VECTOR_MASK 0x00000000000000ffUL
+#define UVH_GR0_TLB_INT0_CONFIG_DM_SHFT 8
+#define UVH_GR0_TLB_INT0_CONFIG_DM_MASK 0x0000000000000700UL
+#define UVH_GR0_TLB_INT0_CONFIG_DESTMODE_SHFT 11
+#define UVH_GR0_TLB_INT0_CONFIG_DESTMODE_MASK 0x0000000000000800UL
+#define UVH_GR0_TLB_INT0_CONFIG_STATUS_SHFT 12
+#define UVH_GR0_TLB_INT0_CONFIG_STATUS_MASK 0x0000000000001000UL
+#define UVH_GR0_TLB_INT0_CONFIG_P_SHFT 13
+#define UVH_GR0_TLB_INT0_CONFIG_P_MASK 0x0000000000002000UL
+#define UVH_GR0_TLB_INT0_CONFIG_T_SHFT 15
+#define UVH_GR0_TLB_INT0_CONFIG_T_MASK 0x0000000000008000UL
+#define UVH_GR0_TLB_INT0_CONFIG_M_SHFT 16
+#define UVH_GR0_TLB_INT0_CONFIG_M_MASK 0x0000000000010000UL
+#define UVH_GR0_TLB_INT0_CONFIG_APIC_ID_SHFT 32
+#define UVH_GR0_TLB_INT0_CONFIG_APIC_ID_MASK 0xffffffff00000000UL
+
+union uvh_gr0_tlb_int0_config_u {
+    unsigned long       v;
+    struct uvh_gr0_tlb_int0_config_s {
+        unsigned long   vector_  :  8;  /* RW */
+        unsigned long   dm       :  3;  /* RW */
+        unsigned long   destmode :  1;  /* RW */
+        unsigned long   status   :  1;  /* RO */
+        unsigned long   p        :  1;  /* RO */
+        unsigned long   rsvd_14  :  1;  /*    */
+        unsigned long   t        :  1;  /* RO */
+        unsigned long   m        :  1;  /* RW */
+        unsigned long   rsvd_17_31: 15;  /*    */
+        unsigned long   apic_id  : 32;  /* RW */
+    } s;
+};
+
+/* ========================================================================= */
+/*                         UVH_GR0_TLB_INT1_CONFIG                           */
+/* ========================================================================= */
+#define UVH_GR0_TLB_INT1_CONFIG 0x61b40UL
+
+#define UVH_GR0_TLB_INT1_CONFIG_VECTOR_SHFT 0
+#define UVH_GR0_TLB_INT1_CONFIG_VECTOR_MASK 0x00000000000000ffUL
+#define UVH_GR0_TLB_INT1_CONFIG_DM_SHFT 8
+#define UVH_GR0_TLB_INT1_CONFIG_DM_MASK 0x0000000000000700UL
+#define UVH_GR0_TLB_INT1_CONFIG_DESTMODE_SHFT 11
+#define UVH_GR0_TLB_INT1_CONFIG_DESTMODE_MASK 0x0000000000000800UL
+#define UVH_GR0_TLB_INT1_CONFIG_STATUS_SHFT 12
+#define UVH_GR0_TLB_INT1_CONFIG_STATUS_MASK 0x0000000000001000UL
+#define UVH_GR0_TLB_INT1_CONFIG_P_SHFT 13
+#define UVH_GR0_TLB_INT1_CONFIG_P_MASK 0x0000000000002000UL
+#define UVH_GR0_TLB_INT1_CONFIG_T_SHFT 15
+#define UVH_GR0_TLB_INT1_CONFIG_T_MASK 0x0000000000008000UL
+#define UVH_GR0_TLB_INT1_CONFIG_M_SHFT 16
+#define UVH_GR0_TLB_INT1_CONFIG_M_MASK 0x0000000000010000UL
+#define UVH_GR0_TLB_INT1_CONFIG_APIC_ID_SHFT 32
+#define UVH_GR0_TLB_INT1_CONFIG_APIC_ID_MASK 0xffffffff00000000UL
+
+union uvh_gr0_tlb_int1_config_u {
+    unsigned long       v;
+    struct uvh_gr0_tlb_int1_config_s {
+        unsigned long   vector_  :  8;  /* RW */
+        unsigned long   dm       :  3;  /* RW */
+        unsigned long   destmode :  1;  /* RW */
+        unsigned long   status   :  1;  /* RO */
+        unsigned long   p        :  1;  /* RO */
+        unsigned long   rsvd_14  :  1;  /*    */
+        unsigned long   t        :  1;  /* RO */
+        unsigned long   m        :  1;  /* RW */
+        unsigned long   rsvd_17_31: 15;  /*    */
+        unsigned long   apic_id  : 32;  /* RW */
+    } s;
+};
+
+/* ========================================================================= */
+/*                         UVH_GR1_TLB_INT0_CONFIG                           */
+/* ========================================================================= */
+#define UVH_GR1_TLB_INT0_CONFIG 0x61f00UL
+
+#define UVH_GR1_TLB_INT0_CONFIG_VECTOR_SHFT 0
+#define UVH_GR1_TLB_INT0_CONFIG_VECTOR_MASK 0x00000000000000ffUL
+#define UVH_GR1_TLB_INT0_CONFIG_DM_SHFT 8
+#define UVH_GR1_TLB_INT0_CONFIG_DM_MASK 0x0000000000000700UL
+#define UVH_GR1_TLB_INT0_CONFIG_DESTMODE_SHFT 11
+#define UVH_GR1_TLB_INT0_CONFIG_DESTMODE_MASK 0x0000000000000800UL
+#define UVH_GR1_TLB_INT0_CONFIG_STATUS_SHFT 12
+#define UVH_GR1_TLB_INT0_CONFIG_STATUS_MASK 0x0000000000001000UL
+#define UVH_GR1_TLB_INT0_CONFIG_P_SHFT 13
+#define UVH_GR1_TLB_INT0_CONFIG_P_MASK 0x0000000000002000UL
+#define UVH_GR1_TLB_INT0_CONFIG_T_SHFT 15
+#define UVH_GR1_TLB_INT0_CONFIG_T_MASK 0x0000000000008000UL
+#define UVH_GR1_TLB_INT0_CONFIG_M_SHFT 16
+#define UVH_GR1_TLB_INT0_CONFIG_M_MASK 0x0000000000010000UL
+#define UVH_GR1_TLB_INT0_CONFIG_APIC_ID_SHFT 32
+#define UVH_GR1_TLB_INT0_CONFIG_APIC_ID_MASK 0xffffffff00000000UL
+
+union uvh_gr1_tlb_int0_config_u {
+    unsigned long       v;
+    struct uvh_gr1_tlb_int0_config_s {
+        unsigned long   vector_  :  8;  /* RW */
+        unsigned long   dm       :  3;  /* RW */
+        unsigned long   destmode :  1;  /* RW */
+        unsigned long   status   :  1;  /* RO */
+        unsigned long   p        :  1;  /* RO */
+        unsigned long   rsvd_14  :  1;  /*    */
+        unsigned long   t        :  1;  /* RO */
+        unsigned long   m        :  1;  /* RW */
+        unsigned long   rsvd_17_31: 15;  /*    */
+        unsigned long   apic_id  : 32;  /* RW */
+    } s;
+};
+
+/* ========================================================================= */
+/*                         UVH_GR1_TLB_INT1_CONFIG                           */
+/* ========================================================================= */
+#define UVH_GR1_TLB_INT1_CONFIG 0x61f40UL
+
+#define UVH_GR1_TLB_INT1_CONFIG_VECTOR_SHFT 0
+#define UVH_GR1_TLB_INT1_CONFIG_VECTOR_MASK 0x00000000000000ffUL
+#define UVH_GR1_TLB_INT1_CONFIG_DM_SHFT 8
+#define UVH_GR1_TLB_INT1_CONFIG_DM_MASK 0x0000000000000700UL
+#define UVH_GR1_TLB_INT1_CONFIG_DESTMODE_SHFT 11
+#define UVH_GR1_TLB_INT1_CONFIG_DESTMODE_MASK 0x0000000000000800UL
+#define UVH_GR1_TLB_INT1_CONFIG_STATUS_SHFT 12
+#define UVH_GR1_TLB_INT1_CONFIG_STATUS_MASK 0x0000000000001000UL
+#define UVH_GR1_TLB_INT1_CONFIG_P_SHFT 13
+#define UVH_GR1_TLB_INT1_CONFIG_P_MASK 0x0000000000002000UL
+#define UVH_GR1_TLB_INT1_CONFIG_T_SHFT 15
+#define UVH_GR1_TLB_INT1_CONFIG_T_MASK 0x0000000000008000UL
+#define UVH_GR1_TLB_INT1_CONFIG_M_SHFT 16
+#define UVH_GR1_TLB_INT1_CONFIG_M_MASK 0x0000000000010000UL
+#define UVH_GR1_TLB_INT1_CONFIG_APIC_ID_SHFT 32
+#define UVH_GR1_TLB_INT1_CONFIG_APIC_ID_MASK 0xffffffff00000000UL
+
+union uvh_gr1_tlb_int1_config_u {
+    unsigned long       v;
+    struct uvh_gr1_tlb_int1_config_s {
+        unsigned long   vector_  :  8;  /* RW */
+        unsigned long   dm       :  3;  /* RW */
+        unsigned long   destmode :  1;  /* RW */
+        unsigned long   status   :  1;  /* RO */
+        unsigned long   p        :  1;  /* RO */
+        unsigned long   rsvd_14  :  1;  /*    */
+        unsigned long   t        :  1;  /* RO */
+        unsigned long   m        :  1;  /* RW */
+        unsigned long   rsvd_17_31: 15;  /*    */
+        unsigned long   apic_id  : 32;  /* RW */
+    } s;
+};
+
+/* ========================================================================= */
 /*                               UVH_INT_CMPB                                */
 /* ========================================================================= */
 #define UVH_INT_CMPB 0x22080UL
diff --git a/arch/x86/kernel/amd_iommu.c b/arch/x86/kernel/amd_iommu.c
index c5962fe3796f..a97db99dad52 100644
--- a/arch/x86/kernel/amd_iommu.c
+++ b/arch/x86/kernel/amd_iommu.c
@@ -1928,6 +1928,12 @@ static phys_addr_t amd_iommu_iova_to_phys(struct iommu_domain *dom,
         return paddr;
 }
 
+static int amd_iommu_domain_has_cap(struct iommu_domain *domain,
+                                    unsigned long cap)
+{
+        return 0;
+}
+
 static struct iommu_ops amd_iommu_ops = {
         .domain_init = amd_iommu_domain_init,
         .domain_destroy = amd_iommu_domain_destroy,
@@ -1936,5 +1942,6 @@ static struct iommu_ops amd_iommu_ops = {
         .map = amd_iommu_map_range,
         .unmap = amd_iommu_unmap_range,
         .iova_to_phys = amd_iommu_iova_to_phys,
+        .domain_has_cap = amd_iommu_domain_has_cap,
 };
 
diff --git a/arch/x86/kernel/apic/bigsmp_32.c b/arch/x86/kernel/apic/bigsmp_32.c
index d806ecaa948f..676cdac385c0 100644
--- a/arch/x86/kernel/apic/bigsmp_32.c
+++ b/arch/x86/kernel/apic/bigsmp_32.c
@@ -26,12 +26,12 @@ static int bigsmp_apic_id_registered(void)
         return 1;
 }
 
-static const cpumask_t *bigsmp_target_cpus(void)
+static const struct cpumask *bigsmp_target_cpus(void)
 {
 #ifdef CONFIG_SMP
-        return &cpu_online_map;
+        return cpu_online_mask;
 #else
-        return &cpumask_of_cpu(0);
+        return cpumask_of(0);
 #endif
 }
 
@@ -118,9 +118,9 @@ static int bigsmp_check_phys_apicid_present(int boot_cpu_physical_apicid)
 }
 
 /* As we are using single CPU as destination, pick only one CPU here */
-static unsigned int bigsmp_cpu_mask_to_apicid(const cpumask_t *cpumask)
+static unsigned int bigsmp_cpu_mask_to_apicid(const struct cpumask *cpumask)
 {
-        return bigsmp_cpu_to_logical_apicid(first_cpu(*cpumask));
+        return bigsmp_cpu_to_logical_apicid(cpumask_first(cpumask));
 }
 
 static unsigned int bigsmp_cpu_mask_to_apicid_and(const struct cpumask *cpumask,
@@ -188,10 +188,10 @@ static const struct dmi_system_id bigsmp_dmi_table[] = {
         { } /* NULL entry stops DMI scanning */
 };
 
-static void bigsmp_vector_allocation_domain(int cpu, cpumask_t *retmask)
+static void bigsmp_vector_allocation_domain(int cpu, struct cpumask *retmask)
 {
-        cpus_clear(*retmask);
-        cpu_set(cpu, *retmask);
+        cpumask_clear(retmask);
+        cpumask_set_cpu(cpu, retmask);
 }
 
 static int probe_bigsmp(void)
diff --git a/arch/x86/kernel/apic/es7000_32.c b/arch/x86/kernel/apic/es7000_32.c
index 19588f2770ee..1c11b819f245 100644
--- a/arch/x86/kernel/apic/es7000_32.c
+++ b/arch/x86/kernel/apic/es7000_32.c
@@ -410,7 +410,7 @@ static void es7000_enable_apic_mode(void)
                 WARN(1, "Command failed, status = %x\n", mip_status);
 }
 
-static void es7000_vector_allocation_domain(int cpu, cpumask_t *retmask)
+static void es7000_vector_allocation_domain(int cpu, struct cpumask *retmask)
 {
         /* Careful. Some cpus do not strictly honor the set of cpus
          * specified in the interrupt destination when using lowest
@@ -420,7 +420,8 @@ static void es7000_vector_allocation_domain(int cpu, cpumask_t *retmask)
          * deliver interrupts to the wrong hyperthread when only one
          * hyperthread was specified in the interrupt desitination.
          */
-        *retmask = (cpumask_t){ { [0] = APIC_ALL_CPUS, } };
+        cpumask_clear(retmask);
+        cpumask_bits(retmask)[0] = APIC_ALL_CPUS;
 }
 
 
@@ -455,14 +456,14 @@ static int es7000_apic_id_registered(void)
         return 1;
 }
 
-static const cpumask_t *target_cpus_cluster(void)
+static const struct cpumask *target_cpus_cluster(void)
 {
-        return &CPU_MASK_ALL;
+        return cpu_all_mask;
 }
 
-static const cpumask_t *es7000_target_cpus(void)
+static const struct cpumask *es7000_target_cpus(void)
 {
-        return &cpumask_of_cpu(smp_processor_id());
+        return cpumask_of(smp_processor_id());
 }
 
 static unsigned long
@@ -517,7 +518,7 @@ static void es7000_setup_apic_routing(void)
           "Enabling APIC mode:  %s. Using %d I/O APICs, target cpus %lx\n",
                 (apic_version[apic] == 0x14) ?
                         "Physical Cluster" : "Logical Cluster",
-                nr_ioapics, cpus_addr(*es7000_target_cpus())[0]);
+                nr_ioapics, cpumask_bits(es7000_target_cpus())[0]);
 }
 
 static int es7000_apicid_to_node(int logical_apicid)
@@ -572,7 +573,7 @@ static int es7000_check_phys_apicid_present(int cpu_physical_apicid)
         return 1;
 }
 
-static unsigned int es7000_cpu_mask_to_apicid(const cpumask_t *cpumask)
+static unsigned int es7000_cpu_mask_to_apicid(const struct cpumask *cpumask)
 {
         unsigned int round = 0;
         int cpu, uninitialized_var(apicid);
diff --git a/arch/x86/kernel/apic/nmi.c b/arch/x86/kernel/apic/nmi.c
index bdfad80c3cf1..d6bd62407152 100644
--- a/arch/x86/kernel/apic/nmi.c
+++ b/arch/x86/kernel/apic/nmi.c
@@ -39,7 +39,7 @@
 int unknown_nmi_panic;
 int nmi_watchdog_enabled;
 
-static cpumask_t backtrace_mask = CPU_MASK_NONE;
+static cpumask_var_t backtrace_mask;
 
 /* nmi_active:
  * >0: the lapic NMI watchdog is active, but can be disabled
@@ -138,6 +138,7 @@ int __init check_nmi_watchdog(void)
         if (!prev_nmi_count)
                 goto error;
 
+        alloc_cpumask_var(&backtrace_mask, GFP_KERNEL);
         printk(KERN_INFO "Testing NMI watchdog ... ");
 
 #ifdef CONFIG_SMP
@@ -413,14 +414,14 @@ nmi_watchdog_tick(struct pt_regs *regs, unsigned reason)
                 touched = 1;
         }
 
-        if (cpu_isset(cpu, backtrace_mask)) {
+        if (cpumask_test_cpu(cpu, backtrace_mask)) {
                 static DEFINE_SPINLOCK(lock);   /* Serialise the printks */
 
                 spin_lock(&lock);
                 printk(KERN_WARNING "NMI backtrace for cpu %d\n", cpu);
                 dump_stack();
                 spin_unlock(&lock);
-                cpu_clear(cpu, backtrace_mask);
+                cpumask_clear_cpu(cpu, backtrace_mask);
         }
 
         /* Could check oops_in_progress here too, but it's safer not to */
@@ -554,10 +555,10 @@ void __trigger_all_cpu_backtrace(void)
 {
         int i;
 
-        backtrace_mask = cpu_online_map;
+        cpumask_copy(backtrace_mask, cpu_online_mask);
         /* Wait for up to 10 seconds for all CPUs to do the backtrace */
         for (i = 0; i < 10 * 1000; i++) {
-                if (cpus_empty(backtrace_mask))
+                if (cpumask_empty(backtrace_mask))
                         break;
                 mdelay(1);
         }
diff --git a/arch/x86/kernel/apic/numaq_32.c b/arch/x86/kernel/apic/numaq_32.c
index ba2fc6465534..533e59c6fc82 100644
--- a/arch/x86/kernel/apic/numaq_32.c
+++ b/arch/x86/kernel/apic/numaq_32.c
@@ -334,9 +334,9 @@ static inline void numaq_smp_callin_clear_local_apic(void)
         clear_local_APIC();
 }
 
-static inline const cpumask_t *numaq_target_cpus(void)
+static inline const struct cpumask *numaq_target_cpus(void)
 {
-        return &CPU_MASK_ALL;
+        return cpu_all_mask;
 }
 
 static inline unsigned long
@@ -427,7 +427,7 @@ static inline int numaq_check_phys_apicid_present(int boot_cpu_physical_apicid)
  * We use physical apicids here, not logical, so just return the default
  * physical broadcast to stop people from breaking us
  */
-static inline unsigned int numaq_cpu_mask_to_apicid(const cpumask_t *cpumask)
+static unsigned int numaq_cpu_mask_to_apicid(const struct cpumask *cpumask)
 {
         return 0x0F;
 }
@@ -462,7 +462,7 @@ static int probe_numaq(void)
         return found_numaq;
 }
 
-static void numaq_vector_allocation_domain(int cpu, cpumask_t *retmask)
+static void numaq_vector_allocation_domain(int cpu, struct cpumask *retmask)
 {
         /* Careful. Some cpus do not strictly honor the set of cpus
          * specified in the interrupt destination when using lowest
@@ -472,7 +472,8 @@ static void numaq_vector_allocation_domain(int cpu, cpumask_t *retmask)
          * deliver interrupts to the wrong hyperthread when only one
          * hyperthread was specified in the interrupt desitination.
          */
-        *retmask = (cpumask_t){ { [0] = APIC_ALL_CPUS, } };
+        cpumask_clear(retmask);
+        cpumask_bits(retmask)[0] = APIC_ALL_CPUS;
 }
 
 static void numaq_setup_portio_remap(void)
diff --git a/arch/x86/kernel/apic/probe_32.c b/arch/x86/kernel/apic/probe_32.c
index 141c99a1c264..01eda2ac65e4 100644
--- a/arch/x86/kernel/apic/probe_32.c
+++ b/arch/x86/kernel/apic/probe_32.c
@@ -83,7 +83,8 @@ static void default_vector_allocation_domain(int cpu, struct cpumask *retmask)
          * deliver interrupts to the wrong hyperthread when only one
          * hyperthread was specified in the interrupt desitination.
          */
-        *retmask = (cpumask_t) { { [0] = APIC_ALL_CPUS } };
+        cpumask_clear(retmask);
+        cpumask_bits(retmask)[0] = APIC_ALL_CPUS;
 }
 
 /* should be called last. */
diff --git a/arch/x86/kernel/apic/summit_32.c b/arch/x86/kernel/apic/summit_32.c
index aac52fa873ff..9cfe1f415d81 100644
--- a/arch/x86/kernel/apic/summit_32.c
+++ b/arch/x86/kernel/apic/summit_32.c
@@ -53,23 +53,19 @@ static unsigned summit_get_apic_id(unsigned long x)
         return (x >> 24) & 0xFF;
 }
 
-static inline void summit_send_IPI_mask(const cpumask_t *mask, int vector)
+static inline void summit_send_IPI_mask(const struct cpumask *mask, int vector)
 {
         default_send_IPI_mask_sequence_logical(mask, vector);
 }
 
 static void summit_send_IPI_allbutself(int vector)
 {
-        cpumask_t mask = cpu_online_map;
-        cpu_clear(smp_processor_id(), mask);
-
-        if (!cpus_empty(mask))
-                summit_send_IPI_mask(&mask, vector);
+        default_send_IPI_mask_allbutself_logical(cpu_online_mask, vector);
 }
 
 static void summit_send_IPI_all(int vector)
 {
-        summit_send_IPI_mask(&cpu_online_map, vector);
+        summit_send_IPI_mask(cpu_online_mask, vector);
 }
 
 #include <asm/tsc.h>
@@ -186,13 +182,13 @@ static inline int is_WPEG(struct rio_detail *rio){
 
 #define SUMMIT_APIC_DFR_VALUE   (APIC_DFR_CLUSTER)
 
-static const cpumask_t *summit_target_cpus(void)
+static const struct cpumask *summit_target_cpus(void)
 {
         /* CPU_MASK_ALL (0xff) has undefined behaviour with
          * dest_LowestPrio mode logical clustered apic interrupt routing
          * Just start on cpu 0.  IRQ balancing will spread load
          */
-        return &cpumask_of_cpu(0);
+        return cpumask_of(0);
 }
 
 static unsigned long summit_check_apicid_used(physid_mask_t bitmap, int apicid)
@@ -289,7 +285,7 @@ static int summit_check_phys_apicid_present(int boot_cpu_physical_apicid)
         return 1;
 }
 
-static unsigned int summit_cpu_mask_to_apicid(const cpumask_t *cpumask)
+static unsigned int summit_cpu_mask_to_apicid(const struct cpumask *cpumask)
 {
         unsigned int round = 0;
         int cpu, apicid = 0;
@@ -346,7 +342,7 @@ static int probe_summit(void)
         return 0;
 }
 
-static void summit_vector_allocation_domain(int cpu, cpumask_t *retmask)
+static void summit_vector_allocation_domain(int cpu, struct cpumask *retmask)
 {
         /* Careful. Some cpus do not strictly honor the set of cpus
          * specified in the interrupt destination when using lowest
@@ -356,7 +352,8 @@ static void summit_vector_allocation_domain(int cpu, cpumask_t *retmask)
          * deliver interrupts to the wrong hyperthread when only one
          * hyperthread was specified in the interrupt desitination.
          */
-        *retmask = (cpumask_t){ { [0] = APIC_ALL_CPUS, } };
+        cpumask_clear(retmask);
+        cpumask_bits(retmask)[0] = APIC_ALL_CPUS;
 }
 
 #ifdef CONFIG_X86_SUMMIT_NUMA
diff --git a/arch/x86/kernel/apic/x2apic_uv_x.c b/arch/x86/kernel/apic/x2apic_uv_x.c
index 1bd6da1f8fad..1248318436e8 100644
--- a/arch/x86/kernel/apic/x2apic_uv_x.c
+++ b/arch/x86/kernel/apic/x2apic_uv_x.c
@@ -118,17 +118,12 @@ static int uv_wakeup_secondary(int phys_apicid, unsigned long start_rip)
 
 static void uv_send_IPI_one(int cpu, int vector)
 {
-        unsigned long val, apicid;
+        unsigned long apicid;
         int pnode;
 
         apicid = per_cpu(x86_cpu_to_apicid, cpu);
         pnode = uv_apicid_to_pnode(apicid);
-
-        val = (1UL << UVH_IPI_INT_SEND_SHFT) |
-              (apicid << UVH_IPI_INT_APIC_ID_SHFT) |
-              (vector << UVH_IPI_INT_VECTOR_SHFT);
-
-        uv_write_global_mmr64(pnode, UVH_IPI_INT, val);
+        uv_hub_send_ipi(pnode, apicid, vector);
 }
 
 static void uv_send_IPI_mask(const struct cpumask *mask, int vector)
diff --git a/arch/x86/kernel/apm_32.c b/arch/x86/kernel/apm_32.c
index ac7783a67432..49e0939bac42 100644
--- a/arch/x86/kernel/apm_32.c
+++ b/arch/x86/kernel/apm_32.c
@@ -466,7 +466,7 @@ static const lookup_t error_table[] = {
  *      @err: APM BIOS return code
  *
  *      Write a meaningful log entry to the kernel log in the event of
- *      an APM error.
+ *      an APM error.  Note that this also handles (negative) kernel errors.
  */
 
 static void apm_error(char *str, int err)
@@ -478,43 +478,14 @@ static void apm_error(char *str, int err)
                         break;
         if (i < ERROR_COUNT)
                 printk(KERN_NOTICE "apm: %s: %s\n", str, error_table[i].msg);
+        else if (err < 0)
+                printk(KERN_NOTICE "apm: %s: linux error code %i\n", str, err);
         else
                 printk(KERN_NOTICE "apm: %s: unknown error code %#2.2x\n",
                        str, err);
 }
 
 /*
- * Lock APM functionality to physical CPU 0
- */
-
-#ifdef CONFIG_SMP
-
-static cpumask_t apm_save_cpus(void)
-{
-        cpumask_t x = current->cpus_allowed;
-        /* Some bioses don't like being called from CPU != 0 */
-        set_cpus_allowed(current, cpumask_of_cpu(0));
-        BUG_ON(smp_processor_id() != 0);
-        return x;
-}
-
-static inline void apm_restore_cpus(cpumask_t mask)
-{
-        set_cpus_allowed(current, mask);
-}
-
-#else
-
-/*
- *      No CPU lockdown needed on a uniprocessor
- */
-
-#define apm_save_cpus()         (current->cpus_allowed)
-#define apm_restore_cpus(x)     (void)(x)
-
-#endif
-
-/*
  * These are the actual BIOS calls.  Depending on APM_ZERO_SEGS and
  * apm_info.allow_ints, we are being really paranoid here!  Not only
  * are interrupts disabled, but all the segment registers (except SS)
@@ -568,16 +539,23 @@ static inline void apm_irq_restore(unsigned long flags)
 #       define APM_DO_RESTORE_SEGS
 #endif
 
+struct apm_bios_call {
+        u32 func;
+        /* In and out */
+        u32 ebx;
+        u32 ecx;
+        /* Out only */
+        u32 eax;
+        u32 edx;
+        u32 esi;
+
+        /* Error: -ENOMEM, or bits 8-15 of eax */
+        int err;
+};
+
 /**
- *      apm_bios_call   -       Make an APM BIOS 32bit call
- *      @func: APM function to execute
- *      @ebx_in: EBX register for call entry
- *      @ecx_in: ECX register for call entry
- *      @eax: EAX register return
- *      @ebx: EBX register return
- *      @ecx: ECX register return
- *      @edx: EDX register return
- *      @esi: ESI register return
+ *      __apm_bios_call - Make an APM BIOS 32bit call
+ *      @_call: pointer to struct apm_bios_call.
  *
  *      Make an APM call using the 32bit protected mode interface. The
  *      caller is responsible for knowing if APM BIOS is configured and
@@ -586,80 +564,142 @@ static inline void apm_irq_restore(unsigned long flags)
  *      flag is loaded into AL.  If there is an error, then the error
  *      code is returned in AH (bits 8-15 of eax) and this function
  *      returns non-zero.
+ *
+ *      Note: this makes the call on the current CPU.
  */
-
-static u8 apm_bios_call(u32 func, u32 ebx_in, u32 ecx_in,
-        u32 *eax, u32 *ebx, u32 *ecx, u32 *edx, u32 *esi)
+static long __apm_bios_call(void *_call)
 {
         APM_DECL_SEGS
         unsigned long           flags;
-        cpumask_t               cpus;
         int                     cpu;
         struct desc_struct      save_desc_40;
         struct desc_struct      *gdt;
-
-        cpus = apm_save_cpus();
+        struct apm_bios_call    *call = _call;
 
         cpu = get_cpu();
+        BUG_ON(cpu != 0);
         gdt = get_cpu_gdt_table(cpu);
         save_desc_40 = gdt[0x40 / 8];
         gdt[0x40 / 8] = bad_bios_desc;
 
         apm_irq_save(flags);
         APM_DO_SAVE_SEGS;
-        apm_bios_call_asm(func, ebx_in, ecx_in, eax, ebx, ecx, edx, esi);
+        apm_bios_call_asm(call->func, call->ebx, call->ecx,
+                          &call->eax, &call->ebx, &call->ecx, &call->edx,
+                          &call->esi);
         APM_DO_RESTORE_SEGS;
         apm_irq_restore(flags);
         gdt[0x40 / 8] = save_desc_40;
         put_cpu();
-        apm_restore_cpus(cpus);
 
-        return *eax & 0xff;
+        return call->eax & 0xff;
+}
+
+/* Run __apm_bios_call or __apm_bios_call_simple on CPU 0 */
+static int on_cpu0(long (*fn)(void *), struct apm_bios_call *call)
+{
+        int ret;
+
+        /* Don't bother with work_on_cpu in the common case, so we don't
+         * have to worry about OOM or overhead. */
+        if (get_cpu() == 0) {
+                ret = fn(call);
+                put_cpu();
+        } else {
+                put_cpu();
+                ret = work_on_cpu(0, fn, call);
+        }
+
+        /* work_on_cpu can fail with -ENOMEM */
+        if (ret < 0)
+                call->err = ret;
+        else
+                call->err = (call->eax >> 8) & 0xff;
+
+        return ret;
 }
 
 /**
- *      apm_bios_call_simple    -       make a simple APM BIOS 32bit call
- *      @func: APM function to invoke
- *      @ebx_in: EBX register value for BIOS call
- *      @ecx_in: ECX register value for BIOS call
- *      @eax: EAX register on return from the BIOS call
+ *      apm_bios_call   -       Make an APM BIOS 32bit call (on CPU 0)
+ *      @call: the apm_bios_call registers.
+ *
+ *      If there is an error, it is returned in @call.err.
+ */
+static int apm_bios_call(struct apm_bios_call *call)
+{
+        return on_cpu0(__apm_bios_call, call);
+}
+
+/**
+ *      __apm_bios_call_simple - Make an APM BIOS 32bit call (on CPU 0)
+ *      @_call: pointer to struct apm_bios_call.
  *
  *      Make a BIOS call that returns one value only, or just status.
  *      If there is an error, then the error code is returned in AH
- *      (bits 8-15 of eax) and this function returns non-zero. This is
- *      used for simpler BIOS operations. This call may hold interrupts
- *      off for a long time on some laptops.
+ *      (bits 8-15 of eax) and this function returns non-zero (it can
+ *      also return -ENOMEM). This is used for simpler BIOS operations.
+ *      This call may hold interrupts off for a long time on some laptops.
+ *
+ *      Note: this makes the call on the current CPU.
  */
-
-static u8 apm_bios_call_simple(u32 func, u32 ebx_in, u32 ecx_in, u32 *eax)
+static long __apm_bios_call_simple(void *_call)
 {
         u8                      error;
         APM_DECL_SEGS
         unsigned long           flags;
-        cpumask_t               cpus;
         int                     cpu;
         struct desc_struct      save_desc_40;
         struct desc_struct      *gdt;
-
-        cpus = apm_save_cpus();
+        struct apm_bios_call    *call = _call;
 
         cpu = get_cpu();
+        BUG_ON(cpu != 0);
         gdt = get_cpu_gdt_table(cpu);
         save_desc_40 = gdt[0x40 / 8];
         gdt[0x40 / 8] = bad_bios_desc;
 
         apm_irq_save(flags);
         APM_DO_SAVE_SEGS;
-        error = apm_bios_call_simple_asm(func, ebx_in, ecx_in, eax);
+        error = apm_bios_call_simple_asm(call->func, call->ebx, call->ecx,
+                                         &call->eax);
         APM_DO_RESTORE_SEGS;
         apm_irq_restore(flags);
         gdt[0x40 / 8] = save_desc_40;
         put_cpu();
-        apm_restore_cpus(cpus);
         return error;
 }
 
 /**
+ *      apm_bios_call_simple    -       make a simple APM BIOS 32bit call
+ *      @func: APM function to invoke
+ *      @ebx_in: EBX register value for BIOS call
+ *      @ecx_in: ECX register value for BIOS call
+ *      @eax: EAX register on return from the BIOS call
+ *      @err: bits
+ *
+ *      Make a BIOS call that returns one value only, or just status.
+ *      If there is an error, then the error code is returned in @err
+ *      and this function returns non-zero. This is used for simpler
+ *      BIOS operations.  This call may hold interrupts off for a long
+ *      time on some laptops.
+ */
+static int apm_bios_call_simple(u32 func, u32 ebx_in, u32 ecx_in, u32 *eax,
+                                int *err)
+{
+        struct apm_bios_call call;
+        int ret;
+
+        call.func = func;
+        call.ebx = ebx_in;
+        call.ecx = ecx_in;
+
+        ret = on_cpu0(__apm_bios_call_simple, &call);
+        *eax = call.eax;
+        *err = call.err;
+        return ret;
+}
+
+/**
  *      apm_driver_version      -       APM driver version
  *      @val:   loaded with the APM version on return
  *
@@ -678,9 +718,10 @@ static u8 apm_bios_call_simple(u32 func, u32 ebx_in, u32 ecx_in, u32 *eax)
 static int apm_driver_version(u_short *val)
 {
         u32 eax;
+        int err;
 
-        if (apm_bios_call_simple(APM_FUNC_VERSION, 0, *val, &eax))
-                return (eax >> 8) & 0xff;
+        if (apm_bios_call_simple(APM_FUNC_VERSION, 0, *val, &eax, &err))
+                return err;
         *val = eax;
         return APM_SUCCESS;
 }
@@ -701,22 +742,21 @@ static int apm_driver_version(u_short *val)
  *      that APM 1.2 is in use. If no messges are pending the value 0x80
  *      is returned (No power management events pending).
  */
-
 static int apm_get_event(apm_event_t *event, apm_eventinfo_t *info)
 {
-        u32 eax;
-        u32 ebx;
-        u32 ecx;
-        u32 dummy;
+        struct apm_bios_call call;
 
-        if (apm_bios_call(APM_FUNC_GET_EVENT, 0, 0, &eax, &ebx, &ecx,
-                          &dummy, &dummy))
-                return (eax >> 8) & 0xff;
-        *event = ebx;
+        call.func = APM_FUNC_GET_EVENT;
+        call.ebx = call.ecx = 0;
+
+        if (apm_bios_call(&call))
+                return call.err;
+
+        *event = call.ebx;
         if (apm_info.connection_version < 0x0102)
                 *info = ~0; /* indicate info not valid */
         else
-                *info = ecx;
+                *info = call.ecx;
         return APM_SUCCESS;
 }
 
@@ -737,9 +777,10 @@ static int apm_get_event(apm_event_t *event, apm_eventinfo_t *info)
 static int set_power_state(u_short what, u_short state)
 {
         u32 eax;
+        int err;
 
-        if (apm_bios_call_simple(APM_FUNC_SET_STATE, what, state, &eax))
-                return (eax >> 8) & 0xff;
+        if (apm_bios_call_simple(APM_FUNC_SET_STATE, what, state, &eax, &err))
+                return err;
         return APM_SUCCESS;
 }
 
@@ -770,6 +811,7 @@ static int apm_do_idle(void)
         u8 ret = 0;
         int idled = 0;
         int polling;
+        int err;
 
         polling = !!(current_thread_info()->status & TS_POLLING);
         if (polling) {
@@ -782,7 +824,7 @@ static int apm_do_idle(void)
         }
         if (!need_resched()) {
                 idled = 1;
-                ret = apm_bios_call_simple(APM_FUNC_IDLE, 0, 0, &eax);
+                ret = apm_bios_call_simple(APM_FUNC_IDLE, 0, 0, &eax, &err);
         }
         if (polling)
                 current_thread_info()->status |= TS_POLLING;
@@ -797,8 +839,7 @@ static int apm_do_idle(void)
                  * Only report the failure the first 5 times.
                  */
                 if (++t < 5) {
-                        printk(KERN_DEBUG "apm_do_idle failed (%d)\n",
-                               (eax >> 8) & 0xff);
+                        printk(KERN_DEBUG "apm_do_idle failed (%d)\n", err);
                         t = jiffies;
                 }
                 return -1;
@@ -816,9 +857,10 @@ static int apm_do_idle(void)
 static void apm_do_busy(void)
 {
         u32 dummy;
+        int err;
 
         if (clock_slowed || ALWAYS_CALL_BUSY) {
-                (void)apm_bios_call_simple(APM_FUNC_BUSY, 0, 0, &dummy);
+                (void)apm_bios_call_simple(APM_FUNC_BUSY, 0, 0, &dummy, &err);
                 clock_slowed = 0;
         }
 }
@@ -937,7 +979,7 @@ static void apm_power_off(void)
 
         /* Some bioses don't like being called from CPU != 0 */
         if (apm_info.realmode_power_off) {
-                (void)apm_save_cpus();
+                set_cpus_allowed_ptr(current, cpumask_of(0));
                 machine_real_restart(po_bios_call, sizeof(po_bios_call));
         } else {
                 (void)set_system_power_state(APM_STATE_OFF);
@@ -956,12 +998,13 @@ static void apm_power_off(void)
 static int apm_enable_power_management(int enable)
 {
         u32 eax;
+        int err;
 
         if ((enable == 0) && (apm_info.bios.flags & APM_BIOS_DISENGAGED))
                 return APM_NOT_ENGAGED;
         if (apm_bios_call_simple(APM_FUNC_ENABLE_PM, APM_DEVICE_BALL,
-                                 enable, &eax))
-                return (eax >> 8) & 0xff;
+                                 enable, &eax, &err))
+                return err;
         if (enable)
                 apm_info.bios.flags &= ~APM_BIOS_DISABLED;
         else
@@ -986,24 +1029,23 @@ static int apm_enable_power_management(int enable)
 
 static int apm_get_power_status(u_short *status, u_short *bat, u_short *life)
 {
-        u32 eax;
-        u32 ebx;
-        u32 ecx;
-        u32 edx;
-        u32 dummy;
+        struct apm_bios_call call;
+
+        call.func = APM_FUNC_GET_STATUS;
+        call.ebx = APM_DEVICE_ALL;
+        call.ecx = 0;
 
         if (apm_info.get_power_status_broken)
                 return APM_32_UNSUPPORTED;
-        if (apm_bios_call(APM_FUNC_GET_STATUS, APM_DEVICE_ALL, 0,
-                          &eax, &ebx, &ecx, &edx, &dummy))
-                return (eax >> 8) & 0xff;
-        *status = ebx;
-        *bat = ecx;
+        if (apm_bios_call(&call))
+                return call.err;
+        *status = call.ebx;
+        *bat = call.ecx;
         if (apm_info.get_power_status_swabinminutes) {
-                *life = swab16((u16)edx);
+                *life = swab16((u16)call.edx);
                 *life |= 0x8000;
         } else
-                *life = edx;
+                *life = call.edx;
         return APM_SUCCESS;
 }
 
@@ -1048,12 +1090,14 @@ static int apm_get_battery_status(u_short which, u_short *status,
 static int apm_engage_power_management(u_short device, int enable)
 {
         u32 eax;
+        int err;
 
         if ((enable == 0) && (device == APM_DEVICE_ALL)
             && (apm_info.bios.flags & APM_BIOS_DISABLED))
                 return APM_DISABLED;
-        if (apm_bios_call_simple(APM_FUNC_ENGAGE_PM, device, enable, &eax))
-                return (eax >> 8) & 0xff;
+        if (apm_bios_call_simple(APM_FUNC_ENGAGE_PM, device, enable,
+                                 &eax, &err))
+                return err;
         if (device == APM_DEVICE_ALL) {
                 if (enable)
                         apm_info.bios.flags &= ~APM_BIOS_DISENGAGED;
@@ -1689,16 +1733,14 @@ static int apm(void *unused)
         char            *power_stat;
         char            *bat_stat;
 
-#ifdef CONFIG_SMP
         /* 2002/08/01 - WT
          * This is to avoid random crashes at boot time during initialization
          * on SMP systems in case of "apm=power-off" mode. Seen on ASUS A7M266D.
          * Some bioses don't like being called from CPU != 0.
          * Method suggested by Ingo Molnar.
          */
-        set_cpus_allowed(current, cpumask_of_cpu(0));
+        set_cpus_allowed_ptr(current, cpumask_of(0));
         BUG_ON(smp_processor_id() != 0);
-#endif
 
         if (apm_info.connection_version == 0) {
                 apm_info.connection_version = apm_info.bios.version;
diff --git a/arch/x86/kernel/cpu/common.c b/arch/x86/kernel/cpu/common.c
index e2962cc1e27b..c4f667896c28 100644
--- a/arch/x86/kernel/cpu/common.c
+++ b/arch/x86/kernel/cpu/common.c
@@ -41,8 +41,6 @@
 
 #include "cpu.h"
 
-#ifdef CONFIG_X86_64
-
 /* all of these masks are initialized in setup_cpu_local_masks() */
 cpumask_var_t cpu_initialized_mask;
 cpumask_var_t cpu_callout_mask;
@@ -60,16 +58,6 @@ void __init setup_cpu_local_masks(void)
         alloc_bootmem_cpumask_var(&cpu_sibling_setup_mask);
 }
 
-#else /* CONFIG_X86_32 */
-
-cpumask_t cpu_sibling_setup_map;
-cpumask_t cpu_callout_map;
-cpumask_t cpu_initialized;
-cpumask_t cpu_callin_map;
-
-#endif /* CONFIG_X86_32 */
-
-
 static const struct cpu_dev *this_cpu __cpuinitdata;
 
 DEFINE_PER_CPU_PAGE_ALIGNED(struct gdt_page, gdt_page) = { .gdt = {
@@ -859,6 +847,7 @@ static void vgetcpu_set_mode(void)
 void __init identify_boot_cpu(void)
 {
         identify_cpu(&boot_cpu_data);
+        init_c1e_mask();
 #ifdef CONFIG_X86_32
         sysenter_setup();
         enable_sep_cpu();
diff --git a/arch/x86/kernel/cpu/cpufreq/p4-clockmod.c b/arch/x86/kernel/cpu/cpufreq/p4-clockmod.c
index 41ed94915f97..6ac55bd341ae 100644
--- a/arch/x86/kernel/cpu/cpufreq/p4-clockmod.c
+++ b/arch/x86/kernel/cpu/cpufreq/p4-clockmod.c
@@ -211,7 +211,7 @@ static int cpufreq_p4_cpu_init(struct cpufreq_policy *policy)
         unsigned int i;
 
 #ifdef CONFIG_SMP
-        cpumask_copy(policy->cpus, &per_cpu(cpu_sibling_map, policy->cpu));
+        cpumask_copy(policy->cpus, cpu_sibling_mask(policy->cpu));
 #endif
 
         /* Errata workaround */
diff --git a/arch/x86/kernel/cpu/cpufreq/powernow-k8.c b/arch/x86/kernel/cpu/cpufreq/powernow-k8.c
index a15ac94e0b9b..4709ead2db52 100644
--- a/arch/x86/kernel/cpu/cpufreq/powernow-k8.c
+++ b/arch/x86/kernel/cpu/cpufreq/powernow-k8.c
@@ -54,7 +54,10 @@ static DEFINE_PER_CPU(struct powernow_k8_data *, powernow_data);
 static int cpu_family = CPU_OPTERON;
 
 #ifndef CONFIG_SMP
-DEFINE_PER_CPU(cpumask_t, cpu_core_map);
+static inline const struct cpumask *cpu_core_mask(int cpu)
+{
+        return cpumask_of(0);
+}
 #endif
 
 /* Return a frequency in MHz, given an input fid */
@@ -699,7 +702,7 @@ static int fill_powernow_table(struct powernow_k8_data *data,
 
         dprintk("cfid 0x%x, cvid 0x%x\n", data->currfid, data->currvid);
         data->powernow_table = powernow_table;
-        if (first_cpu(per_cpu(cpu_core_map, data->cpu)) == data->cpu)
+        if (cpumask_first(cpu_core_mask(data->cpu)) == data->cpu)
                 print_basics(data);
 
         for (j = 0; j < data->numps; j++)
@@ -862,7 +865,7 @@ static int powernow_k8_cpu_init_acpi(struct powernow_k8_data *data)
 
         /* fill in data */
         data->numps = data->acpi_data.state_count;
-        if (first_cpu(per_cpu(cpu_core_map, data->cpu)) == data->cpu)
+        if (cpumask_first(cpu_core_mask(data->cpu)) == data->cpu)
                 print_basics(data);
         powernow_k8_acpi_pst_values(data, 0);
 
@@ -1300,7 +1303,7 @@ static int __cpuinit powernowk8_cpu_init(struct cpufreq_policy *pol)
         if (cpu_family == CPU_HW_PSTATE)
                 cpumask_copy(pol->cpus, cpumask_of(pol->cpu));
         else
-                cpumask_copy(pol->cpus, &per_cpu(cpu_core_map, pol->cpu));
+                cpumask_copy(pol->cpus, cpu_core_mask(pol->cpu));
         data->available_cores = pol->cpus;
 
         if (cpu_family == CPU_HW_PSTATE)
@@ -1365,7 +1368,7 @@ static unsigned int powernowk8_get(unsigned int cpu)
         unsigned int khz = 0;
         unsigned int first;
 
-        first = first_cpu(per_cpu(cpu_core_map, cpu));
+        first = cpumask_first(cpu_core_mask(cpu));
         data = per_cpu(powernow_data, first);
 
         if (!data)
diff --git a/arch/x86/kernel/cpu/cpufreq/speedstep-ich.c b/arch/x86/kernel/cpu/cpufreq/speedstep-ich.c
index 8bbb11adb315..016c1a4fa3fc 100644
--- a/arch/x86/kernel/cpu/cpufreq/speedstep-ich.c
+++ b/arch/x86/kernel/cpu/cpufreq/speedstep-ich.c
@@ -321,7 +321,7 @@ static int speedstep_cpu_init(struct cpufreq_policy *policy)
 
         /* only run on CPU to be set, or on its sibling */
 #ifdef CONFIG_SMP
-        cpumask_copy(policy->cpus, &per_cpu(cpu_sibling_map, policy->cpu));
+        cpumask_copy(policy->cpus, cpu_sibling_mask(policy->cpu));
 #endif
 
         cpus_allowed = current->cpus_allowed;
diff --git a/arch/x86/kernel/cpu/intel_cacheinfo.c b/arch/x86/kernel/cpu/intel_cacheinfo.c
index c471eb1a389c..483eda96e102 100644
--- a/arch/x86/kernel/cpu/intel_cacheinfo.c
+++ b/arch/x86/kernel/cpu/intel_cacheinfo.c
@@ -159,7 +159,7 @@ struct _cpuid4_info_regs {
         unsigned long can_disable;
 };
 
-#ifdef CONFIG_PCI
+#if defined(CONFIG_PCI) && defined(CONFIG_SYSFS)
 static struct pci_device_id k8_nb_id[] = {
         { PCI_DEVICE(PCI_VENDOR_ID_AMD, 0x1103) },
         { PCI_DEVICE(PCI_VENDOR_ID_AMD, 0x1203) },
@@ -324,15 +324,6 @@ __cpuinit cpuid4_cache_lookup_regs(int index,
         return 0;
 }
 
-static int
-__cpuinit cpuid4_cache_lookup(int index, struct _cpuid4_info *this_leaf)
-{
-        struct _cpuid4_info_regs *leaf_regs =
-                (struct _cpuid4_info_regs *)this_leaf;
-
-        return cpuid4_cache_lookup_regs(index, leaf_regs);
-}
-
 static int __cpuinit find_num_cache_leaves(void)
 {
         unsigned int            eax, ebx, ecx, edx;
@@ -508,6 +499,8 @@ unsigned int __cpuinit init_intel_cacheinfo(struct cpuinfo_x86 *c)
         return l2;
 }
 
+#ifdef CONFIG_SYSFS
+
 /* pointer to _cpuid4_info array (for each cache leaf) */
 static DEFINE_PER_CPU(struct _cpuid4_info *, cpuid4_info);
 #define CPUID4_INFO_IDX(x, y)   (&((per_cpu(cpuid4_info, x))[y]))
@@ -571,6 +564,15 @@ static void __cpuinit free_cache_attributes(unsigned int cpu)
         per_cpu(cpuid4_info, cpu) = NULL;
 }
 
+static int
+__cpuinit cpuid4_cache_lookup(int index, struct _cpuid4_info *this_leaf)
+{
+        struct _cpuid4_info_regs *leaf_regs =
+                (struct _cpuid4_info_regs *)this_leaf;
+
+        return cpuid4_cache_lookup_regs(index, leaf_regs);
+}
+
 static void __cpuinit get_cpu_leaves(void *_retval)
 {
         int j, *retval = _retval, cpu = smp_processor_id();
@@ -612,8 +614,6 @@ static int __cpuinit detect_cache_attributes(unsigned int cpu)
         return retval;
 }
 
-#ifdef CONFIG_SYSFS
-
 #include <linux/kobject.h>
 #include <linux/sysfs.h>
 
diff --git a/arch/x86/kernel/cpu/mcheck/mce_64.c b/arch/x86/kernel/cpu/mcheck/mce_64.c
index ca14604611ec..863f89568b1a 100644
--- a/arch/x86/kernel/cpu/mcheck/mce_64.c
+++ b/arch/x86/kernel/cpu/mcheck/mce_64.c
@@ -990,7 +990,7 @@ static struct sysdev_attribute *mce_attributes[] = {
         NULL
 };
 
-static cpumask_t mce_device_initialized = CPU_MASK_NONE;
+static cpumask_var_t mce_device_initialized;
 
 /* Per cpu sysdev init.  All of the cpus still share the same ctl bank */
 static __cpuinit int mce_create_device(unsigned int cpu)
@@ -1021,7 +1021,7 @@ static __cpuinit int mce_create_device(unsigned int cpu)
                 if (err)
                         goto error2;
         }
-        cpu_set(cpu, mce_device_initialized);
+        cpumask_set_cpu(cpu, mce_device_initialized);
 
         return 0;
 error2:
@@ -1043,7 +1043,7 @@ static __cpuinit void mce_remove_device(unsigned int cpu)
 {
         int i;
 
-        if (!cpu_isset(cpu, mce_device_initialized))
+        if (!cpumask_test_cpu(cpu, mce_device_initialized))
                 return;
 
         for (i = 0; mce_attributes[i]; i++)
@@ -1053,7 +1053,7 @@ static __cpuinit void mce_remove_device(unsigned int cpu)
                 sysdev_remove_file(&per_cpu(device_mce, cpu),
                         &bank_attrs[i]);
         sysdev_unregister(&per_cpu(device_mce,cpu));
-        cpu_clear(cpu, mce_device_initialized);
+        cpumask_clear_cpu(cpu, mce_device_initialized);
 }
 
 /* Make sure there are no machine checks on offlined CPUs. */
@@ -1162,6 +1162,8 @@ static __init int mce_init_device(void)
         if (!mce_available(&boot_cpu_data))
                 return -EIO;
 
+        alloc_cpumask_var(&mce_device_initialized, GFP_KERNEL);
+
         err = mce_init_banks();
         if (err)
                 return err;
diff --git a/arch/x86/kernel/cpu/mcheck/mce_amd_64.c b/arch/x86/kernel/cpu/mcheck/mce_amd_64.c
index 7d01be868870..56dde9c4bc96 100644
--- a/arch/x86/kernel/cpu/mcheck/mce_amd_64.c
+++ b/arch/x86/kernel/cpu/mcheck/mce_amd_64.c
@@ -485,7 +485,7 @@ static __cpuinit int threshold_create_bank(unsigned int cpu, unsigned int bank)
 
 #ifdef CONFIG_SMP
         if (cpu_data(cpu).cpu_core_id && shared_bank[bank]) {   /* symlink */
-                i = cpumask_first(&per_cpu(cpu_core_map, cpu));
+                i = cpumask_first(cpu_core_mask(cpu));
 
                 /* first core not up yet */
                 if (cpu_data(i).cpu_core_id)
@@ -505,7 +505,7 @@ static __cpuinit int threshold_create_bank(unsigned int cpu, unsigned int bank)
                 if (err)
                         goto out;
 
-                cpumask_copy(b->cpus, &per_cpu(cpu_core_map, cpu));
+                cpumask_copy(b->cpus, cpu_core_mask(cpu));
                 per_cpu(threshold_banks, cpu)[bank] = b;
                 goto out;
         }
@@ -529,7 +529,7 @@ static __cpuinit int threshold_create_bank(unsigned int cpu, unsigned int bank)
 #ifndef CONFIG_SMP
         cpumask_setall(b->cpus);
 #else
-        cpumask_copy(b->cpus, &per_cpu(cpu_core_map, cpu));
+        cpumask_copy(b->cpus, cpu_core_mask(cpu));
 #endif
 
         per_cpu(threshold_banks, cpu)[bank] = b;
diff --git a/arch/x86/kernel/cpu/mcheck/mce_intel_64.c b/arch/x86/kernel/cpu/mcheck/mce_intel_64.c
index 57df3d383470..d6b72df89d69 100644
--- a/arch/x86/kernel/cpu/mcheck/mce_intel_64.c
+++ b/arch/x86/kernel/cpu/mcheck/mce_intel_64.c
@@ -249,7 +249,7 @@ void cmci_rediscover(int dying)
         for_each_online_cpu (cpu) {
                 if (cpu == dying)
                         continue;
-                if (set_cpus_allowed_ptr(current, &cpumask_of_cpu(cpu)))
+                if (set_cpus_allowed_ptr(current, cpumask_of(cpu)))
                         continue;
                 /* Recheck banks in case CPUs don't all have the same */
                 if (cmci_supported(&banks))
diff --git a/arch/x86/kernel/cpu/mtrr/generic.c b/arch/x86/kernel/cpu/mtrr/generic.c
index 37f28fc7cf95..0b776c09aff3 100644
--- a/arch/x86/kernel/cpu/mtrr/generic.c
+++ b/arch/x86/kernel/cpu/mtrr/generic.c
@@ -462,9 +462,6 @@ static void generic_get_mtrr(unsigned int reg, unsigned long *base,
         *base = base_hi << (32 - PAGE_SHIFT) | base_lo >> PAGE_SHIFT;
         *type = base_lo & 0xff;
 
-        printk(KERN_DEBUG "  get_mtrr: cpu%d reg%02d base=%010lx size=%010lx %s\n",
-                        cpu, reg, *base, *size,
-                        mtrr_attrib_to_str(*type & 0xff));
 out_put_cpu:
         put_cpu();
 }
diff --git a/arch/x86/kernel/cpu/proc.c b/arch/x86/kernel/cpu/proc.c
index d67e0e48bc2d..f93047fed791 100644
--- a/arch/x86/kernel/cpu/proc.c
+++ b/arch/x86/kernel/cpu/proc.c
@@ -14,7 +14,7 @@ static void show_cpuinfo_core(struct seq_file *m, struct cpuinfo_x86 *c,
         if (c->x86_max_cores * smp_num_siblings > 1) {
                 seq_printf(m, "physical id\t: %d\n", c->phys_proc_id);
                 seq_printf(m, "siblings\t: %d\n",
-                           cpus_weight(per_cpu(cpu_core_map, cpu)));
+                           cpumask_weight(cpu_sibling_mask(cpu)));
                 seq_printf(m, "core id\t\t: %d\n", c->cpu_core_id);
                 seq_printf(m, "cpu cores\t: %d\n", c->booted_cores);
                 seq_printf(m, "apicid\t\t: %d\n", c->apicid);
@@ -143,9 +143,9 @@ static int show_cpuinfo(struct seq_file *m, void *v)
 static void *c_start(struct seq_file *m, loff_t *pos)
 {
         if (*pos == 0)  /* just in case, cpu 0 is not the first */
-                *pos = first_cpu(cpu_online_map);
+                *pos = cpumask_first(cpu_online_mask);
         else
-                *pos = next_cpu_nr(*pos - 1, cpu_online_map);
+                *pos = cpumask_next(*pos - 1, cpu_online_mask);
         if ((*pos) < nr_cpu_ids)
                 return &cpu_data(*pos);
         return NULL;
diff --git a/arch/x86/kernel/microcode_amd.c b/arch/x86/kernel/microcode_amd.c
index c25fdb382292..453b5795a5c6 100644
--- a/arch/x86/kernel/microcode_amd.c
+++ b/arch/x86/kernel/microcode_amd.c
@@ -12,31 +12,30 @@
  *
  *  Licensed under the terms of the GNU General Public
  *  License version 2. See file COPYING for details.
-*/
-
+ */
+#include <linux/platform_device.h>
 #include <linux/capability.h>
-#include <linux/kernel.h>
-#include <linux/init.h>
-#include <linux/sched.h>
-#include <linux/cpumask.h>
-#include <linux/module.h>
-#include <linux/slab.h>
-#include <linux/vmalloc.h>
 #include <linux/miscdevice.h>
+#include <linux/firmware.h>
 #include <linux/spinlock.h>
-#include <linux/mm.h>
-#include <linux/fs.h>
+#include <linux/cpumask.h>
+#include <linux/pci_ids.h>
+#include <linux/uaccess.h>
+#include <linux/vmalloc.h>
+#include <linux/kernel.h>
+#include <linux/module.h>
 #include <linux/mutex.h>
+#include <linux/sched.h>
+#include <linux/init.h>
+#include <linux/slab.h>
 #include <linux/cpu.h>
-#include <linux/firmware.h>
-#include <linux/platform_device.h>
 #include <linux/pci.h>
-#include <linux/pci_ids.h>
-#include <linux/uaccess.h>
+#include <linux/fs.h>
+#include <linux/mm.h>
 
-#include <asm/msr.h>
-#include <asm/processor.h>
 #include <asm/microcode.h>
+#include <asm/processor.h>
+#include <asm/msr.h>
 
 MODULE_DESCRIPTION("AMD Microcode Update Driver");
 MODULE_AUTHOR("Peter Oruba");
@@ -72,8 +71,8 @@ struct microcode_header_amd {
 } __attribute__((packed));
 
 struct microcode_amd {
-        struct microcode_header_amd hdr;
-        unsigned int mpb[0];
+        struct microcode_header_amd     hdr;
+        unsigned int                    mpb[0];
 };
 
 #define UCODE_MAX_SIZE                  2048
@@ -184,8 +183,8 @@ static int get_ucode_data(void *to, const u8 *from, size_t n)
         return 0;
 }
 
-static void *get_next_ucode(const u8 *buf, unsigned int size,
-                            unsigned int *mc_size)
+static void *
+get_next_ucode(const u8 *buf, unsigned int size, unsigned int *mc_size)
 {
         unsigned int total_size;
         u8 section_hdr[UCODE_CONTAINER_SECTION_HDR];
@@ -223,7 +222,6 @@ static void *get_next_ucode(const u8 *buf, unsigned int size,
         return mc;
 }
 
-
 static int install_equiv_cpu_table(const u8 *buf)
 {
         u8 *container_hdr[UCODE_CONTAINER_HEADER_SIZE];
@@ -372,4 +370,3 @@ struct microcode_ops * __init init_amd_microcode(void)
 {
         return &microcode_amd_ops;
 }
-
diff --git a/arch/x86/kernel/microcode_core.c b/arch/x86/kernel/microcode_core.c
index c9b721ba968c..a0f3851ef310 100644
--- a/arch/x86/kernel/microcode_core.c
+++ b/arch/x86/kernel/microcode_core.c
@@ -70,67 +70,78 @@
  *              Fix sigmatch() macro to handle old CPUs with pf == 0.
  *              Thanks to Stuart Swales for pointing out this bug.
  */
+#include <linux/platform_device.h>
 #include <linux/capability.h>
-#include <linux/kernel.h>
-#include <linux/init.h>
-#include <linux/sched.h>
+#include <linux/miscdevice.h>
+#include <linux/firmware.h>
 #include <linux/smp_lock.h>
+#include <linux/spinlock.h>
 #include <linux/cpumask.h>
-#include <linux/module.h>
-#include <linux/slab.h>
+#include <linux/uaccess.h>
 #include <linux/vmalloc.h>
-#include <linux/miscdevice.h>
-#include <linux/spinlock.h>
-#include <linux/mm.h>
-#include <linux/fs.h>
+#include <linux/kernel.h>
+#include <linux/module.h>
 #include <linux/mutex.h>
+#include <linux/sched.h>
+#include <linux/init.h>
+#include <linux/slab.h>
 #include <linux/cpu.h>
-#include <linux/firmware.h>
-#include <linux/platform_device.h>
+#include <linux/fs.h>
+#include <linux/mm.h>
 
-#include <asm/msr.h>
-#include <asm/uaccess.h>
-#include <asm/processor.h>
 #include <asm/microcode.h>
+#include <asm/processor.h>
+#include <asm/msr.h>
 
 MODULE_DESCRIPTION("Microcode Update Driver");
 MODULE_AUTHOR("Tigran Aivazian <tigran@aivazian.fsnet.co.uk>");
 MODULE_LICENSE("GPL");
 
-#define MICROCODE_VERSION       "2.00"
+#define MICROCODE_VERSION       "2.00"
 
-static struct microcode_ops *microcode_ops;
+static struct microcode_ops     *microcode_ops;
 
 /* no concurrent ->write()s are allowed on /dev/cpu/microcode */
 static DEFINE_MUTEX(microcode_mutex);
 
-struct ucode_cpu_info ucode_cpu_info[NR_CPUS];
+struct ucode_cpu_info           ucode_cpu_info[NR_CPUS];
 EXPORT_SYMBOL_GPL(ucode_cpu_info);
 
 #ifdef CONFIG_MICROCODE_OLD_INTERFACE
+struct update_for_cpu {
+        const void __user       *buf;
+        size_t                  size;
+};
+
+static long update_for_cpu(void *_ufc)
+{
+        struct update_for_cpu *ufc = _ufc;
+        int error;
+
+        error = microcode_ops->request_microcode_user(smp_processor_id(),
+                                                      ufc->buf, ufc->size);
+        if (error < 0)
+                return error;
+        if (!error)
+                microcode_ops->apply_microcode(smp_processor_id());
+        return error;
+}
+
 static int do_microcode_update(const void __user *buf, size_t size)
 {
-        cpumask_t old;
         int error = 0;
         int cpu;
-
-        old = current->cpus_allowed;
+        struct update_for_cpu ufc = { .buf = buf, .size = size };
 
         for_each_online_cpu(cpu) {
                 struct ucode_cpu_info *uci = ucode_cpu_info + cpu;
 
                 if (!uci->valid)
                         continue;
-
-                set_cpus_allowed_ptr(current, &cpumask_of_cpu(cpu));
-                error = microcode_ops->request_microcode_user(cpu, buf, size);
+                error = work_on_cpu(cpu, update_for_cpu, &ufc);
                 if (error < 0)
-                        goto out;
-                if (!error)
-                        microcode_ops->apply_microcode(cpu);
+                        break;
         }
-out:
-        set_cpus_allowed_ptr(current, &old);
         return error;
 }
 
@@ -198,18 +209,33 @@ static void microcode_dev_exit(void)
 
 MODULE_ALIAS_MISCDEV(MICROCODE_MINOR);
 #else
-#define microcode_dev_init() 0
-#define microcode_dev_exit() do { } while (0)
+#define microcode_dev_init()    0
+#define microcode_dev_exit()    do { } while (0)
 #endif
 
 /* fake device for request_firmware */
-static struct platform_device *microcode_pdev;
+static struct platform_device   *microcode_pdev;
+
+static long reload_for_cpu(void *unused)
+{
+        struct ucode_cpu_info *uci = ucode_cpu_info + smp_processor_id();
+        int err = 0;
+
+        mutex_lock(&microcode_mutex);
+        if (uci->valid) {
+                err = microcode_ops->request_microcode_fw(smp_processor_id(),
+                                                          &microcode_pdev->dev);
+                if (!err)
+                        microcode_ops->apply_microcode(smp_processor_id());
+        }
+        mutex_unlock(&microcode_mutex);
+        return err;
+}
 
 static ssize_t reload_store(struct sys_device *dev,
                             struct sysdev_attribute *attr,
                             const char *buf, size_t sz)
 {
-        struct ucode_cpu_info *uci = ucode_cpu_info + dev->id;
         char *end;
         unsigned long val = simple_strtoul(buf, &end, 0);
         int err = 0;
@@ -218,21 +244,9 @@ static ssize_t reload_store(struct sys_device *dev,
         if (end == buf)
                 return -EINVAL;
         if (val == 1) {
-                cpumask_t old = current->cpus_allowed;
-
                 get_online_cpus();
-                if (cpu_online(cpu)) {
-                        set_cpus_allowed_ptr(current, &cpumask_of_cpu(cpu));
-                        mutex_lock(&microcode_mutex);
-                        if (uci->valid) {
-                                err = microcode_ops->request_microcode_fw(cpu,
-                                                &microcode_pdev->dev);
-                                if (!err)
-                                        microcode_ops->apply_microcode(cpu);
-                        }
-                        mutex_unlock(&microcode_mutex);
-                        set_cpus_allowed_ptr(current, &old);
-                }
+                if (cpu_online(cpu))
+                        err = work_on_cpu(cpu, reload_for_cpu, NULL);
                 put_online_cpus();
         }
         if (err)
@@ -268,8 +282,8 @@ static struct attribute *mc_default_attrs[] = {
 };
 
 static struct attribute_group mc_attr_group = {
-        .attrs = mc_default_attrs,
-        .name = "microcode",
+        .attrs          = mc_default_attrs,
+        .name           = "microcode",
 };
 
 static void __microcode_fini_cpu(int cpu)
@@ -328,9 +342,9 @@ static int microcode_resume_cpu(int cpu)
         return 0;
 }
 
-static void microcode_update_cpu(int cpu)
+static long microcode_update_cpu(void *unused)
 {
-        struct ucode_cpu_info *uci = ucode_cpu_info + cpu;
+        struct ucode_cpu_info *uci = ucode_cpu_info + smp_processor_id();
         int err = 0;
 
         /*
@@ -338,30 +352,27 @@ static void microcode_update_cpu(int cpu)
          * otherwise just request a firmware:
          */
         if (uci->valid) {
-                err = microcode_resume_cpu(cpu);
-        } else {        
-                collect_cpu_info(cpu);
+                err = microcode_resume_cpu(smp_processor_id());
+        } else {
+                collect_cpu_info(smp_processor_id());
                 if (uci->valid && system_state == SYSTEM_RUNNING)
-                        err = microcode_ops->request_microcode_fw(cpu,
+                        err = microcode_ops->request_microcode_fw(
+                                        smp_processor_id(),
                                         &microcode_pdev->dev);
         }
         if (!err)
-                microcode_ops->apply_microcode(cpu);
+                microcode_ops->apply_microcode(smp_processor_id());
+        return err;
 }
 
-static void microcode_init_cpu(int cpu)
+static int microcode_init_cpu(int cpu)
 {
-        cpumask_t old = current->cpus_allowed;
-
-        set_cpus_allowed_ptr(current, &cpumask_of_cpu(cpu));
-        /* We should bind the task to the CPU */
-        BUG_ON(raw_smp_processor_id() != cpu);
-
+        int err;
         mutex_lock(&microcode_mutex);
-        microcode_update_cpu(cpu);
+        err = work_on_cpu(cpu, microcode_update_cpu, NULL);
         mutex_unlock(&microcode_mutex);
 
-        set_cpus_allowed_ptr(current, &old);
+        return err;
 }
 
 static int mc_sysdev_add(struct sys_device *sys_dev)
@@ -379,8 +390,11 @@ static int mc_sysdev_add(struct sys_device *sys_dev)
         if (err)
                 return err;
 
-        microcode_init_cpu(cpu);
-        return 0;
+        err = microcode_init_cpu(cpu);
+        if (err)
+                sysfs_remove_group(&sys_dev->kobj, &mc_attr_group);
+
+        return err;
 }
 
 static int mc_sysdev_remove(struct sys_device *sys_dev)
@@ -404,14 +418,14 @@ static int mc_sysdev_resume(struct sys_device *dev)
                 return 0;
 
         /* only CPU 0 will apply ucode here */
-        microcode_update_cpu(0);
+        microcode_update_cpu(NULL);
         return 0;
 }
 
 static struct sysdev_driver mc_sysdev_driver = {
-        .add = mc_sysdev_add,
-        .remove = mc_sysdev_remove,
-        .resume = mc_sysdev_resume,
+        .add            = mc_sysdev_add,
+        .remove         = mc_sysdev_remove,
+        .resume         = mc_sysdev_resume,
 };
 
 static __cpuinit int
@@ -424,7 +438,9 @@ mc_cpu_callback(struct notifier_block *nb, unsigned long action, void *hcpu)
         switch (action) {
         case CPU_ONLINE:
         case CPU_ONLINE_FROZEN:
-                microcode_init_cpu(cpu);
+                if (microcode_init_cpu(cpu))
+                        printk(KERN_ERR "microcode: failed to init CPU%d\n",
+                               cpu);
         case CPU_DOWN_FAILED:
         case CPU_DOWN_FAILED_FROZEN:
                 pr_debug("microcode: CPU%d added\n", cpu);
@@ -448,7 +464,7 @@ mc_cpu_callback(struct notifier_block *nb, unsigned long action, void *hcpu)
 }
 
 static struct notifier_block __refdata mc_cpu_notifier = {
-        .notifier_call = mc_cpu_callback,
+        .notifier_call  = mc_cpu_callback,
 };
 
 static int __init microcode_init(void)
diff --git a/arch/x86/kernel/microcode_intel.c b/arch/x86/kernel/microcode_intel.c
index 5e9f4fc51385..149b9ec7c1ab 100644
--- a/arch/x86/kernel/microcode_intel.c
+++ b/arch/x86/kernel/microcode_intel.c
@@ -70,28 +70,28 @@
  *              Fix sigmatch() macro to handle old CPUs with pf == 0.
  *              Thanks to Stuart Swales for pointing out this bug.
  */
+#include <linux/platform_device.h>
 #include <linux/capability.h>
-#include <linux/kernel.h>
-#include <linux/init.h>
-#include <linux/sched.h>
+#include <linux/miscdevice.h>
+#include <linux/firmware.h>
 #include <linux/smp_lock.h>
+#include <linux/spinlock.h>
 #include <linux/cpumask.h>
-#include <linux/module.h>
-#include <linux/slab.h>
+#include <linux/uaccess.h>
 #include <linux/vmalloc.h>
-#include <linux/miscdevice.h>
-#include <linux/spinlock.h>
-#include <linux/mm.h>
-#include <linux/fs.h>
+#include <linux/kernel.h>
+#include <linux/module.h>
 #include <linux/mutex.h>
+#include <linux/sched.h>
+#include <linux/init.h>
+#include <linux/slab.h>
 #include <linux/cpu.h>
-#include <linux/firmware.h>
-#include <linux/platform_device.h>
-#include <linux/uaccess.h>
+#include <linux/fs.h>
+#include <linux/mm.h>
 
-#include <asm/msr.h>
-#include <asm/processor.h>
 #include <asm/microcode.h>
+#include <asm/processor.h>
+#include <asm/msr.h>
 
 MODULE_DESCRIPTION("Microcode Update Driver");
 MODULE_AUTHOR("Tigran Aivazian <tigran@aivazian.fsnet.co.uk>");
@@ -129,12 +129,13 @@ struct extended_sigtable {
         struct extended_signature sigs[0];
 };
 
-#define DEFAULT_UCODE_DATASIZE  (2000)
+#define DEFAULT_UCODE_DATASIZE  (2000)
 #define MC_HEADER_SIZE          (sizeof(struct microcode_header_intel))
 #define DEFAULT_UCODE_TOTALSIZE (DEFAULT_UCODE_DATASIZE + MC_HEADER_SIZE)
 #define EXT_HEADER_SIZE         (sizeof(struct extended_sigtable))
 #define EXT_SIGNATURE_SIZE      (sizeof(struct extended_signature))
 #define DWSIZE                  (sizeof(u32))
+
 #define get_totalsize(mc) \
         (((struct microcode_intel *)mc)->hdr.totalsize ? \
          ((struct microcode_intel *)mc)->hdr.totalsize : \
@@ -197,30 +198,31 @@ static inline int update_match_cpu(struct cpu_signature *csig, int sig, int pf)
 }
 
 static inline int
-update_match_revision(struct microcode_header_intel *mc_header, int rev)
+update_match_revision(struct microcode_header_intel *mc_header, int rev)
 {
         return (mc_header->rev <= rev) ? 0 : 1;
 }
 
 static int microcode_sanity_check(void *mc)
 {
+        unsigned long total_size, data_size, ext_table_size;
         struct microcode_header_intel *mc_header = mc;
         struct extended_sigtable *ext_header = NULL;
-        struct extended_signature *ext_sig;
-        unsigned long total_size, data_size, ext_table_size;
         int sum, orig_sum, ext_sigcount = 0, i;
+        struct extended_signature *ext_sig;
 
         total_size = get_totalsize(mc_header);
         data_size = get_datasize(mc_header);
+
         if (data_size + MC_HEADER_SIZE > total_size) {
                 printk(KERN_ERR "microcode: error! "
-                        "Bad data size in microcode data file\n");
+                                "Bad data size in microcode data file\n");
                 return -EINVAL;
         }
 
         if (mc_header->ldrver != 1 || mc_header->hdrver != 1) {
                 printk(KERN_ERR "microcode: error! "
-                        "Unknown microcode update format\n");
+                                "Unknown microcode update format\n");
                 return -EINVAL;
         }
         ext_table_size = total_size - (MC_HEADER_SIZE + data_size);
@@ -318,11 +320,15 @@ get_matching_microcode(struct cpu_signature *cpu_sig, void *mc, int rev)
 
 static void apply_microcode(int cpu)
 {
+        struct microcode_intel *mc_intel;
+        struct ucode_cpu_info *uci;
         unsigned long flags;
         unsigned int val[2];
-        int cpu_num = raw_smp_processor_id();
-        struct ucode_cpu_info *uci = ucode_cpu_info + cpu;
-        struct microcode_intel *mc_intel = uci->mc;
+        int cpu_num;
+
+        cpu_num = raw_smp_processor_id();
+        uci = ucode_cpu_info + cpu;
+        mc_intel = uci->mc;
 
         /* We should bind the task to the CPU */
         BUG_ON(cpu_num != cpu);
@@ -348,15 +354,17 @@ static void apply_microcode(int cpu)
         spin_unlock_irqrestore(&microcode_update_lock, flags);
         if (val[1] != mc_intel->hdr.rev) {
                 printk(KERN_ERR "microcode: CPU%d update from revision "
-                        "0x%x to 0x%x failed\n", cpu_num, uci->cpu_sig.rev, val[1]);
+                                "0x%x to 0x%x failed\n",
+                        cpu_num, uci->cpu_sig.rev, val[1]);
                 return;
         }
         printk(KERN_INFO "microcode: CPU%d updated from revision "
-               "0x%x to 0x%x, date = %04x-%02x-%02x \n",
+                         "0x%x to 0x%x, date = %04x-%02x-%02x \n",
                 cpu_num, uci->cpu_sig.rev, val[1],
                 mc_intel->hdr.date & 0xffff,
                 mc_intel->hdr.date >> 24,
                 (mc_intel->hdr.date >> 16) & 0xff);
+
         uci->cpu_sig.rev = val[1];
 }
 
@@ -404,18 +412,23 @@ static int generic_load_microcode(int cpu, void *data, size_t size,
                 leftover  -= mc_size;
         }
 
-        if (new_mc) {
-                if (!leftover) {
-                        if (uci->mc)
-                                vfree(uci->mc);
-                        uci->mc = (struct microcode_intel *)new_mc;
-                        pr_debug("microcode: CPU%d found a matching microcode update with"
-                                 " version 0x%x (current=0x%x)\n",
-                                cpu, new_rev, uci->cpu_sig.rev);
-                } else
-                        vfree(new_mc);
+        if (!new_mc)
+                goto out;
+
+        if (leftover) {
+                vfree(new_mc);
+                goto out;
         }
 
+        if (uci->mc)
+                vfree(uci->mc);
+        uci->mc = (struct microcode_intel *)new_mc;
+
+        pr_debug("microcode: CPU%d found a matching microcode update with"
+                 " version 0x%x (current=0x%x)\n",
+                        cpu, new_rev, uci->cpu_sig.rev);
+
+ out:
         return (int)leftover;
 }
 
diff --git a/arch/x86/kernel/process.c b/arch/x86/kernel/process.c
index 62fc75b67e45..ca989158e847 100644
--- a/arch/x86/kernel/process.c
+++ b/arch/x86/kernel/process.c
@@ -328,7 +328,7 @@ void stop_this_cpu(void *dummy)
         /*
          * Remove this CPU:
          */
-        cpu_clear(smp_processor_id(), cpu_online_map);
+        set_cpu_online(smp_processor_id(), false);
         disable_local_APIC();
 
         for (;;) {
@@ -478,12 +478,13 @@ static int __cpuinit check_c1e_idle(const struct cpuinfo_x86 *c)
         return 1;
 }
 
-static cpumask_t c1e_mask = CPU_MASK_NONE;
+static cpumask_var_t c1e_mask;
 static int c1e_detected;
 
 void c1e_remove_cpu(int cpu)
 {
-        cpu_clear(cpu, c1e_mask);
+        if (c1e_mask != NULL)
+                cpumask_clear_cpu(cpu, c1e_mask);
 }
 
 /*
@@ -512,8 +513,8 @@ static void c1e_idle(void)
         if (c1e_detected) {
                 int cpu = smp_processor_id();
 
-                if (!cpu_isset(cpu, c1e_mask)) {
-                        cpu_set(cpu, c1e_mask);
+                if (!cpumask_test_cpu(cpu, c1e_mask)) {
+                        cpumask_set_cpu(cpu, c1e_mask);
                         /*
                          * Force broadcast so ACPI can not interfere. Needs
                          * to run with interrupts enabled as it uses
@@ -565,6 +566,15 @@ void __cpuinit select_idle_routine(const struct cpuinfo_x86 *c)
                 pm_idle = default_idle;
 }
 
+void __init init_c1e_mask(void)
+{
+        /* If we're using c1e_idle, we need to allocate c1e_mask. */
+        if (pm_idle == c1e_idle) {
+                alloc_cpumask_var(&c1e_mask, GFP_KERNEL);
+                cpumask_clear(c1e_mask);
+        }
+}
+
 static int __init idle_setup(char *str)
 {
         if (!str)
diff --git a/arch/x86/kernel/process_32.c b/arch/x86/kernel/process_32.c
index 14014d766cad..76f8f84043a2 100644
--- a/arch/x86/kernel/process_32.c
+++ b/arch/x86/kernel/process_32.c
@@ -245,7 +245,7 @@ void prepare_to_copy(struct task_struct *tsk)
         unlazy_fpu(tsk);
 }
 
-int copy_thread(int nr, unsigned long clone_flags, unsigned long sp,
+int copy_thread(unsigned long clone_flags, unsigned long sp,
         unsigned long unused,
         struct task_struct *p, struct pt_regs *regs)
 {
diff --git a/arch/x86/kernel/process_64.c b/arch/x86/kernel/process_64.c
index abb7e6a7f0c6..b751a41392b1 100644
--- a/arch/x86/kernel/process_64.c
+++ b/arch/x86/kernel/process_64.c
@@ -278,7 +278,7 @@ void prepare_to_copy(struct task_struct *tsk)
         unlazy_fpu(tsk);
 }
 
-int copy_thread(int nr, unsigned long clone_flags, unsigned long sp,
+int copy_thread(unsigned long clone_flags, unsigned long sp,
                 unsigned long unused,
         struct task_struct *p, struct pt_regs *regs)
 {
diff --git a/arch/x86/kernel/ptrace.c b/arch/x86/kernel/ptrace.c
index 5c6e46320db1..fe9345c967de 100644
--- a/arch/x86/kernel/ptrace.c
+++ b/arch/x86/kernel/ptrace.c
@@ -1462,6 +1462,6 @@ asmregparm void syscall_trace_leave(struct pt_regs *regs)
          * system call instruction.
          */
         if (test_thread_flag(TIF_SINGLESTEP) &&
-            tracehook_consider_fatal_signal(current, SIGTRAP, SIG_DFL))
+            tracehook_consider_fatal_signal(current, SIGTRAP))
                 send_sigtrap(current, regs, 0, TRAP_BRKPT);
 }
diff --git a/arch/x86/kernel/setup_percpu.c b/arch/x86/kernel/setup_percpu.c
index 400331b50a53..3a97a4cf1872 100644
--- a/arch/x86/kernel/setup_percpu.c
+++ b/arch/x86/kernel/setup_percpu.c
@@ -153,7 +153,6 @@ static struct page * __init pcpur_get_page(unsigned int cpu, int pageno)
 static ssize_t __init setup_pcpu_remap(size_t static_size)
 {
         static struct vm_struct vm;
-        pg_data_t *last;
         size_t ptrs_size, dyn_size;
         unsigned int cpu;
         ssize_t ret;
@@ -162,22 +161,9 @@ static ssize_t __init setup_pcpu_remap(size_t static_size)
          * If large page isn't supported, there's no benefit in doing
          * this.  Also, on non-NUMA, embedding is better.
          */
-        if (!cpu_has_pse || pcpu_need_numa())
+        if (!cpu_has_pse || !pcpu_need_numa())
                 return -EINVAL;
 
-        last = NULL;
-        for_each_possible_cpu(cpu) {
-                int node = early_cpu_to_node(cpu);
-
-                if (node_online(node) && NODE_DATA(node) &&
-                    last && last != NODE_DATA(node))
-                        goto proceed;
-
-                last = NODE_DATA(node);
-        }
-        return -EINVAL;
-
-proceed:
         /*
          * Currently supports only single page.  Supporting multiple
          * pages won't be too difficult if it ever becomes necessary.
diff --git a/arch/x86/kernel/signal.c b/arch/x86/kernel/signal.c
index dfcc74ab0ab6..14425166b8e3 100644
--- a/arch/x86/kernel/signal.c
+++ b/arch/x86/kernel/signal.c
@@ -221,7 +221,7 @@ get_sigframe(struct k_sigaction *ka, struct pt_regs *regs, size_t frame_size,
         if (!onsigstack) {
                 /* This is the X/Open sanctioned signal stack switching.  */
                 if (ka->sa.sa_flags & SA_ONSTACK) {
-                        if (sas_ss_flags(sp) == 0)
+                        if (current->sas_ss_size)
                                 sp = current->sas_ss_sp + current->sas_ss_size;
                 } else {
 #ifdef CONFIG_X86_32
diff --git a/arch/x86/kernel/smpboot.c b/arch/x86/kernel/smpboot.c
index ef7d10170c30..58d24ef917d8 100644
--- a/arch/x86/kernel/smpboot.c
+++ b/arch/x86/kernel/smpboot.c
@@ -101,11 +101,11 @@ EXPORT_SYMBOL(smp_num_siblings);
 DEFINE_PER_CPU(u16, cpu_llc_id) = BAD_APICID;
 
 /* representing HT siblings of each logical CPU */
-DEFINE_PER_CPU(cpumask_t, cpu_sibling_map);
+DEFINE_PER_CPU(cpumask_var_t, cpu_sibling_map);
 EXPORT_PER_CPU_SYMBOL(cpu_sibling_map);
 
 /* representing HT and core siblings of each logical CPU */
-DEFINE_PER_CPU(cpumask_t, cpu_core_map);
+DEFINE_PER_CPU(cpumask_var_t, cpu_core_map);
 EXPORT_PER_CPU_SYMBOL(cpu_core_map);
 
 /* Per CPU bogomips and other parameters */
@@ -115,11 +115,6 @@ EXPORT_PER_CPU_SYMBOL(cpu_info);
 atomic_t init_deasserted;
 
 #if defined(CONFIG_NUMA) && defined(CONFIG_X86_32)
-
-/* which logical CPUs are on which nodes */
-cpumask_t node_to_cpumask_map[MAX_NUMNODES] __read_mostly =
-                                { [0 ... MAX_NUMNODES-1] = CPU_MASK_NONE };
-EXPORT_SYMBOL(node_to_cpumask_map);
 /* which node each logical CPU is on */
 int cpu_to_node_map[NR_CPUS] __read_mostly = { [0 ... NR_CPUS-1] = 0 };
 EXPORT_SYMBOL(cpu_to_node_map);
@@ -128,7 +123,7 @@ EXPORT_SYMBOL(cpu_to_node_map);
 static void map_cpu_to_node(int cpu, int node)
 {
         printk(KERN_INFO "Mapping cpu %d to node %d\n", cpu, node);
-        cpumask_set_cpu(cpu, &node_to_cpumask_map[node]);
+        cpumask_set_cpu(cpu, node_to_cpumask_map[node]);
         cpu_to_node_map[cpu] = node;
 }
 
@@ -139,7 +134,7 @@ static void unmap_cpu_to_node(int cpu)
 
         printk(KERN_INFO "Unmapping cpu %d from all nodes\n", cpu);
         for (node = 0; node < MAX_NUMNODES; node++)
-                cpumask_clear_cpu(cpu, &node_to_cpumask_map[node]);
+                cpumask_clear_cpu(cpu, node_to_cpumask_map[node]);
         cpu_to_node_map[cpu] = 0;
 }
 #else /* !(CONFIG_NUMA && CONFIG_X86_32) */
@@ -301,7 +296,7 @@ notrace static void __cpuinit start_secondary(void *unused)
         __flush_tlb_all();
 #endif
 
-        /* This must be done before setting cpu_online_map */
+        /* This must be done before setting cpu_online_mask */
         set_cpu_sibling_map(raw_smp_processor_id());
         wmb();
 
@@ -334,6 +329,23 @@ notrace static void __cpuinit start_secondary(void *unused)
         cpu_idle();
 }
 
+#ifdef CONFIG_CPUMASK_OFFSTACK
+/* In this case, llc_shared_map is a pointer to a cpumask. */
+static inline void copy_cpuinfo_x86(struct cpuinfo_x86 *dst,
+                                    const struct cpuinfo_x86 *src)
+{
+        struct cpumask *llc = dst->llc_shared_map;
+        *dst = *src;
+        dst->llc_shared_map = llc;
+}
+#else
+static inline void copy_cpuinfo_x86(struct cpuinfo_x86 *dst,
+                                    const struct cpuinfo_x86 *src)
+{
+        *dst = *src;
+}
+#endif /* CONFIG_CPUMASK_OFFSTACK */
+
 /*
  * The bootstrap kernel entry code has set these up. Save them for
  * a given CPU
@@ -343,7 +355,7 @@ void __cpuinit smp_store_cpu_info(int id)
 {
         struct cpuinfo_x86 *c = &cpu_data(id);
 
-        *c = boot_cpu_data;
+        copy_cpuinfo_x86(c, &boot_cpu_data);
         c->cpu_index = id;
         if (id != 0)
                 identify_secondary_cpu(c);
@@ -367,15 +379,15 @@ void __cpuinit set_cpu_sibling_map(int cpu)
                                 cpumask_set_cpu(cpu, cpu_sibling_mask(i));
                                 cpumask_set_cpu(i, cpu_core_mask(cpu));
                                 cpumask_set_cpu(cpu, cpu_core_mask(i));
-                                cpumask_set_cpu(i, &c->llc_shared_map);
-                                cpumask_set_cpu(cpu, &o->llc_shared_map);
+                                cpumask_set_cpu(i, c->llc_shared_map);
+                                cpumask_set_cpu(cpu, o->llc_shared_map);
                         }
                 }
         } else {
                 cpumask_set_cpu(cpu, cpu_sibling_mask(cpu));
         }
 
-        cpumask_set_cpu(cpu, &c->llc_shared_map);
+        cpumask_set_cpu(cpu, c->llc_shared_map);
 
         if (current_cpu_data.x86_max_cores == 1) {
                 cpumask_copy(cpu_core_mask(cpu), cpu_sibling_mask(cpu));
@@ -386,8 +398,8 @@ void __cpuinit set_cpu_sibling_map(int cpu)
         for_each_cpu(i, cpu_sibling_setup_mask) {
                 if (per_cpu(cpu_llc_id, cpu) != BAD_APICID &&
                     per_cpu(cpu_llc_id, cpu) == per_cpu(cpu_llc_id, i)) {
-                        cpumask_set_cpu(i, &c->llc_shared_map);
-                        cpumask_set_cpu(cpu, &cpu_data(i).llc_shared_map);
+                        cpumask_set_cpu(i, c->llc_shared_map);
+                        cpumask_set_cpu(cpu, cpu_data(i).llc_shared_map);
                 }
                 if (c->phys_proc_id == cpu_data(i).phys_proc_id) {
                         cpumask_set_cpu(i, cpu_core_mask(cpu));
@@ -425,12 +437,7 @@ const struct cpumask *cpu_coregroup_mask(int cpu)
         if (sched_mc_power_savings || sched_smt_power_savings)
                 return cpu_core_mask(cpu);
         else
-                return &c->llc_shared_map;
-}
-
-cpumask_t cpu_coregroup_map(int cpu)
-{
-        return *cpu_coregroup_mask(cpu);
+                return c->llc_shared_map;
 }
 
 static void impress_friends(void)
@@ -897,9 +904,8 @@ int __cpuinit native_cpu_up(unsigned int cpu)
  */
 static __init void disable_smp(void)
 {
-        /* use the read/write pointers to the present and possible maps */
-        cpumask_copy(&cpu_present_map, cpumask_of(0));
-        cpumask_copy(&cpu_possible_map, cpumask_of(0));
+        init_cpu_present(cpumask_of(0));
+        init_cpu_possible(cpumask_of(0));
         smpboot_clear_io_apic_irqs();
 
         if (smp_found_config)
@@ -1031,6 +1037,8 @@ static void __init smp_cpu_index_default(void)
  */
 void __init native_smp_prepare_cpus(unsigned int max_cpus)
 {
+        unsigned int i;
+
         preempt_disable();
         smp_cpu_index_default();
         current_cpu_data = boot_cpu_data;
@@ -1044,6 +1052,14 @@ void __init native_smp_prepare_cpus(unsigned int max_cpus)
         boot_cpu_logical_apicid = logical_smp_processor_id();
 #endif
         current_thread_info()->cpu = 0;  /* needed? */
+        for_each_possible_cpu(i) {
+                alloc_cpumask_var(&per_cpu(cpu_sibling_map, i), GFP_KERNEL);
+                alloc_cpumask_var(&per_cpu(cpu_core_map, i), GFP_KERNEL);
+                alloc_cpumask_var(&cpu_data(i).llc_shared_map, GFP_KERNEL);
+                cpumask_clear(per_cpu(cpu_core_map, i));
+                cpumask_clear(per_cpu(cpu_sibling_map, i));
+                cpumask_clear(cpu_data(i).llc_shared_map);
+        }
         set_cpu_sibling_map(0);
 
         enable_IR_x2apic();
@@ -1132,11 +1148,11 @@ early_param("possible_cpus", _setup_possible_cpus);
 
 
 /*
- * cpu_possible_map should be static, it cannot change as cpu's
+ * cpu_possible_mask should be static, it cannot change as cpu's
  * are onlined, or offlined. The reason is per-cpu data-structures
  * are allocated by some modules at init time, and dont expect to
  * do this dynamically on cpu arrival/departure.
- * cpu_present_map on the other hand can change dynamically.
+ * cpu_present_mask on the other hand can change dynamically.
  * In case when cpu_hotplug is not compiled, then we resort to current
  * behaviour, which is cpu_possible == cpu_present.
  * - Ashok Raj
diff --git a/arch/x86/kernel/syscall_table_32.S b/arch/x86/kernel/syscall_table_32.S
index 3bdb64829b82..ff5c8736b491 100644
--- a/arch/x86/kernel/syscall_table_32.S
+++ b/arch/x86/kernel/syscall_table_32.S
@@ -332,3 +332,5 @@ ENTRY(sys_call_table)
         .long sys_dup3                  /* 330 */
         .long sys_pipe2
         .long sys_inotify_init1
+        .long sys_preadv
+        .long sys_pwritev
diff --git a/arch/x86/kernel/tlb_uv.c b/arch/x86/kernel/tlb_uv.c
index 79c073247284..deb5ebb32c3b 100644
--- a/arch/x86/kernel/tlb_uv.c
+++ b/arch/x86/kernel/tlb_uv.c
@@ -275,6 +275,8 @@ const struct cpumask *uv_flush_send_and_wait(int cpu, int this_blade,
         return NULL;
 }
 
+static DEFINE_PER_CPU(cpumask_var_t, uv_flush_tlb_mask);
+
 /**
  * uv_flush_tlb_others - globally purge translation cache of a virtual
  * address or all TLB's
@@ -304,8 +306,7 @@ const struct cpumask *uv_flush_tlb_others(const struct cpumask *cpumask,
                                           struct mm_struct *mm,
                                           unsigned long va, unsigned int cpu)
 {
-        static DEFINE_PER_CPU(cpumask_t, flush_tlb_mask);
-        struct cpumask *flush_mask = &__get_cpu_var(flush_tlb_mask);
+        struct cpumask *flush_mask = __get_cpu_var(uv_flush_tlb_mask);
         int i;
         int bit;
         int blade;
@@ -755,6 +756,10 @@ static int __init uv_bau_init(void)
         if (!is_uv_system())
                 return 0;
 
+        for_each_possible_cpu(cur_cpu)
+                alloc_cpumask_var_node(&per_cpu(uv_flush_tlb_mask, cur_cpu),
+                                       GFP_KERNEL, cpu_to_node(cur_cpu));
+
         uv_bau_retry_limit = 1;
         uv_nshift = uv_hub_info->n_val;
         uv_mmask = (1UL << uv_hub_info->n_val) - 1;
diff --git a/arch/x86/mm/Makefile b/arch/x86/mm/Makefile
index 08537747cb58..fdd30d08ab52 100644
--- a/arch/x86/mm/Makefile
+++ b/arch/x86/mm/Makefile
@@ -14,7 +14,7 @@ obj-$(CONFIG_MMIOTRACE)		+= mmiotrace.o
 mmiotrace-y                     := kmmio.o pf_in.o mmio-mod.o
 obj-$(CONFIG_MMIOTRACE_TEST)    += testmmiotrace.o
 
-obj-$(CONFIG_NUMA)              += numa_$(BITS).o
+obj-$(CONFIG_NUMA)              += numa.o numa_$(BITS).o
 obj-$(CONFIG_K8_NUMA)           += k8topology_64.o
 obj-$(CONFIG_ACPI_NUMA)         += srat_$(BITS).o
 
diff --git a/arch/x86/mm/highmem_32.c b/arch/x86/mm/highmem_32.c
index 5bc5d1688c1c..8126e8d1a2a4 100644
--- a/arch/x86/mm/highmem_32.c
+++ b/arch/x86/mm/highmem_32.c
@@ -40,7 +40,6 @@ void *kmap_atomic_prot(struct page *page, enum km_type type, pgprot_t prot)
 
         debug_kmap_atomic(type);
 
-        debug_kmap_atomic(type);
         idx = type + KM_TYPE_NR*smp_processor_id();
         vaddr = __fix_to_virt(FIX_KMAP_BEGIN + idx);
         BUG_ON(!pte_none(*(kmap_pte-idx)));
diff --git a/arch/x86/mm/iomap_32.c b/arch/x86/mm/iomap_32.c
index bff0c9032f8c..8056545e2d39 100644
--- a/arch/x86/mm/iomap_32.c
+++ b/arch/x86/mm/iomap_32.c
@@ -23,7 +23,7 @@
 
 int is_io_mapping_possible(resource_size_t base, unsigned long size)
 {
-#ifndef CONFIG_X86_PAE
+#if !defined(CONFIG_X86_PAE) && defined(CONFIG_PHYS_ADDR_T_64BIT)
         /* There is no way to map greater than 1 << 32 address without PAE */
         if (base + size > 0x100000000ULL)
                 return 0;
@@ -39,6 +39,7 @@ void *kmap_atomic_prot_pfn(unsigned long pfn, enum km_type type, pgprot_t prot)
 
         pagefault_disable();
 
+        debug_kmap_atomic(type);
         idx = type + KM_TYPE_NR * smp_processor_id();
         vaddr = __fix_to_virt(FIX_KMAP_BEGIN + idx);
         set_pte(kmap_pte - idx, pfn_pte(pfn, prot));
@@ -72,7 +73,6 @@ iounmap_atomic(void *kvaddr, enum km_type type)
         unsigned long vaddr = (unsigned long) kvaddr & PAGE_MASK;
         enum fixed_addresses idx = type + KM_TYPE_NR*smp_processor_id();
 
-        debug_kmap_atomic(type);
         /*
          * Force other mappings to Oops if they'll try to access this pte
          * without first remap it.  Keeping stale mappings around is a bad idea
diff --git a/arch/x86/mm/mmio-mod.c b/arch/x86/mm/mmio-mod.c
index 2c4baa88f2cb..c9342ed8b402 100644
--- a/arch/x86/mm/mmio-mod.c
+++ b/arch/x86/mm/mmio-mod.c
@@ -378,27 +378,34 @@ static void clear_trace_list(void)
 }
 
 #ifdef CONFIG_HOTPLUG_CPU
-static cpumask_t downed_cpus;
+static cpumask_var_t downed_cpus;
 
 static void enter_uniprocessor(void)
 {
         int cpu;
         int err;
 
+        if (downed_cpus == NULL &&
+            !alloc_cpumask_var(&downed_cpus, GFP_KERNEL)) {
+                pr_notice(NAME "Failed to allocate mask\n");
+                goto out;
+        }
+
         get_online_cpus();
-        downed_cpus = cpu_online_map;
-        cpu_clear(first_cpu(cpu_online_map), downed_cpus);
+        cpumask_copy(downed_cpus, cpu_online_mask);
+        cpumask_clear_cpu(cpumask_first(cpu_online_mask), downed_cpus);
         if (num_online_cpus() > 1)
                 pr_notice(NAME "Disabling non-boot CPUs...\n");
         put_online_cpus();
 
-        for_each_cpu_mask(cpu, downed_cpus) {
+        for_each_cpu(cpu, downed_cpus) {
                 err = cpu_down(cpu);
                 if (!err)
                         pr_info(NAME "CPU%d is down.\n", cpu);
                 else
                         pr_err(NAME "Error taking CPU%d down: %d\n", cpu, err);
         }
+out:
         if (num_online_cpus() > 1)
                 pr_warning(NAME "multiple CPUs still online, "
                                                 "may miss events.\n");
@@ -411,10 +418,10 @@ static void __ref leave_uniprocessor(void)
         int cpu;
         int err;
 
-        if (cpus_weight(downed_cpus) == 0)
+        if (downed_cpus == NULL || cpumask_weight(downed_cpus) == 0)
                 return;
         pr_notice(NAME "Re-enabling CPUs...\n");
-        for_each_cpu_mask(cpu, downed_cpus) {
+        for_each_cpu(cpu, downed_cpus) {
                 err = cpu_up(cpu);
                 if (!err)
                         pr_info(NAME "enabled CPU%d.\n", cpu);
diff --git a/arch/x86/mm/numa.c b/arch/x86/mm/numa.c
new file mode 100644
index 000000000000..550df481accd
--- /dev/null
+++ b/arch/x86/mm/numa.c
@@ -0,0 +1,67 @@
+/* Common code for 32 and 64-bit NUMA */
+#include <linux/topology.h>
+#include <linux/module.h>
+#include <linux/bootmem.h>
+
+#ifdef CONFIG_DEBUG_PER_CPU_MAPS
+# define DBG(x...) printk(KERN_DEBUG x)
+#else
+# define DBG(x...)
+#endif
+
+/*
+ * Which logical CPUs are on which nodes
+ */
+cpumask_var_t node_to_cpumask_map[MAX_NUMNODES];
+EXPORT_SYMBOL(node_to_cpumask_map);
+
+/*
+ * Allocate node_to_cpumask_map based on number of available nodes
+ * Requires node_possible_map to be valid.
+ *
+ * Note: node_to_cpumask() is not valid until after this is done.
+ * (Use CONFIG_DEBUG_PER_CPU_MAPS to check this.)
+ */
+void __init setup_node_to_cpumask_map(void)
+{
+        unsigned int node, num = 0;
+
+        /* setup nr_node_ids if not done yet */
+        if (nr_node_ids == MAX_NUMNODES) {
+                for_each_node_mask(node, node_possible_map)
+                        num = node;
+                nr_node_ids = num + 1;
+        }
+
+        /* allocate the map */
+        for (node = 0; node < nr_node_ids; node++)
+                alloc_bootmem_cpumask_var(&node_to_cpumask_map[node]);
+
+        /* cpumask_of_node() will now work */
+        pr_debug("Node to cpumask map for %d nodes\n", nr_node_ids);
+}
+
+#ifdef CONFIG_DEBUG_PER_CPU_MAPS
+/*
+ * Returns a pointer to the bitmask of CPUs on Node 'node'.
+ */
+const struct cpumask *cpumask_of_node(int node)
+{
+        if (node >= nr_node_ids) {
+                printk(KERN_WARNING
+                        "cpumask_of_node(%d): node > nr_node_ids(%d)\n",
+                        node, nr_node_ids);
+                dump_stack();
+                return cpu_none_mask;
+        }
+        if (node_to_cpumask_map[node] == NULL) {
+                printk(KERN_WARNING
+                        "cpumask_of_node(%d): no node_to_cpumask_map!\n",
+                        node);
+                dump_stack();
+                return cpu_online_mask;
+        }
+        return node_to_cpumask_map[node];
+}
+EXPORT_SYMBOL(cpumask_of_node);
+#endif
diff --git a/arch/x86/mm/numa_64.c b/arch/x86/mm/numa_64.c
index 64c9cf043cdd..d73aaa892371 100644
--- a/arch/x86/mm/numa_64.c
+++ b/arch/x86/mm/numa_64.c
@@ -20,12 +20,6 @@
 #include <asm/acpi.h>
 #include <asm/k8.h>
 
-#ifdef CONFIG_DEBUG_PER_CPU_MAPS
-# define DBG(x...) printk(KERN_DEBUG x)
-#else
-# define DBG(x...)
-#endif
-
 struct pglist_data *node_data[MAX_NUMNODES] __read_mostly;
 EXPORT_SYMBOL(node_data);
 
@@ -49,12 +43,6 @@ DEFINE_EARLY_PER_CPU(int, x86_cpu_to_node_map, NUMA_NO_NODE);
 EXPORT_EARLY_PER_CPU_SYMBOL(x86_cpu_to_node_map);
 
 /*
- * Which logical CPUs are on which nodes
- */
-cpumask_t *node_to_cpumask_map;
-EXPORT_SYMBOL(node_to_cpumask_map);
-
-/*
  * Given a shift value, try to populate memnodemap[]
  * Returns :
  * 1 if OK
@@ -661,36 +649,6 @@ void __init init_cpu_to_node(void)
 #endif
 
 
-/*
- * Allocate node_to_cpumask_map based on number of available nodes
- * Requires node_possible_map to be valid.
- *
- * Note: node_to_cpumask() is not valid until after this is done.
- * (Use CONFIG_DEBUG_PER_CPU_MAPS to check this.)
- */
-void __init setup_node_to_cpumask_map(void)
-{
-        unsigned int node, num = 0;
-        cpumask_t *map;
-
-        /* setup nr_node_ids if not done yet */
-        if (nr_node_ids == MAX_NUMNODES) {
-                for_each_node_mask(node, node_possible_map)
-                        num = node;
-                nr_node_ids = num + 1;
-        }
-
-        /* allocate the map */
-        map = alloc_bootmem_low(nr_node_ids * sizeof(cpumask_t));
-        DBG("node_to_cpumask_map at %p for %d nodes\n", map, nr_node_ids);
-
-        pr_debug("Node to cpumask map at %p for %d nodes\n",
-                 map, nr_node_ids);
-
-        /* node_to_cpumask() will now work */
-        node_to_cpumask_map = map;
-}
-
 void __cpuinit numa_set_node(int cpu, int node)
 {
         int *cpu_to_node_map = early_per_cpu_ptr(x86_cpu_to_node_map);
@@ -723,12 +681,12 @@ void __cpuinit numa_clear_node(int cpu)
 
 void __cpuinit numa_add_cpu(int cpu)
 {
-        cpu_set(cpu, node_to_cpumask_map[early_cpu_to_node(cpu)]);
+        cpumask_set_cpu(cpu, node_to_cpumask_map[early_cpu_to_node(cpu)]);
 }
 
 void __cpuinit numa_remove_cpu(int cpu)
 {
-        cpu_clear(cpu, node_to_cpumask_map[early_cpu_to_node(cpu)]);
+        cpumask_clear_cpu(cpu, node_to_cpumask_map[early_cpu_to_node(cpu)]);
 }
 
 #else /* CONFIG_DEBUG_PER_CPU_MAPS */
@@ -739,20 +697,20 @@ void __cpuinit numa_remove_cpu(int cpu)
 static void __cpuinit numa_set_cpumask(int cpu, int enable)
 {
         int node = early_cpu_to_node(cpu);
-        cpumask_t *mask;
+        struct cpumask *mask;
         char buf[64];
 
-        if (node_to_cpumask_map == NULL) {
-                printk(KERN_ERR "node_to_cpumask_map NULL\n");
+        mask = node_to_cpumask_map[node];
+        if (mask == NULL) {
+                printk(KERN_ERR "node_to_cpumask_map[%i] NULL\n", node);
                 dump_stack();
                 return;
         }
 
-        mask = &node_to_cpumask_map[node];
         if (enable)
-                cpu_set(cpu, *mask);
+                cpumask_set_cpu(cpu, mask);
         else
-                cpu_clear(cpu, *mask);
+                cpumask_clear_cpu(cpu, mask);
 
         cpulist_scnprintf(buf, sizeof(buf), mask);
         printk(KERN_DEBUG "%s cpu %d node %d: mask now %s\n",
@@ -799,59 +757,6 @@ int early_cpu_to_node(int cpu)
         return per_cpu(x86_cpu_to_node_map, cpu);
 }
 
-
-/* empty cpumask */
-static const cpumask_t cpu_mask_none;
-
-/*
- * Returns a pointer to the bitmask of CPUs on Node 'node'.
- */
-const cpumask_t *cpumask_of_node(int node)
-{
-        if (node_to_cpumask_map == NULL) {
-                printk(KERN_WARNING
-                        "cpumask_of_node(%d): no node_to_cpumask_map!\n",
-                        node);
-                dump_stack();
-                return (const cpumask_t *)&cpu_online_map;
-        }
-        if (node >= nr_node_ids) {
-                printk(KERN_WARNING
-                        "cpumask_of_node(%d): node > nr_node_ids(%d)\n",
-                        node, nr_node_ids);
-                dump_stack();
-                return &cpu_mask_none;
-        }
-        return &node_to_cpumask_map[node];
-}
-EXPORT_SYMBOL(cpumask_of_node);
-
-/*
- * Returns a bitmask of CPUs on Node 'node'.
- *
- * Side note: this function creates the returned cpumask on the stack
- * so with a high NR_CPUS count, excessive stack space is used.  The
- * node_to_cpumask_ptr function should be used whenever possible.
- */
-cpumask_t node_to_cpumask(int node)
-{
-        if (node_to_cpumask_map == NULL) {
-                printk(KERN_WARNING
-                        "node_to_cpumask(%d): no node_to_cpumask_map!\n", node);
-                dump_stack();
-                return cpu_online_map;
-        }
-        if (node >= nr_node_ids) {
-                printk(KERN_WARNING
-                        "node_to_cpumask(%d): node > nr_node_ids(%d)\n",
-                        node, nr_node_ids);
-                dump_stack();
-                return cpu_mask_none;
-        }
-        return node_to_cpumask_map[node];
-}
-EXPORT_SYMBOL(node_to_cpumask);
-
 /*
  * --------- end of debug versions of the numa functions ---------
  */
diff --git a/arch/x86/oprofile/op_model_p4.c b/arch/x86/oprofile/op_model_p4.c
index 4c4a51c90bc2..819b131fd752 100644
--- a/arch/x86/oprofile/op_model_p4.c
+++ b/arch/x86/oprofile/op_model_p4.c
@@ -380,7 +380,7 @@ static unsigned int get_stagger(void)
 {
 #ifdef CONFIG_SMP
         int cpu = smp_processor_id();
-        return (cpu != first_cpu(per_cpu(cpu_sibling_map, cpu)));
+        return cpu != cpumask_first(__get_cpu_var(cpu_sibling_map));
 #endif
         return 0;
 }
diff --git a/arch/x86/pci/i386.c b/arch/x86/pci/i386.c
index f234a37bd428..f1817f71e009 100644
--- a/arch/x86/pci/i386.c
+++ b/arch/x86/pci/i386.c
@@ -258,24 +258,7 @@ void pcibios_set_master(struct pci_dev *dev)
         pci_write_config_byte(dev, PCI_LATENCY_TIMER, lat);
 }
 
-static void pci_unmap_page_range(struct vm_area_struct *vma)
-{
-        u64 addr = (u64)vma->vm_pgoff << PAGE_SHIFT;
-        free_memtype(addr, addr + vma->vm_end - vma->vm_start);
-}
-
-static void pci_track_mmap_page_range(struct vm_area_struct *vma)
-{
-        u64 addr = (u64)vma->vm_pgoff << PAGE_SHIFT;
-        unsigned long flags = pgprot_val(vma->vm_page_prot)
-                                                & _PAGE_CACHE_MASK;
-
-        reserve_memtype(addr, addr + vma->vm_end - vma->vm_start, flags, NULL);
-}
-
 static struct vm_operations_struct pci_mmap_ops = {
-        .open  = pci_track_mmap_page_range,
-        .close = pci_unmap_page_range,
         .access = generic_access_phys,
 };
 
@@ -283,11 +266,6 @@ int pci_mmap_page_range(struct pci_dev *dev, struct vm_area_struct *vma,
                         enum pci_mmap_state mmap_state, int write_combine)
 {
         unsigned long prot;
-        u64 addr = vma->vm_pgoff << PAGE_SHIFT;
-        unsigned long len = vma->vm_end - vma->vm_start;
-        unsigned long flags;
-        unsigned long new_flags;
-        int retval;
 
         /* I/O space cannot be accessed via normal processor loads and
          * stores on this platform.
@@ -308,30 +286,6 @@ int pci_mmap_page_range(struct pci_dev *dev, struct vm_area_struct *vma,
 
         vma->vm_page_prot = __pgprot(prot);
 
-        flags = pgprot_val(vma->vm_page_prot) & _PAGE_CACHE_MASK;
-        retval = reserve_memtype(addr, addr + len, flags, &new_flags);
-        if (retval)
-                return retval;
-
-        if (flags != new_flags) {
-                if (!is_new_memtype_allowed(flags, new_flags)) {
-                        free_memtype(addr, addr+len);
-                        return -EINVAL;
-                }
-                flags = new_flags;
-                vma->vm_page_prot = __pgprot(
-                        (pgprot_val(vma->vm_page_prot) & ~_PAGE_CACHE_MASK) |
-                        flags);
-        }
-
-        if (((vma->vm_pgoff < max_low_pfn_mapped) ||
-             (vma->vm_pgoff >= (1UL<<(32 - PAGE_SHIFT)) &&
-              vma->vm_pgoff < max_pfn_mapped)) &&
-            ioremap_change_attr((unsigned long)__va(addr), len, flags)) {
-                free_memtype(addr, addr + len);
-                return -EINVAL;
-        }
-
         if (io_remap_pfn_range(vma, vma->vm_start, vma->vm_pgoff,
                                vma->vm_end - vma->vm_start,
                                vma->vm_page_prot))
diff --git a/arch/x86/power/Makefile b/arch/x86/power/Makefile
index 9ff4d5b55ad1..58b32db33125 100644
--- a/arch/x86/power/Makefile
+++ b/arch/x86/power/Makefile
@@ -1,2 +1,7 @@
+# __restore_processor_state() restores %gs after S3 resume and so should not
+# itself be stack-protected
+nostackp := $(call cc-option, -fno-stack-protector)
+CFLAGS_cpu_$(BITS).o    := $(nostackp)
+
 obj-$(CONFIG_PM_SLEEP)          += cpu_$(BITS).o
 obj-$(CONFIG_HIBERNATION)       += hibernate_$(BITS).o hibernate_asm_$(BITS).o
diff --git a/arch/x86/xen/smp.c b/arch/x86/xen/smp.c
index 8d470562ffc9..585a6e330837 100644
--- a/arch/x86/xen/smp.c
+++ b/arch/x86/xen/smp.c
@@ -158,7 +158,7 @@ static void __init xen_fill_possible_map(void)
                 rc = HYPERVISOR_vcpu_op(VCPUOP_is_up, i, NULL);
                 if (rc >= 0) {
                         num_processors++;
-                        cpu_set(i, cpu_possible_map);
+                        set_cpu_possible(i, true);
                 }
         }
 }
@@ -197,7 +197,7 @@ static void __init xen_smp_prepare_cpus(unsigned int max_cpus)
         while ((num_possible_cpus() > 1) && (num_possible_cpus() > max_cpus)) {
                 for (cpu = nr_cpu_ids - 1; !cpu_possible(cpu); cpu--)
                         continue;
-                cpu_clear(cpu, cpu_possible_map);
+                set_cpu_possible(cpu, false);
         }
 
         for_each_possible_cpu (cpu) {
@@ -210,7 +210,7 @@ static void __init xen_smp_prepare_cpus(unsigned int max_cpus)
                 if (IS_ERR(idle))
                         panic("failed fork for CPU %d", cpu);
 
-                cpu_set(cpu, cpu_present_map);
+                set_cpu_present(cpu, true);
         }
 }
 
diff --git a/arch/xtensa/Kconfig b/arch/xtensa/Kconfig
index 981200830432..fa6dc4dd3b19 100644
--- a/arch/xtensa/Kconfig
+++ b/arch/xtensa/Kconfig
@@ -4,16 +4,13 @@
 mainmenu "Linux/Xtensa Kernel Configuration"
 
 config FRAME_POINTER
-        bool
-        default n
+        def_bool n
 
 config ZONE_DMA
-        bool
-        default y
+        def_bool y
 
 config XTENSA
-        bool
-        default y
+        def_bool y
         select HAVE_IDE
         help
           Xtensa processors are 32-bit RISC machines designed by Tensilica
@@ -24,28 +21,25 @@ config XTENSA
           a home page at <http://xtensa.sourceforge.net/>.
 
 config RWSEM_XCHGADD_ALGORITHM
-        bool
-        default y
+        def_bool y
 
 config GENERIC_FIND_NEXT_BIT
-        bool
-        default y
+        def_bool y
 
 config GENERIC_HWEIGHT
-        bool
-        default y
+        def_bool y
 
 config GENERIC_HARDIRQS
-        bool
-        default y
+        def_bool y
+
+config GENERIC_GPIO
+        def_bool y
 
 config ARCH_HAS_ILOG2_U32
-        bool
-        default n
+        def_bool n
 
 config ARCH_HAS_ILOG2_U64
-        bool
-        default n
+        def_bool n
 
 config NO_IOPORT
         def_bool y
@@ -54,9 +48,18 @@ config HZ
         int
         default 100
 
+config GENERIC_TIME
+        def_bool y
+
 source "init/Kconfig"
 source "kernel/Kconfig.freezer"
 
+config MMU
+        def_bool n
+
+config VARIANT_IRQ_SWITCH
+        def_bool n
+
 menu "Processor type and features"
 
 choice
@@ -65,38 +68,41 @@ choice
 
 config XTENSA_VARIANT_FSF
         bool "fsf - default (not generic) configuration"
+        select MMU
 
 config XTENSA_VARIANT_DC232B
         bool "dc232b - Diamond 232L Standard Core Rev.B (LE)"
+        select MMU
         help
-        This variant refers to Tensilica's Diamond 232L Standard core Rev.B (LE).
-endchoice
+          This variant refers to Tensilica's Diamond 232L Standard core Rev.B (LE).
 
-config MMU
-        bool
-        default y
+config XTENSA_VARIANT_S6000
+        bool "s6000 - Stretch software configurable processor"
+        select VARIANT_IRQ_SWITCH
+        select ARCH_REQUIRE_GPIOLIB
+endchoice
 
 config XTENSA_UNALIGNED_USER
         bool "Unaligned memory access in use space"
-        ---help---
-           The Xtensa architecture currently does not handle unaligned
-           memory accesses in hardware but through an exception handler.
-           Per default, unaligned memory accesses are disabled in user space.
+        help
+          The Xtensa architecture currently does not handle unaligned
+          memory accesses in hardware but through an exception handler.
+          Per default, unaligned memory accesses are disabled in user space.
 
-           Say Y here to enable unaligned memory access in user space.
+          Say Y here to enable unaligned memory access in user space.
 
 config PREEMPT
         bool "Preemptible Kernel"
-        ---help---
-           This option reduces the latency of the kernel when reacting to
-           real-time or interactive events by allowing a low priority process to
-           be preempted even if it is in kernel mode executing a system call.
-           Unfortunately the kernel code has some race conditions if both
-           CONFIG_SMP and CONFIG_PREEMPT are enabled, so this option is
-           currently disabled if you are building an SMP kernel.
+        help
+          This option reduces the latency of the kernel when reacting to
+          real-time or interactive events by allowing a low priority process to
+          be preempted even if it is in kernel mode executing a system call.
+          Unfortunately the kernel code has some race conditions if both
+          CONFIG_SMP and CONFIG_PREEMPT are enabled, so this option is
+          currently disabled if you are building an SMP kernel.
 
-           Say Y here if you are building a kernel for a desktop, embedded
-           or real-time system.  Say N if you are unsure.
+          Say Y here if you are building a kernel for a desktop, embedded
+          or real-time system.  Say N if you are unsure.
 
 config MATH_EMULATION
         bool "Math emulation"
@@ -105,6 +111,32 @@ config MATH_EMULATION
 
 endmenu
 
+config XTENSA_CALIBRATE_CCOUNT
+        def_bool n
+        help
+          On some platforms (XT2000, for example), the CPU clock rate can
+          vary.  The frequency can be determined, however, by measuring
+          against a well known, fixed frequency, such as an UART oscillator.
+
+config SERIAL_CONSOLE
+        def_bool n
+
+config XTENSA_ISS_NETWORK
+        def_bool n
+
+menu "Bus options"
+
+config PCI
+        bool "PCI support"
+        default y
+        help
+          Find out whether you have a PCI motherboard. PCI is the name of a
+          bus system, i.e. the way the CPU talks to the other stuff inside
+          your box. Other bus systems are ISA, EISA, MicroChannel (MCA) or
+          VESA. If you have PCI, say Y, otherwise N.
+
+source "drivers/pci/Kconfig"
+
 menu "Platform options"
 
 choice
@@ -113,33 +145,35 @@ choice
 
 config XTENSA_PLATFORM_ISS
         bool "ISS"
+        select XTENSA_CALIBRATE_CCOUNT
+        select SERIAL_CONSOLE
+        select XTENSA_ISS_NETWORK
         help
           ISS is an acronym for Tensilica's Instruction Set Simulator.
 
 config XTENSA_PLATFORM_XT2000
         bool "XT2000"
+        select XTENSA_CALIBRATE_CCOUNT
+        select PCI
         help
           XT2000 is the name of Tensilica's feature-rich emulation platform.
           This hardware is capable of running a full Linux distribution.
 
-endchoice
+config XTENSA_PLATFORM_S6105
+        bool "S6105"
+        select SERIAL_CONSOLE
 
+endchoice
 
-config XTENSA_CALIBRATE_CCOUNT
-        bool "Auto calibration of the CPU clock rate"
-        ---help---
-          On some platforms (XT2000, for example), the CPU clock rate can
-          vary.  The frequency can be determined, however, by measuring
-          against a well known, fixed frequency, such as an UART oscillator.
 
 config XTENSA_CPU_CLOCK
         int "CPU clock rate [MHz]"
         depends on !XTENSA_CALIBRATE_CCOUNT
-        default "16"
+        default 16
 
 config GENERIC_CALIBRATE_DELAY
         bool "Auto calibration of the BogoMIPS value"
-        ---help---
+        help
           The BogoMIPS value can easily be derived from the CPU frequency.
 
 config CMDLINE_BOOL
@@ -156,52 +190,27 @@ config CMDLINE
           time by entering them here. As a minimum, you should specify the
           memory size and the root device (e.g., mem=64M root=/dev/nfs).
 
-config SERIAL_CONSOLE
-        bool
-        depends on XTENSA_PLATFORM_ISS
-        default y
-
-config XTENSA_ISS_NETWORK
-        bool
-        depends on XTENSA_PLATFORM_ISS
-        default y
-
 source "mm/Kconfig"
 
 endmenu
 
-menu "Bus options"
-
-config PCI
-        bool "PCI support" if !XTENSA_PLATFORM_ISS
-        depends on !XTENSA_PLATFORM_ISS
-        default y
+config HOTPLUG
+        bool "Support for hot-pluggable devices"
         help
-          Find out whether you have a PCI motherboard. PCI is the name of a
-          bus system, i.e. the way the CPU talks to the other stuff inside
-          your box. Other bus systems are ISA, EISA, MicroChannel (MCA) or
-          VESA. If you have PCI, say Y, otherwise N.
+          Say Y here if you want to plug devices into your computer while
+          the system is running, and be able to use them quickly.  In many
+          cases, the devices can likewise be unplugged at any time too.
 
-source "drivers/pci/Kconfig"
+          One well known example of this is PCMCIA- or PC-cards, credit-card
+          size devices such as network cards, modems or hard drives which are
+          plugged into slots found on all modern laptop computers.  Another
+          example, used on modern desktops as well as laptops, is USB.
 
-config HOTPLUG
-
-        bool "Support for hot-pluggable devices"
-        ---help---
-        Say Y here if you want to plug devices into your computer while
-        the system is running, and be able to use them quickly.  In many
-        cases, the devices can likewise be unplugged at any time too.
-
-        One well known example of this is PCMCIA- or PC-cards, credit-card
-        size devices such as network cards, modems or hard drives which are
-        plugged into slots found on all modern laptop computers.  Another
-        example, used on modern desktops as well as laptops, is USB.
-
-        Enable HOTPLUG and build a modular kernel.  Get agent software
-        (from <http://linux-hotplug.sourceforge.net/>) and install it.
-        Then your kernel will automatically call out to a user mode "policy
-        agent" (/sbin/hotplug) to load modules and set up software needed
-        to use devices as you hotplug them.
+          Enable HOTPLUG and build a modular kernel.  Get agent software
+          (from <http://linux-hotplug.sourceforge.net/>) and install it.
+          Then your kernel will automatically call out to a user mode "policy
+          agent" (/sbin/hotplug) to load modules and set up software needed
+          to use devices as you hotplug them.
 
 source "drivers/pcmcia/Kconfig"
 
@@ -213,9 +222,8 @@ menu "Executable file formats"
 
 # only elf supported
 config KCORE_ELF
-        bool
+        def_bool y
         depends on PROC_FS
-        default y
         help
           If you enabled support for /proc file system then the file
           /proc/kcore will contain the kernel core image in ELF format. This
@@ -240,7 +248,7 @@ source "fs/Kconfig"
 menu "Xtensa initrd options"
         depends on BLK_DEV_INITRD
 
-        config EMBEDDED_RAMDISK
+config EMBEDDED_RAMDISK
         bool "Embed root filesystem ramdisk into the kernel"
 
 config EMBEDDED_RAMDISK_IMAGE
diff --git a/arch/xtensa/Makefile b/arch/xtensa/Makefile
index 1da55fe4beff..4caffac3ca2e 100644
--- a/arch/xtensa/Makefile
+++ b/arch/xtensa/Makefile
@@ -15,6 +15,7 @@
 
 variant-$(CONFIG_XTENSA_VARIANT_FSF)            := fsf
 variant-$(CONFIG_XTENSA_VARIANT_DC232B)         := dc232b
+variant-$(CONFIG_XTENSA_VARIANT_S6000)          := s6000
 variant-$(CONFIG_XTENSA_VARIANT_LINUX_CUSTOM)   := custom
 
 VARIANT = $(variant-y)
@@ -24,6 +25,7 @@ export VARIANT
 
 platform-$(CONFIG_XTENSA_PLATFORM_XT2000)       := xt2000
 platform-$(CONFIG_XTENSA_PLATFORM_ISS)          := iss
+platform-$(CONFIG_XTENSA_PLATFORM_S6105)        := s6105
 
 PLATFORM = $(platform-y)
 export PLATFORM
@@ -62,20 +64,23 @@ ifneq ($(VARIANT),)
   endif
 endif
 
-#
+# Only build variant and/or platform if it includes a Makefile
+
+buildvar := $(shell test -a $(srctree)/arch/xtensa/variants/$(VARIANT)/Makefile && echo arch/xtensa/variants/$(VARIANT)/)
+buildplf := $(shell test -a $(srctree)/arch/xtensa/platforms/$(PLATFORM)/Makefile && echo arch/xtensa/platforms/$(PLATFORM)/)
+
+# Find libgcc.a
 
 LIBGCC := $(shell $(CC) $(KBUILD_CFLAGS) -print-libgcc-file-name)
 
 head-y          := arch/xtensa/kernel/head.o
 core-y          += arch/xtensa/kernel/ arch/xtensa/mm/
-ifneq ($(PLATFORM),)
-core-y          += arch/xtensa/platforms/$(PLATFORM)/
-endif
+core-y          += $(buildvar) $(buildplf)
+
 libs-y          += arch/xtensa/lib/ $(LIBGCC)
 
 boot            := arch/xtensa/boot
 
-
 all: zImage
 
 bzImage : zImage
diff --git a/arch/xtensa/configs/s6105_defconfig b/arch/xtensa/configs/s6105_defconfig
new file mode 100644
index 000000000000..6e1deff41590
--- /dev/null
+++ b/arch/xtensa/configs/s6105_defconfig
@@ -0,0 +1,530 @@
+#
+# Automatically generated make config: don't edit
+# Linux kernel version: 2.6.29-rc7-s6
+# Tue Mar 10 11:09:26 2009
+#
+# CONFIG_FRAME_POINTER is not set
+CONFIG_ZONE_DMA=y
+CONFIG_XTENSA=y
+CONFIG_RWSEM_XCHGADD_ALGORITHM=y
+CONFIG_GENERIC_FIND_NEXT_BIT=y
+CONFIG_GENERIC_HWEIGHT=y
+CONFIG_GENERIC_HARDIRQS=y
+CONFIG_GENERIC_GPIO=y
+# CONFIG_ARCH_HAS_ILOG2_U32 is not set
+# CONFIG_ARCH_HAS_ILOG2_U64 is not set
+CONFIG_NO_IOPORT=y
+CONFIG_HZ=100
+CONFIG_GENERIC_TIME=y
+CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
+
+#
+# General setup
+#
+CONFIG_EXPERIMENTAL=y
+CONFIG_BROKEN_ON_SMP=y
+CONFIG_LOCK_KERNEL=y
+CONFIG_INIT_ENV_ARG_LIMIT=32
+CONFIG_LOCALVERSION=""
+CONFIG_LOCALVERSION_AUTO=y
+CONFIG_SYSVIPC=y
+CONFIG_SYSVIPC_SYSCTL=y
+# CONFIG_POSIX_MQUEUE is not set
+# CONFIG_BSD_PROCESS_ACCT is not set
+# CONFIG_TASKSTATS is not set
+# CONFIG_AUDIT is not set
+
+#
+# RCU Subsystem
+#
+# CONFIG_CLASSIC_RCU is not set
+# CONFIG_TREE_RCU is not set
+CONFIG_PREEMPT_RCU=y
+# CONFIG_RCU_TRACE is not set
+# CONFIG_TREE_RCU_TRACE is not set
+# CONFIG_PREEMPT_RCU_TRACE is not set
+CONFIG_IKCONFIG=y
+CONFIG_IKCONFIG_PROC=y
+CONFIG_LOG_BUF_SHIFT=16
+# CONFIG_GROUP_SCHED is not set
+# CONFIG_CGROUPS is not set
+# CONFIG_SYSFS_DEPRECATED_V2 is not set
+# CONFIG_RELAY is not set
+# CONFIG_NAMESPACES is not set
+CONFIG_BLK_DEV_INITRD=y
+CONFIG_INITRAMFS_SOURCE=""
+CONFIG_CC_OPTIMIZE_FOR_SIZE=y
+CONFIG_SYSCTL=y
+CONFIG_EMBEDDED=y
+CONFIG_SYSCTL_SYSCALL=y
+CONFIG_KALLSYMS=y
+# CONFIG_KALLSYMS_ALL is not set
+# CONFIG_KALLSYMS_EXTRA_PASS is not set
+# CONFIG_HOTPLUG is not set
+CONFIG_PRINTK=y
+CONFIG_BUG=y
+CONFIG_ELF_CORE=y
+# CONFIG_COMPAT_BRK is not set
+CONFIG_BASE_FULL=y
+CONFIG_FUTEX=y
+CONFIG_ANON_INODES=y
+CONFIG_EPOLL=y
+CONFIG_SIGNALFD=y
+CONFIG_TIMERFD=y
+CONFIG_EVENTFD=y
+CONFIG_AIO=y
+CONFIG_VM_EVENT_COUNTERS=y
+CONFIG_SLAB=y
+# CONFIG_SLUB is not set
+# CONFIG_SLOB is not set
+# CONFIG_PROFILING is not set
+# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set
+CONFIG_SLABINFO=y
+CONFIG_RT_MUTEXES=y
+CONFIG_BASE_SMALL=0
+# CONFIG_MODULES is not set
+CONFIG_BLOCK=y
+# CONFIG_LBD is not set
+# CONFIG_BLK_DEV_IO_TRACE is not set
+# CONFIG_BLK_DEV_BSG is not set
+# CONFIG_BLK_DEV_INTEGRITY is not set
+
+#
+# IO Schedulers
+#
+CONFIG_IOSCHED_NOOP=y
+# CONFIG_IOSCHED_AS is not set
+# CONFIG_IOSCHED_DEADLINE is not set
+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"
+# CONFIG_FREEZER is not set
+# CONFIG_MMU is not set
+CONFIG_VARIANT_IRQ_SWITCH=y
+
+#
+# Processor type and features
+#
+# CONFIG_XTENSA_VARIANT_FSF is not set
+# CONFIG_XTENSA_VARIANT_DC232B is not set
+CONFIG_XTENSA_VARIANT_S6000=y
+# CONFIG_XTENSA_UNALIGNED_USER is not set
+CONFIG_PREEMPT=y
+# CONFIG_MATH_EMULATION is not set
+# CONFIG_HIGHMEM is not set
+# CONFIG_XTENSA_CALIBRATE_CCOUNT is not set
+CONFIG_SERIAL_CONSOLE=y
+# CONFIG_XTENSA_ISS_NETWORK is not set
+
+#
+# Bus options
+#
+# CONFIG_PCI is not set
+# CONFIG_ARCH_SUPPORTS_MSI is not set
+
+#
+# Platform options
+#
+# CONFIG_XTENSA_PLATFORM_ISS is not set
+# CONFIG_XTENSA_PLATFORM_XT2000 is not set
+CONFIG_XTENSA_PLATFORM_S6105=y
+CONFIG_XTENSA_CPU_CLOCK=300
+CONFIG_GENERIC_CALIBRATE_DELAY=y
+CONFIG_CMDLINE_BOOL=y
+CONFIG_CMDLINE="console=ttyS1,38400 debug bootmem_debug loglevel=7"
+CONFIG_SELECT_MEMORY_MODEL=y
+CONFIG_FLATMEM_MANUAL=y
+# CONFIG_DISCONTIGMEM_MANUAL is not set
+# CONFIG_SPARSEMEM_MANUAL is not set
+CONFIG_FLATMEM=y
+CONFIG_FLAT_NODE_MEM_MAP=y
+CONFIG_PAGEFLAGS_EXTENDED=y
+CONFIG_SPLIT_PTLOCK_CPUS=4
+# CONFIG_PHYS_ADDR_T_64BIT is not set
+CONFIG_ZONE_DMA_FLAG=1
+CONFIG_VIRT_TO_BUS=y
+
+#
+# Executable file formats
+#
+CONFIG_KCORE_ELF=y
+CONFIG_BINFMT_FLAT=y
+# CONFIG_BINFMT_ZFLAT is not set
+# CONFIG_BINFMT_SHARED_FLAT is not set
+# CONFIG_HAVE_AOUT is not set
+# CONFIG_BINFMT_MISC is not set
+CONFIG_NET=y
+
+#
+# Networking options
+#
+CONFIG_COMPAT_NET_DEV_OPS=y
+CONFIG_PACKET=y
+# CONFIG_PACKET_MMAP is not set
+CONFIG_UNIX=y
+# 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 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 is not set
+# CONFIG_INET_XFRM_MODE_TUNNEL is not set
+# CONFIG_INET_XFRM_MODE_BEET is not set
+# CONFIG_INET_LRO is not set
+# CONFIG_INET_DIAG is not set
+# 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_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_NET_DSA 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
+# CONFIG_NET_SCHED is not set
+# CONFIG_DCB is not set
+
+#
+# Network testing
+#
+# CONFIG_NET_PKTGEN is not set
+# CONFIG_HAMRADIO is not set
+# CONFIG_CAN is not set
+# CONFIG_IRDA is not set
+# CONFIG_BT is not set
+# CONFIG_AF_RXRPC is not set
+# CONFIG_PHONET is not set
+# CONFIG_WIRELESS is not set
+# CONFIG_WIMAX 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_DEBUG_DRIVER is not set
+# CONFIG_DEBUG_DEVRES is not set
+# CONFIG_SYS_HYPERVISOR is not set
+# CONFIG_CONNECTOR is not set
+# CONFIG_MTD is not set
+# CONFIG_PARPORT is not set
+CONFIG_BLK_DEV=y
+# CONFIG_BLK_DEV_COW_COMMON is not set
+# CONFIG_BLK_DEV_LOOP is not set
+# CONFIG_BLK_DEV_NBD is not set
+CONFIG_BLK_DEV_RAM=y
+CONFIG_BLK_DEV_RAM_COUNT=16
+CONFIG_BLK_DEV_RAM_SIZE=4096
+# CONFIG_BLK_DEV_XIP is not set
+# CONFIG_CDROM_PKTCDVD is not set
+# CONFIG_ATA_OVER_ETH is not set
+# CONFIG_BLK_DEV_HD is not set
+# CONFIG_MISC_DEVICES is not set
+CONFIG_HAVE_IDE=y
+# CONFIG_IDE is not set
+
+#
+# SCSI device support
+#
+# CONFIG_RAID_ATTRS is not set
+# CONFIG_SCSI is not set
+# CONFIG_SCSI_DMA is not set
+# CONFIG_SCSI_NETLINK is not set
+# CONFIG_ATA is not set
+# CONFIG_MD is not set
+# CONFIG_NETDEVICES is not set
+# CONFIG_ISDN is not set
+# CONFIG_PHONE is not set
+
+#
+# Input device support
+#
+# CONFIG_INPUT is not set
+
+#
+# Hardware I/O ports
+#
+# CONFIG_SERIO is not set
+# CONFIG_GAMEPORT is not set
+
+#
+# Character devices
+#
+# CONFIG_VT is not set
+# CONFIG_DEVKMEM is not set
+# CONFIG_SERIAL_NONSTANDARD is not set
+
+#
+# Serial drivers
+#
+CONFIG_SERIAL_8250=y
+CONFIG_SERIAL_8250_CONSOLE=y
+CONFIG_SERIAL_8250_NR_UARTS=2
+CONFIG_SERIAL_8250_RUNTIME_UARTS=2
+# CONFIG_SERIAL_8250_EXTENDED is not set
+
+#
+# Non-8250 serial port support
+#
+CONFIG_SERIAL_CORE=y
+CONFIG_SERIAL_CORE_CONSOLE=y
+CONFIG_UNIX98_PTYS=y
+# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
+# CONFIG_LEGACY_PTYS is not set
+# CONFIG_IPMI_HANDLER is not set
+# CONFIG_HW_RANDOM is not set
+# CONFIG_RTC is not set
+# CONFIG_GEN_RTC is not set
+# CONFIG_R3964 is not set
+# CONFIG_RAW_DRIVER is not set
+# CONFIG_TCG_TPM is not set
+# CONFIG_I2C is not set
+# CONFIG_SPI is not set
+CONFIG_ARCH_REQUIRE_GPIOLIB=y
+CONFIG_GPIOLIB=y
+# CONFIG_DEBUG_GPIO is not set
+# CONFIG_GPIO_SYSFS is not set
+
+#
+# Memory mapped GPIO expanders:
+#
+
+#
+# I2C GPIO expanders:
+#
+
+#
+# PCI GPIO expanders:
+#
+
+#
+# SPI GPIO expanders:
+#
+# CONFIG_W1 is not set
+# CONFIG_POWER_SUPPLY is not set
+# CONFIG_HWMON is not set
+# CONFIG_THERMAL is not set
+# CONFIG_THERMAL_HWMON is not set
+# CONFIG_WATCHDOG is not set
+CONFIG_SSB_POSSIBLE=y
+
+#
+# Sonics Silicon Backplane
+#
+# CONFIG_SSB is not set
+
+#
+# Multifunction device drivers
+#
+# CONFIG_MFD_CORE is not set
+# CONFIG_MFD_SM501 is not set
+# CONFIG_HTC_PASIC3 is not set
+# CONFIG_MFD_TMIO is not set
+# CONFIG_REGULATOR is not set
+
+#
+# Multimedia devices
+#
+
+#
+# Multimedia core support
+#
+# CONFIG_VIDEO_DEV is not set
+# CONFIG_DVB_CORE is not set
+# CONFIG_VIDEO_MEDIA is not set
+
+#
+# Multimedia drivers
+#
+# CONFIG_DAB is not set
+
+#
+# Graphics support
+#
+# CONFIG_VGASTATE is not set
+# CONFIG_VIDEO_OUTPUT_CONTROL is not set
+# CONFIG_FB is not set
+# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
+
+#
+# Display device support
+#
+# CONFIG_DISPLAY_SUPPORT is not set
+# CONFIG_SOUND is not set
+# CONFIG_USB_SUPPORT is not set
+# CONFIG_MMC is not set
+# CONFIG_MEMSTICK is not set
+# CONFIG_NEW_LEDS is not set
+# CONFIG_ACCESSIBILITY is not set
+# CONFIG_RTC_CLASS is not set
+# CONFIG_DMADEVICES is not set
+# CONFIG_UIO is not set
+# CONFIG_STAGING is not set
+
+#
+# File systems
+#
+# CONFIG_EXT2_FS is not set
+# CONFIG_EXT3_FS is not set
+# CONFIG_EXT4_FS is not set
+# CONFIG_REISERFS_FS is not set
+# CONFIG_JFS_FS is not set
+# CONFIG_FS_POSIX_ACL is not set
+CONFIG_FILE_LOCKING=y
+# CONFIG_XFS_FS is not set
+# CONFIG_OCFS2_FS is not set
+# CONFIG_BTRFS_FS is not set
+# CONFIG_DNOTIFY is not set
+# CONFIG_INOTIFY is not set
+# CONFIG_QUOTA is not set
+# 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 is not set
+# CONFIG_UDF_FS is not set
+
+#
+# DOS/FAT/NT Filesystems
+#
+# CONFIG_MSDOS_FS is not set
+# CONFIG_VFAT_FS is not set
+# CONFIG_NTFS_FS is not set
+
+#
+# Pseudo filesystems
+#
+CONFIG_PROC_FS=y
+CONFIG_PROC_SYSCTL=y
+CONFIG_SYSFS=y
+# CONFIG_TMPFS is not set
+# CONFIG_HUGETLB_PAGE is not set
+# CONFIG_CONFIGFS_FS is not set
+# CONFIG_MISC_FILESYSTEMS is not set
+# CONFIG_NETWORK_FILESYSTEMS is not set
+
+#
+# Partition Types
+#
+# CONFIG_PARTITION_ADVANCED is not set
+CONFIG_MSDOS_PARTITION=y
+# CONFIG_NLS is not set
+# CONFIG_DLM is not set
+
+#
+# Xtensa initrd options
+#
+# CONFIG_EMBEDDED_RAMDISK is not set
+
+#
+# Kernel hacking
+#
+CONFIG_PRINTK_TIME=y
+# CONFIG_ENABLE_WARN_DEPRECATED is not set
+# CONFIG_ENABLE_MUST_CHECK is not set
+CONFIG_FRAME_WARN=1024
+# 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=y
+CONFIG_DEBUG_SHIRQ=y
+CONFIG_DETECT_SOFTLOCKUP=y
+# CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set
+CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0
+# CONFIG_SCHED_DEBUG is not set
+# CONFIG_SCHEDSTATS is not set
+# CONFIG_TIMER_STATS is not set
+# CONFIG_DEBUG_OBJECTS is not set
+# CONFIG_DEBUG_SLAB is not set
+# CONFIG_DEBUG_RT_MUTEXES is not set
+# CONFIG_RT_MUTEX_TESTER is not set
+CONFIG_DEBUG_SPINLOCK=y
+CONFIG_DEBUG_MUTEXES=y
+CONFIG_DEBUG_SPINLOCK_SLEEP=y
+# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
+# CONFIG_DEBUG_KOBJECT is not set
+# CONFIG_DEBUG_INFO is not set
+# CONFIG_DEBUG_VM is not set
+CONFIG_DEBUG_NOMMU_REGIONS=y
+# CONFIG_DEBUG_WRITECOUNT is not set
+# CONFIG_DEBUG_MEMORY_INIT is not set
+# CONFIG_DEBUG_LIST is not set
+# CONFIG_DEBUG_SG is not set
+# CONFIG_DEBUG_NOTIFIERS is not set
+# CONFIG_BOOT_PRINTK_DELAY is not set
+# CONFIG_RCU_TORTURE_TEST is not set
+# CONFIG_BACKTRACE_SELF_TEST is not set
+# CONFIG_DEBUG_BLOCK_EXT_DEVT is not set
+# CONFIG_FAULT_INJECTION is not set
+# CONFIG_SYSCTL_SYSCALL_CHECK is not set
+
+#
+# Tracers
+#
+# CONFIG_PREEMPT_TRACER is not set
+# CONFIG_SCHED_TRACER is not set
+# CONFIG_CONTEXT_SWITCH_TRACER is not set
+# CONFIG_BOOT_TRACER is not set
+# CONFIG_TRACE_BRANCH_PROFILING is not set
+# CONFIG_DYNAMIC_PRINTK_DEBUG is not set
+# CONFIG_SAMPLES is not set
+
+#
+# Security options
+#
+# CONFIG_KEYS is not set
+# CONFIG_SECURITY is not set
+# CONFIG_SECURITYFS is not set
+# CONFIG_SECURITY_FILE_CAPABILITIES is not set
+# CONFIG_CRYPTO is not set
+
+#
+# Library routines
+#
+CONFIG_GENERIC_FIND_LAST_BIT=y
+# CONFIG_CRC_CCITT is not set
+# CONFIG_CRC16 is not set
+# CONFIG_CRC_T10DIF is not set
+# CONFIG_CRC_ITU_T is not set
+# CONFIG_CRC32 is not set
+# CONFIG_CRC7 is not set
+# CONFIG_LIBCRC32C is not set
+CONFIG_PLIST=y
+CONFIG_HAS_IOMEM=y
+CONFIG_HAS_DMA=y
diff --git a/arch/xtensa/include/asm/cacheflush.h b/arch/xtensa/include/asm/cacheflush.h
index 94c4c53a099e..8fc1c0c8de07 100644
--- a/arch/xtensa/include/asm/cacheflush.h
+++ b/arch/xtensa/include/asm/cacheflush.h
@@ -65,13 +65,17 @@ extern void __flush_invalidate_dcache_range(unsigned long, unsigned long);
 # define __flush_invalidate_dcache_range(p,s)   __invalidate_dcache_range(p,s)
 #endif
 
-#if (DCACHE_WAY_SIZE > PAGE_SIZE)
+#if defined(CONFIG_MMU) && (DCACHE_WAY_SIZE > PAGE_SIZE)
 extern void __flush_invalidate_dcache_page_alias(unsigned long, unsigned long);
+#else
+static inline void __flush_invalidate_dcache_page_alias(unsigned long virt,
+                                                        unsigned long phys) { }
 #endif
-#if (ICACHE_WAY_SIZE > PAGE_SIZE)
+#if defined(CONFIG_MMU) && (ICACHE_WAY_SIZE > PAGE_SIZE)
 extern void __invalidate_icache_page_alias(unsigned long, unsigned long);
 #else
-# define __invalidate_icache_page_alias(v,p)    do { } while(0)
+static inline void __invalidate_icache_page_alias(unsigned long virt,
+                                                unsigned long phys) { }
 #endif
 
 /*
diff --git a/arch/xtensa/include/asm/dma.h b/arch/xtensa/include/asm/dma.h
index e30f3abf48f0..137ca3945b07 100644
--- a/arch/xtensa/include/asm/dma.h
+++ b/arch/xtensa/include/asm/dma.h
@@ -44,8 +44,9 @@
  *      the value desired).
  */
 
+#ifndef MAX_DMA_ADDRESS
 #define MAX_DMA_ADDRESS         (PAGE_OFFSET + XCHAL_KIO_SIZE - 1)
-
+#endif
 
 /* Reserve and release a DMA channel */
 extern int request_dma(unsigned int dmanr, const char * device_id);
diff --git a/arch/xtensa/include/asm/flat.h b/arch/xtensa/include/asm/flat.h
new file mode 100644
index 000000000000..94c44abf15e4
--- /dev/null
+++ b/arch/xtensa/include/asm/flat.h
@@ -0,0 +1,12 @@
+#ifndef __ASM_XTENSA_FLAT_H
+#define __ASM_XTENSA_FLAT_H
+
+#define flat_argvp_envp_on_stack()                      0
+#define flat_old_ram_flag(flags)                        (flags)
+#define flat_reloc_valid(reloc, size)                   ((reloc) <= (size))
+#define flat_get_addr_from_rp(rp, relval, flags, p)     get_unaligned(rp)
+#define flat_put_addr_at_rp(rp, val, relval     )       put_unaligned(val, rp)
+#define flat_get_relocate_addr(rel)                     (rel)
+#define flat_set_persistent(relval, p)                  0
+
+#endif /* __ASM_XTENSA_FLAT_H */
diff --git a/arch/xtensa/include/asm/gpio.h b/arch/xtensa/include/asm/gpio.h
new file mode 100644
index 000000000000..0763b0763960
--- /dev/null
+++ b/arch/xtensa/include/asm/gpio.h
@@ -0,0 +1,56 @@
+/*
+ * Generic GPIO API implementation for xtensa.
+ *
+ * Stolen from x86, which is derived from the generic GPIO API for powerpc:
+ *
+ * Copyright (c) 2007-2008  MontaVista Software, Inc.
+ *
+ * Author: Anton Vorontsov <avorontsov@ru.mvista.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.
+ */
+
+#ifndef _ASM_XTENSA_GPIO_H
+#define _ASM_XTENSA_GPIO_H
+
+#include <asm-generic/gpio.h>
+
+#ifdef CONFIG_GPIOLIB
+
+/*
+ * Just call gpiolib.
+ */
+static inline int gpio_get_value(unsigned int gpio)
+{
+        return __gpio_get_value(gpio);
+}
+
+static inline void gpio_set_value(unsigned int gpio, int value)
+{
+        __gpio_set_value(gpio, value);
+}
+
+static inline int gpio_cansleep(unsigned int gpio)
+{
+        return __gpio_cansleep(gpio);
+}
+
+/*
+ * Not implemented, yet.
+ */
+static inline int gpio_to_irq(unsigned int gpio)
+{
+        return -ENOSYS;
+}
+
+static inline int irq_to_gpio(unsigned int irq)
+{
+        return -EINVAL;
+}
+
+#endif /* CONFIG_GPIOLIB */
+
+#endif /* _ASM_XTENSA_GPIO_H */
diff --git a/arch/xtensa/include/asm/io.h b/arch/xtensa/include/asm/io.h
index 07b7299dab20..d04cd3a625fa 100644
--- a/arch/xtensa/include/asm/io.h
+++ b/arch/xtensa/include/asm/io.h
@@ -69,21 +69,28 @@ static inline void * phys_to_virt(unsigned long address)
 
 static inline void *ioremap(unsigned long offset, unsigned long size)
 {
+#ifdef CONFIG_MMU
         if (offset >= XCHAL_KIO_PADDR
             && offset < XCHAL_KIO_PADDR + XCHAL_KIO_SIZE)
                 return (void*)(offset-XCHAL_KIO_PADDR+XCHAL_KIO_BYPASS_VADDR);
-
         else
                 BUG();
+#else
+        return (void *)offset;
+#endif
 }
 
 static inline void *ioremap_nocache(unsigned long offset, unsigned long size)
 {
+#ifdef CONFIG_MMU
         if (offset >= XCHAL_KIO_PADDR
             && offset < XCHAL_KIO_PADDR + XCHAL_KIO_SIZE)
                 return (void*)(offset-XCHAL_KIO_PADDR+XCHAL_KIO_CACHED_VADDR);
         else
                 BUG();
+#else
+        return (void *)offset;
+#endif
 }
 
 static inline void iounmap(void *addr)
diff --git a/arch/xtensa/include/asm/irq.h b/arch/xtensa/include/asm/irq.h
index 1620d1e0e695..dfac82dc52ad 100644
--- a/arch/xtensa/include/asm/irq.h
+++ b/arch/xtensa/include/asm/irq.h
@@ -14,6 +14,13 @@
 #include <platform/hardware.h>
 #include <variant/core.h>
 
+#ifdef CONFIG_VARIANT_IRQ_SWITCH
+#include <variant/irq.h>
+#else
+static inline void variant_irq_enable(unsigned int irq) { }
+static inline void variant_irq_disable(unsigned int irq) { }
+#endif
+
 #ifndef PLATFORM_NR_IRQS
 # define PLATFORM_NR_IRQS 0
 #endif
diff --git a/arch/xtensa/include/asm/mmu.h b/arch/xtensa/include/asm/mmu.h
index 44c5bb04c55c..04890d6e2335 100644
--- a/arch/xtensa/include/asm/mmu.h
+++ b/arch/xtensa/include/asm/mmu.h
@@ -11,7 +11,12 @@
 #ifndef _XTENSA_MMU_H
 #define _XTENSA_MMU_H
 
+#ifndef CONFIG_MMU
+#include <asm/nommu.h>
+#else
+
 /* Default "unsigned long" context */
 typedef unsigned long mm_context_t;
 
+#endif /* CONFIG_MMU */
 #endif  /* _XTENSA_MMU_H */
diff --git a/arch/xtensa/include/asm/mmu_context.h b/arch/xtensa/include/asm/mmu_context.h
index c0fd8e5b4513..dbd8731a876a 100644
--- a/arch/xtensa/include/asm/mmu_context.h
+++ b/arch/xtensa/include/asm/mmu_context.h
@@ -13,16 +13,20 @@
 #ifndef _XTENSA_MMU_CONTEXT_H
 #define _XTENSA_MMU_CONTEXT_H
 
+#ifndef CONFIG_MMU
+#include <asm/nommu_context.h>
+#else
+
 #include <linux/stringify.h>
 #include <linux/sched.h>
 
+#include <variant/core.h>
+
 #include <asm/pgtable.h>
 #include <asm/cacheflush.h>
 #include <asm/tlbflush.h>
 #include <asm-generic/mm_hooks.h>
 
-#define XCHAL_MMU_ASID_BITS     8
-
 #if (XCHAL_HAVE_TLBS != 1)
 # error "Linux must have an MMU!"
 #endif
@@ -133,4 +137,5 @@ static inline void enter_lazy_tlb(struct mm_struct *mm, struct task_struct *tsk)
 
 }
 
+#endif /* CONFIG_MMU */
 #endif /* _XTENSA_MMU_CONTEXT_H */
diff --git a/arch/xtensa/include/asm/nommu.h b/arch/xtensa/include/asm/nommu.h
new file mode 100644
index 000000000000..dce2c438c5ba
--- /dev/null
+++ b/arch/xtensa/include/asm/nommu.h
@@ -0,0 +1,3 @@
+typedef struct {
+        unsigned long end_brk;
+} mm_context_t;
diff --git a/arch/xtensa/include/asm/nommu_context.h b/arch/xtensa/include/asm/nommu_context.h
new file mode 100644
index 000000000000..599e7a2e729d
--- /dev/null
+++ b/arch/xtensa/include/asm/nommu_context.h
@@ -0,0 +1,25 @@
+static inline void enter_lazy_tlb(struct mm_struct *mm, struct task_struct *tsk)
+{
+}
+
+static inline int init_new_context(struct task_struct *tsk, struct mm_struct *mm)
+{
+        return 0;
+}
+
+static inline void destroy_context(struct mm_struct *mm)
+{
+}
+
+static inline void activate_mm(struct mm_struct *prev, struct mm_struct *next)
+{
+}
+
+static inline void switch_mm(struct mm_struct *prev, struct mm_struct *next,
+                                struct task_struct *tsk)
+{
+}
+
+static inline void deactivate_mm(struct task_struct *tsk, struct mm_struct *mm)
+{
+}
diff --git a/arch/xtensa/include/asm/page.h b/arch/xtensa/include/asm/page.h
index 11f7dc2dbec7..17e0c5383b10 100644
--- a/arch/xtensa/include/asm/page.h
+++ b/arch/xtensa/include/asm/page.h
@@ -14,6 +14,7 @@
 #include <asm/processor.h>
 #include <asm/types.h>
 #include <asm/cache.h>
+#include <platform/hardware.h>
 
 /*
  * Fixed TLB translations in the processor.
@@ -32,8 +33,14 @@
 #define PAGE_SIZE               (__XTENSA_UL_CONST(1) << PAGE_SHIFT)
 #define PAGE_MASK               (~(PAGE_SIZE-1))
 
+#ifdef CONFIG_MMU
 #define PAGE_OFFSET             XCHAL_KSEG_CACHED_VADDR
 #define MAX_MEM_PFN             XCHAL_KSEG_SIZE
+#else
+#define PAGE_OFFSET             0
+#define MAX_MEM_PFN             (PLATFORM_DEFAULT_MEM_START + PLATFORM_DEFAULT_MEM_SIZE)
+#endif
+
 #define PGTABLE_START           0x80000000
 
 /*
@@ -150,9 +157,11 @@ extern void copy_user_page(void*, void*, unsigned long, struct page*);
  * addresses.
  */
 
+#define ARCH_PFN_OFFSET         (PLATFORM_DEFAULT_MEM_START >> PAGE_SHIFT)
+
 #define __pa(x)                 ((unsigned long) (x) - PAGE_OFFSET)
 #define __va(x)                 ((void *)((unsigned long) (x) + PAGE_OFFSET))
-#define pfn_valid(pfn)          ((unsigned long)pfn < max_mapnr)
+#define pfn_valid(pfn)          ((pfn) >= ARCH_PFN_OFFSET && ((pfn) - ARCH_PFN_OFFSET) < max_mapnr)
 #ifdef CONFIG_DISCONTIGMEM
 # error CONFIG_DISCONTIGMEM not supported
 #endif
@@ -162,8 +171,9 @@ extern void copy_user_page(void*, void*, unsigned long, struct page*);
 #define virt_addr_valid(kaddr)  pfn_valid(__pa(kaddr) >> PAGE_SHIFT)
 #define page_to_phys(page)      (page_to_pfn(page) << PAGE_SHIFT)
 
+#ifdef CONFIG_MMU
 #define WANT_PAGE_VIRTUAL
-
+#endif
 
 #endif /* __ASSEMBLY__ */
 
diff --git a/arch/xtensa/include/asm/pgtable.h b/arch/xtensa/include/asm/pgtable.h
index 8014d96b21f1..a138770c358e 100644
--- a/arch/xtensa/include/asm/pgtable.h
+++ b/arch/xtensa/include/asm/pgtable.h
@@ -183,7 +183,15 @@ extern unsigned long empty_zero_page[1024];
 
 #define ZERO_PAGE(vaddr) (virt_to_page(empty_zero_page))
 
+#ifdef CONFIG_MMU
 extern pgd_t swapper_pg_dir[PAGE_SIZE/sizeof(pgd_t)];
+extern void paging_init(void);
+extern void pgtable_cache_init(void);
+#else
+# define swapper_pg_dir NULL
+static inline void paging_init(void) { }
+static inline void pgtable_cache_init(void) { }
+#endif
 
 /*
  * The pmd contains the kernel virtual address of the pte page.
@@ -383,8 +391,6 @@ ptep_set_wrprotect(struct mm_struct *mm, unsigned long addr, pte_t *ptep)
 
 #else
 
-extern void paging_init(void);
-
 #define kern_addr_valid(addr)   (1)
 
 extern  void update_mmu_cache(struct vm_area_struct * vma,
@@ -398,9 +404,6 @@ extern  void update_mmu_cache(struct vm_area_struct * vma,
 #define io_remap_pfn_range(vma,from,pfn,size,prot) \
                 remap_pfn_range(vma, from, pfn, size, prot)
 
-
-extern void pgtable_cache_init(void);
-
 typedef pte_t *pte_addr_t;
 
 #endif /* !defined (__ASSEMBLY__) */
diff --git a/arch/xtensa/include/asm/platform.h b/arch/xtensa/include/asm/platform.h
index e3d5a48ad495..7d936e58e9be 100644
--- a/arch/xtensa/include/asm/platform.h
+++ b/arch/xtensa/include/asm/platform.h
@@ -74,16 +74,5 @@ extern int platform_pcibios_fixup (void);
  */
 extern void platform_calibrate_ccount (void);
 
-/*
- * platform_get_rtc_time returns RTC seconds (returns 0 for no error)
- */
-extern int platform_get_rtc_time(time_t*);
-
-/*
- * platform_set_rtc_time set RTC seconds (returns 0 for no error)
- */
-extern int platform_set_rtc_time(time_t);
-
-
 #endif  /* _XTENSA_PLATFORM_H */
 
diff --git a/arch/xtensa/include/asm/processor.h b/arch/xtensa/include/asm/processor.h
index 07387d3b99f4..0ea4937c0b61 100644
--- a/arch/xtensa/include/asm/processor.h
+++ b/arch/xtensa/include/asm/processor.h
@@ -13,6 +13,7 @@
 
 #include <variant/core.h>
 #include <asm/coprocessor.h>
+#include <platform/hardware.h>
 
 #include <linux/compiler.h>
 #include <asm/ptrace.h>
@@ -25,6 +26,8 @@
 # error Linux requires the Xtensa Windowed Registers Option.
 #endif
 
+#define ARCH_SLAB_MINALIGN      XCHAL_DATA_WIDTH
+
 /*
  * User space process size: 1 GB.
  * Windowed call ABI requires caller and callee to be located within the same
@@ -33,7 +36,12 @@
  * the 1 GB requirement applies to the stack as well.
  */
 
+#ifdef CONFIG_MMU
 #define TASK_SIZE       __XTENSA_UL_CONST(0x40000000)
+#else
+#define TASK_SIZE       (PLATFORM_DEFAULT_MEM_START + PLATFORM_DEFAULT_MEM_SIZE)
+#endif
+
 #define STACK_TOP       TASK_SIZE
 #define STACK_TOP_MAX   STACK_TOP
 
diff --git a/arch/xtensa/kernel/entry.S b/arch/xtensa/kernel/entry.S
index a51d36a27389..80d24c485fd3 100644
--- a/arch/xtensa/kernel/entry.S
+++ b/arch/xtensa/kernel/entry.S
@@ -1463,6 +1463,7 @@ ENTRY(_spill_registers)
         callx0  a0              # should not return
 1:      j       1b
 
+#ifdef CONFIG_MMU
 /*
  * We should never get here. Bail out!
  */
@@ -1775,7 +1776,7 @@ ENTRY(fast_store_prohibited)
         bbsi.l  a2, PS_UM_BIT, 1f
         j       _kernel_exception
 1:      j       _user_exception
-
+#endif /* CONFIG_MMU */
 
 /*
  * System Calls.
diff --git a/arch/xtensa/kernel/head.S b/arch/xtensa/kernel/head.S
index 67e69139520b..0817f9db836e 100644
--- a/arch/xtensa/kernel/head.S
+++ b/arch/xtensa/kernel/head.S
@@ -53,7 +53,7 @@ _start:	_j	2f
 2:      l32r    a0, 1b
         jx      a0
 
-        .text
+        .section .init.text, "ax"
         .align 4
 _startup:
 
@@ -235,8 +235,9 @@ should_never_return:
  */
         
 .section ".bss.page_aligned", "w"
+#ifdef CONFIG_MMU
 ENTRY(swapper_pg_dir)
         .fill   PAGE_SIZE, 1, 0
+#endif
 ENTRY(empty_zero_page)
         .fill   PAGE_SIZE, 1, 0
-
diff --git a/arch/xtensa/kernel/irq.c b/arch/xtensa/kernel/irq.c
index f3b66fba5b8f..a36c85edd045 100644
--- a/arch/xtensa/kernel/irq.c
+++ b/arch/xtensa/kernel/irq.c
@@ -132,6 +132,18 @@ static void xtensa_irq_unmask(unsigned int irq)
         set_sr (cached_irq_mask, INTENABLE);
 }
 
+static void xtensa_irq_enable(unsigned int irq)
+{
+        variant_irq_enable(irq);
+        xtensa_irq_unmask(irq);
+}
+
+static void xtensa_irq_disable(unsigned int irq)
+{
+        xtensa_irq_mask(irq);
+        variant_irq_disable(irq);
+}
+
 static void xtensa_irq_ack(unsigned int irq)
 {
         set_sr(1 << irq, INTCLEAR);
@@ -146,6 +158,8 @@ static int xtensa_irq_retrigger(unsigned int irq)
 
 static struct irq_chip xtensa_irq_chip = {
         .name           = "xtensa",
+        .enable         = xtensa_irq_enable,
+        .disable        = xtensa_irq_disable,
         .mask           = xtensa_irq_mask,
         .unmask         = xtensa_irq_unmask,
         .ack            = xtensa_irq_ack,
diff --git a/arch/xtensa/kernel/platform.c b/arch/xtensa/kernel/platform.c
index 69675f216062..1b91a97f1d84 100644
--- a/arch/xtensa/kernel/platform.c
+++ b/arch/xtensa/kernel/platform.c
@@ -36,8 +36,6 @@ _F(void, power_off, (void), { while(1); });
 _F(void, idle, (void), { __asm__ __volatile__ ("waiti 0" ::: "memory"); });
 _F(void, heartbeat, (void), { });
 _F(int,  pcibios_fixup, (void), { return 0; });
-_F(int, get_rtc_time, (time_t* t), { return 0; });
-_F(int, set_rtc_time, (time_t t), { return 0; });
 
 #ifdef CONFIG_XTENSA_CALIBRATE_CCOUNT
 _F(void, calibrate_ccount, (void),
diff --git a/arch/xtensa/kernel/process.c b/arch/xtensa/kernel/process.c
index 9185597eb6a0..031f36685710 100644
--- a/arch/xtensa/kernel/process.c
+++ b/arch/xtensa/kernel/process.c
@@ -172,7 +172,7 @@ void prepare_to_copy(struct task_struct *tsk)
  *       childregs.
  */
 
-int copy_thread(int nr, unsigned long clone_flags, unsigned long usp,
+int copy_thread(unsigned long clone_flags, unsigned long usp,
                 unsigned long unused,
                 struct task_struct * p, struct pt_regs * regs)
 {
diff --git a/arch/xtensa/kernel/setup.c b/arch/xtensa/kernel/setup.c
index 4ec1633c2941..1e5a034fe011 100644
--- a/arch/xtensa/kernel/setup.c
+++ b/arch/xtensa/kernel/setup.c
@@ -84,7 +84,13 @@ sysmem_info_t __initdata sysmem;
 int initrd_is_mapped;
 #endif
 
+#ifdef CONFIG_MMU
 extern void init_mmu(void);
+#else
+static inline void init_mmu(void) { }
+#endif
+
+extern void zones_init(void);
 
 /*
  * Boot parameter parsing.
@@ -286,6 +292,7 @@ void __init setup_arch(char **cmdline_p)
 
 
         paging_init();
+        zones_init();
 
 #ifdef CONFIG_VT
 # if defined(CONFIG_VGA_CONSOLE)
diff --git a/arch/xtensa/kernel/time.c b/arch/xtensa/kernel/time.c
index 8df1e842f6d4..8848120d291b 100644
--- a/arch/xtensa/kernel/time.c
+++ b/arch/xtensa/kernel/time.c
@@ -14,7 +14,7 @@
 
 #include <linux/errno.h>
 #include <linux/time.h>
-#include <linux/timex.h>
+#include <linux/clocksource.h>
 #include <linux/interrupt.h>
 #include <linux/module.h>
 #include <linux/init.h>
@@ -25,27 +25,31 @@
 #include <asm/timex.h>
 #include <asm/platform.h>
 
-
-DEFINE_SPINLOCK(rtc_lock);
-EXPORT_SYMBOL(rtc_lock);
-
-
 #ifdef CONFIG_XTENSA_CALIBRATE_CCOUNT
 unsigned long ccount_per_jiffy;         /* per 1/HZ */
 unsigned long nsec_per_ccount;          /* nsec per ccount increment */
 #endif
 
-static long last_rtc_update = 0;
-
-/*
- * Scheduler clock - returns current tim in nanosec units.
- */
-
-unsigned long long sched_clock(void)
+static cycle_t ccount_read(void)
 {
-        return (unsigned long long)jiffies * (1000000000 / HZ);
+        return (cycle_t)get_ccount();
 }
 
+static struct clocksource ccount_clocksource = {
+        .name = "ccount",
+        .rating = 200,
+        .read = ccount_read,
+        .mask = CLOCKSOURCE_MASK(32),
+        /*
+         * With a shift of 22 the lower limit of the cpu clock is
+         * 1MHz, where NSEC_PER_CCOUNT is 1000 or a bit less than
+         * 2^10: Since we have 32 bits and the multiplicator can
+         * already take up as much as 10 bits, this leaves us with
+         * remaining upper 22 bits.
+         */
+        .shift = 22,
+};
+
 static irqreturn_t timer_interrupt(int irq, void *dev_id);
 static struct irqaction timer_irqaction = {
         .handler =      timer_interrupt,
@@ -55,11 +59,11 @@ static struct irqaction timer_irqaction = {
 
 void __init time_init(void)
 {
-        time_t sec_o, sec_n = 0;
+        xtime.tv_nsec = 0;
+        xtime.tv_sec = read_persistent_clock();
 
-        /* The platform must provide a function to calibrate the processor
-         * speed for the CALIBRATE.
-         */
+        set_normalized_timespec(&wall_to_monotonic,
+                -xtime.tv_sec, -xtime.tv_nsec);
 
 #ifdef CONFIG_XTENSA_CALIBRATE_CCOUNT
         printk("Calibrating CPU frequency ");
@@ -67,19 +71,10 @@ void __init time_init(void)
         printk("%d.%02d MHz\n", (int)ccount_per_jiffy/(1000000/HZ),
                         (int)(ccount_per_jiffy/(10000/HZ))%100);
 #endif
-
-        /* Set time from RTC (if provided) */
-
-        if (platform_get_rtc_time(&sec_o) == 0)
-                while (platform_get_rtc_time(&sec_n))
-                        if (sec_o != sec_n)
-                                break;
-
-        xtime.tv_nsec = 0;
-        last_rtc_update = xtime.tv_sec = sec_n;
-
-        set_normalized_timespec(&wall_to_monotonic,
-                -xtime.tv_sec, -xtime.tv_nsec);
+        ccount_clocksource.mult =
+                clocksource_hz2mult(CCOUNT_PER_JIFFY * HZ,
+                                ccount_clocksource.shift);
+        clocksource_register(&ccount_clocksource);
 
         /* Initialize the linux timer interrupt. */
 
@@ -87,69 +82,6 @@ void __init time_init(void)
         set_linux_timer(get_ccount() + CCOUNT_PER_JIFFY);
 }
 
-
-int do_settimeofday(struct timespec *tv)
-{
-        time_t wtm_sec, sec = tv->tv_sec;
-        long wtm_nsec, nsec = tv->tv_nsec;
-        unsigned long delta;
-
-        if ((unsigned long)tv->tv_nsec >= NSEC_PER_SEC)
-                return -EINVAL;
-
-        write_seqlock_irq(&xtime_lock);
-
-        /* This is revolting. We need to set "xtime" correctly. However, the
-         * value in this location is the value at the most recent update of
-         * wall time.  Discover what correction gettimeofday() would have
-         * made, and then undo it!
-         */
-
-        delta = CCOUNT_PER_JIFFY;
-        delta += get_ccount() - get_linux_timer();
-        nsec -= delta * NSEC_PER_CCOUNT;
-
-        wtm_sec  = wall_to_monotonic.tv_sec + (xtime.tv_sec - sec);
-        wtm_nsec = wall_to_monotonic.tv_nsec + (xtime.tv_nsec - nsec);
-
-        set_normalized_timespec(&xtime, sec, nsec);
-        set_normalized_timespec(&wall_to_monotonic, wtm_sec, wtm_nsec);
-
-        ntp_clear();
-        write_sequnlock_irq(&xtime_lock);
-        return 0;
-}
-
-EXPORT_SYMBOL(do_settimeofday);
-
-
-void do_gettimeofday(struct timeval *tv)
-{
-        unsigned long flags;
-        unsigned long volatile sec, usec, delta, seq;
-
-        do {
-                seq = read_seqbegin_irqsave(&xtime_lock, flags);
-
-                sec = xtime.tv_sec;
-                usec = (xtime.tv_nsec / NSEC_PER_USEC);
-
-                delta = get_linux_timer() - get_ccount();
-
-        } while (read_seqretry_irqrestore(&xtime_lock, seq, flags));
-
-        usec += (((unsigned long) CCOUNT_PER_JIFFY - delta)
-                 * (unsigned long) NSEC_PER_CCOUNT) / NSEC_PER_USEC;
-
-        for (; usec >= 1000000; sec++, usec -= 1000000)
-                ;
-
-        tv->tv_sec = sec;
-        tv->tv_usec = usec;
-}
-
-EXPORT_SYMBOL(do_gettimeofday);
-
 /*
  * The timer interrupt is called HZ times per second.
  */
@@ -178,16 +110,6 @@ again:
                 next += CCOUNT_PER_JIFFY;
                 set_linux_timer(next);
 
-                if (ntp_synced() &&
-                    xtime.tv_sec - last_rtc_update >= 659 &&
-                    abs((xtime.tv_nsec/1000)-(1000000-1000000/HZ))<5000000/HZ) {
-
-                        if (platform_set_rtc_time(xtime.tv_sec+1) == 0)
-                                last_rtc_update = xtime.tv_sec+1;
-                        else
-                                /* Do it again in 60 s */
-                                last_rtc_update += 60;
-                }
                 write_sequnlock(&xtime_lock);
         }
 
@@ -213,4 +135,3 @@ void __cpuinit calibrate_delay(void)
                (loops_per_jiffy/(10000/HZ)) % 100);
 }
 #endif
-
diff --git a/arch/xtensa/kernel/traps.c b/arch/xtensa/kernel/traps.c
index c44f830b6c7a..9f0b71189e94 100644
--- a/arch/xtensa/kernel/traps.c
+++ b/arch/xtensa/kernel/traps.c
@@ -104,6 +104,7 @@ static dispatch_init_table_t __initdata dispatch_init_table[] = {
 #endif
 { EXCCAUSE_UNALIGNED,           KRNL,      fast_unaligned },
 #endif
+#ifdef CONFIG_MMU
 { EXCCAUSE_ITLB_MISS,           0,         do_page_fault },
 { EXCCAUSE_ITLB_MISS,           USER|KRNL, fast_second_level_miss},
 { EXCCAUSE_ITLB_MULTIHIT,               0,         do_multihit },
@@ -118,6 +119,7 @@ static dispatch_init_table_t __initdata dispatch_init_table[] = {
 { EXCCAUSE_STORE_CACHE_ATTRIBUTE,       USER|KRNL, fast_store_prohibited },
 { EXCCAUSE_STORE_CACHE_ATTRIBUTE,       0,         do_page_fault },
 { EXCCAUSE_LOAD_CACHE_ATTRIBUTE,        0,         do_page_fault },
+#endif /* CONFIG_MMU */
 /* XCCHAL_EXCCAUSE_FLOATING_POINT unhandled */
 #if XTENSA_HAVE_COPROCESSOR(0)
 COPROCESSOR(0),
@@ -372,11 +374,10 @@ void show_trace(struct task_struct *task, unsigned long *sp)
         unsigned long a0, a1, pc;
         unsigned long sp_start, sp_end;
 
-        a1 = (unsigned long)sp;
-
-        if (a1 == 0)
-                __asm__ __volatile__ ("mov %0, a1\n" : "=a"(a1));
-
+        if (sp)
+                a1 = (unsigned long)sp;
+        else
+                a1 = task->thread.sp;
 
         sp_start = a1 & ~(THREAD_SIZE-1);
         sp_end = sp_start + THREAD_SIZE;
@@ -418,9 +419,8 @@ void show_stack(struct task_struct *task, unsigned long *sp)
         int i = 0;
         unsigned long *stack;
 
-        if (sp == 0)
-                __asm__ __volatile__ ("mov %0, a1\n" : "=a"(sp));
-
+        if (!sp)
+                sp = (unsigned long *)task->thread.sp;
         stack = sp;
 
         printk("\nStack: ");
diff --git a/arch/xtensa/kernel/vectors.S b/arch/xtensa/kernel/vectors.S
index eb2d7bb69ee0..74a7518faf16 100644
--- a/arch/xtensa/kernel/vectors.S
+++ b/arch/xtensa/kernel/vectors.S
@@ -309,6 +309,7 @@ ENTRY(_DoubleExceptionVector)
          * All other exceptions are unexpected and thus unrecoverable!
          */
 
+#ifdef CONFIG_MMU
         .extern fast_second_level_miss_double_kernel
 
 .Lksp:  /* a0: a0, a1: a1, a2: a2, a3: trashed, depc: depc, excsave: a3 */
@@ -319,6 +320,9 @@ ENTRY(_DoubleExceptionVector)
         bnez    a3, .Lunrecoverable
 1:      movi    a3, fast_second_level_miss_double_kernel
         jx      a3
+#else
+.equ    .Lksp,  .Lunrecoverable
+#endif
 
         /* Critical! We can't handle this situation. PANIC! */
 
diff --git a/arch/xtensa/kernel/vmlinux.lds.S b/arch/xtensa/kernel/vmlinux.lds.S
index d506774f4b05..c1be9a4a740c 100644
--- a/arch/xtensa/kernel/vmlinux.lds.S
+++ b/arch/xtensa/kernel/vmlinux.lds.S
@@ -17,6 +17,7 @@
 #include <asm-generic/vmlinux.lds.h>
 
 #include <variant/core.h>
+#include <platform/hardware.h>
 OUTPUT_ARCH(xtensa)
 ENTRY(_start)
 
@@ -26,7 +27,9 @@ jiffies = jiffies_64 + 4;
 jiffies = jiffies_64;
 #endif
 
+#ifndef KERNELOFFSET
 #define KERNELOFFSET 0xd0001000
+#endif
 
 /* Note: In the following macros, it would be nice to specify only the
    vector name and section kind and construct "sym" and "section" using
diff --git a/arch/xtensa/mm/Makefile b/arch/xtensa/mm/Makefile
index 64e304a2f884..f0b646d2f843 100644
--- a/arch/xtensa/mm/Makefile
+++ b/arch/xtensa/mm/Makefile
@@ -2,4 +2,5 @@
 # Makefile for the Linux/Xtensa-specific parts of the memory manager.
 #
 
-obj-y    := init.o fault.o tlb.o misc.o cache.o
+obj-y                   := init.o cache.o misc.o
+obj-$(CONFIG_MMU)       += fault.o mmu.o tlb.o
diff --git a/arch/xtensa/mm/init.c b/arch/xtensa/mm/init.c
index 34163cfaaffc..427e14fa43c5 100644
--- a/arch/xtensa/mm/init.c
+++ b/arch/xtensa/mm/init.c
@@ -24,15 +24,8 @@
 #include <linux/mm.h>
 #include <linux/slab.h>
 
-#include <asm/pgtable.h>
 #include <asm/bootparam.h>
-#include <asm/mmu_context.h>
-#include <asm/tlb.h>
 #include <asm/page.h>
-#include <asm/pgalloc.h>
-
-
-DEFINE_PER_CPU(struct mmu_gather, mmu_gathers);
 
 /* References to section boundaries */
 
@@ -130,7 +123,8 @@ void __init bootmem_init(void)
 
         /* Find an area to use for the bootmem bitmap. */
 
-        bootmap_size = bootmem_bootmap_pages(max_low_pfn) << PAGE_SHIFT;
+        bootmap_size = bootmem_bootmap_pages(max_low_pfn - min_low_pfn);
+        bootmap_size <<= PAGE_SHIFT;
         bootmap_start = ~0;
 
         for (i=0; i<sysmem.nr_banks; i++)
@@ -145,8 +139,9 @@ void __init bootmem_init(void)
         /* Reserve the bootmem bitmap area */
 
         mem_reserve(bootmap_start, bootmap_start + bootmap_size, 1);
-        bootmap_size = init_bootmem_node(NODE_DATA(0), min_low_pfn,
+        bootmap_size = init_bootmem_node(NODE_DATA(0),
                                          bootmap_start >> PAGE_SHIFT,
+                                         min_low_pfn,
                                          max_low_pfn);
 
         /* Add all remaining memory pieces into the bootmem map */
@@ -158,14 +153,14 @@ void __init bootmem_init(void)
 }
 
 
-void __init paging_init(void)
+void __init zones_init(void)
 {
         unsigned long zones_size[MAX_NR_ZONES];
         int i;
 
         /* All pages are DMA-able, so we put them all in the DMA zone. */
 
-        zones_size[ZONE_DMA] = max_low_pfn;
+        zones_size[ZONE_DMA] = max_low_pfn - ARCH_PFN_OFFSET;
         for (i = 1; i < MAX_NR_ZONES; i++)
                 zones_size[i] = 0;
 
@@ -173,40 +168,7 @@ void __init paging_init(void)
         zones_size[ZONE_HIGHMEM] = max_pfn - max_low_pfn;
 #endif
 
-        /* Initialize the kernel's page tables. */
-
-        memset(swapper_pg_dir, 0, PAGE_SIZE);
-
-        free_area_init(zones_size);
-}
-
-/*
- * Flush the mmu and reset associated register to default values.
- */
-
-void __init init_mmu (void)
-{
-        /* Writing zeros to the <t>TLBCFG special registers ensure
-         * that valid values exist in the register.  For existing
-         * PGSZID<w> fields, zero selects the first element of the
-         * page-size array.  For nonexistent PGSZID<w> fields, zero is
-         * the best value to write.  Also, when changing PGSZID<w>
-         * fields, the corresponding TLB must be flushed.
-         */
-        set_itlbcfg_register (0);
-        set_dtlbcfg_register (0);
-        flush_tlb_all ();
-
-        /* Set rasid register to a known value. */
-
-        set_rasid_register (ASID_USER_FIRST);
-
-        /* Set PTEVADDR special register to the start of the page
-         * table, which is in kernel mappable space (ie. not
-         * statically mapped).  This register's value is undefined on
-         * reset.
-         */
-        set_ptevaddr_register (PGTABLE_START);
+        free_area_init_node(0, zones_size, ARCH_PFN_OFFSET, NULL);
 }
 
 /*
@@ -218,8 +180,8 @@ void __init mem_init(void)
         unsigned long codesize, reservedpages, datasize, initsize;
         unsigned long highmemsize, tmp, ram;
 
-        max_mapnr = num_physpages = max_low_pfn;
-        high_memory = (void *) __va(max_mapnr << PAGE_SHIFT);
+        max_mapnr = num_physpages = max_low_pfn - ARCH_PFN_OFFSET;
+        high_memory = (void *) __va(max_low_pfn << PAGE_SHIFT);
         highmemsize = 0;
 
 #ifdef CONFIG_HIGHMEM
@@ -229,7 +191,7 @@ void __init mem_init(void)
         totalram_pages += free_all_bootmem();
 
         reservedpages = ram = 0;
-        for (tmp = 0; tmp < max_low_pfn; tmp++) {
+        for (tmp = 0; tmp < max_mapnr; tmp++) {
                 ram++;
                 if (PageReserved(mem_map+tmp))
                         reservedpages++;
@@ -279,23 +241,3 @@ void free_initmem(void)
         printk("Freeing unused kernel memory: %dk freed\n",
                (&__init_end - &__init_begin) >> 10);
 }
-
-struct kmem_cache *pgtable_cache __read_mostly;
-
-static void pgd_ctor(void* addr)
-{
-        pte_t* ptep = (pte_t*)addr;
-        int i;
-
-        for (i = 0; i < 1024; i++, ptep++)
-                pte_clear(NULL, 0, ptep);
-
-}
-
-void __init pgtable_cache_init(void)
-{
-        pgtable_cache = kmem_cache_create("pgd",
-                        PAGE_SIZE, PAGE_SIZE,
-                        SLAB_HWCACHE_ALIGN,
-                        pgd_ctor);
-}
diff --git a/arch/xtensa/mm/misc.S b/arch/xtensa/mm/misc.S
index c885664211d1..b048406d8756 100644
--- a/arch/xtensa/mm/misc.S
+++ b/arch/xtensa/mm/misc.S
@@ -84,6 +84,7 @@ ENTRY(copy_page)
 
         retw
 
+#ifdef CONFIG_MMU
 /*
  * If we have to deal with cache aliasing, we use temporary memory mappings
  * to ensure that the source and destination pages have the same color as
@@ -311,6 +312,7 @@ ENTRY(__invalidate_icache_page_alias)
 /* End of special treatment in tlb miss exception */
 
 ENTRY(__tlbtemp_mapping_end)
+#endif /* CONFIG_MMU
 
 /*
  * void __invalidate_icache_page(ulong start)
diff --git a/arch/xtensa/mm/mmu.c b/arch/xtensa/mm/mmu.c
new file mode 100644
index 000000000000..4bb91a970f1f
--- /dev/null
+++ b/arch/xtensa/mm/mmu.c
@@ -0,0 +1,70 @@
+/*
+ * xtensa mmu stuff
+ *
+ * Extracted from init.c
+ */
+#include <linux/percpu.h>
+#include <linux/init.h>
+#include <linux/string.h>
+#include <linux/slab.h>
+#include <linux/cache.h>
+
+#include <asm/tlb.h>
+#include <asm/tlbflush.h>
+#include <asm/mmu_context.h>
+#include <asm/page.h>
+
+DEFINE_PER_CPU(struct mmu_gather, mmu_gathers);
+
+void __init paging_init(void)
+{
+        memset(swapper_pg_dir, 0, PAGE_SIZE);
+}
+
+/*
+ * Flush the mmu and reset associated register to default values.
+ */
+void __init init_mmu(void)
+{
+        /* Writing zeros to the <t>TLBCFG special registers ensure
+         * that valid values exist in the register.  For existing
+         * PGSZID<w> fields, zero selects the first element of the
+         * page-size array.  For nonexistent PGSZID<w> fields, zero is
+         * the best value to write.  Also, when changing PGSZID<w>
+         * fields, the corresponding TLB must be flushed.
+         */
+        set_itlbcfg_register(0);
+        set_dtlbcfg_register(0);
+        flush_tlb_all();
+
+        /* Set rasid register to a known value. */
+
+        set_rasid_register(ASID_USER_FIRST);
+
+        /* Set PTEVADDR special register to the start of the page
+         * table, which is in kernel mappable space (ie. not
+         * statically mapped).  This register's value is undefined on
+         * reset.
+         */
+        set_ptevaddr_register(PGTABLE_START);
+}
+
+struct kmem_cache *pgtable_cache __read_mostly;
+
+static void pgd_ctor(void *addr)
+{
+        pte_t *ptep = (pte_t *)addr;
+        int i;
+
+        for (i = 0; i < 1024; i++, ptep++)
+                pte_clear(NULL, 0, ptep);
+
+}
+
+void __init pgtable_cache_init(void)
+{
+        pgtable_cache = kmem_cache_create("pgd",
+                        PAGE_SIZE, PAGE_SIZE,
+                        SLAB_HWCACHE_ALIGN,
+                        pgd_ctor);
+}
diff --git a/arch/xtensa/platforms/s6105/Makefile b/arch/xtensa/platforms/s6105/Makefile
new file mode 100644
index 000000000000..0be6194bcb72
--- /dev/null
+++ b/arch/xtensa/platforms/s6105/Makefile
@@ -0,0 +1,3 @@
+# Makefile for the Stretch S6105 eval board
+
+obj-y           := setup.o device.o
diff --git a/arch/xtensa/platforms/s6105/device.c b/arch/xtensa/platforms/s6105/device.c
new file mode 100644
index 000000000000..78b08be5a92d
--- /dev/null
+++ b/arch/xtensa/platforms/s6105/device.c
@@ -0,0 +1,67 @@
+/*
+ * s6105 platform devices
+ *
+ * Copyright (c) 2009 emlix GmbH
+ */
+
+#include <linux/kernel.h>
+#include <linux/init.h>
+#include <linux/platform_device.h>
+#include <linux/serial.h>
+#include <linux/serial_8250.h>
+
+#include <variant/hardware.h>
+
+#define UART_INTNUM             4
+
+static const signed char uart_irq_mappings[] = {
+        S6_INTC_UART(0),
+        S6_INTC_UART(1),
+        -1,
+};
+
+const signed char *platform_irq_mappings[NR_IRQS] = {
+        [UART_INTNUM] = uart_irq_mappings,
+};
+
+static struct plat_serial8250_port serial_platform_data[] = {
+        {
+                .membase = (void *)S6_REG_UART + 0x0000,
+                .mapbase = S6_REG_UART + 0x0000,
+                .irq = UART_INTNUM,
+                .uartclk = S6_SCLK,
+                .regshift = 2,
+                .iotype = SERIAL_IO_MEM,
+                .flags = ASYNC_BOOT_AUTOCONF | ASYNC_SKIP_TEST,
+        },
+        {
+                .membase = (void *)S6_REG_UART + 0x1000,
+                .mapbase = S6_REG_UART + 0x1000,
+                .irq = UART_INTNUM,
+                .uartclk = S6_SCLK,
+                .regshift = 2,
+                .iotype = SERIAL_IO_MEM,
+                .flags = ASYNC_BOOT_AUTOCONF | ASYNC_SKIP_TEST,
+        },
+        { },
+};
+
+static struct platform_device platform_devices[] = {
+        {
+                .name = "serial8250",
+                .id = PLAT8250_DEV_PLATFORM,
+                .dev = {
+                        .platform_data = serial_platform_data,
+                },
+        },
+};
+
+static int __init device_init(void)
+{
+        int i;
+
+        for (i = 0; i < ARRAY_SIZE(platform_devices); i++)
+                platform_device_register(&platform_devices[i]);
+        return 0;
+}
+arch_initcall_sync(device_init);
diff --git a/arch/xtensa/platforms/s6105/include/platform/gpio.h b/arch/xtensa/platforms/s6105/include/platform/gpio.h
new file mode 100644
index 000000000000..fa11aa4b61e9
--- /dev/null
+++ b/arch/xtensa/platforms/s6105/include/platform/gpio.h
@@ -0,0 +1,27 @@
+#ifndef __ASM_XTENSA_S6105_GPIO_H
+#define __ASM_XTENSA_S6105_GPIO_H
+
+#define GPIO_BP_TEMP_ALARM      0
+#define GPIO_PB_RESET_IN        1
+#define GPIO_EXP_IRQ            2
+#define GPIO_TRIGGER_IRQ        3
+#define GPIO_RTC_IRQ            4
+#define GPIO_PHY_IRQ            5
+#define GPIO_IMAGER_RESET       6
+#define GPIO_SD_IRQ             7
+#define GPIO_MINI_BOOT_INH      8
+#define GPIO_BOARD_RESET        9
+#define GPIO_EXP_PRESENT        10
+#define GPIO_LED1_NGREEN        12
+#define GPIO_LED1_RED           13
+#define GPIO_LED0_NGREEN        14
+#define GPIO_LED0_NRED          15
+#define GPIO_SPI_CS0            16
+#define GPIO_SPI_CS1            17
+#define GPIO_SPI_CS3            19
+#define GPIO_SPI_CS4            20
+#define GPIO_SD_WP              21
+#define GPIO_BP_RESET           22
+#define GPIO_ALARM_OUT          23
+
+#endif /* __ASM_XTENSA_S6105_GPIO_H */
diff --git a/arch/xtensa/platforms/s6105/include/platform/hardware.h b/arch/xtensa/platforms/s6105/include/platform/hardware.h
new file mode 100644
index 000000000000..d628efac7089
--- /dev/null
+++ b/arch/xtensa/platforms/s6105/include/platform/hardware.h
@@ -0,0 +1,11 @@
+#ifndef __XTENSA_S6105_HARDWARE_H
+#define __XTENSA_S6105_HARDWARE_H
+
+#define PLATFORM_DEFAULT_MEM_START      0x40000000
+#define PLATFORM_DEFAULT_MEM_SIZE       0x08000000
+
+#define MAX_DMA_ADDRESS                 0
+
+#define KERNELOFFSET                    (PLATFORM_DEFAULT_MEM_START + 0x1000)
+
+#endif /* __XTENSA_S6105_HARDWARE_H */
diff --git a/arch/xtensa/platforms/s6105/include/platform/serial.h b/arch/xtensa/platforms/s6105/include/platform/serial.h
new file mode 100644
index 000000000000..c8a771e5981b
--- /dev/null
+++ b/arch/xtensa/platforms/s6105/include/platform/serial.h
@@ -0,0 +1,8 @@
+#ifndef __ASM_XTENSA_S6105_SERIAL_H
+#define __ASM_XTENSA_S6105_SERIAL_H
+
+#include <variant/hardware.h>
+
+#define BASE_BAUD (S6_SCLK / 16)
+
+#endif /* __ASM_XTENSA_S6105_SERIAL_H */
diff --git a/arch/xtensa/platforms/s6105/setup.c b/arch/xtensa/platforms/s6105/setup.c
new file mode 100644
index 000000000000..ae041d5027a2
--- /dev/null
+++ b/arch/xtensa/platforms/s6105/setup.c
@@ -0,0 +1,61 @@
+/*
+ * s6105 control routines
+ *
+ * Copyright (c) 2009 emlix GmbH
+ */
+#include <linux/irq.h>
+#include <linux/io.h>
+#include <linux/gpio.h>
+
+#include <asm/bootparam.h>
+
+#include <variant/hardware.h>
+#include <platform/gpio.h>
+
+void platform_halt(void)
+{
+        local_irq_disable();
+        while (1)
+                ;
+}
+
+void platform_power_off(void)
+{
+        platform_halt();
+}
+
+void platform_restart(void)
+{
+        platform_halt();
+}
+
+void __init platform_setup(char **cmdline)
+{
+        unsigned long reg;
+
+        reg = readl(S6_REG_GREG1 + S6_GREG1_CLKGATE);
+        reg &= ~(1 << S6_GREG1_BLOCK_SB);
+        writel(reg, S6_REG_GREG1 + S6_GREG1_CLKGATE);
+
+        reg = readl(S6_REG_GREG1 + S6_GREG1_BLOCKENA);
+        reg |= 1 << S6_GREG1_BLOCK_SB;
+        writel(reg, S6_REG_GREG1 + S6_GREG1_BLOCKENA);
+
+        printk(KERN_NOTICE "S6105 on Stretch S6000 - "
+                "Copyright (C) 2009 emlix GmbH <info@emlix.com>\n");
+}
+
+void __init platform_init(bp_tag_t *first)
+{
+        gpio_request(GPIO_LED1_NGREEN, "led1_green");
+        gpio_request(GPIO_LED1_RED, "led1_red");
+        gpio_direction_output(GPIO_LED1_NGREEN, 1);
+}
+
+void platform_heartbeat(void)
+{
+        static unsigned int c;
+
+        if (!(++c & 0x4F))
+                gpio_direction_output(GPIO_LED1_RED, !(c & 0x10));
+}
diff --git a/arch/xtensa/platforms/xt2000/include/platform/hardware.h b/arch/xtensa/platforms/xt2000/include/platform/hardware.h
index 41459ad07766..886ef156ded3 100644
--- a/arch/xtensa/platforms/xt2000/include/platform/hardware.h
+++ b/arch/xtensa/platforms/xt2000/include/platform/hardware.h
@@ -16,7 +16,6 @@
 #define _XTENSA_XT2000_HARDWARE_H
 
 #include <variant/core.h>
-#include <asm/io.h>
 
 /* 
  * Memory configuration.
diff --git a/arch/xtensa/variants/s6000/Makefile b/arch/xtensa/variants/s6000/Makefile
new file mode 100644
index 000000000000..03b3975468bd
--- /dev/null
+++ b/arch/xtensa/variants/s6000/Makefile
@@ -0,0 +1,3 @@
+# s6000 Makefile
+
+obj-y           += irq.o gpio.o
diff --git a/arch/xtensa/variants/s6000/gpio.c b/arch/xtensa/variants/s6000/gpio.c
new file mode 100644
index 000000000000..33a8d952934c
--- /dev/null
+++ b/arch/xtensa/variants/s6000/gpio.c
@@ -0,0 +1,71 @@
+/*
+ * s6000 gpio driver
+ *
+ * Copyright (c) 2009 emlix GmbH
+ * Authors:     Oskar Schirmer <os@emlix.com>
+ *              Johannes Weiner <jw@emlix.com>
+ */
+#include <linux/kernel.h>
+#include <linux/module.h>
+#include <linux/init.h>
+#include <linux/io.h>
+#include <linux/gpio.h>
+
+#include <variant/hardware.h>
+
+#define S6_GPIO_DATA            0x000
+#define S6_GPIO_IS              0x404
+#define S6_GPIO_IBE             0x408
+#define S6_GPIO_IEV             0x40C
+#define S6_GPIO_IE              0x410
+#define S6_GPIO_RIS             0x414
+#define S6_GPIO_MIS             0x418
+#define S6_GPIO_IC              0x41C
+#define S6_GPIO_AFSEL           0x420
+#define S6_GPIO_DIR             0x800
+#define S6_GPIO_BANK(nr)        ((nr) * 0x1000)
+#define S6_GPIO_MASK(nr)        (4 << (nr))
+#define S6_GPIO_OFFSET(nr) \
+                (S6_GPIO_BANK((nr) >> 3) + S6_GPIO_MASK((nr) & 7))
+
+static int direction_input(struct gpio_chip *chip, unsigned int off)
+{
+        writeb(0, S6_REG_GPIO + S6_GPIO_DIR + S6_GPIO_OFFSET(off));
+        return 0;
+}
+
+static int get(struct gpio_chip *chip, unsigned int off)
+{
+        return readb(S6_REG_GPIO + S6_GPIO_DATA + S6_GPIO_OFFSET(off));
+}
+
+static int direction_output(struct gpio_chip *chip, unsigned int off, int val)
+{
+        unsigned rel = S6_GPIO_OFFSET(off);
+        writeb(~0, S6_REG_GPIO + S6_GPIO_DIR + rel);
+        writeb(val ? ~0 : 0, S6_REG_GPIO + S6_GPIO_DATA + rel);
+        return 0;
+}
+
+static void set(struct gpio_chip *chip, unsigned int off, int val)
+{
+        writeb(val ? ~0 : 0, S6_REG_GPIO + S6_GPIO_DATA + S6_GPIO_OFFSET(off));
+}
+
+static struct gpio_chip gpiochip = {
+        .owner = THIS_MODULE,
+        .direction_input = direction_input,
+        .get = get,
+        .direction_output = direction_output,
+        .set = set,
+        .base = 0,
+        .ngpio = 24,
+        .can_sleep = 0, /* no blocking io needed */
+        .exported = 0, /* no exporting to userspace */
+};
+
+static int gpio_init(void)
+{
+        return gpiochip_add(&gpiochip);
+}
+device_initcall(gpio_init);
diff --git a/arch/xtensa/variants/s6000/include/variant/core.h b/arch/xtensa/variants/s6000/include/variant/core.h
new file mode 100644
index 000000000000..af007953027e
--- /dev/null
+++ b/arch/xtensa/variants/s6000/include/variant/core.h
@@ -0,0 +1,431 @@
+/*
+ * Xtensa processor core configuration information.
+ *
+ * This file is subject to the terms and conditions of the GNU General Public
+ * License.  See the file "COPYING" in the main directory of this archive
+ * for more details.
+ *
+ * Copyright (c) 1999-2008 Tensilica Inc.
+ */
+
+#ifndef _XTENSA_CORE_CONFIGURATION_H
+#define _XTENSA_CORE_CONFIGURATION_H
+
+
+/****************************************************************************
+            Parameters Useful for Any Code, USER or PRIVILEGED
+ ****************************************************************************/
+
+/*
+ *  Note:  Macros of the form XCHAL_HAVE_*** have a value of 1 if the option is
+ *  configured, and a value of 0 otherwise.  These macros are always defined.
+ */
+
+
+/*----------------------------------------------------------------------
+                                ISA
+  ----------------------------------------------------------------------*/
+
+#define XCHAL_HAVE_BE                   0       /* big-endian byte ordering */
+#define XCHAL_HAVE_WINDOWED             1       /* windowed registers option */
+#define XCHAL_NUM_AREGS                 64      /* num of physical addr regs */
+#define XCHAL_NUM_AREGS_LOG2            6       /* log2(XCHAL_NUM_AREGS) */
+#define XCHAL_MAX_INSTRUCTION_SIZE      8       /* max instr bytes (3..8) */
+#define XCHAL_HAVE_DEBUG                1       /* debug option */
+#define XCHAL_HAVE_DENSITY              1       /* 16-bit instructions */
+#define XCHAL_HAVE_LOOPS                1       /* zero-overhead loops */
+#define XCHAL_HAVE_NSA                  1       /* NSA/NSAU instructions */
+#define XCHAL_HAVE_MINMAX               1       /* MIN/MAX instructions */
+#define XCHAL_HAVE_SEXT                 1       /* SEXT instruction */
+#define XCHAL_HAVE_CLAMPS               1       /* CLAMPS instruction */
+#define XCHAL_HAVE_MUL16                1       /* MUL16S/MUL16U instructions */
+#define XCHAL_HAVE_MUL32                1       /* MULL instruction */
+#define XCHAL_HAVE_MUL32_HIGH           1       /* MULUH/MULSH instructions */
+#define XCHAL_HAVE_DIV32                0       /* QUOS/QUOU/REMS/REMU instructions */
+#define XCHAL_HAVE_L32R                 1       /* L32R instruction */
+#define XCHAL_HAVE_ABSOLUTE_LITERALS    1       /* non-PC-rel (extended) L32R */
+#define XCHAL_HAVE_CONST16              0       /* CONST16 instruction */
+#define XCHAL_HAVE_ADDX                 1       /* ADDX#/SUBX# instructions */
+#define XCHAL_HAVE_WIDE_BRANCHES        0       /* B*.W18 or B*.W15 instr's */
+#define XCHAL_HAVE_PREDICTED_BRANCHES   0       /* B[EQ/EQZ/NE/NEZ]T instr's */
+#define XCHAL_HAVE_CALL4AND12           1       /* (obsolete option) */
+#define XCHAL_HAVE_ABS                  1       /* ABS instruction */
+/*#define XCHAL_HAVE_POPC               0*/     /* POPC instruction */
+/*#define XCHAL_HAVE_CRC                0*/     /* CRC instruction */
+#define XCHAL_HAVE_RELEASE_SYNC         0       /* L32AI/S32RI instructions */
+#define XCHAL_HAVE_S32C1I               0       /* S32C1I instruction */
+#define XCHAL_HAVE_SPECULATION          0       /* speculation */
+#define XCHAL_HAVE_FULL_RESET           0       /* all regs/state reset */
+#define XCHAL_NUM_CONTEXTS              1       /* */
+#define XCHAL_NUM_MISC_REGS             4       /* num of scratch regs (0..4) */
+#define XCHAL_HAVE_TAP_MASTER           0       /* JTAG TAP control instr's */
+#define XCHAL_HAVE_PRID                 0       /* processor ID register */
+#define XCHAL_HAVE_THREADPTR            0       /* THREADPTR register */
+#define XCHAL_HAVE_BOOLEANS             1       /* boolean registers */
+#define XCHAL_HAVE_CP                   1       /* CPENABLE reg (coprocessor) */
+#define XCHAL_CP_MAXCFG                 8       /* max allowed cp id plus one */
+#define XCHAL_HAVE_MAC16                0       /* MAC16 package */
+#define XCHAL_HAVE_VECTORFPU2005        0       /* vector floating-point pkg */
+#define XCHAL_HAVE_FP                   1       /* floating point pkg */
+#define XCHAL_HAVE_VECTRA1              0       /* Vectra I  pkg */
+#define XCHAL_HAVE_VECTRALX             0       /* Vectra LX pkg */
+#define XCHAL_HAVE_HIFI2                0       /* HiFi2 Audio Engine pkg */
+
+
+/*----------------------------------------------------------------------
+                                MISC
+  ----------------------------------------------------------------------*/
+
+#define XCHAL_NUM_WRITEBUFFER_ENTRIES   8       /* size of write buffer */
+#define XCHAL_INST_FETCH_WIDTH          8       /* instr-fetch width in bytes */
+#define XCHAL_DATA_WIDTH                16      /* data width in bytes */
+/*  In T1050, applies to selected core load and store instructions (see ISA): */
+#define XCHAL_UNALIGNED_LOAD_EXCEPTION  1       /* unaligned loads cause exc. */
+#define XCHAL_UNALIGNED_STORE_EXCEPTION 1       /* unaligned stores cause exc.*/
+
+#define XCHAL_SW_VERSION                701001  /* sw version of this header */
+
+#define XCHAL_CORE_ID                   "stretch_bali"  /* alphanum core name
+                                                   (CoreID) set in the Xtensa
+                                                   Processor Generator */
+
+#define XCHAL_BUILD_UNIQUE_ID           0x000104B9      /* 22-bit sw build ID */
+
+/*
+ *  These definitions describe the hardware targeted by this software.
+ */
+#define XCHAL_HW_CONFIGID0              0xC2F3F9FE      /* ConfigID hi 32 bits*/
+#define XCHAL_HW_CONFIGID1              0x054104B9      /* ConfigID lo 32 bits*/
+#define XCHAL_HW_VERSION_NAME           "LX1.0.2"       /* full version name */
+#define XCHAL_HW_VERSION_MAJOR          2100    /* major ver# of targeted hw */
+#define XCHAL_HW_VERSION_MINOR          2       /* minor ver# of targeted hw */
+#define XCHAL_HW_VERSION                210002  /* major*100+minor */
+#define XCHAL_HW_REL_LX1                1
+#define XCHAL_HW_REL_LX1_0              1
+#define XCHAL_HW_REL_LX1_0_2            1
+#define XCHAL_HW_CONFIGID_RELIABLE      1
+/*  If software targets a *range* of hardware versions, these are the bounds: */
+#define XCHAL_HW_MIN_VERSION_MAJOR      2100    /* major v of earliest tgt hw */
+#define XCHAL_HW_MIN_VERSION_MINOR      2       /* minor v of earliest tgt hw */
+#define XCHAL_HW_MIN_VERSION            210002  /* earliest targeted hw */
+#define XCHAL_HW_MAX_VERSION_MAJOR      2100    /* major v of latest tgt hw */
+#define XCHAL_HW_MAX_VERSION_MINOR      2       /* minor v of latest tgt hw */
+#define XCHAL_HW_MAX_VERSION            210002  /* latest targeted hw */
+
+
+/*----------------------------------------------------------------------
+                                CACHE
+  ----------------------------------------------------------------------*/
+
+#define XCHAL_ICACHE_LINESIZE           16      /* I-cache line size in bytes */
+#define XCHAL_DCACHE_LINESIZE           16      /* D-cache line size in bytes */
+#define XCHAL_ICACHE_LINEWIDTH          4       /* log2(I line size in bytes) */
+#define XCHAL_DCACHE_LINEWIDTH          4       /* log2(D line size in bytes) */
+
+#define XCHAL_ICACHE_SIZE               32768   /* I-cache size in bytes or 0 */
+#define XCHAL_DCACHE_SIZE               32768   /* D-cache size in bytes or 0 */
+
+#define XCHAL_DCACHE_IS_WRITEBACK       1       /* writeback feature */
+
+
+
+
+/****************************************************************************
+    Parameters Useful for PRIVILEGED (Supervisory or Non-Virtualized) Code
+ ****************************************************************************/
+
+
+#ifndef XTENSA_HAL_NON_PRIVILEGED_ONLY
+
+/*----------------------------------------------------------------------
+                                CACHE
+  ----------------------------------------------------------------------*/
+
+#define XCHAL_HAVE_PIF                  1       /* any outbound PIF present */
+
+/*  If present, cache size in bytes == (ways * 2^(linewidth + setwidth)).  */
+
+/*  Number of cache sets in log2(lines per way):  */
+#define XCHAL_ICACHE_SETWIDTH           9
+#define XCHAL_DCACHE_SETWIDTH           10
+
+/*  Cache set associativity (number of ways):  */
+#define XCHAL_ICACHE_WAYS               4
+#define XCHAL_DCACHE_WAYS               2
+
+/*  Cache features:  */
+#define XCHAL_ICACHE_LINE_LOCKABLE      1
+#define XCHAL_DCACHE_LINE_LOCKABLE      0
+#define XCHAL_ICACHE_ECC_PARITY         0
+#define XCHAL_DCACHE_ECC_PARITY         0
+
+/*  Number of encoded cache attr bits (see <xtensa/hal.h> for decoded bits):  */
+#define XCHAL_CA_BITS                   4
+
+
+/*----------------------------------------------------------------------
+                        INTERNAL I/D RAM/ROMs and XLMI
+  ----------------------------------------------------------------------*/
+
+#define XCHAL_NUM_INSTROM               0       /* number of core instr. ROMs */
+#define XCHAL_NUM_INSTRAM               0       /* number of core instr. RAMs */
+#define XCHAL_NUM_DATAROM               0       /* number of core data ROMs */
+#define XCHAL_NUM_DATARAM               1       /* number of core data RAMs */
+#define XCHAL_NUM_URAM                  0       /* number of core unified RAMs*/
+#define XCHAL_NUM_XLMI                  1       /* number of core XLMI ports */
+
+/*  Data RAM 0:  */
+#define XCHAL_DATARAM0_VADDR            0x3FFF0000
+#define XCHAL_DATARAM0_PADDR            0x3FFF0000
+#define XCHAL_DATARAM0_SIZE             65536
+#define XCHAL_DATARAM0_ECC_PARITY       0
+
+/*  XLMI Port 0:  */
+#define XCHAL_XLMI0_VADDR               0x37F80000
+#define XCHAL_XLMI0_PADDR               0x37F80000
+#define XCHAL_XLMI0_SIZE                262144
+#define XCHAL_XLMI0_ECC_PARITY  0
+
+
+/*----------------------------------------------------------------------
+                        INTERRUPTS and TIMERS
+  ----------------------------------------------------------------------*/
+
+#define XCHAL_HAVE_INTERRUPTS           1       /* interrupt option */
+#define XCHAL_HAVE_HIGHPRI_INTERRUPTS   1       /* med/high-pri. interrupts */
+#define XCHAL_HAVE_NMI                  1       /* non-maskable interrupt */
+#define XCHAL_HAVE_CCOUNT               1       /* CCOUNT reg. (timer option) */
+#define XCHAL_NUM_TIMERS                3       /* number of CCOMPAREn regs */
+#define XCHAL_NUM_INTERRUPTS            27      /* number of interrupts */
+#define XCHAL_NUM_INTERRUPTS_LOG2       5       /* ceil(log2(NUM_INTERRUPTS)) */
+#define XCHAL_NUM_EXTINTERRUPTS         20      /* num of external interrupts */
+#define XCHAL_NUM_INTLEVELS             4       /* number of interrupt levels
+                                                   (not including level zero) */
+#define XCHAL_EXCM_LEVEL                1       /* level masked by PS.EXCM */
+        /* (always 1 in XEA1; levels 2 .. EXCM_LEVEL are "medium priority") */
+
+/*  Masks of interrupts at each interrupt level:  */
+#define XCHAL_INTLEVEL1_MASK            0x01F07FFF
+#define XCHAL_INTLEVEL2_MASK            0x02018000
+#define XCHAL_INTLEVEL3_MASK            0x04060000
+#define XCHAL_INTLEVEL4_MASK            0x00000000
+#define XCHAL_INTLEVEL5_MASK            0x00080000
+#define XCHAL_INTLEVEL6_MASK            0x00000000
+#define XCHAL_INTLEVEL7_MASK            0x00000000
+
+/*  Masks of interrupts at each range 1..n of interrupt levels:  */
+#define XCHAL_INTLEVEL1_ANDBELOW_MASK   0x01F07FFF
+#define XCHAL_INTLEVEL2_ANDBELOW_MASK   0x03F1FFFF
+#define XCHAL_INTLEVEL3_ANDBELOW_MASK   0x07F7FFFF
+#define XCHAL_INTLEVEL4_ANDBELOW_MASK   0x07F7FFFF
+#define XCHAL_INTLEVEL5_ANDBELOW_MASK   0x07FFFFFF
+#define XCHAL_INTLEVEL6_ANDBELOW_MASK   0x07FFFFFF
+#define XCHAL_INTLEVEL7_ANDBELOW_MASK   0x07FFFFFF
+
+/*  Level of each interrupt:  */
+#define XCHAL_INT0_LEVEL                1
+#define XCHAL_INT1_LEVEL                1
+#define XCHAL_INT2_LEVEL                1
+#define XCHAL_INT3_LEVEL                1
+#define XCHAL_INT4_LEVEL                1
+#define XCHAL_INT5_LEVEL                1
+#define XCHAL_INT6_LEVEL                1
+#define XCHAL_INT7_LEVEL                1
+#define XCHAL_INT8_LEVEL                1
+#define XCHAL_INT9_LEVEL                1
+#define XCHAL_INT10_LEVEL               1
+#define XCHAL_INT11_LEVEL               1
+#define XCHAL_INT12_LEVEL               1
+#define XCHAL_INT13_LEVEL               1
+#define XCHAL_INT14_LEVEL               1
+#define XCHAL_INT15_LEVEL               2
+#define XCHAL_INT16_LEVEL               2
+#define XCHAL_INT17_LEVEL               3
+#define XCHAL_INT18_LEVEL               3
+#define XCHAL_INT19_LEVEL               5
+#define XCHAL_INT20_LEVEL               1
+#define XCHAL_INT21_LEVEL               1
+#define XCHAL_INT22_LEVEL               1
+#define XCHAL_INT23_LEVEL               1
+#define XCHAL_INT24_LEVEL               1
+#define XCHAL_INT25_LEVEL               2
+#define XCHAL_INT26_LEVEL               3
+#define XCHAL_DEBUGLEVEL                4       /* debug interrupt level */
+#define XCHAL_HAVE_DEBUG_EXTERN_INT     1       /* OCD external db interrupt */
+#define XCHAL_NMILEVEL                  5       /* NMI "level" (for use with
+                                                   EXCSAVE/EPS/EPC_n, RFI n) */
+
+/*  Type of each interrupt:  */
+#define XCHAL_INT0_TYPE         XTHAL_INTTYPE_EXTERN_LEVEL
+#define XCHAL_INT1_TYPE         XTHAL_INTTYPE_EXTERN_LEVEL
+#define XCHAL_INT2_TYPE         XTHAL_INTTYPE_EXTERN_LEVEL
+#define XCHAL_INT3_TYPE         XTHAL_INTTYPE_EXTERN_LEVEL
+#define XCHAL_INT4_TYPE         XTHAL_INTTYPE_EXTERN_LEVEL
+#define XCHAL_INT5_TYPE         XTHAL_INTTYPE_EXTERN_LEVEL
+#define XCHAL_INT6_TYPE         XTHAL_INTTYPE_EXTERN_LEVEL
+#define XCHAL_INT7_TYPE         XTHAL_INTTYPE_EXTERN_LEVEL
+#define XCHAL_INT8_TYPE         XTHAL_INTTYPE_EXTERN_LEVEL
+#define XCHAL_INT9_TYPE         XTHAL_INTTYPE_EXTERN_LEVEL
+#define XCHAL_INT10_TYPE        XTHAL_INTTYPE_EXTERN_LEVEL
+#define XCHAL_INT11_TYPE        XTHAL_INTTYPE_EXTERN_LEVEL
+#define XCHAL_INT12_TYPE        XTHAL_INTTYPE_EXTERN_LEVEL
+#define XCHAL_INT13_TYPE        XTHAL_INTTYPE_EXTERN_LEVEL
+#define XCHAL_INT14_TYPE        XTHAL_INTTYPE_EXTERN_LEVEL
+#define XCHAL_INT15_TYPE        XTHAL_INTTYPE_EXTERN_LEVEL
+#define XCHAL_INT16_TYPE        XTHAL_INTTYPE_EXTERN_LEVEL
+#define XCHAL_INT17_TYPE        XTHAL_INTTYPE_EXTERN_LEVEL
+#define XCHAL_INT18_TYPE        XTHAL_INTTYPE_EXTERN_LEVEL
+#define XCHAL_INT19_TYPE        XTHAL_INTTYPE_NMI
+#define XCHAL_INT20_TYPE        XTHAL_INTTYPE_SOFTWARE
+#define XCHAL_INT21_TYPE        XTHAL_INTTYPE_SOFTWARE
+#define XCHAL_INT22_TYPE        XTHAL_INTTYPE_SOFTWARE
+#define XCHAL_INT23_TYPE        XTHAL_INTTYPE_SOFTWARE
+#define XCHAL_INT24_TYPE        XTHAL_INTTYPE_TIMER
+#define XCHAL_INT25_TYPE        XTHAL_INTTYPE_TIMER
+#define XCHAL_INT26_TYPE        XTHAL_INTTYPE_TIMER
+
+/*  Masks of interrupts for each type of interrupt:  */
+#define XCHAL_INTTYPE_MASK_UNCONFIGURED 0xF8000000
+#define XCHAL_INTTYPE_MASK_SOFTWARE     0x00F00000
+#define XCHAL_INTTYPE_MASK_EXTERN_EDGE  0x00000000
+#define XCHAL_INTTYPE_MASK_EXTERN_LEVEL 0x0007FFFF
+#define XCHAL_INTTYPE_MASK_TIMER        0x07000000
+#define XCHAL_INTTYPE_MASK_NMI          0x00080000
+#define XCHAL_INTTYPE_MASK_WRITE_ERROR  0x00000000
+
+/*  Interrupt numbers assigned to specific interrupt sources:  */
+#define XCHAL_TIMER0_INTERRUPT          24      /* CCOMPARE0 */
+#define XCHAL_TIMER1_INTERRUPT          25      /* CCOMPARE1 */
+#define XCHAL_TIMER2_INTERRUPT          26      /* CCOMPARE2 */
+#define XCHAL_TIMER3_INTERRUPT          XTHAL_TIMER_UNCONFIGURED
+#define XCHAL_NMI_INTERRUPT             19      /* non-maskable interrupt */
+
+/*  Interrupt numbers for levels at which only one interrupt is configured:  */
+#define XCHAL_INTLEVEL5_NUM             19
+/*  (There are many interrupts each at level(s) 1, 2, 3.)  */
+
+
+/*
+ *  External interrupt vectors/levels.
+ *  These macros describe how Xtensa processor interrupt numbers
+ *  (as numbered internally, eg. in INTERRUPT and INTENABLE registers)
+ *  map to external BInterrupt<n> pins, for those interrupts
+ *  configured as external (level-triggered, edge-triggered, or NMI).
+ *  See the Xtensa processor databook for more details.
+ */
+
+/*  Core interrupt numbers mapped to each EXTERNAL interrupt number:  */
+#define XCHAL_EXTINT0_NUM               0       /* (intlevel 1) */
+#define XCHAL_EXTINT1_NUM               1       /* (intlevel 1) */
+#define XCHAL_EXTINT2_NUM               2       /* (intlevel 1) */
+#define XCHAL_EXTINT3_NUM               3       /* (intlevel 1) */
+#define XCHAL_EXTINT4_NUM               4       /* (intlevel 1) */
+#define XCHAL_EXTINT5_NUM               5       /* (intlevel 1) */
+#define XCHAL_EXTINT6_NUM               6       /* (intlevel 1) */
+#define XCHAL_EXTINT7_NUM               7       /* (intlevel 1) */
+#define XCHAL_EXTINT8_NUM               8       /* (intlevel 1) */
+#define XCHAL_EXTINT9_NUM               9       /* (intlevel 1) */
+#define XCHAL_EXTINT10_NUM              10      /* (intlevel 1) */
+#define XCHAL_EXTINT11_NUM              11      /* (intlevel 1) */
+#define XCHAL_EXTINT12_NUM              12      /* (intlevel 1) */
+#define XCHAL_EXTINT13_NUM              13      /* (intlevel 1) */
+#define XCHAL_EXTINT14_NUM              14      /* (intlevel 1) */
+#define XCHAL_EXTINT15_NUM              15      /* (intlevel 2) */
+#define XCHAL_EXTINT16_NUM              16      /* (intlevel 2) */
+#define XCHAL_EXTINT17_NUM              17      /* (intlevel 3) */
+#define XCHAL_EXTINT18_NUM              18      /* (intlevel 3) */
+#define XCHAL_EXTINT19_NUM              19      /* (intlevel 5) */
+
+
+/*----------------------------------------------------------------------
+                        EXCEPTIONS and VECTORS
+  ----------------------------------------------------------------------*/
+
+#define XCHAL_XEA_VERSION               2       /* Xtensa Exception Architecture
+                                                   number: 1 == XEA1 (old)
+                                                           2 == XEA2 (new)
+                                                           0 == XEAX (extern) */
+#define XCHAL_HAVE_XEA1                 0       /* Exception Architecture 1 */
+#define XCHAL_HAVE_XEA2                 1       /* Exception Architecture 2 */
+#define XCHAL_HAVE_XEAX                 0       /* External Exception Arch. */
+#define XCHAL_HAVE_EXCEPTIONS           1       /* exception option */
+#define XCHAL_HAVE_MEM_ECC_PARITY       0       /* local memory ECC/parity */
+#define XCHAL_HAVE_VECTOR_SELECT        0       /* relocatable vectors */
+#define XCHAL_HAVE_VECBASE              0       /* relocatable vectors */
+
+#define XCHAL_RESET_VECOFS              0x00000000
+#define XCHAL_RESET_VECTOR_VADDR        0x3FFE03D0
+#define XCHAL_RESET_VECTOR_PADDR        0x3FFE03D0
+#define XCHAL_USER_VECOFS               0x00000000
+#define XCHAL_USER_VECTOR_VADDR         0x40000220
+#define XCHAL_USER_VECTOR_PADDR         0x40000220
+#define XCHAL_KERNEL_VECOFS             0x00000000
+#define XCHAL_KERNEL_VECTOR_VADDR       0x40000200
+#define XCHAL_KERNEL_VECTOR_PADDR       0x40000200
+#define XCHAL_DOUBLEEXC_VECOFS          0x00000000
+#define XCHAL_DOUBLEEXC_VECTOR_VADDR    0x400002A0
+#define XCHAL_DOUBLEEXC_VECTOR_PADDR    0x400002A0
+#define XCHAL_WINDOW_OF4_VECOFS         0x00000000
+#define XCHAL_WINDOW_UF4_VECOFS         0x00000040
+#define XCHAL_WINDOW_OF8_VECOFS         0x00000080
+#define XCHAL_WINDOW_UF8_VECOFS         0x000000C0
+#define XCHAL_WINDOW_OF12_VECOFS        0x00000100
+#define XCHAL_WINDOW_UF12_VECOFS        0x00000140
+#define XCHAL_WINDOW_VECTORS_VADDR      0x40000000
+#define XCHAL_WINDOW_VECTORS_PADDR      0x40000000
+#define XCHAL_INTLEVEL2_VECOFS          0x00000000
+#define XCHAL_INTLEVEL2_VECTOR_VADDR    0x40000240
+#define XCHAL_INTLEVEL2_VECTOR_PADDR    0x40000240
+#define XCHAL_INTLEVEL3_VECOFS          0x00000000
+#define XCHAL_INTLEVEL3_VECTOR_VADDR    0x40000260
+#define XCHAL_INTLEVEL3_VECTOR_PADDR    0x40000260
+#define XCHAL_INTLEVEL4_VECOFS          0x00000000
+#define XCHAL_INTLEVEL4_VECTOR_VADDR    0x40000390
+#define XCHAL_INTLEVEL4_VECTOR_PADDR    0x40000390
+#define XCHAL_DEBUG_VECOFS              XCHAL_INTLEVEL4_VECOFS
+#define XCHAL_DEBUG_VECTOR_VADDR        XCHAL_INTLEVEL4_VECTOR_VADDR
+#define XCHAL_DEBUG_VECTOR_PADDR        XCHAL_INTLEVEL4_VECTOR_PADDR
+#define XCHAL_NMI_VECOFS                0x00000000
+#define XCHAL_NMI_VECTOR_VADDR          0x400003B0
+#define XCHAL_NMI_VECTOR_PADDR          0x400003B0
+#define XCHAL_INTLEVEL5_VECOFS          XCHAL_NMI_VECOFS
+#define XCHAL_INTLEVEL5_VECTOR_VADDR    XCHAL_NMI_VECTOR_VADDR
+#define XCHAL_INTLEVEL5_VECTOR_PADDR    XCHAL_NMI_VECTOR_PADDR
+
+
+/*----------------------------------------------------------------------
+                                DEBUG
+  ----------------------------------------------------------------------*/
+
+#define XCHAL_HAVE_OCD                  1       /* OnChipDebug option */
+#define XCHAL_NUM_IBREAK                2       /* number of IBREAKn regs */
+#define XCHAL_NUM_DBREAK                2       /* number of DBREAKn regs */
+#define XCHAL_HAVE_OCD_DIR_ARRAY        1       /* faster OCD option */
+
+
+/*----------------------------------------------------------------------
+                                MMU
+  ----------------------------------------------------------------------*/
+
+/*  See core-matmap.h header file for more details.  */
+
+#define XCHAL_HAVE_TLBS                 1       /* inverse of HAVE_CACHEATTR */
+#define XCHAL_HAVE_SPANNING_WAY         1       /* one way maps I+D 4GB vaddr */
+#define XCHAL_HAVE_IDENTITY_MAP         1       /* vaddr == paddr always */
+#define XCHAL_HAVE_CACHEATTR            0       /* CACHEATTR register present */
+#define XCHAL_HAVE_MIMIC_CACHEATTR      1       /* region protection */
+#define XCHAL_HAVE_XLT_CACHEATTR        0       /* region prot. w/translation */
+#define XCHAL_HAVE_PTP_MMU              0       /* full MMU (with page table
+                                                   [autorefill] and protection)
+                                                   usable for an MMU-based OS */
+/*  If none of the above last 4 are set, it's a custom TLB configuration.  */
+
+#define XCHAL_MMU_ASID_BITS             0       /* number of bits in ASIDs */
+#define XCHAL_MMU_RINGS                 1       /* number of rings (1..4) */
+#define XCHAL_MMU_RING_BITS             0       /* num of bits in RING field */
+
+#endif /* !XTENSA_HAL_NON_PRIVILEGED_ONLY */
+
+
+#endif /* _XTENSA_CORE_CONFIGURATION_H */
+
diff --git a/arch/xtensa/variants/s6000/include/variant/hardware.h b/arch/xtensa/variants/s6000/include/variant/hardware.h
new file mode 100644
index 000000000000..5d9ba098d84a
--- /dev/null
+++ b/arch/xtensa/variants/s6000/include/variant/hardware.h
@@ -0,0 +1,259 @@
+#ifndef __XTENSA_S6000_HARDWARE_H
+#define __XTENSA_S6000_HARDWARE_H
+
+#define S6_SCLK                 1843200
+
+#define S6_MEM_REG              0x20000000
+#define S6_MEM_EFI              0x33F00000
+#define S6_MEM_PCIE_DATARAM1    0x34000000
+#define S6_MEM_XLMI             0x37F80000
+#define S6_MEM_PIF_DATARAM1     0x37FFC000
+#define S6_MEM_GMAC             0x38000000
+#define S6_MEM_I2S              0x3A000000
+#define S6_MEM_EGIB             0x3C000000
+#define S6_MEM_PCIE_CFG         0x3E000000
+#define S6_MEM_PIF_DATARAM      0x3FFE0000
+#define S6_MEM_XLMI_DATARAM     0x3FFF0000
+#define S6_MEM_DDR              0x40000000
+#define S6_MEM_PCIE_APER        0xC0000000
+#define S6_MEM_AUX              0xF0000000
+
+/* Device addresses */
+
+#define S6_REG_SCB              S6_MEM_REG
+#define S6_REG_NB               (S6_REG_SCB + 0x10000)
+#define S6_REG_LMSDMA           (S6_REG_SCB + 0x20000)
+#define S6_REG_NI               (S6_REG_SCB + 0x30000)
+#define S6_REG_NIDMA            (S6_REG_SCB + 0x40000)
+#define S6_REG_NS               (S6_REG_SCB + 0x50000)
+#define S6_REG_DDR              (S6_REG_SCB + 0x60000)
+#define S6_REG_GREG1            (S6_REG_SCB + 0x70000)
+#define S6_REG_DP               (S6_REG_SCB + 0x80000)
+#define S6_REG_DPDMA            (S6_REG_SCB + 0x90000)
+#define S6_REG_EGIB             (S6_REG_SCB + 0xA0000)
+#define S6_REG_PCIE             (S6_REG_SCB + 0xB0000)
+#define S6_REG_I2S              (S6_REG_SCB + 0xC0000)
+#define S6_REG_GMAC             (S6_REG_SCB + 0xD0000)
+#define S6_REG_HIFDMA           (S6_REG_SCB + 0xE0000)
+#define S6_REG_GREG2            (S6_REG_SCB + 0xF0000)
+
+#define S6_REG_APB              S6_REG_SCB
+#define S6_REG_UART             (S6_REG_APB + 0x0000)
+#define S6_REG_INTC             (S6_REG_APB + 0x2000)
+#define S6_REG_SPI              (S6_REG_APB + 0x3000)
+#define S6_REG_I2C              (S6_REG_APB + 0x4000)
+#define S6_REG_GPIO             (S6_REG_APB + 0x8000)
+
+/* Global register block */
+
+#define S6_GREG1_PLL_LOCKCLEAR  0x000
+#define S6_GREG1_PLL_LOCK_SYS           0
+#define S6_GREG1_PLL_LOCK_IO            1
+#define S6_GREG1_PLL_LOCK_AIM           2
+#define S6_GREG1_PLL_LOCK_DP0           3
+#define S6_GREG1_PLL_LOCK_DP2           4
+#define S6_GREG1_PLL_LOCK_DDR           5
+#define S6_GREG1_PLL_LOCKSTAT   0x004
+#define S6_GREG1_PLL_LOCKSTAT_CURLOCK   0
+#define S6_GREG1_PLL_LOCKSTAT_EVERUNLCK 8
+#define S6_GREG1_PLLSEL         0x010
+#define S6_GREG1_PLLSEL_AIM             0
+#define S6_GREG1_PLLSEL_AIM_DDR2                0
+#define S6_GREG1_PLLSEL_AIM_300MHZ              1
+#define S6_GREG1_PLLSEL_AIM_240MHZ              2
+#define S6_GREG1_PLLSEL_AIM_200MHZ              3
+#define S6_GREG1_PLLSEL_AIM_150MHZ              4
+#define S6_GREG1_PLLSEL_AIM_120MHZ              5
+#define S6_GREG1_PLLSEL_AIM_40MHZ               6
+#define S6_GREG1_PLLSEL_AIM_PLLAIMREF           7
+#define S6_GREG1_PLLSEL_AIM_MASK                7
+#define S6_GREG1_PLLSEL_DDR             8
+#define S6_GREG1_PLLSEL_DDR_HS                  0
+#define S6_GREG1_PLLSEL_DDR_333MHZ              1
+#define S6_GREG1_PLLSEL_DDR_250MHZ              2
+#define S6_GREG1_PLLSEL_DDR_200MHZ              3
+#define S6_GREG1_PLLSEL_DDR_167MHZ              4
+#define S6_GREG1_PLLSEL_DDR_100MHZ              5
+#define S6_GREG1_PLLSEL_DDR_33MHZ               6
+#define S6_GREG1_PLLSEL_DDR_PLLIOREF            7
+#define S6_GREG1_PLLSEL_DDR_MASK                7
+#define S6_GREG1_PLLSEL_GMAC            16
+#define S6_GREG1_PLLSEL_GMAC_125MHZ             0
+#define S6_GREG1_PLLSEL_GMAC_25MHZ              1
+#define S6_GREG1_PLLSEL_GMAC_2500KHZ            2
+#define S6_GREG1_PLLSEL_GMAC_EXTERN             3
+#define S6_GREG1_PLLSEL_GMAC_MASK               3
+#define S6_GREG1_PLLSEL_GMII            18
+#define S6_GREG1_PLLSEL_GMII_111MHZ             0
+#define S6_GREG1_PLLSEL_GMII_IOREF              1
+#define S6_GREG1_PLLSEL_GMII_NONE               2
+#define S6_GREG1_PLLSEL_GMII_125MHZ             3
+#define S6_GREG1_PLLSEL_GMII_MASK               3
+#define S6_GREG1_SYSUNLOCKCNT   0x020
+#define S6_GREG1_IOUNLOCKCNT    0x024
+#define S6_GREG1_AIMUNLOCKCNT   0x028
+#define S6_GREG1_DP0UNLOCKCNT   0x02C
+#define S6_GREG1_DP2UNLOCKCNT   0x030
+#define S6_GREG1_DDRUNLOCKCNT   0x034
+#define S6_GREG1_CLKBAL0        0x040
+#define S6_GREG1_CLKBAL0_LSGB           0
+#define S6_GREG1_CLKBAL0_LSPX           8
+#define S6_GREG1_CLKBAL0_MEMDO          16
+#define S6_GREG1_CLKBAL0_HSXT1          24
+#define S6_GREG1_CLKBAL1        0x044
+#define S6_GREG1_CLKBAL1_HSISEF         0
+#define S6_GREG1_CLKBAL1_HSNI           8
+#define S6_GREG1_CLKBAL1_HSNS           16
+#define S6_GREG1_CLKBAL1_HSISEFCFG      24
+#define S6_GREG1_CLKBAL2        0x048
+#define S6_GREG1_CLKBAL2_LSNB           0
+#define S6_GREG1_CLKBAL2_LSSB           8
+#define S6_GREG1_CLKBAL2_LSREST         24
+#define S6_GREG1_CLKBAL3        0x04C
+#define S6_GREG1_CLKBAL3_ISEFXAD        0
+#define S6_GREG1_CLKBAL3_ISEFLMS        8
+#define S6_GREG1_CLKBAL3_ISEFISEF       16
+#define S6_GREG1_CLKBAL3_DDRDD          24
+#define S6_GREG1_CLKBAL4        0x050
+#define S6_GREG1_CLKBAL4_DDRDP          0
+#define S6_GREG1_CLKBAL4_DDRDO          8
+#define S6_GREG1_CLKBAL4_DDRNB          16
+#define S6_GREG1_CLKBAL4_DDRLMS         24
+#define S6_GREG1_BLOCKENA       0x100
+#define S6_GREG1_BLOCK_DDR              0
+#define S6_GREG1_BLOCK_DP               1
+#define S6_GREG1_BLOCK_NSNI             2
+#define S6_GREG1_BLOCK_PCIE             3
+#define S6_GREG1_BLOCK_GMAC             4
+#define S6_GREG1_BLOCK_I2S              5
+#define S6_GREG1_BLOCK_EGIB             6
+#define S6_GREG1_BLOCK_SB               7
+#define S6_GREG1_BLOCK_XT1              8
+#define S6_GREG1_CLKGATE        0x104
+#define S6_GREG1_BGATE_AIMNORTH         9
+#define S6_GREG1_BGATE_AIMEAST          10
+#define S6_GREG1_BGATE_AIMWEST          11
+#define S6_GREG1_BGATE_AIMSOUTH         12
+#define S6_GREG1_CHIPRES        0x108
+#define S6_GREG1_CHIPRES_SOFTRES        0
+#define S6_GREG1_CHIPRES_LOSTLOCK       1
+#define S6_GREG1_RESETCAUSE     0x10C
+#define S6_GREG1_RESETCAUSE_RESETN      0
+#define S6_GREG1_RESETCAUSE_GLOBAL      1
+#define S6_GREG1_RESETCAUSE_WDOGTIMER   2
+#define S6_GREG1_RESETCAUSE_SWCHIP      3
+#define S6_GREG1_RESETCAUSE_PLLSYSLOSS  4
+#define S6_GREG1_RESETCAUSE_PCIE        5
+#define S6_GREG1_RESETCAUSE_CREATEDGLOB 6
+#define S6_GREG1_REFCLOCKCNT    0x110
+#define S6_GREG1_RESETTIMER     0x114
+#define S6_GREG1_NMITIMER       0x118
+#define S6_GREG1_GLOBAL_TIMER   0x11C
+#define S6_GREG1_TIMER0         0x180
+#define S6_GREG1_TIMER1         0x184
+#define S6_GREG1_UARTCLOCKSEL   0x204
+#define S6_GREG1_CHIPVERSPACKG  0x208
+#define S6_GREG1_CHIPVERSPACKG_CHIPVID  0
+#define S6_GREG1_CHIPVERSPACKG_PACKSEL  8
+#define S6_GREG1_ONDIETERMCTRL  0x20C
+#define S6_GREG1_ONDIETERMCTRL_WEST     0
+#define S6_GREG1_ONDIETERMCTRL_NORTH    2
+#define S6_GREG1_ONDIETERMCTRL_EAST     4
+#define S6_GREG1_ONDIETERMCTRL_SOUTH    6
+#define S6_GREG1_ONDIETERMCTRL_NONE             0
+#define S6_GREG1_ONDIETERMCTRL_75OHM            2
+#define S6_GREG1_ONDIETERMCTRL_MASK             3
+#define S6_GREG1_BOOT_CFG0      0x210
+#define S6_GREG1_BOOT_CFG0_AIMSTRONG    1
+#define S6_GREG1_BOOT_CFG0_MINIBOOTDL   2
+#define S6_GREG1_BOOT_CFG0_OCDGPIO8SET  5
+#define S6_GREG1_BOOT_CFG0_OCDGPIOENA   6
+#define S6_GREG1_BOOT_CFG0_DOWNSTREAM   7
+#define S6_GREG1_BOOT_CFG0_PLLSYSDIV    8
+#define S6_GREG1_BOOT_CFG0_PLLSYSDIV_300MHZ     1
+#define S6_GREG1_BOOT_CFG0_PLLSYSDIV_240MHZ     2
+#define S6_GREG1_BOOT_CFG0_PLLSYSDIV_200MHZ     3
+#define S6_GREG1_BOOT_CFG0_PLLSYSDIV_150MHZ     4
+#define S6_GREG1_BOOT_CFG0_PLLSYSDIV_120MHZ     5
+#define S6_GREG1_BOOT_CFG0_PLLSYSDIV_40MHZ      6
+#define S6_GREG1_BOOT_CFG0_PLLSYSDIV_MASK       7
+#define S6_GREG1_BOOT_CFG0_BALHSLMS     12
+#define S6_GREG1_BOOT_CFG0_BALHSNB      18
+#define S6_GREG1_BOOT_CFG0_BALHSXAD     24
+#define S6_GREG1_BOOT_CFG1      0x214
+#define S6_GREG1_BOOT_CFG1_PCIE1LANE    1
+#define S6_GREG1_BOOT_CFG1_MPLLPRESCALE 2
+#define S6_GREG1_BOOT_CFG1_MPLLNCY      4
+#define S6_GREG1_BOOT_CFG1_MPLLNCY5     9
+#define S6_GREG1_BOOT_CFG1_BALHSREST    14
+#define S6_GREG1_BOOT_CFG1_BALHSPSMEMS  20
+#define S6_GREG1_BOOT_CFG1_BALLSGI      26
+#define S6_GREG1_BOOT_CFG2      0x218
+#define S6_GREG1_BOOT_CFG2_PEID         0
+#define S6_GREG1_BOOT_CFG3      0x21C
+#define S6_GREG1_DRAMBUSYHOLDOF 0x220
+#define S6_GREG1_DRAMBUSYHOLDOF_XT0     0
+#define S6_GREG1_DRAMBUSYHOLDOF_XT1     4
+#define S6_GREG1_DRAMBUSYHOLDOF_XT_MASK         7
+#define S6_GREG1_PCIEBAR1SIZE   0x224
+#define S6_GREG1_PCIEBAR2SIZE   0x228
+#define S6_GREG1_PCIEVENDOR     0x22C
+#define S6_GREG1_PCIEDEVICE     0x230
+#define S6_GREG1_PCIEREV        0x234
+#define S6_GREG1_PCIECLASS      0x238
+#define S6_GREG1_XT1DCACHEMISS  0x240
+#define S6_GREG1_XT1ICACHEMISS  0x244
+#define S6_GREG1_HWSEMAPHORE(n) (0x400 + 4 * (n))
+#define S6_GREG1_HWSEMAPHORE_NB         16
+
+/* peripheral interrupt numbers */
+
+#define S6_INTC_GPIO(n)                 (n)             /* 0..3 */
+#define S6_INTC_I2C                     4
+#define S6_INTC_SPI                     5
+#define S6_INTC_NB_ERR                  6
+#define S6_INTC_DMA_LMSERR              7
+#define S6_INTC_DMA_LMSLOWWMRK(n)       (8 + (n))       /* 0..11 */
+#define S6_INTC_DMA_LMSPENDCNT(n)       (20 + (n))      /* 0..11 */
+#define S6_INTC_DMA HOSTLOWWMRK(n)      (32 + (n))      /* 0..6 */
+#define S6_INTC_DMA_HOSTPENDCNT(n)      (39 + (n))      /* 0..6 */
+#define S6_INTC_DMA_HOSTERR             46
+#define S6_INTC_UART(n)                 (47 + (n))      /* 0..1 */
+#define S6_INTC_XAD                     49
+#define S6_INTC_NI_ERR                  50
+#define S6_INTC_NI_INFIFOFULL           51
+#define S6_INTC_DMA_NIERR               52
+#define S6_INTC_DMA_NILOWWMRK(n)        (53 + (n))      /* 0..3 */
+#define S6_INTC_DMA_NIPENDCNT(n)        (57 + (n))      /* 0..3 */
+#define S6_INTC_DDR                     61
+#define S6_INTC_NS_ERR                  62
+#define S6_INTC_EFI_CFGERR              63
+#define S6_INTC_EFI_ISEFTEST            64
+#define S6_INTC_EFI_WRITEERR            65
+#define S6_INTC_NMI_TIMER               66
+#define S6_INTC_PLLLOCK_SYS             67
+#define S6_INTC_PLLLOCK_IO              68
+#define S6_INTC_PLLLOCK_AIM             69
+#define S6_INTC_PLLLOCK_DP0             70
+#define S6_INTC_PLLLOCK_DP2             71
+#define S6_INTC_I2S_ERR                 72
+#define S6_INTC_GMAC_STAT               73
+#define S6_INTC_GMAC_ERR                74
+#define S6_INTC_GIB_ERR                 75
+#define S6_INTC_PCIE_ERR                76
+#define S6_INTC_PCIE_MSI(n)             (77 + (n))      /* 0..3 */
+#define S6_INTC_PCIE_INTA               81
+#define S6_INTC_PCIE_INTB               82
+#define S6_INTC_PCIE_INTC               83
+#define S6_INTC_PCIE_INTD               84
+#define S6_INTC_SW(n)                   (85 + (n))      /* 0..9 */
+#define S6_INTC_SW_ENABLE(n)            (85 + 256 + (n))
+#define S6_INTC_DMA_DP_ERR              95
+#define S6_INTC_DMA_DPLOWWMRK(n)        (96 + (n))      /* 0..3 */
+#define S6_INTC_DMA_DPPENDCNT(n)        (100 + (n))     /* 0..3 */
+#define S6_INTC_DMA_DPTERMCNT(n)        (104 + (n))     /* 0..3 */
+#define S6_INTC_TIMER0                  108
+#define S6_INTC_TIMER1                  109
+#define S6_INTC_DMA_HOSTTERMCNT(n)      (110 + (n))     /* 0..6 */
+
+#endif /* __XTENSA_S6000_HARDWARE_H */
diff --git a/arch/xtensa/variants/s6000/include/variant/irq.h b/arch/xtensa/variants/s6000/include/variant/irq.h
new file mode 100644
index 000000000000..fa031cb0acc4
--- /dev/null
+++ b/arch/xtensa/variants/s6000/include/variant/irq.h
@@ -0,0 +1,9 @@
+#ifndef __XTENSA_S6000_IRQ_H
+#define __XTENSA_S6000_IRQ_H
+
+#define NO_IRQ          (-1)
+
+extern void variant_irq_enable(unsigned int irq);
+extern void variant_irq_disable(unsigned int irq);
+
+#endif /* __XTENSA_S6000_IRQ_H */
diff --git a/arch/xtensa/variants/s6000/include/variant/tie-asm.h b/arch/xtensa/variants/s6000/include/variant/tie-asm.h
new file mode 100644
index 000000000000..f02d0a3a2e20
--- /dev/null
+++ b/arch/xtensa/variants/s6000/include/variant/tie-asm.h
@@ -0,0 +1,304 @@
+/*
+ * This header file contains assembly-language definitions (assembly
+ * macros, etc.) for this specific Xtensa processor's TIE extensions
+ * and options.  It is customized to this Xtensa processor configuration.
+ *
+ * This file is subject to the terms and conditions of the GNU General Public
+ * License.  See the file "COPYING" in the main directory of this archive
+ * for more details.
+ *
+ * Copyright (C) 1999-2008 Tensilica Inc.
+ */
+
+#ifndef _XTENSA_CORE_TIE_ASM_H
+#define _XTENSA_CORE_TIE_ASM_H
+
+/*  Selection parameter values for save-area save/restore macros:  */
+/*  Option vs. TIE:  */
+#define XTHAL_SAS_TIE   0x0001  /* custom extension or coprocessor */
+#define XTHAL_SAS_OPT   0x0002  /* optional (and not a coprocessor) */
+/*  Whether used automatically by compiler:  */
+#define XTHAL_SAS_NOCC  0x0004  /* not used by compiler w/o special opts/code */
+#define XTHAL_SAS_CC    0x0008  /* used by compiler without special opts/code */
+/*  ABI handling across function calls:  */
+#define XTHAL_SAS_CALR  0x0010  /* caller-saved */
+#define XTHAL_SAS_CALE  0x0020  /* callee-saved */
+#define XTHAL_SAS_GLOB  0x0040  /* global across function calls (in thread) */
+/*  Misc  */
+#define XTHAL_SAS_ALL   0xFFFF  /* include all default NCP contents */
+
+
+
+/* Macro to save all non-coprocessor (extra) custom TIE and optional state
+ * (not including zero-overhead loop registers).
+ * Save area ptr (clobbered):  ptr  (16 byte aligned)
+ * Scratch regs  (clobbered):  at1..at4  (only first XCHAL_NCP_NUM_ATMPS needed)
+ */
+        .macro xchal_ncp_store  ptr at1 at2 at3 at4  continue=0 ofs=-1 select=XTHAL_SAS_ALL
+        xchal_sa_start  \continue, \ofs
+        .ifeq (XTHAL_SAS_OPT | XTHAL_SAS_NOCC | XTHAL_SAS_CALR) & ~\select
+        xchal_sa_align  \ptr, 0, 1024-4, 4, 4
+        rsr     \at1, BR                // boolean option
+        s32i    \at1, \ptr, .Lxchal_ofs_ + 0
+        .set    .Lxchal_ofs_, .Lxchal_ofs_ + 4
+        .endif
+        .endm   // xchal_ncp_store
+
+/* Macro to save all non-coprocessor (extra) custom TIE and optional state
+ * (not including zero-overhead loop registers).
+ * Save area ptr (clobbered):  ptr  (16 byte aligned)
+ * Scratch regs  (clobbered):  at1..at4  (only first XCHAL_NCP_NUM_ATMPS needed)
+ */
+        .macro xchal_ncp_load  ptr at1 at2 at3 at4  continue=0 ofs=-1 select=XTHAL_SAS_ALL
+        xchal_sa_start  \continue, \ofs
+        .ifeq (XTHAL_SAS_OPT | XTHAL_SAS_NOCC | XTHAL_SAS_CALR) & ~\select
+        xchal_sa_align  \ptr, 0, 1024-4, 4, 4
+        l32i    \at1, \ptr, .Lxchal_ofs_ + 0
+        wsr     \at1, BR                // boolean option
+        .set    .Lxchal_ofs_, .Lxchal_ofs_ + 4
+        .endif
+        .endm   // xchal_ncp_load
+
+
+
+#define XCHAL_NCP_NUM_ATMPS     1
+
+
+
+/* Macro to save the state of TIE coprocessor FPU.
+ * Save area ptr (clobbered):  ptr  (16 byte aligned)
+ * Scratch regs  (clobbered):  at1..at4  (only first XCHAL_CP0_NUM_ATMPS needed)
+ */
+#define xchal_cp_FPU_store      xchal_cp0_store
+/* #define xchal_cp_FPU_store_a2        xchal_cp0_store a2 a3 a4 a5 a6 */
+        .macro  xchal_cp0_store  ptr at1 at2 at3 at4  continue=0 ofs=-1 select=XTHAL_SAS_ALL
+        xchal_sa_start \continue, \ofs
+        .ifeq (XTHAL_SAS_TIE | XTHAL_SAS_NOCC | XTHAL_SAS_CALR) & ~\select
+        xchal_sa_align  \ptr, 0, 0, 1, 16
+        rur232  \at1            // FCR
+        s32i    \at1, \ptr, 0
+        rur233  \at1            // FSR
+        s32i    \at1, \ptr, 4
+        SSI f0, \ptr,  8
+        SSI f1, \ptr,  12
+        SSI f2, \ptr,  16
+        SSI f3, \ptr,  20
+        SSI f4, \ptr,  24
+        SSI f5, \ptr,  28
+        SSI f6, \ptr,  32
+        SSI f7, \ptr,  36
+        SSI f8, \ptr,  40
+        SSI f9, \ptr,  44
+        SSI f10, \ptr,  48
+        SSI f11, \ptr,  52
+        SSI f12, \ptr,  56
+        SSI f13, \ptr,  60
+        SSI f14, \ptr,  64
+        SSI f15, \ptr,  68
+        .set    .Lxchal_ofs_, .Lxchal_ofs_ + 72
+        .endif
+        .endm   // xchal_cp0_store
+
+/* Macro to restore the state of TIE coprocessor FPU.
+ * Save area ptr (clobbered):  ptr  (16 byte aligned)
+ * Scratch regs  (clobbered):  at1..at4  (only first XCHAL_CP0_NUM_ATMPS needed)
+ */
+#define xchal_cp_FPU_load       xchal_cp0_load
+/* #define xchal_cp_FPU_load_a2 xchal_cp0_load a2 a3 a4 a5 a6 */
+        .macro  xchal_cp0_load  ptr at1 at2 at3 at4  continue=0 ofs=-1 select=XTHAL_SAS_ALL
+        xchal_sa_start \continue, \ofs
+        .ifeq (XTHAL_SAS_TIE | XTHAL_SAS_NOCC | XTHAL_SAS_CALR) & ~\select
+        xchal_sa_align  \ptr, 0, 0, 1, 16
+        l32i    \at1, \ptr, 0
+        wur232  \at1            // FCR
+        l32i    \at1, \ptr, 4
+        wur233  \at1            // FSR
+        LSI f0, \ptr,  8
+        LSI f1, \ptr,  12
+        LSI f2, \ptr,  16
+        LSI f3, \ptr,  20
+        LSI f4, \ptr,  24
+        LSI f5, \ptr,  28
+        LSI f6, \ptr,  32
+        LSI f7, \ptr,  36
+        LSI f8, \ptr,  40
+        LSI f9, \ptr,  44
+        LSI f10, \ptr,  48
+        LSI f11, \ptr,  52
+        LSI f12, \ptr,  56
+        LSI f13, \ptr,  60
+        LSI f14, \ptr,  64
+        LSI f15, \ptr,  68
+        .set    .Lxchal_ofs_, .Lxchal_ofs_ + 72
+        .endif
+        .endm   // xchal_cp0_load
+
+#define XCHAL_CP0_NUM_ATMPS     1
+
+/* Macro to save the state of TIE coprocessor XAD.
+ * Save area ptr (clobbered):  ptr  (16 byte aligned)
+ * Scratch regs  (clobbered):  at1..at4  (only first XCHAL_CP6_NUM_ATMPS needed)
+ */
+#define xchal_cp_XAD_store      xchal_cp6_store
+/* #define xchal_cp_XAD_store_a2        xchal_cp6_store a2 a3 a4 a5 a6 */
+        .macro  xchal_cp6_store  ptr at1 at2 at3 at4  continue=0 ofs=-1 select=XTHAL_SAS_ALL
+        xchal_sa_start \continue, \ofs
+        .ifeq (XTHAL_SAS_TIE | XTHAL_SAS_NOCC | XTHAL_SAS_CALR) & ~\select
+        xchal_sa_align  \ptr, 0, 0, 1, 16
+        rur0    \at1            // LDCBHI
+        s32i    \at1, \ptr, 0
+        rur1    \at1            // LDCBLO
+        s32i    \at1, \ptr, 4
+        rur2    \at1            // STCBHI
+        s32i    \at1, \ptr, 8
+        rur3    \at1            // STCBLO
+        s32i    \at1, \ptr, 12
+        rur8    \at1            // LDBRBASE
+        s32i    \at1, \ptr, 16
+        rur9    \at1            // LDBROFF
+        s32i    \at1, \ptr, 20
+        rur10   \at1            // LDBRINC
+        s32i    \at1, \ptr, 24
+        rur11   \at1            // STBRBASE
+        s32i    \at1, \ptr, 28
+        rur12   \at1            // STBROFF
+        s32i    \at1, \ptr, 32
+        rur13   \at1            // STBRINC
+        s32i    \at1, \ptr, 36
+        rur24   \at1            // SCRATCH0
+        s32i    \at1, \ptr, 40
+        rur25   \at1            // SCRATCH1
+        s32i    \at1, \ptr, 44
+        rur26   \at1            // SCRATCH2
+        s32i    \at1, \ptr, 48
+        rur27   \at1            // SCRATCH3
+        s32i    \at1, \ptr, 52
+        WRAS128I wra0, \ptr,  64
+        WRAS128I wra1, \ptr,  80
+        WRAS128I wra2, \ptr,  96
+        WRAS128I wra3, \ptr,  112
+        WRAS128I wra4, \ptr,  128
+        WRAS128I wra5, \ptr,  144
+        WRAS128I wra6, \ptr,  160
+        WRAS128I wra7, \ptr,  176
+        WRAS128I wra8, \ptr,  192
+        WRAS128I wra9, \ptr,  208
+        WRAS128I wra10, \ptr,  224
+        WRAS128I wra11, \ptr,  240
+        WRAS128I wra12, \ptr,  256
+        WRAS128I wra13, \ptr,  272
+        WRAS128I wra14, \ptr,  288
+        WRAS128I wra15, \ptr,  304
+        WRBS128I wrb0, \ptr,  320
+        WRBS128I wrb1, \ptr,  336
+        WRBS128I wrb2, \ptr,  352
+        WRBS128I wrb3, \ptr,  368
+        WRBS128I wrb4, \ptr,  384
+        WRBS128I wrb5, \ptr,  400
+        WRBS128I wrb6, \ptr,  416
+        WRBS128I wrb7, \ptr,  432
+        WRBS128I wrb8, \ptr,  448
+        WRBS128I wrb9, \ptr,  464
+        WRBS128I wrb10, \ptr,  480
+        WRBS128I wrb11, \ptr,  496
+        WRBS128I wrb12, \ptr,  512
+        WRBS128I wrb13, \ptr,  528
+        WRBS128I wrb14, \ptr,  544
+        WRBS128I wrb15, \ptr,  560
+        .set    .Lxchal_ofs_, .Lxchal_ofs_ + 576
+        .endif
+        .endm   // xchal_cp6_store
+
+/* Macro to restore the state of TIE coprocessor XAD.
+ * Save area ptr (clobbered):  ptr  (16 byte aligned)
+ * Scratch regs  (clobbered):  at1..at4  (only first XCHAL_CP6_NUM_ATMPS needed)
+ */
+#define xchal_cp_XAD_load       xchal_cp6_load
+/* #define xchal_cp_XAD_load_a2 xchal_cp6_load a2 a3 a4 a5 a6 */
+        .macro  xchal_cp6_load  ptr at1 at2 at3 at4  continue=0 ofs=-1 select=XTHAL_SAS_ALL
+        xchal_sa_start \continue, \ofs
+        .ifeq (XTHAL_SAS_TIE | XTHAL_SAS_NOCC | XTHAL_SAS_CALR) & ~\select
+        xchal_sa_align  \ptr, 0, 0, 1, 16
+        l32i    \at1, \ptr, 0
+        wur0    \at1            // LDCBHI
+        l32i    \at1, \ptr, 4
+        wur1    \at1            // LDCBLO
+        l32i    \at1, \ptr, 8
+        wur2    \at1            // STCBHI
+        l32i    \at1, \ptr, 12
+        wur3    \at1            // STCBLO
+        l32i    \at1, \ptr, 16
+        wur8    \at1            // LDBRBASE
+        l32i    \at1, \ptr, 20
+        wur9    \at1            // LDBROFF
+        l32i    \at1, \ptr, 24
+        wur10   \at1            // LDBRINC
+        l32i    \at1, \ptr, 28
+        wur11   \at1            // STBRBASE
+        l32i    \at1, \ptr, 32
+        wur12   \at1            // STBROFF
+        l32i    \at1, \ptr, 36
+        wur13   \at1            // STBRINC
+        l32i    \at1, \ptr, 40
+        wur24   \at1            // SCRATCH0
+        l32i    \at1, \ptr, 44
+        wur25   \at1            // SCRATCH1
+        l32i    \at1, \ptr, 48
+        wur26   \at1            // SCRATCH2
+        l32i    \at1, \ptr, 52
+        wur27   \at1            // SCRATCH3
+        WRBL128I wrb0, \ptr,  320
+        WRBL128I wrb1, \ptr,  336
+        WRBL128I wrb2, \ptr,  352
+        WRBL128I wrb3, \ptr,  368
+        WRBL128I wrb4, \ptr,  384
+        WRBL128I wrb5, \ptr,  400
+        WRBL128I wrb6, \ptr,  416
+        WRBL128I wrb7, \ptr,  432
+        WRBL128I wrb8, \ptr,  448
+        WRBL128I wrb9, \ptr,  464
+        WRBL128I wrb10, \ptr,  480
+        WRBL128I wrb11, \ptr,  496
+        WRBL128I wrb12, \ptr,  512
+        WRBL128I wrb13, \ptr,  528
+        WRBL128I wrb14, \ptr,  544
+        WRBL128I wrb15, \ptr,  560
+        WRAL128I wra0, \ptr,  64
+        WRAL128I wra1, \ptr,  80
+        WRAL128I wra2, \ptr,  96
+        WRAL128I wra3, \ptr,  112
+        WRAL128I wra4, \ptr,  128
+        WRAL128I wra5, \ptr,  144
+        WRAL128I wra6, \ptr,  160
+        WRAL128I wra7, \ptr,  176
+        WRAL128I wra8, \ptr,  192
+        WRAL128I wra9, \ptr,  208
+        WRAL128I wra10, \ptr,  224
+        WRAL128I wra11, \ptr,  240
+        WRAL128I wra12, \ptr,  256
+        WRAL128I wra13, \ptr,  272
+        WRAL128I wra14, \ptr,  288
+        WRAL128I wra15, \ptr,  304
+        .set    .Lxchal_ofs_, .Lxchal_ofs_ + 576
+        .endif
+        .endm   // xchal_cp6_load
+
+#define XCHAL_CP6_NUM_ATMPS     1
+#define XCHAL_SA_NUM_ATMPS      1
+
+        /*  Empty macros for unconfigured coprocessors:  */
+        .macro xchal_cp1_store  p a b c d continue=0 ofs=-1 select=-1 ; .endm
+        .macro xchal_cp1_load   p a b c d continue=0 ofs=-1 select=-1 ; .endm
+        .macro xchal_cp2_store  p a b c d continue=0 ofs=-1 select=-1 ; .endm
+        .macro xchal_cp2_load   p a b c d continue=0 ofs=-1 select=-1 ; .endm
+        .macro xchal_cp3_store  p a b c d continue=0 ofs=-1 select=-1 ; .endm
+        .macro xchal_cp3_load   p a b c d continue=0 ofs=-1 select=-1 ; .endm
+        .macro xchal_cp4_store  p a b c d continue=0 ofs=-1 select=-1 ; .endm
+        .macro xchal_cp4_load   p a b c d continue=0 ofs=-1 select=-1 ; .endm
+        .macro xchal_cp5_store  p a b c d continue=0 ofs=-1 select=-1 ; .endm
+        .macro xchal_cp5_load   p a b c d continue=0 ofs=-1 select=-1 ; .endm
+        .macro xchal_cp7_store  p a b c d continue=0 ofs=-1 select=-1 ; .endm
+        .macro xchal_cp7_load   p a b c d continue=0 ofs=-1 select=-1 ; .endm
+
+#endif /*_XTENSA_CORE_TIE_ASM_H*/
+
diff --git a/arch/xtensa/variants/s6000/include/variant/tie.h b/arch/xtensa/variants/s6000/include/variant/tie.h
new file mode 100644
index 000000000000..be7ea843d5df
--- /dev/null
+++ b/arch/xtensa/variants/s6000/include/variant/tie.h
@@ -0,0 +1,191 @@
+/*
+ * This header file describes this specific Xtensa processor's TIE extensions
+ * that extend basic Xtensa core functionality.  It is customized to this
+ * Xtensa processor configuration.
+ *
+ * This file is subject to the terms and conditions of the GNU General Public
+ * License.  See the file "COPYING" in the main directory of this archive
+ * for more details.
+ *
+ * Copyright (C) 1999-2008 Tensilica Inc.
+ */
+
+#ifndef _XTENSA_CORE_TIE_H
+#define _XTENSA_CORE_TIE_H
+
+#define XCHAL_CP_NUM                    2       /* number of coprocessors */
+#define XCHAL_CP_MAX                    7       /* max CP ID + 1 (0 if none) */
+#define XCHAL_CP_MASK                   0x41    /* bitmask of all CPs by ID */
+#define XCHAL_CP_PORT_MASK              0x00    /* bitmask of only port CPs */
+
+/*  Basic parameters of each coprocessor:  */
+#define XCHAL_CP0_NAME                  "FPU"
+#define XCHAL_CP0_IDENT                 FPU
+#define XCHAL_CP0_SA_SIZE               72      /* size of state save area */
+#define XCHAL_CP0_SA_ALIGN              4       /* min alignment of save area */
+#define XCHAL_CP_ID_FPU                 0       /* coprocessor ID (0..7) */
+#define XCHAL_CP6_NAME                  "XAD"
+#define XCHAL_CP6_IDENT                 XAD
+#define XCHAL_CP6_SA_SIZE               576     /* size of state save area */
+#define XCHAL_CP6_SA_ALIGN              16      /* min alignment of save area */
+#define XCHAL_CP_ID_XAD                 6       /* coprocessor ID (0..7) */
+
+/*  Filler info for unassigned coprocessors, to simplify arrays etc:  */
+#define XCHAL_CP1_SA_SIZE               0
+#define XCHAL_CP1_SA_ALIGN              1
+#define XCHAL_CP2_SA_SIZE               0
+#define XCHAL_CP2_SA_ALIGN              1
+#define XCHAL_CP3_SA_SIZE               0
+#define XCHAL_CP3_SA_ALIGN              1
+#define XCHAL_CP4_SA_SIZE               0
+#define XCHAL_CP4_SA_ALIGN              1
+#define XCHAL_CP5_SA_SIZE               0
+#define XCHAL_CP5_SA_ALIGN              1
+#define XCHAL_CP7_SA_SIZE               0
+#define XCHAL_CP7_SA_ALIGN              1
+
+/*  Save area for non-coprocessor optional and custom (TIE) state:  */
+#define XCHAL_NCP_SA_SIZE               4
+#define XCHAL_NCP_SA_ALIGN              4
+
+/*  Total save area for optional and custom state (NCP + CPn):  */
+#define XCHAL_TOTAL_SA_SIZE             672     /* with 16-byte align padding */
+#define XCHAL_TOTAL_SA_ALIGN            16      /* actual minimum alignment */
+
+/*
+ * Detailed contents of save areas.
+ * NOTE:  caller must define the XCHAL_SA_REG macro (not defined here)
+ * before expanding the XCHAL_xxx_SA_LIST() macros.
+ *
+ * XCHAL_SA_REG(s,ccused,abikind,kind,opt,name,galign,align,asize,
+ *              dbnum,base,regnum,bitsz,gapsz,reset,x...)
+ *
+ *      s = passed from XCHAL_*_LIST(s), eg. to select how to expand
+ *      ccused = set if used by compiler without special options or code
+ *      abikind = 0 (caller-saved), 1 (callee-saved), or 2 (thread-global)
+ *      kind = 0 (special reg), 1 (TIE user reg), or 2 (TIE regfile reg)
+ *      opt = 0 (custom TIE extension or coprocessor), or 1 (optional reg)
+ *      name = lowercase reg name (no quotes)
+ *      galign = group byte alignment (power of 2) (galign >= align)
+ *      align = register byte alignment (power of 2)
+ *      asize = allocated size in bytes (asize*8 == bitsz + gapsz + padsz)
+ *        (not including any pad bytes required to galign this or next reg)
+ *      dbnum = unique target number f/debug (see <xtensa-libdb-macros.h>)
+ *      base = reg shortname w/o index (or sr=special, ur=TIE user reg)
+ *      regnum = reg index in regfile, or special/TIE-user reg number
+ *      bitsz = number of significant bits (regfile width, or ur/sr mask bits)
+ *      gapsz = intervening bits, if bitsz bits not stored contiguously
+ *      (padsz = pad bits at end [TIE regfile] or at msbits [ur,sr] of asize)
+ *      reset = register reset value (or 0 if undefined at reset)
+ *      x = reserved for future use (0 until then)
+ *
+ *  To filter out certain registers, e.g. to expand only the non-global
+ *  registers used by the compiler, you can do something like this:
+ *
+ *  #define XCHAL_SA_REG(s,ccused,p...) SELCC##ccused(p)
+ *  #define SELCC0(p...)
+ *  #define SELCC1(abikind,p...)        SELAK##abikind(p)
+ *  #define SELAK0(p...)                REG(p)
+ *  #define SELAK1(p...)                REG(p)
+ *  #define SELAK2(p...)
+ *  #define REG(kind,tie,name,galn,aln,asz,csz,dbnum,base,rnum,bsz,rst,x...) \
+ *              ...what you want to expand...
+ */
+
+#define XCHAL_NCP_SA_NUM        1
+#define XCHAL_NCP_SA_LIST(s)    \
+ XCHAL_SA_REG(s,0,0,0,1,             br, 4, 4, 4,0x0204,  sr,4  , 16,0,0,0)
+
+#define XCHAL_CP0_SA_NUM        18
+#define XCHAL_CP0_SA_LIST(s)    \
+ XCHAL_SA_REG(s,0,0,1,0,            fcr, 4, 4, 4,0x03E8,  ur,232, 32,0,0,0) \
+ XCHAL_SA_REG(s,0,0,1,0,            fsr, 4, 4, 4,0x03E9,  ur,233, 32,0,0,0) \
+ XCHAL_SA_REG(s,0,0,2,0,             f0, 4, 4, 4,0x0030,   f,0  , 32,0,0,0) \
+ XCHAL_SA_REG(s,0,0,2,0,             f1, 4, 4, 4,0x0031,   f,1  , 32,0,0,0) \
+ XCHAL_SA_REG(s,0,0,2,0,             f2, 4, 4, 4,0x0032,   f,2  , 32,0,0,0) \
+ XCHAL_SA_REG(s,0,0,2,0,             f3, 4, 4, 4,0x0033,   f,3  , 32,0,0,0) \
+ XCHAL_SA_REG(s,0,0,2,0,             f4, 4, 4, 4,0x0034,   f,4  , 32,0,0,0) \
+ XCHAL_SA_REG(s,0,0,2,0,             f5, 4, 4, 4,0x0035,   f,5  , 32,0,0,0) \
+ XCHAL_SA_REG(s,0,0,2,0,             f6, 4, 4, 4,0x0036,   f,6  , 32,0,0,0) \
+ XCHAL_SA_REG(s,0,0,2,0,             f7, 4, 4, 4,0x0037,   f,7  , 32,0,0,0) \
+ XCHAL_SA_REG(s,0,0,2,0,             f8, 4, 4, 4,0x0038,   f,8  , 32,0,0,0) \
+ XCHAL_SA_REG(s,0,0,2,0,             f9, 4, 4, 4,0x0039,   f,9  , 32,0,0,0) \
+ XCHAL_SA_REG(s,0,0,2,0,            f10, 4, 4, 4,0x003A,   f,10 , 32,0,0,0) \
+ XCHAL_SA_REG(s,0,0,2,0,            f11, 4, 4, 4,0x003B,   f,11 , 32,0,0,0) \
+ XCHAL_SA_REG(s,0,0,2,0,            f12, 4, 4, 4,0x003C,   f,12 , 32,0,0,0) \
+ XCHAL_SA_REG(s,0,0,2,0,            f13, 4, 4, 4,0x003D,   f,13 , 32,0,0,0) \
+ XCHAL_SA_REG(s,0,0,2,0,            f14, 4, 4, 4,0x003E,   f,14 , 32,0,0,0) \
+ XCHAL_SA_REG(s,0,0,2,0,            f15, 4, 4, 4,0x003F,   f,15 , 32,0,0,0)
+
+#define XCHAL_CP1_SA_NUM        0
+#define XCHAL_CP1_SA_LIST(s)    /* empty */
+
+#define XCHAL_CP2_SA_NUM        0
+#define XCHAL_CP2_SA_LIST(s)    /* empty */
+
+#define XCHAL_CP3_SA_NUM        0
+#define XCHAL_CP3_SA_LIST(s)    /* empty */
+
+#define XCHAL_CP4_SA_NUM        0
+#define XCHAL_CP4_SA_LIST(s)    /* empty */
+
+#define XCHAL_CP5_SA_NUM        0
+#define XCHAL_CP5_SA_LIST(s)    /* empty */
+
+#define XCHAL_CP6_SA_NUM        46
+#define XCHAL_CP6_SA_LIST(s)    \
+ XCHAL_SA_REG(s,0,0,1,0,         ldcbhi,16, 4, 4,0x0300,  ur,0  , 32,0,0,0) \
+ XCHAL_SA_REG(s,0,0,1,0,         ldcblo, 4, 4, 4,0x0301,  ur,1  , 32,0,0,0) \
+ XCHAL_SA_REG(s,0,0,1,0,         stcbhi, 4, 4, 4,0x0302,  ur,2  , 32,0,0,0) \
+ XCHAL_SA_REG(s,0,0,1,0,         stcblo, 4, 4, 4,0x0303,  ur,3  , 32,0,0,0) \
+ XCHAL_SA_REG(s,0,0,1,0,       ldbrbase, 4, 4, 4,0x0308,  ur,8  , 32,0,0,0) \
+ XCHAL_SA_REG(s,0,0,1,0,        ldbroff, 4, 4, 4,0x0309,  ur,9  , 32,0,0,0) \
+ XCHAL_SA_REG(s,0,0,1,0,        ldbrinc, 4, 4, 4,0x030A,  ur,10 , 32,0,0,0) \
+ XCHAL_SA_REG(s,0,0,1,0,       stbrbase, 4, 4, 4,0x030B,  ur,11 , 32,0,0,0) \
+ XCHAL_SA_REG(s,0,0,1,0,        stbroff, 4, 4, 4,0x030C,  ur,12 , 32,0,0,0) \
+ XCHAL_SA_REG(s,0,0,1,0,        stbrinc, 4, 4, 4,0x030D,  ur,13 , 32,0,0,0) \
+ XCHAL_SA_REG(s,0,0,1,0,       scratch0, 4, 4, 4,0x0318,  ur,24 , 32,0,0,0) \
+ XCHAL_SA_REG(s,0,0,1,0,       scratch1, 4, 4, 4,0x0319,  ur,25 , 32,0,0,0) \
+ XCHAL_SA_REG(s,0,0,1,0,       scratch2, 4, 4, 4,0x031A,  ur,26 , 32,0,0,0) \
+ XCHAL_SA_REG(s,0,0,1,0,       scratch3, 4, 4, 4,0x031B,  ur,27 , 32,0,0,0) \
+ XCHAL_SA_REG(s,0,0,2,0,           wra0,16,16,16,0x1010, wra,0  ,128,0,0,0) \
+ XCHAL_SA_REG(s,0,0,2,0,           wra1,16,16,16,0x1011, wra,1  ,128,0,0,0) \
+ XCHAL_SA_REG(s,0,0,2,0,           wra2,16,16,16,0x1012, wra,2  ,128,0,0,0) \
+ XCHAL_SA_REG(s,0,0,2,0,           wra3,16,16,16,0x1013, wra,3  ,128,0,0,0) \
+ XCHAL_SA_REG(s,0,0,2,0,           wra4,16,16,16,0x1014, wra,4  ,128,0,0,0) \
+ XCHAL_SA_REG(s,0,0,2,0,           wra5,16,16,16,0x1015, wra,5  ,128,0,0,0) \
+ XCHAL_SA_REG(s,0,0,2,0,           wra6,16,16,16,0x1016, wra,6  ,128,0,0,0) \
+ XCHAL_SA_REG(s,0,0,2,0,           wra7,16,16,16,0x1017, wra,7  ,128,0,0,0) \
+ XCHAL_SA_REG(s,0,0,2,0,           wra8,16,16,16,0x1018, wra,8  ,128,0,0,0) \
+ XCHAL_SA_REG(s,0,0,2,0,           wra9,16,16,16,0x1019, wra,9  ,128,0,0,0) \
+ XCHAL_SA_REG(s,0,0,2,0,          wra10,16,16,16,0x101A, wra,10 ,128,0,0,0) \
+ XCHAL_SA_REG(s,0,0,2,0,          wra11,16,16,16,0x101B, wra,11 ,128,0,0,0) \
+ XCHAL_SA_REG(s,0,0,2,0,          wra12,16,16,16,0x101C, wra,12 ,128,0,0,0) \
+ XCHAL_SA_REG(s,0,0,2,0,          wra13,16,16,16,0x101D, wra,13 ,128,0,0,0) \
+ XCHAL_SA_REG(s,0,0,2,0,          wra14,16,16,16,0x101E, wra,14 ,128,0,0,0) \
+ XCHAL_SA_REG(s,0,0,2,0,          wra15,16,16,16,0x101F, wra,15 ,128,0,0,0) \
+ XCHAL_SA_REG(s,0,0,2,0,           wrb0,16,16,16,0x1020, wrb,0  ,128,0,0,0) \
+ XCHAL_SA_REG(s,0,0,2,0,           wrb1,16,16,16,0x1021, wrb,1  ,128,0,0,0) \
+ XCHAL_SA_REG(s,0,0,2,0,           wrb2,16,16,16,0x1022, wrb,2  ,128,0,0,0) \
+ XCHAL_SA_REG(s,0,0,2,0,           wrb3,16,16,16,0x1023, wrb,3  ,128,0,0,0) \
+ XCHAL_SA_REG(s,0,0,2,0,           wrb4,16,16,16,0x1024, wrb,4  ,128,0,0,0) \
+ XCHAL_SA_REG(s,0,0,2,0,           wrb5,16,16,16,0x1025, wrb,5  ,128,0,0,0) \
+ XCHAL_SA_REG(s,0,0,2,0,           wrb6,16,16,16,0x1026, wrb,6  ,128,0,0,0) \
+ XCHAL_SA_REG(s,0,0,2,0,           wrb7,16,16,16,0x1027, wrb,7  ,128,0,0,0) \
+ XCHAL_SA_REG(s,0,0,2,0,           wrb8,16,16,16,0x1028, wrb,8  ,128,0,0,0) \
+ XCHAL_SA_REG(s,0,0,2,0,           wrb9,16,16,16,0x1029, wrb,9  ,128,0,0,0) \
+ XCHAL_SA_REG(s,0,0,2,0,          wrb10,16,16,16,0x102A, wrb,10 ,128,0,0,0) \
+ XCHAL_SA_REG(s,0,0,2,0,          wrb11,16,16,16,0x102B, wrb,11 ,128,0,0,0) \
+ XCHAL_SA_REG(s,0,0,2,0,          wrb12,16,16,16,0x102C, wrb,12 ,128,0,0,0) \
+ XCHAL_SA_REG(s,0,0,2,0,          wrb13,16,16,16,0x102D, wrb,13 ,128,0,0,0) \
+ XCHAL_SA_REG(s,0,0,2,0,          wrb14,16,16,16,0x102E, wrb,14 ,128,0,0,0) \
+ XCHAL_SA_REG(s,0,0,2,0,          wrb15,16,16,16,0x102F, wrb,15 ,128,0,0,0)
+
+#define XCHAL_CP7_SA_NUM        0
+#define XCHAL_CP7_SA_LIST(s)    /* empty */
+
+/* Byte length of instruction from its first nibble (op0 field), per FLIX.  */
+#define XCHAL_OP0_FORMAT_LENGTHS        3,3,3,3,3,3,3,3,2,2,2,2,2,2,8,8
+
+#endif /*_XTENSA_CORE_TIE_H*/
+
diff --git a/arch/xtensa/variants/s6000/irq.c b/arch/xtensa/variants/s6000/irq.c
new file mode 100644
index 000000000000..6651e3285fcf
--- /dev/null
+++ b/arch/xtensa/variants/s6000/irq.c
@@ -0,0 +1,74 @@
+/*
+ * s6000 irq crossbar
+ *
+ * Copyright (c) 2009 emlix GmbH
+ * Authors:     Johannes Weiner <jw@emlix.com>
+ *              Oskar Schirmer <os@emlix.com>
+ */
+#include <linux/io.h>
+#include <asm/irq.h>
+#include <variant/hardware.h>
+
+/* S6_REG_INTC */
+#define INTC_STATUS     0x000
+#define INTC_RAW        0x010
+#define INTC_STATUS_AG  0x100
+#define INTC_CFG(n)     (0x200 + 4 * (n))
+
+/*
+ * The s6000 has a crossbar that multiplexes interrupt output lines
+ * from the peripherals to input lines on the xtensa core.
+ *
+ * We leave the mapping decisions to the platform as it depends on the
+ * actually connected peripherals which distribution makes sense.
+ */
+extern const signed char *platform_irq_mappings[NR_IRQS];
+
+static unsigned long scp_to_intc_enable[] = {
+#define TO_INTC_ENABLE(n)       (((n) << 1) + 1)
+        TO_INTC_ENABLE(0),
+        TO_INTC_ENABLE(1),
+        TO_INTC_ENABLE(2),
+        TO_INTC_ENABLE(3),
+        TO_INTC_ENABLE(4),
+        TO_INTC_ENABLE(5),
+        TO_INTC_ENABLE(6),
+        TO_INTC_ENABLE(7),
+        TO_INTC_ENABLE(8),
+        TO_INTC_ENABLE(9),
+        TO_INTC_ENABLE(10),
+        TO_INTC_ENABLE(11),
+        TO_INTC_ENABLE(12),
+        -1,
+        -1,
+        TO_INTC_ENABLE(13),
+        -1,
+        TO_INTC_ENABLE(14),
+        -1,
+        TO_INTC_ENABLE(15),
+#undef  TO_INTC_ENABLE
+};
+
+static void irq_set(unsigned int irq, int enable)
+{
+        unsigned long en;
+        const signed char *m = platform_irq_mappings[irq];
+
+        if (!m)
+                return;
+        en = enable ? scp_to_intc_enable[irq] : 0;
+        while (*m >= 0) {
+                writel(en, S6_REG_INTC + INTC_CFG(*m));
+                m++;
+        }
+}
+
+void variant_irq_enable(unsigned int irq)
+{
+        irq_set(irq, 1);
+}
+
+void variant_irq_disable(unsigned int irq)
+{
+        irq_set(irq, 0);
+}