117 files changed, 749 insertions, 637 deletions

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 5021db2217ed..9722f8bb506c 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -16,8 +16,7 @@ config ARM
         select HAVE_ARCH_KGDB
         select HAVE_KPROBES if (!XIP_KERNEL)
         select HAVE_KRETPROBES if (HAVE_KPROBES)
-        select HAVE_FTRACE if (!XIP_KERNEL)
-        select HAVE_DYNAMIC_FTRACE if (HAVE_FTRACE)
+        select HAVE_FUNCTION_TRACER if (!XIP_KERNEL)
         select HAVE_GENERIC_DMA_COHERENT
         help
           The ARM series is a line of low-power-consumption RISC chip designs
diff --git a/arch/arm/boot/compressed/Makefile b/arch/arm/boot/compressed/Makefile
index 7a03f2007882..c47f2a3f8f8f 100644
--- a/arch/arm/boot/compressed/Makefile
+++ b/arch/arm/boot/compressed/Makefile
@@ -70,7 +70,7 @@ SEDFLAGS	= s/TEXT_START/$(ZTEXTADDR)/;s/BSS_START/$(ZBSSADDR)/
 targets       := vmlinux vmlinux.lds piggy.gz piggy.o font.o font.c \
                  head.o misc.o $(OBJS)
 
-ifeq ($(CONFIG_FTRACE),y)
+ifeq ($(CONFIG_FUNCTION_TRACER),y)
 ORIG_CFLAGS := $(KBUILD_CFLAGS)
 KBUILD_CFLAGS = $(subst -pg, , $(ORIG_CFLAGS))
 endif
diff --git a/arch/arm/common/sharpsl_pm.c b/arch/arm/common/sharpsl_pm.c
index db8309161408..780bbf7cb26f 100644
--- a/arch/arm/common/sharpsl_pm.c
+++ b/arch/arm/common/sharpsl_pm.c
@@ -54,11 +54,13 @@
 /*
  * Prototypes
  */
+#ifdef CONFIG_PM
 static int sharpsl_off_charge_battery(void);
-static int sharpsl_check_battery_temp(void);
 static int sharpsl_check_battery_voltage(void);
-static int sharpsl_ac_check(void);
 static int sharpsl_fatal_check(void);
+#endif
+static int sharpsl_check_battery_temp(void);
+static int sharpsl_ac_check(void);
 static int sharpsl_average_value(int ad);
 static void sharpsl_average_clear(void);
 static void sharpsl_charge_toggle(struct work_struct *private_);
@@ -424,6 +426,7 @@ static int sharpsl_check_battery_temp(void)
         return 0;
 }
 
+#ifdef CONFIG_PM
 static int sharpsl_check_battery_voltage(void)
 {
         int val, i, buff[5];
@@ -455,6 +458,7 @@ static int sharpsl_check_battery_voltage(void)
 
         return 0;
 }
+#endif
 
 static int sharpsl_ac_check(void)
 {
@@ -586,8 +590,6 @@ static int corgi_pxa_pm_enter(suspend_state_t state)
 
         return 0;
 }
-#endif
-
 
 /*
  * Check for fatal battery errors
@@ -738,7 +740,10 @@ static int sharpsl_off_charge_battery(void)
                 }
         }
 }
-
+#else
+#define sharpsl_pm_suspend      NULL
+#define sharpsl_pm_resume       NULL
+#endif
 
 static ssize_t battery_percentage_show(struct device *dev, struct device_attribute *attr, char *buf)
 {
@@ -768,10 +773,12 @@ static void sharpsl_apm_get_power_status(struct apm_power_info *info)
         info->battery_life = sharpsl_pm.battstat.mainbat_percent;
 }
 
+#ifdef CONFIG_PM
 static struct platform_suspend_ops sharpsl_pm_ops = {
         .enter          = corgi_pxa_pm_enter,
         .valid          = suspend_valid_only_mem,
 };
+#endif
 
 static int __init sharpsl_pm_probe(struct platform_device *pdev)
 {
@@ -802,7 +809,9 @@ static int __init sharpsl_pm_probe(struct platform_device *pdev)
 
         apm_get_power_status = sharpsl_apm_get_power_status;
 
+#ifdef CONFIG_PM
         suspend_set_ops(&sharpsl_pm_ops);
+#endif
 
         mod_timer(&sharpsl_pm.ac_timer, jiffies + msecs_to_jiffies(250));
 
diff --git a/arch/arm/include/asm/ftrace.h b/arch/arm/include/asm/ftrace.h
index 584ef9a8e5a5..39c8bc1a006a 100644
--- a/arch/arm/include/asm/ftrace.h
+++ b/arch/arm/include/asm/ftrace.h
@@ -1,7 +1,7 @@
 #ifndef _ASM_ARM_FTRACE
 #define _ASM_ARM_FTRACE
 
-#ifdef CONFIG_FTRACE
+#ifdef CONFIG_FUNCTION_TRACER
 #define MCOUNT_ADDR             ((long)(mcount))
 #define MCOUNT_INSN_SIZE        4 /* sizeof mcount call */
 
diff --git a/arch/arm/kernel/armksyms.c b/arch/arm/kernel/armksyms.c
index 2357b1cf1cf9..c74f766ffc12 100644
--- a/arch/arm/kernel/armksyms.c
+++ b/arch/arm/kernel/armksyms.c
@@ -183,6 +183,6 @@ EXPORT_SYMBOL(_find_next_bit_be);
 
 EXPORT_SYMBOL(copy_page);
 
-#ifdef CONFIG_FTRACE
+#ifdef CONFIG_FUNCTION_TRACER
 EXPORT_SYMBOL(mcount);
 #endif
diff --git a/arch/arm/kernel/entry-common.S b/arch/arm/kernel/entry-common.S
index 3aa14dcc5bab..06269ea375c5 100644
--- a/arch/arm/kernel/entry-common.S
+++ b/arch/arm/kernel/entry-common.S
@@ -101,7 +101,7 @@ ENDPROC(ret_from_fork)
 #undef CALL
 #define CALL(x) .long x
 
-#ifdef CONFIG_FTRACE
+#ifdef CONFIG_FUNCTION_TRACER
 #ifdef CONFIG_DYNAMIC_FTRACE
 ENTRY(mcount)
         stmdb sp!, {r0-r3, lr}
@@ -149,7 +149,7 @@ trace:
 ftrace_stub:
         mov pc, lr
 
-#endif /* CONFIG_FTRACE */
+#endif /* CONFIG_FUNCTION_TRACER */
 
 /*=============================================================================
  * SWI handler
diff --git a/arch/arm/kernel/ftrace.c b/arch/arm/kernel/ftrace.c
index 76d50e6091bc..6c90479e8974 100644
--- a/arch/arm/kernel/ftrace.c
+++ b/arch/arm/kernel/ftrace.c
@@ -95,19 +95,6 @@ int ftrace_update_ftrace_func(ftrace_func_t func)
         return ret;
 }
 
-int ftrace_mcount_set(unsigned long *data)
-{
-        unsigned long pc, old;
-        unsigned long *addr = data;
-        unsigned char *new;
-
-        pc = (unsigned long)&mcount_call;
-        memcpy(&old, &mcount_call, MCOUNT_INSN_SIZE);
-        new = ftrace_call_replace(pc, *addr);
-        *addr = ftrace_modify_code(pc, (unsigned char *)&old, new);
-        return 0;
-}
-
 /* run from kstop_machine */
 int __init ftrace_dyn_arch_init(void *data)
 {
diff --git a/arch/arm/mach-at91/board-afeb-9260v1.c b/arch/arm/mach-at91/board-afeb-9260v1.c
index 9c040c78889a..e263fda3e2d1 100644
--- a/arch/arm/mach-at91/board-afeb-9260v1.c
+++ b/arch/arm/mach-at91/board-afeb-9260v1.c
@@ -165,6 +165,7 @@ static struct at91_mmc_data __initdata afeb9260_mmc_data = {
 static struct i2c_board_info __initdata afeb9260_i2c_devices[] = {
         {
                 I2C_BOARD_INFO("fm3130", 0x68),
+        }, {
                 I2C_BOARD_INFO("24c64", 0x50),
         },
 };
diff --git a/arch/arm/mach-at91/include/mach/gpio.h b/arch/arm/mach-at91/include/mach/gpio.h
index 76d76e2fa69e..bffa6741a751 100644
--- a/arch/arm/mach-at91/include/mach/gpio.h
+++ b/arch/arm/mach-at91/include/mach/gpio.h
@@ -13,6 +13,7 @@
 #ifndef __ASM_ARCH_AT91RM9200_GPIO_H
 #define __ASM_ARCH_AT91RM9200_GPIO_H
 
+#include <linux/kernel.h>
 #include <asm/irq.h>
 
 #define PIN_BASE                NR_AIC_IRQS
@@ -220,6 +221,7 @@ static inline int gpio_request(unsigned gpio, const char *label)
 
 static inline void gpio_free(unsigned gpio)
 {
+        might_sleep();
 }
 
 extern int gpio_direction_input(unsigned gpio);
diff --git a/arch/arm/mach-ep93xx/core.c b/arch/arm/mach-ep93xx/core.c
index de53f0be71b9..48345fb34613 100644
--- a/arch/arm/mach-ep93xx/core.c
+++ b/arch/arm/mach-ep93xx/core.c
@@ -26,6 +26,7 @@
 #include <linux/serial_core.h>
 #include <linux/device.h>
 #include <linux/mm.h>
+#include <linux/dma-mapping.h>
 #include <linux/time.h>
 #include <linux/timex.h>
 #include <linux/delay.h>
@@ -449,12 +450,13 @@ static struct resource ep93xx_ohci_resources[] = {
         },
 };
 
+
 static struct platform_device ep93xx_ohci_device = {
         .name           = "ep93xx-ohci",
         .id             = -1,
         .dev            = {
-                .dma_mask               = (void *)0xffffffff,
-                .coherent_dma_mask      = 0xffffffff,
+                .dma_mask               = &ep93xx_ohci_device.dev.coherent_dma_mask,
+                .coherent_dma_mask      = DMA_BIT_MASK(32),
         },
         .num_resources  = ARRAY_SIZE(ep93xx_ohci_resources),
         .resource       = ep93xx_ohci_resources,
diff --git a/arch/arm/mach-imx/include/mach/gpio.h b/arch/arm/mach-imx/include/mach/gpio.h
index 6e3d795f2264..502d5aa2c093 100644
--- a/arch/arm/mach-imx/include/mach/gpio.h
+++ b/arch/arm/mach-imx/include/mach/gpio.h
@@ -1,5 +1,6 @@
 #ifndef _IMX_GPIO_H
 
+#include <linux/kernel.h>
 #include <mach/imx-regs.h>
 
 #define IMX_GPIO_ALLOC_MODE_NORMAL      0
@@ -63,6 +64,8 @@ static inline int gpio_request(unsigned gpio, const char *label)
 
 static inline void gpio_free(unsigned gpio)
 {
+        might_sleep();
+
         imx_gpio_free(gpio);
 }
 
diff --git a/arch/arm/mach-ixp4xx/include/mach/gpio.h b/arch/arm/mach-ixp4xx/include/mach/gpio.h
index 9fbde177920f..cd5aec26c072 100644
--- a/arch/arm/mach-ixp4xx/include/mach/gpio.h
+++ b/arch/arm/mach-ixp4xx/include/mach/gpio.h
@@ -25,6 +25,7 @@
 #ifndef __ASM_ARCH_IXP4XX_GPIO_H
 #define __ASM_ARCH_IXP4XX_GPIO_H
 
+#include <linux/kernel.h>
 #include <mach/hardware.h>
 
 static inline int gpio_request(unsigned gpio, const char *label)
@@ -34,6 +35,8 @@ static inline int gpio_request(unsigned gpio, const char *label)
 
 static inline void gpio_free(unsigned gpio)
 {
+        might_sleep();
+
         return;
 }
 
diff --git a/arch/arm/mach-ks8695/include/mach/gpio.h b/arch/arm/mach-ks8695/include/mach/gpio.h
index 73c84168761c..d4af5c335f16 100644
--- a/arch/arm/mach-ks8695/include/mach/gpio.h
+++ b/arch/arm/mach-ks8695/include/mach/gpio.h
@@ -11,6 +11,8 @@
 #ifndef __ASM_ARCH_GPIO_H_
 #define __ASM_ARCH_GPIO_H_
 
+#include <linux/kernel.h>
+
 #define KS8695_GPIO_0           0
 #define KS8695_GPIO_1           1
 #define KS8695_GPIO_2           2
@@ -74,6 +76,7 @@ static inline int gpio_request(unsigned int pin, const char *label)
 
 static inline void gpio_free(unsigned int pin)
 {
+        might_sleep();
 }
 
 #endif
diff --git a/arch/arm/mach-mx3/mx31ads.c b/arch/arm/mach-mx3/mx31ads.c
index 1be4a390c63f..f902a7c37c31 100644
--- a/arch/arm/mach-mx3/mx31ads.c
+++ b/arch/arm/mach-mx3/mx31ads.c
@@ -35,6 +35,8 @@
 #include <mach/imx-uart.h>
 #include <mach/iomux-mx3.h>
 
+#include "devices.h"
+
 /*!
  * @file mx31ads.c
  *
diff --git a/arch/arm/mach-mx3/pcm037.c b/arch/arm/mach-mx3/pcm037.c
index 11fda95c86a5..843f68c8ead1 100644
--- a/arch/arm/mach-mx3/pcm037.c
+++ b/arch/arm/mach-mx3/pcm037.c
@@ -91,12 +91,12 @@ static struct map_desc pcm037_io_desc[] __initdata = {
                 .virtual        = AIPS1_BASE_ADDR_VIRT,
                 .pfn            = __phys_to_pfn(AIPS1_BASE_ADDR),
                 .length         = AIPS1_SIZE,
-                .type           = MT_DEVICE
+                .type           = MT_DEVICE_NONSHARED
         }, {
                 .virtual        = AIPS2_BASE_ADDR_VIRT,
                 .pfn            = __phys_to_pfn(AIPS2_BASE_ADDR),
                 .length         = AIPS2_SIZE,
-                .type           = MT_DEVICE
+                .type           = MT_DEVICE_NONSHARED
         },
 };
 
diff --git a/arch/arm/mach-ns9xxx/gpio.c b/arch/arm/mach-ns9xxx/gpio.c
index 5241e6a286cc..5503ca09c4ae 100644
--- a/arch/arm/mach-ns9xxx/gpio.c
+++ b/arch/arm/mach-ns9xxx/gpio.c
@@ -8,6 +8,7 @@
  * under the terms of the GNU General Public License version 2 as published by
  * the Free Software Foundation.
  */
+#include <linux/kernel.h>
 #include <linux/compiler.h>
 #include <linux/init.h>
 #include <linux/spinlock.h>
@@ -63,6 +64,7 @@ EXPORT_SYMBOL(gpio_request);
 
 void gpio_free(unsigned gpio)
 {
+        might_sleep();
         clear_bit(gpio, gpiores);
         return;
 }
diff --git a/arch/arm/mach-orion5x/gpio.c b/arch/arm/mach-orion5x/gpio.c
index fc419868e39f..f99d08811e5a 100644
--- a/arch/arm/mach-orion5x/gpio.c
+++ b/arch/arm/mach-orion5x/gpio.c
@@ -165,6 +165,8 @@ EXPORT_SYMBOL(gpio_request);
 
 void gpio_free(unsigned pin)
 {
+        might_sleep();
+
         if (pin >= GPIO_MAX || !test_bit(pin, gpio_valid)) {
                 pr_debug("%s: invalid GPIO %d\n", __func__, pin);
                 return;
diff --git a/arch/arm/mach-pxa/corgi_pm.c b/arch/arm/mach-pxa/corgi_pm.c
index eb7d6c94aa42..e35259032813 100644
--- a/arch/arm/mach-pxa/corgi_pm.c
+++ b/arch/arm/mach-pxa/corgi_pm.c
@@ -204,7 +204,9 @@ static struct sharpsl_charger_machinfo corgi_pm_machinfo = {
         .read_devdata    = corgipm_read_devdata,
         .charger_wakeup  = corgi_charger_wakeup,
         .should_wakeup   = corgi_should_wakeup,
-#ifdef CONFIG_BACKLIGHT_CORGI
+#if defined(CONFIG_LCD_CORGI)
+        .backlight_limit = corgi_lcd_limit_intensity,
+#elif defined(CONFIG_BACKLIGHT_CORGI)
         .backlight_limit = corgibl_limit_intensity,
 #endif
         .charge_on_volt   = SHARPSL_CHARGE_ON_VOLT,
diff --git a/arch/arm/mach-pxa/include/mach/sharpsl.h b/arch/arm/mach-pxa/include/mach/sharpsl.h
index 3b1d4a72d4d1..8242e14a44fa 100644
--- a/arch/arm/mach-pxa/include/mach/sharpsl.h
+++ b/arch/arm/mach-pxa/include/mach/sharpsl.h
@@ -26,6 +26,7 @@ struct corgits_machinfo {
  * SharpSL Backlight
  */
 extern void corgibl_limit_intensity(int limit);
+extern void corgi_lcd_limit_intensity(int limit);
 
 
 /*
diff --git a/arch/arm/mach-pxa/spitz.c b/arch/arm/mach-pxa/spitz.c
index 524f656dc56d..f0a5bbae0b45 100644
--- a/arch/arm/mach-pxa/spitz.c
+++ b/arch/arm/mach-pxa/spitz.c
@@ -385,6 +385,16 @@ static void __init spitz_init_spi(void)
         if (err)
                 goto err_free_2;
 
+        err = gpio_direction_output(SPITZ_GPIO_ADS7846_CS, 1);
+        if (err)
+                goto err_free_3;
+        err = gpio_direction_output(SPITZ_GPIO_LCDCON_CS, 1);
+        if (err)
+                goto err_free_3;
+        err = gpio_direction_output(SPITZ_GPIO_MAX1111_CS, 1);
+        if (err)
+                goto err_free_3;
+
         if (machine_is_akita()) {
                 spitz_lcdcon_info.gpio_backlight_cont = AKITA_GPIO_BACKLIGHT_CONT;
                 spitz_lcdcon_info.gpio_backlight_on = AKITA_GPIO_BACKLIGHT_ON;
@@ -394,6 +404,8 @@ static void __init spitz_init_spi(void)
         spi_register_board_info(ARRAY_AND_SIZE(spitz_spi_devices));
         return;
 
+err_free_3:
+        gpio_free(SPITZ_GPIO_MAX1111_CS);
 err_free_2:
         gpio_free(SPITZ_GPIO_LCDCON_CS);
 err_free_1:
diff --git a/arch/arm/mach-pxa/spitz_pm.c b/arch/arm/mach-pxa/spitz_pm.c
index 53018db106ac..072e77cfe5a3 100644
--- a/arch/arm/mach-pxa/spitz_pm.c
+++ b/arch/arm/mach-pxa/spitz_pm.c
@@ -198,7 +198,9 @@ struct sharpsl_charger_machinfo spitz_pm_machinfo = {
         .read_devdata     = spitzpm_read_devdata,
         .charger_wakeup   = spitz_charger_wakeup,
         .should_wakeup    = spitz_should_wakeup,
-#ifdef CONFIG_BACKLIGHT_CORGI
+#if defined(CONFIG_LCD_CORGI)
+        .backlight_limit = corgi_lcd_limit_intensity,
+#elif defined(CONFIG_BACKLIGHT_CORGI)
         .backlight_limit  = corgibl_limit_intensity,
 #endif
         .charge_on_volt   = SHARPSL_CHARGE_ON_VOLT,
diff --git a/arch/arm/mm/proc-xsc3.S b/arch/arm/mm/proc-xsc3.S
index 04dc8b65401b..8f6cf56c11c0 100644
--- a/arch/arm/mm/proc-xsc3.S
+++ b/arch/arm/mm/proc-xsc3.S
@@ -349,7 +349,7 @@ ENTRY(cpu_xsc3_switch_mm)
 cpu_xsc3_mt_table:
         .long   0x00                                            @ L_PTE_MT_UNCACHED
         .long   PTE_EXT_TEX(1)                                  @ L_PTE_MT_BUFFERABLE
-        .long   PTE_CACHEABLE                                   @ L_PTE_MT_WRITETHROUGH
+        .long   PTE_EXT_TEX(5) | PTE_CACHEABLE                  @ L_PTE_MT_WRITETHROUGH
         .long   PTE_CACHEABLE | PTE_BUFFERABLE                  @ L_PTE_MT_WRITEBACK
         .long   PTE_EXT_TEX(1) | PTE_BUFFERABLE                 @ L_PTE_MT_DEV_SHARED
         .long   0x00                                            @ unused
diff --git a/arch/arm/plat-mxc/gpio.c b/arch/arm/plat-mxc/gpio.c
index 733e0acac916..de5c4747453f 100644
--- a/arch/arm/plat-mxc/gpio.c
+++ b/arch/arm/plat-mxc/gpio.c
@@ -188,7 +188,7 @@ static int mxc_gpio_get(struct gpio_chip *chip, unsigned offset)
         struct mxc_gpio_port *port =
                 container_of(chip, struct mxc_gpio_port, chip);
 
-        return (__raw_readl(port->base + GPIO_DR) >> offset) & 1;
+        return (__raw_readl(port->base + GPIO_PSR) >> offset) & 1;
 }
 
 static int mxc_gpio_direction_input(struct gpio_chip *chip, unsigned offset)
diff --git a/arch/arm/plat-mxc/include/mach/io.h b/arch/arm/plat-mxc/include/mach/io.h
index 65b6810124c1..5d4cb1196441 100644
--- a/arch/arm/plat-mxc/include/mach/io.h
+++ b/arch/arm/plat-mxc/include/mach/io.h
@@ -14,6 +14,26 @@
 /* Allow IO space to be anywhere in the memory */
 #define IO_SPACE_LIMIT 0xffffffff
 
+#ifdef CONFIG_ARCH_MX3
+#define __arch_ioremap __mx3_ioremap
+#define __arch_iounmap __iounmap
+
+static inline void __iomem *
+__mx3_ioremap(unsigned long phys_addr, size_t size, unsigned int mtype)
+{
+        if (mtype == MT_DEVICE) {
+                /* Access all peripherals below 0x80000000 as nonshared device
+                 * but leave l2cc alone.
+                 */
+                if ((phys_addr < 0x80000000) && ((phys_addr < L2CC_BASE_ADDR) ||
+                        (phys_addr >= L2CC_BASE_ADDR + L2CC_SIZE)))
+                        mtype = MT_DEVICE_NONSHARED;
+        }
+
+        return __arm_ioremap(phys_addr, size, mtype);
+}
+#endif
+
 /* io address mapping macro */
 #define __io(a)                 ((void __iomem *)(a))
 
diff --git a/arch/ia64/include/asm/iommu.h b/arch/ia64/include/asm/iommu.h
index 5fb2bb93de3b..0490794fe4aa 100644
--- a/arch/ia64/include/asm/iommu.h
+++ b/arch/ia64/include/asm/iommu.h
@@ -11,6 +11,5 @@ extern int force_iommu, no_iommu;
 extern int iommu_detected;
 extern void iommu_dma_init(void);
 extern void machvec_init(const char *name);
-extern int forbid_dac;
 
 #endif
diff --git a/arch/ia64/include/asm/kvm_host.h b/arch/ia64/include/asm/kvm_host.h
index 85db124d37f6..c60d324da540 100644
--- a/arch/ia64/include/asm/kvm_host.h
+++ b/arch/ia64/include/asm/kvm_host.h
@@ -365,7 +365,8 @@ struct kvm_vcpu_arch {
         long itc_offset;
         unsigned long itc_check;
         unsigned long timer_check;
-        unsigned long timer_pending;
+        unsigned int timer_pending;
+        unsigned int timer_fired;
 
         unsigned long vrr[8];
         unsigned long ibr[8];
@@ -417,6 +418,9 @@ struct kvm_arch {
         struct list_head assigned_dev_head;
         struct dmar_domain *intel_iommu_domain;
         struct hlist_head irq_ack_notifier_list;
+
+        unsigned long irq_sources_bitmap;
+        unsigned long irq_states[KVM_IOAPIC_NUM_PINS];
 };
 
 union cpuid3_t {
diff --git a/arch/ia64/kernel/pci-dma.c b/arch/ia64/kernel/pci-dma.c
index 10a75b557650..031abbf9c875 100644
--- a/arch/ia64/kernel/pci-dma.c
+++ b/arch/ia64/kernel/pci-dma.c
@@ -89,13 +89,6 @@ int iommu_dma_supported(struct device *dev, u64 mask)
 {
         struct dma_mapping_ops *ops = get_dma_ops(dev);
 
-#ifdef CONFIG_PCI
-        if (mask > 0xffffffff && forbid_dac > 0) {
-                dev_info(dev, "Disallowing DAC for device\n");
-                return 0;
-        }
-#endif
-
         if (ops->dma_supported_op)
                 return ops->dma_supported_op(dev, mask);
 
diff --git a/arch/ia64/kvm/Makefile b/arch/ia64/kvm/Makefile
index cf37f8f490c0..3ab4d6d50704 100644
--- a/arch/ia64/kvm/Makefile
+++ b/arch/ia64/kvm/Makefile
@@ -29,13 +29,18 @@ define cmd_offsets
          echo ""; \
          echo "#endif" ) > $@
 endef
+
 # We use internal rules to avoid the "is up to date" message from make
-arch/ia64/kvm/asm-offsets.s: arch/ia64/kvm/asm-offsets.c
+arch/ia64/kvm/asm-offsets.s: arch/ia64/kvm/asm-offsets.c \
+                        $(wildcard $(srctree)/arch/ia64/include/asm/*.h)\
+                        $(wildcard $(srctree)/include/linux/*.h)
         $(call if_changed_dep,cc_s_c)
 
 $(obj)/$(offsets-file): arch/ia64/kvm/asm-offsets.s
         $(call cmd,offsets)
 
+FORCE : $(obj)/$(offsets-file)
+
 #
 # Makefile for Kernel-based Virtual Machine module
 #
@@ -53,7 +58,6 @@ endif
 kvm-objs := $(common-objs) kvm-ia64.o kvm_fw.o
 obj-$(CONFIG_KVM) += kvm.o
 
-FORCE : $(obj)/$(offsets-file)
 EXTRA_CFLAGS_vcpu.o += -mfixed-range=f2-f5,f12-f127
 kvm-intel-objs = vmm.o vmm_ivt.o trampoline.o vcpu.o optvfault.o mmio.o \
         vtlb.o process.o
diff --git a/arch/ia64/kvm/kvm-ia64.c b/arch/ia64/kvm/kvm-ia64.c
index a312c9e9b9ef..3caac477de9e 100644
--- a/arch/ia64/kvm/kvm-ia64.c
+++ b/arch/ia64/kvm/kvm-ia64.c
@@ -385,6 +385,7 @@ static int handle_global_purge(struct kvm_vcpu *vcpu, struct kvm_run *kvm_run)
         struct kvm *kvm = vcpu->kvm;
         struct call_data call_data;
         int i;
+
         call_data.ptc_g_data = p->u.ptc_g_data;
 
         for (i = 0; i < KVM_MAX_VCPUS; i++) {
@@ -418,33 +419,41 @@ int kvm_emulate_halt(struct kvm_vcpu *vcpu)
         ktime_t kt;
         long itc_diff;
         unsigned long vcpu_now_itc;
-
         unsigned long expires;
         struct hrtimer *p_ht = &vcpu->arch.hlt_timer;
         unsigned long cyc_per_usec = local_cpu_data->cyc_per_usec;
         struct vpd *vpd = to_host(vcpu->kvm, vcpu->arch.vpd);
 
-        vcpu_now_itc = ia64_getreg(_IA64_REG_AR_ITC) + vcpu->arch.itc_offset;
+        if (irqchip_in_kernel(vcpu->kvm)) {
 
-        if (time_after(vcpu_now_itc, vpd->itm)) {
-                vcpu->arch.timer_check = 1;
-                return 1;
-        }
-        itc_diff = vpd->itm - vcpu_now_itc;
-        if (itc_diff < 0)
-                itc_diff = -itc_diff;
+                vcpu_now_itc = ia64_getreg(_IA64_REG_AR_ITC) + vcpu->arch.itc_offset;
 
-        expires = div64_u64(itc_diff, cyc_per_usec);
-        kt = ktime_set(0, 1000 * expires);
-        vcpu->arch.ht_active = 1;
-        hrtimer_start(p_ht, kt, HRTIMER_MODE_ABS);
+                if (time_after(vcpu_now_itc, vpd->itm)) {
+                        vcpu->arch.timer_check = 1;
+                        return 1;
+                }
+                itc_diff = vpd->itm - vcpu_now_itc;
+                if (itc_diff < 0)
+                        itc_diff = -itc_diff;
+
+                expires = div64_u64(itc_diff, cyc_per_usec);
+                kt = ktime_set(0, 1000 * expires);
+
+                down_read(&vcpu->kvm->slots_lock);
+                vcpu->arch.ht_active = 1;
+                hrtimer_start(p_ht, kt, HRTIMER_MODE_ABS);
 
-        if (irqchip_in_kernel(vcpu->kvm)) {
                 vcpu->arch.mp_state = KVM_MP_STATE_HALTED;
                 kvm_vcpu_block(vcpu);
                 hrtimer_cancel(p_ht);
                 vcpu->arch.ht_active = 0;
 
+                if (test_and_clear_bit(KVM_REQ_UNHALT, &vcpu->requests))
+                        if (vcpu->arch.mp_state == KVM_MP_STATE_HALTED)
+                                vcpu->arch.mp_state =
+                                        KVM_MP_STATE_RUNNABLE;
+                up_read(&vcpu->kvm->slots_lock);
+
                 if (vcpu->arch.mp_state != KVM_MP_STATE_RUNNABLE)
                         return -EINTR;
                 return 1;
@@ -484,10 +493,6 @@ static int (*kvm_vti_exit_handlers[])(struct kvm_vcpu *vcpu,
 static const int kvm_vti_max_exit_handlers =
                 sizeof(kvm_vti_exit_handlers)/sizeof(*kvm_vti_exit_handlers);
 
-static void kvm_prepare_guest_switch(struct kvm_vcpu *vcpu)
-{
-}
-
 static uint32_t kvm_get_exit_reason(struct kvm_vcpu *vcpu)
 {
         struct exit_ctl_data *p_exit_data;
@@ -600,8 +605,6 @@ static int __vcpu_run(struct kvm_vcpu *vcpu, struct kvm_run *kvm_run)
 
 again:
         preempt_disable();
-
-        kvm_prepare_guest_switch(vcpu);
         local_irq_disable();
 
         if (signal_pending(current)) {
@@ -614,7 +617,7 @@ again:
 
         vcpu->guest_mode = 1;
         kvm_guest_enter();
-
+        down_read(&vcpu->kvm->slots_lock);
         r = vti_vcpu_run(vcpu, kvm_run);
         if (r < 0) {
                 local_irq_enable();
@@ -634,9 +637,8 @@ again:
          * But we need to prevent reordering, hence this barrier():
          */
         barrier();
-
         kvm_guest_exit();
-
+        up_read(&vcpu->kvm->slots_lock);
         preempt_enable();
 
         r = kvm_handle_exit(kvm_run, vcpu);
@@ -673,6 +675,7 @@ int kvm_arch_vcpu_ioctl_run(struct kvm_vcpu *vcpu, struct kvm_run *kvm_run)
 
         if (unlikely(vcpu->arch.mp_state == KVM_MP_STATE_UNINITIALIZED)) {
                 kvm_vcpu_block(vcpu);
+                clear_bit(KVM_REQ_UNHALT, &vcpu->requests);
                 vcpu_put(vcpu);
                 return -EAGAIN;
         }
@@ -778,6 +781,9 @@ static void kvm_init_vm(struct kvm *kvm)
         kvm_build_io_pmt(kvm);
 
         INIT_LIST_HEAD(&kvm->arch.assigned_dev_head);
+
+        /* Reserve bit 0 of irq_sources_bitmap for userspace irq source */
+        set_bit(KVM_USERSPACE_IRQ_SOURCE_ID, &kvm->arch.irq_sources_bitmap);
 }
 
 struct  kvm *kvm_arch_create_vm(void)
@@ -941,9 +947,8 @@ long kvm_arch_vm_ioctl(struct file *filp,
                         goto out;
                 if (irqchip_in_kernel(kvm)) {
                         mutex_lock(&kvm->lock);
-                        kvm_ioapic_set_irq(kvm->arch.vioapic,
-                                                irq_event.irq,
-                                                irq_event.level);
+                        kvm_set_irq(kvm, KVM_USERSPACE_IRQ_SOURCE_ID,
+                                    irq_event.irq, irq_event.level);
                         mutex_unlock(&kvm->lock);
                         r = 0;
                 }
@@ -1123,15 +1128,16 @@ static enum hrtimer_restart hlt_timer_fn(struct hrtimer *data)
         wait_queue_head_t *q;
 
         vcpu  = container_of(data, struct kvm_vcpu, arch.hlt_timer);
+        q = &vcpu->wq;
+
         if (vcpu->arch.mp_state != KVM_MP_STATE_HALTED)
                 goto out;
 
-        q = &vcpu->wq;
-        if (waitqueue_active(q)) {
-                vcpu->arch.mp_state = KVM_MP_STATE_RUNNABLE;
+        if (waitqueue_active(q))
                 wake_up_interruptible(q);
-        }
+
 out:
+        vcpu->arch.timer_fired = 1;
         vcpu->arch.timer_check = 1;
         return HRTIMER_NORESTART;
 }
@@ -1700,12 +1706,14 @@ static void vcpu_kick_intr(void *info)
 void kvm_vcpu_kick(struct kvm_vcpu *vcpu)
 {
         int ipi_pcpu = vcpu->cpu;
+        int cpu = get_cpu();
 
         if (waitqueue_active(&vcpu->wq))
                 wake_up_interruptible(&vcpu->wq);
 
-        if (vcpu->guest_mode)
+        if (vcpu->guest_mode && cpu != ipi_pcpu)
                 smp_call_function_single(ipi_pcpu, vcpu_kick_intr, vcpu, 0);
+        put_cpu();
 }
 
 int kvm_apic_set_irq(struct kvm_vcpu *vcpu, u8 vec, u8 trig)
@@ -1715,13 +1723,7 @@ int kvm_apic_set_irq(struct kvm_vcpu *vcpu, u8 vec, u8 trig)
 
         if (!test_and_set_bit(vec, &vpd->irr[0])) {
                 vcpu->arch.irq_new_pending = 1;
-                 if (vcpu->arch.mp_state == KVM_MP_STATE_RUNNABLE)
-                        kvm_vcpu_kick(vcpu);
-                else if (vcpu->arch.mp_state == KVM_MP_STATE_HALTED) {
-                        vcpu->arch.mp_state = KVM_MP_STATE_RUNNABLE;
-                        if (waitqueue_active(&vcpu->wq))
-                                wake_up_interruptible(&vcpu->wq);
-                }
+                kvm_vcpu_kick(vcpu);
                 return 1;
         }
         return 0;
@@ -1791,7 +1793,7 @@ int kvm_cpu_has_interrupt(struct kvm_vcpu *vcpu)
 
 int kvm_cpu_has_pending_timer(struct kvm_vcpu *vcpu)
 {
-        return 0;
+        return vcpu->arch.timer_fired;
 }
 
 gfn_t unalias_gfn(struct kvm *kvm, gfn_t gfn)
diff --git a/arch/ia64/kvm/kvm_fw.c b/arch/ia64/kvm/kvm_fw.c
index 0c69d9ec92d4..cb7600bdff9d 100644
--- a/arch/ia64/kvm/kvm_fw.c
+++ b/arch/ia64/kvm/kvm_fw.c
@@ -286,6 +286,12 @@ static  u64 kvm_get_pal_call_index(struct kvm_vcpu *vcpu)
         return index;
 }
 
+static void prepare_for_halt(struct kvm_vcpu *vcpu)
+{
+        vcpu->arch.timer_pending = 1;
+        vcpu->arch.timer_fired = 0;
+}
+
 int kvm_pal_emul(struct kvm_vcpu *vcpu, struct kvm_run *run)
 {
 
@@ -304,11 +310,10 @@ int kvm_pal_emul(struct kvm_vcpu *vcpu, struct kvm_run *run)
                 break;
         case PAL_HALT_LIGHT:
         {
-                vcpu->arch.timer_pending = 1;
                 INIT_PAL_STATUS_SUCCESS(result);
+                prepare_for_halt(vcpu);
                 if (kvm_highest_pending_irq(vcpu) == -1)
                         ret = kvm_emulate_halt(vcpu);
-
         }
                 break;
 
diff --git a/arch/ia64/kvm/process.c b/arch/ia64/kvm/process.c
index 3417783ae164..800817307b7b 100644
--- a/arch/ia64/kvm/process.c
+++ b/arch/ia64/kvm/process.c
@@ -713,7 +713,7 @@ void leave_hypervisor_tail(void)
                                 if (!(VCPU(v, itv) & (1 << 16))) {
                                         vcpu_pend_interrupt(v, VCPU(v, itv)
                                                         & 0xff);
-                                VMX(v, itc_check) = 0;
+                                        VMX(v, itc_check) = 0;
                                 } else {
                                         v->arch.timer_pending = 1;
                                 }
diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig
index 653574bc19cf..f4af967a6b30 100644
--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
@@ -327,7 +327,6 @@ config SGI_IP22
         select IP22_CPU_SCACHE
         select IRQ_CPU
         select GENERIC_ISA_DMA_SUPPORT_BROKEN
-        select SGI_HAS_DS1286
         select SGI_HAS_I8042
         select SGI_HAS_INDYDOG
         select SGI_HAS_HAL2
@@ -382,7 +381,6 @@ config SGI_IP28
         select HW_HAS_EISA
         select I8253
         select I8259
-        select SGI_HAS_DS1286
         select SGI_HAS_I8042
         select SGI_HAS_INDYDOG
         select SGI_HAS_HAL2
@@ -893,9 +891,6 @@ config EMMA2RH
 config SERIAL_RM9000
         bool
 
-config SGI_HAS_DS1286
-        bool
-
 config SGI_HAS_INDYDOG
         bool
 
diff --git a/arch/mips/configs/ip22_defconfig b/arch/mips/configs/ip22_defconfig
index cc8e6bf2b245..f719bf5e01aa 100644
--- a/arch/mips/configs/ip22_defconfig
+++ b/arch/mips/configs/ip22_defconfig
@@ -771,7 +771,6 @@ CONFIG_WATCHDOG=y
 CONFIG_INDYDOG=m
 # CONFIG_HW_RANDOM is not set
 # CONFIG_RTC is not set
-CONFIG_SGI_DS1286=m
 # CONFIG_R3964 is not set
 CONFIG_RAW_DRIVER=m
 CONFIG_MAX_RAW_DEVS=256
diff --git a/arch/mips/configs/ip27_defconfig b/arch/mips/configs/ip27_defconfig
index 831d3e5a1ea6..34ea319be94c 100644
--- a/arch/mips/configs/ip27_defconfig
+++ b/arch/mips/configs/ip27_defconfig
@@ -701,7 +701,6 @@ CONFIG_LEGACY_PTY_COUNT=256
 # CONFIG_WATCHDOG is not set
 CONFIG_HW_RANDOM=m
 # CONFIG_RTC is not set
-CONFIG_SGI_IP27_RTC=y
 # CONFIG_R3964 is not set
 # CONFIG_APPLICOM is not set
 # CONFIG_DRM is not set
diff --git a/arch/mips/configs/ip28_defconfig b/arch/mips/configs/ip28_defconfig
index 822b01f643e3..70a744e9a8c5 100644
--- a/arch/mips/configs/ip28_defconfig
+++ b/arch/mips/configs/ip28_defconfig
@@ -70,7 +70,6 @@ CONFIG_CPU_BIG_ENDIAN=y
 CONFIG_SYS_SUPPORTS_BIG_ENDIAN=y
 CONFIG_IRQ_CPU=y
 CONFIG_SWAP_IO_SPACE=y
-CONFIG_SGI_HAS_DS1286=y
 CONFIG_SGI_HAS_INDYDOG=y
 CONFIG_SGI_HAS_SEEQ=y
 CONFIG_SGI_HAS_WD93=y
@@ -585,7 +584,6 @@ CONFIG_LEGACY_PTY_COUNT=256
 # CONFIG_IPMI_HANDLER is not set
 # CONFIG_HW_RANDOM is not set
 # CONFIG_RTC is not set
-CONFIG_SGI_DS1286=y
 # CONFIG_DTLK is not set
 # CONFIG_R3964 is not set
 # CONFIG_RAW_DRIVER is not set
diff --git a/arch/mips/include/asm/bitops.h b/arch/mips/include/asm/bitops.h
index 49df8c4c9d25..bac4a960b24c 100644
--- a/arch/mips/include/asm/bitops.h
+++ b/arch/mips/include/asm/bitops.h
@@ -558,39 +558,67 @@ static inline void __clear_bit_unlock(unsigned long nr, volatile unsigned long *
         __clear_bit(nr, addr);
 }
 
-#if defined(CONFIG_CPU_MIPS32) || defined(CONFIG_CPU_MIPS64)
-
 /*
  * Return the bit position (0..63) of the most significant 1 bit in a word
  * Returns -1 if no 1 bit exists
  */
-static inline unsigned long __fls(unsigned long x)
+static inline unsigned long __fls(unsigned long word)
 {
-        int lz;
+        int num;
 
-        if (sizeof(x) == 4) {
+        if (BITS_PER_LONG == 32 &&
+            __builtin_constant_p(cpu_has_mips_r) && cpu_has_mips_r) {
                 __asm__(
                 "       .set    push                                    \n"
                 "       .set    mips32                                  \n"
                 "       clz     %0, %1                                  \n"
                 "       .set    pop                                     \n"
-                : "=r" (lz)
-                : "r" (x));
+                : "=r" (num)
+                : "r" (word));
 
-                return 31 - lz;
+                return 31 - num;
         }
 
-        BUG_ON(sizeof(x) != 8);
+        if (BITS_PER_LONG == 64 &&
+            __builtin_constant_p(cpu_has_mips64) && cpu_has_mips64) {
+                __asm__(
+                "       .set    push                                    \n"
+                "       .set    mips64                                  \n"
+                "       dclz    %0, %1                                  \n"
+                "       .set    pop                                     \n"
+                : "=r" (num)
+                : "r" (word));
 
-        __asm__(
-        "       .set    push                                            \n"
-        "       .set    mips64                                          \n"
-        "       dclz    %0, %1                                          \n"
-        "       .set    pop                                             \n"
-        : "=r" (lz)
-        : "r" (x));
+                return 63 - num;
+        }
+
+        num = BITS_PER_LONG - 1;
 
-        return 63 - lz;
+#if BITS_PER_LONG == 64
+        if (!(word & (~0ul << 32))) {
+                num -= 32;
+                word <<= 32;
+        }
+#endif
+        if (!(word & (~0ul << (BITS_PER_LONG-16)))) {
+                num -= 16;
+                word <<= 16;
+        }
+        if (!(word & (~0ul << (BITS_PER_LONG-8)))) {
+                num -= 8;
+                word <<= 8;
+        }
+        if (!(word & (~0ul << (BITS_PER_LONG-4)))) {
+                num -= 4;
+                word <<= 4;
+        }
+        if (!(word & (~0ul << (BITS_PER_LONG-2)))) {
+                num -= 2;
+                word <<= 2;
+        }
+        if (!(word & (~0ul << (BITS_PER_LONG-1))))
+                num -= 1;
+        return num;
 }
 
 /*
@@ -612,23 +640,43 @@ static inline unsigned long __ffs(unsigned long word)
  * This is defined the same way as ffs.
  * Note fls(0) = 0, fls(1) = 1, fls(0x80000000) = 32.
  */
-static inline int fls(int word)
+static inline int fls(int x)
 {
-        __asm__("clz %0, %1" : "=r" (word) : "r" (word));
+        int r;
 
-        return 32 - word;
-}
+        if (__builtin_constant_p(cpu_has_mips_r) && cpu_has_mips_r) {
+                __asm__("clz %0, %1" : "=r" (x) : "r" (x));
 
-#if defined(CONFIG_64BIT) && defined(CONFIG_CPU_MIPS64)
-static inline int fls64(__u64 word)
-{
-        __asm__("dclz %0, %1" : "=r" (word) : "r" (word));
+                return 32 - x;
+        }
 
-        return 64 - word;
+        r = 32;
+        if (!x)
+                return 0;
+        if (!(x & 0xffff0000u)) {
+                x <<= 16;
+                r -= 16;
+        }
+        if (!(x & 0xff000000u)) {
+                x <<= 8;
+                r -= 8;
+        }
+        if (!(x & 0xf0000000u)) {
+                x <<= 4;
+                r -= 4;
+        }
+        if (!(x & 0xc0000000u)) {
+                x <<= 2;
+                r -= 2;
+        }
+        if (!(x & 0x80000000u)) {
+                x <<= 1;
+                r -= 1;
+        }
+        return r;
 }
-#else
+
 #include <asm-generic/bitops/fls64.h>
-#endif
 
 /*
  * ffs - find first bit set.
@@ -646,16 +694,6 @@ static inline int ffs(int word)
         return fls(word & -word);
 }
 
-#else
-
-#include <asm-generic/bitops/__ffs.h>
-#include <asm-generic/bitops/__fls.h>
-#include <asm-generic/bitops/ffs.h>
-#include <asm-generic/bitops/fls.h>
-#include <asm-generic/bitops/fls64.h>
-
-#endif /*defined(CONFIG_CPU_MIPS32) || defined(CONFIG_CPU_MIPS64) */
-
 #include <asm-generic/bitops/ffz.h>
 #include <asm-generic/bitops/find.h>
 
diff --git a/arch/mips/include/asm/break.h b/arch/mips/include/asm/break.h
index 25b980c91e7e..44437ed765e8 100644
--- a/arch/mips/include/asm/break.h
+++ b/arch/mips/include/asm/break.h
@@ -29,6 +29,7 @@
 #define _BRK_THREADBP   11      /* For threads, user bp (used by debuggers) */
 #define BRK_BUG         512     /* Used by BUG() */
 #define BRK_KDB         513     /* Used in KDB_ENTER() */
+#define BRK_MEMU        514     /* Used by FPU emulator */
 #define BRK_MULOVF      1023    /* Multiply overflow */
 
 #endif /* __ASM_BREAK_H */
diff --git a/arch/mips/include/asm/byteorder.h b/arch/mips/include/asm/byteorder.h
index fe7dc2d59b69..2988d29a0867 100644
--- a/arch/mips/include/asm/byteorder.h
+++ b/arch/mips/include/asm/byteorder.h
@@ -11,11 +11,19 @@
 #include <linux/compiler.h>
 #include <asm/types.h>
 
-#ifdef __GNUC__
+#if defined(__MIPSEB__)
+# define __BIG_ENDIAN
+#elif defined(__MIPSEL__)
+# define __LITTLE_ENDIAN
+#else
+# error "MIPS, but neither __MIPSEB__, nor __MIPSEL__???"
+#endif
+
+#define __SWAB_64_THRU_32__
 
 #ifdef CONFIG_CPU_MIPSR2
 
-static __inline__ __attribute_const__ __u16 ___arch__swab16(__u16 x)
+static inline __attribute_const__ __u16 __arch_swab16(__u16 x)
 {
         __asm__(
         "       wsbh    %0, %1                  \n"
@@ -24,9 +32,9 @@ static __inline__ __attribute_const__ __u16 ___arch__swab16(__u16 x)
 
         return x;
 }
-#define __arch__swab16(x)       ___arch__swab16(x)
+#define __arch_swab16 __arch_swab16
 
-static __inline__ __attribute_const__ __u32 ___arch__swab32(__u32 x)
+static inline __attribute_const__ __u32 __arch_swab32(__u32 x)
 {
         __asm__(
         "       wsbh    %0, %1                  \n"
@@ -36,11 +44,10 @@ static __inline__ __attribute_const__ __u32 ___arch__swab32(__u32 x)
 
         return x;
 }
-#define __arch__swab32(x)       ___arch__swab32(x)
+#define __arch_swab32 __arch_swab32
 
 #ifdef CONFIG_CPU_MIPS64_R2
-
-static __inline__ __attribute_const__ __u64 ___arch__swab64(__u64 x)
+static inline __attribute_const__ __u64 __arch_swab64(__u64 x)
 {
         __asm__(
         "       dsbh    %0, %1                  \n"
@@ -51,26 +58,11 @@ static __inline__ __attribute_const__ __u64 ___arch__swab64(__u64 x)
 
         return x;
 }
-
-#define __arch__swab64(x)       ___arch__swab64(x)
-
+#define __arch_swab64 __arch_swab64
 #endif /* CONFIG_CPU_MIPS64_R2 */
 
 #endif /* CONFIG_CPU_MIPSR2 */
 
-#if !defined(__STRICT_ANSI__) || defined(__KERNEL__)
-#  define __BYTEORDER_HAS_U64__
-#  define __SWAB_64_THRU_32__
-#endif
-
-#endif /* __GNUC__ */
-
-#if defined(__MIPSEB__)
-#  include <linux/byteorder/big_endian.h>
-#elif defined(__MIPSEL__)
-#  include <linux/byteorder/little_endian.h>
-#else
-#  error "MIPS, but neither __MIPSEB__, nor __MIPSEL__???"
-#endif
+#include <linux/byteorder.h>
 
 #endif /* _ASM_BYTEORDER_H */
diff --git a/arch/mips/include/asm/cpu-features.h b/arch/mips/include/asm/cpu-features.h
index 5ea701fc3425..12d12dfe73c0 100644
--- a/arch/mips/include/asm/cpu-features.h
+++ b/arch/mips/include/asm/cpu-features.h
@@ -141,6 +141,8 @@
 #define cpu_has_mips64  (cpu_has_mips64r1 | cpu_has_mips64r2)
 #define cpu_has_mips_r1 (cpu_has_mips32r1 | cpu_has_mips64r1)
 #define cpu_has_mips_r2 (cpu_has_mips32r2 | cpu_has_mips64r2)
+#define cpu_has_mips_r  (cpu_has_mips32r1 | cpu_has_mips32r2 | \
+                         cpu_has_mips64r1 | cpu_has_mips64r2)
 
 #ifndef cpu_has_dsp
 #define cpu_has_dsp             (cpu_data[0].ases & MIPS_ASE_DSP)
diff --git a/arch/mips/include/asm/ds1286.h b/arch/mips/include/asm/ds1286.h
deleted file mode 100644
index 6983b6ff0af3..000000000000
--- a/arch/mips/include/asm/ds1286.h
+++ /dev/null
@@ -1,15 +0,0 @@
-/*
- * 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.
- *
- * Machine dependent access functions for RTC registers.
- *
- * Copyright (C) 2003 Ralf Baechle (ralf@linux-mips.org)
- */
-#ifndef _ASM_DS1286_H
-#define _ASM_DS1286_H
-
-#include <ds1286.h>
-
-#endif /* _ASM_DS1286_H */
diff --git a/arch/mips/include/asm/fpu_emulator.h b/arch/mips/include/asm/fpu_emulator.h
index 2731c38bd7ae..e5189572956c 100644
--- a/arch/mips/include/asm/fpu_emulator.h
+++ b/arch/mips/include/asm/fpu_emulator.h
@@ -23,6 +23,9 @@
 #ifndef _ASM_FPU_EMULATOR_H
 #define _ASM_FPU_EMULATOR_H
 
+#include <asm/break.h>
+#include <asm/inst.h>
+
 struct mips_fpu_emulator_stats {
         unsigned int emulated;
         unsigned int loads;
@@ -34,4 +37,18 @@ struct mips_fpu_emulator_stats {
 
 extern struct mips_fpu_emulator_stats fpuemustats;
 
+extern int mips_dsemul(struct pt_regs *regs, mips_instruction ir,
+        unsigned long cpc);
+extern int do_dsemulret(struct pt_regs *xcp);
+
+/*
+ * Instruction inserted following the badinst to further tag the sequence
+ */
+#define BD_COOKIE 0x0000bd36    /* tne $0, $0 with baggage */
+
+/*
+ * Break instruction with special math emu break code set
+ */
+#define BREAK_MATH (0x0000000d | (BRK_MEMU << 16))
+
 #endif /* _ASM_FPU_EMULATOR_H */
diff --git a/arch/mips/include/asm/m48t35.h b/arch/mips/include/asm/m48t35.h
deleted file mode 100644
index f44852e9a96d..000000000000
--- a/arch/mips/include/asm/m48t35.h
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- *  Registers for the SGS-Thomson M48T35 Timekeeper RAM chip
- */
-#ifndef _ASM_M48T35_H
-#define _ASM_M48T35_H
-
-#include <linux/spinlock.h>
-
-extern spinlock_t rtc_lock;
-
-struct m48t35_rtc {
-        volatile u8     pad[0x7ff8];    /* starts at 0x7ff8 */
-        volatile u8     control;
-        volatile u8     sec;
-        volatile u8     min;
-        volatile u8     hour;
-        volatile u8     day;
-        volatile u8     date;
-        volatile u8     month;
-        volatile u8     year;
-};
-
-#define M48T35_RTC_SET          0x80
-#define M48T35_RTC_STOPPED      0x80
-#define M48T35_RTC_READ         0x40
-
-#endif /* _ASM_M48T35_H */
diff --git a/arch/mips/kernel/cpu-probe.c b/arch/mips/kernel/cpu-probe.c
index 0cf15457ecac..c9207b5fd923 100644
--- a/arch/mips/kernel/cpu-probe.c
+++ b/arch/mips/kernel/cpu-probe.c
@@ -286,11 +286,12 @@ static inline int __cpu_has_fpu(void)
 #define R4K_OPTS (MIPS_CPU_TLB | MIPS_CPU_4KEX | MIPS_CPU_4K_CACHE \
                 | MIPS_CPU_COUNTER)
 
-static inline void cpu_probe_legacy(struct cpuinfo_mips *c)
+static inline void cpu_probe_legacy(struct cpuinfo_mips *c, unsigned int cpu)
 {
         switch (c->processor_id & 0xff00) {
         case PRID_IMP_R2000:
                 c->cputype = CPU_R2000;
+                __cpu_name[cpu] = "R2000";
                 c->isa_level = MIPS_CPU_ISA_I;
                 c->options = MIPS_CPU_TLB | MIPS_CPU_3K_CACHE |
                              MIPS_CPU_NOFPUEX;
@@ -299,13 +300,19 @@ static inline void cpu_probe_legacy(struct cpuinfo_mips *c)
                 c->tlbsize = 64;
                 break;
         case PRID_IMP_R3000:
-                if ((c->processor_id & 0xff) == PRID_REV_R3000A)
-                        if (cpu_has_confreg())
+                if ((c->processor_id & 0xff) == PRID_REV_R3000A) {
+                        if (cpu_has_confreg()) {
                                 c->cputype = CPU_R3081E;
-                        else
+                                __cpu_name[cpu] = "R3081";
+                        } else {
                                 c->cputype = CPU_R3000A;
-                else
+                                __cpu_name[cpu] = "R3000A";
+                        }
+                        break;
+                } else {
                         c->cputype = CPU_R3000;
+                        __cpu_name[cpu] = "R3000";
+                }
                 c->isa_level = MIPS_CPU_ISA_I;
                 c->options = MIPS_CPU_TLB | MIPS_CPU_3K_CACHE |
                              MIPS_CPU_NOFPUEX;
@@ -315,15 +322,21 @@ static inline void cpu_probe_legacy(struct cpuinfo_mips *c)
                 break;
         case PRID_IMP_R4000:
                 if (read_c0_config() & CONF_SC) {
-                        if ((c->processor_id & 0xff) >= PRID_REV_R4400)
+                        if ((c->processor_id & 0xff) >= PRID_REV_R4400) {
                                 c->cputype = CPU_R4400PC;
-                        else
+                                __cpu_name[cpu] = "R4400PC";
+                        } else {
                                 c->cputype = CPU_R4000PC;
+                                __cpu_name[cpu] = "R4000PC";
+                        }
                 } else {
-                        if ((c->processor_id & 0xff) >= PRID_REV_R4400)
+                        if ((c->processor_id & 0xff) >= PRID_REV_R4400) {
                                 c->cputype = CPU_R4400SC;
-                        else
+                                __cpu_name[cpu] = "R4400SC";
+                        } else {
                                 c->cputype = CPU_R4000SC;
+                                __cpu_name[cpu] = "R4000SC";
+                        }
                 }
 
                 c->isa_level = MIPS_CPU_ISA_III;
@@ -336,25 +349,34 @@ static inline void cpu_probe_legacy(struct cpuinfo_mips *c)
                 switch (c->processor_id & 0xf0) {
                 case PRID_REV_VR4111:
                         c->cputype = CPU_VR4111;
+                        __cpu_name[cpu] = "NEC VR4111";
                         break;
                 case PRID_REV_VR4121:
                         c->cputype = CPU_VR4121;
+                        __cpu_name[cpu] = "NEC VR4121";
                         break;
                 case PRID_REV_VR4122:
-                        if ((c->processor_id & 0xf) < 0x3)
+                        if ((c->processor_id & 0xf) < 0x3) {
                                 c->cputype = CPU_VR4122;
-                        else
+                                __cpu_name[cpu] = "NEC VR4122";
+                        } else {
                                 c->cputype = CPU_VR4181A;
+                                __cpu_name[cpu] = "NEC VR4181A";
+                        }
                         break;
                 case PRID_REV_VR4130:
-                        if ((c->processor_id & 0xf) < 0x4)
+                        if ((c->processor_id & 0xf) < 0x4) {
                                 c->cputype = CPU_VR4131;
-                        else
+                                __cpu_name[cpu] = "NEC VR4131";
+                        } else {
                                 c->cputype = CPU_VR4133;
+                                __cpu_name[cpu] = "NEC VR4133";
+                        }
                         break;
                 default:
                         printk(KERN_INFO "Unexpected CPU of NEC VR4100 series\n");
                         c->cputype = CPU_VR41XX;
+                        __cpu_name[cpu] = "NEC Vr41xx";
                         break;
                 }
                 c->isa_level = MIPS_CPU_ISA_III;
@@ -363,6 +385,7 @@ static inline void cpu_probe_legacy(struct cpuinfo_mips *c)
                 break;
         case PRID_IMP_R4300:
                 c->cputype = CPU_R4300;
+                __cpu_name[cpu] = "R4300";
                 c->isa_level = MIPS_CPU_ISA_III;
                 c->options = R4K_OPTS | MIPS_CPU_FPU | MIPS_CPU_32FPR |
                              MIPS_CPU_LLSC;
@@ -370,6 +393,7 @@ static inline void cpu_probe_legacy(struct cpuinfo_mips *c)
                 break;
         case PRID_IMP_R4600:
                 c->cputype = CPU_R4600;
+                __cpu_name[cpu] = "R4600";
                 c->isa_level = MIPS_CPU_ISA_III;
                 c->options = R4K_OPTS | MIPS_CPU_FPU | MIPS_CPU_32FPR |
                              MIPS_CPU_LLSC;
@@ -384,6 +408,7 @@ static inline void cpu_probe_legacy(struct cpuinfo_mips *c)
                  * it's c0_prid id number with the TX3900.
                  */
                 c->cputype = CPU_R4650;
+                __cpu_name[cpu] = "R4650";
                 c->isa_level = MIPS_CPU_ISA_III;
                 c->options = R4K_OPTS | MIPS_CPU_FPU | MIPS_CPU_LLSC;
                 c->tlbsize = 48;
@@ -395,25 +420,26 @@ static inline void cpu_probe_legacy(struct cpuinfo_mips *c)
 
                 if ((c->processor_id & 0xf0) == (PRID_REV_TX3927 & 0xf0)) {
                         c->cputype = CPU_TX3927;
+                        __cpu_name[cpu] = "TX3927";
                         c->tlbsize = 64;
                 } else {
                         switch (c->processor_id & 0xff) {
                         case PRID_REV_TX3912:
                                 c->cputype = CPU_TX3912;
+                                __cpu_name[cpu] = "TX3912";
                                 c->tlbsize = 32;
                                 break;
                         case PRID_REV_TX3922:
                                 c->cputype = CPU_TX3922;
+                                __cpu_name[cpu] = "TX3922";
                                 c->tlbsize = 64;
                                 break;
-                        default:
-                                c->cputype = CPU_UNKNOWN;
-                                break;
                         }
                 }
                 break;
         case PRID_IMP_R4700:
                 c->cputype = CPU_R4700;
+                __cpu_name[cpu] = "R4700";
                 c->isa_level = MIPS_CPU_ISA_III;
                 c->options = R4K_OPTS | MIPS_CPU_FPU | MIPS_CPU_32FPR |
                              MIPS_CPU_LLSC;
@@ -421,6 +447,7 @@ static inline void cpu_probe_legacy(struct cpuinfo_mips *c)
                 break;
         case PRID_IMP_TX49:
                 c->cputype = CPU_TX49XX;
+                __cpu_name[cpu] = "R49XX";
                 c->isa_level = MIPS_CPU_ISA_III;
                 c->options = R4K_OPTS | MIPS_CPU_LLSC;
                 if (!(c->processor_id & 0x08))
@@ -429,6 +456,7 @@ static inline void cpu_probe_legacy(struct cpuinfo_mips *c)
                 break;
         case PRID_IMP_R5000:
                 c->cputype = CPU_R5000;
+                __cpu_name[cpu] = "R5000";
                 c->isa_level = MIPS_CPU_ISA_IV;
                 c->options = R4K_OPTS | MIPS_CPU_FPU | MIPS_CPU_32FPR |
                              MIPS_CPU_LLSC;
@@ -436,6 +464,7 @@ static inline void cpu_probe_legacy(struct cpuinfo_mips *c)
                 break;
         case PRID_IMP_R5432:
                 c->cputype = CPU_R5432;
+                __cpu_name[cpu] = "R5432";
                 c->isa_level = MIPS_CPU_ISA_IV;
                 c->options = R4K_OPTS | MIPS_CPU_FPU | MIPS_CPU_32FPR |
                              MIPS_CPU_WATCH | MIPS_CPU_LLSC;
@@ -443,6 +472,7 @@ static inline void cpu_probe_legacy(struct cpuinfo_mips *c)
                 break;
         case PRID_IMP_R5500:
                 c->cputype = CPU_R5500;
+                __cpu_name[cpu] = "R5500";
                 c->isa_level = MIPS_CPU_ISA_IV;
                 c->options = R4K_OPTS | MIPS_CPU_FPU | MIPS_CPU_32FPR |
                              MIPS_CPU_WATCH | MIPS_CPU_LLSC;
@@ -450,6 +480,7 @@ static inline void cpu_probe_legacy(struct cpuinfo_mips *c)
                 break;
         case PRID_IMP_NEVADA:
                 c->cputype = CPU_NEVADA;
+                __cpu_name[cpu] = "Nevada";
                 c->isa_level = MIPS_CPU_ISA_IV;
                 c->options = R4K_OPTS | MIPS_CPU_FPU | MIPS_CPU_32FPR |
                              MIPS_CPU_DIVEC | MIPS_CPU_LLSC;
@@ -457,6 +488,7 @@ static inline void cpu_probe_legacy(struct cpuinfo_mips *c)
                 break;
         case PRID_IMP_R6000:
                 c->cputype = CPU_R6000;
+                __cpu_name[cpu] = "R6000";
                 c->isa_level = MIPS_CPU_ISA_II;
                 c->options = MIPS_CPU_TLB | MIPS_CPU_FPU |
                              MIPS_CPU_LLSC;
@@ -464,6 +496,7 @@ static inline void cpu_probe_legacy(struct cpuinfo_mips *c)
                 break;
         case PRID_IMP_R6000A:
                 c->cputype = CPU_R6000A;
+                __cpu_name[cpu] = "R6000A";
                 c->isa_level = MIPS_CPU_ISA_II;
                 c->options = MIPS_CPU_TLB | MIPS_CPU_FPU |
                              MIPS_CPU_LLSC;
@@ -471,6 +504,7 @@ static inline void cpu_probe_legacy(struct cpuinfo_mips *c)
                 break;
         case PRID_IMP_RM7000:
                 c->cputype = CPU_RM7000;
+                __cpu_name[cpu] = "RM7000";
                 c->isa_level = MIPS_CPU_ISA_IV;
                 c->options = R4K_OPTS | MIPS_CPU_FPU | MIPS_CPU_32FPR |
                              MIPS_CPU_LLSC;
@@ -486,6 +520,7 @@ static inline void cpu_probe_legacy(struct cpuinfo_mips *c)
                 break;
         case PRID_IMP_RM9000:
                 c->cputype = CPU_RM9000;
+                __cpu_name[cpu] = "RM9000";
                 c->isa_level = MIPS_CPU_ISA_IV;
                 c->options = R4K_OPTS | MIPS_CPU_FPU | MIPS_CPU_32FPR |
                              MIPS_CPU_LLSC;
@@ -500,6 +535,7 @@ static inline void cpu_probe_legacy(struct cpuinfo_mips *c)
                 break;
         case PRID_IMP_R8000:
                 c->cputype = CPU_R8000;
+                __cpu_name[cpu] = "RM8000";
                 c->isa_level = MIPS_CPU_ISA_IV;
                 c->options = MIPS_CPU_TLB | MIPS_CPU_4KEX |
                              MIPS_CPU_FPU | MIPS_CPU_32FPR |
@@ -508,6 +544,7 @@ static inline void cpu_probe_legacy(struct cpuinfo_mips *c)
                 break;
         case PRID_IMP_R10000:
                 c->cputype = CPU_R10000;
+                __cpu_name[cpu] = "R10000";
                 c->isa_level = MIPS_CPU_ISA_IV;
                 c->options = MIPS_CPU_TLB | MIPS_CPU_4K_CACHE | MIPS_CPU_4KEX |
                              MIPS_CPU_FPU | MIPS_CPU_32FPR |
@@ -517,6 +554,7 @@ static inline void cpu_probe_legacy(struct cpuinfo_mips *c)
                 break;
         case PRID_IMP_R12000:
                 c->cputype = CPU_R12000;
+                __cpu_name[cpu] = "R12000";
                 c->isa_level = MIPS_CPU_ISA_IV;
                 c->options = MIPS_CPU_TLB | MIPS_CPU_4K_CACHE | MIPS_CPU_4KEX |
                              MIPS_CPU_FPU | MIPS_CPU_32FPR |
@@ -526,6 +564,7 @@ static inline void cpu_probe_legacy(struct cpuinfo_mips *c)
                 break;
         case PRID_IMP_R14000:
                 c->cputype = CPU_R14000;
+                __cpu_name[cpu] = "R14000";
                 c->isa_level = MIPS_CPU_ISA_IV;
                 c->options = MIPS_CPU_TLB | MIPS_CPU_4K_CACHE | MIPS_CPU_4KEX |
                              MIPS_CPU_FPU | MIPS_CPU_32FPR |
@@ -535,6 +574,7 @@ static inline void cpu_probe_legacy(struct cpuinfo_mips *c)
                 break;
         case PRID_IMP_LOONGSON2:
                 c->cputype = CPU_LOONGSON2;
+                __cpu_name[cpu] = "ICT Loongson-2";
                 c->isa_level = MIPS_CPU_ISA_III;
                 c->options = R4K_OPTS |
                              MIPS_CPU_FPU | MIPS_CPU_LLSC |
@@ -652,21 +692,24 @@ static inline unsigned int decode_config3(struct cpuinfo_mips *c)
 
 static void __cpuinit decode_configs(struct cpuinfo_mips *c)
 {
+        int ok;
+
         /* MIPS32 or MIPS64 compliant CPU.  */
         c->options = MIPS_CPU_4KEX | MIPS_CPU_4K_CACHE | MIPS_CPU_COUNTER |
                      MIPS_CPU_DIVEC | MIPS_CPU_LLSC | MIPS_CPU_MCHECK;
 
         c->scache.flags = MIPS_CACHE_NOT_PRESENT;
 
-        /* Read Config registers.  */
-        if (!decode_config0(c))
-                return;                 /* actually worth a panic() */
-        if (!decode_config1(c))
-                return;
-        if (!decode_config2(c))
-                return;
-        if (!decode_config3(c))
-                return;
+        ok = decode_config0(c);                 /* Read Config registers.  */
+        BUG_ON(!ok);                            /* Arch spec violation!  */
+        if (ok)
+                ok = decode_config1(c);
+        if (ok)
+                ok = decode_config2(c);
+        if (ok)
+                ok = decode_config3(c);
+
+        mips_probe_watch_registers(c);
 }
 
 #ifdef CONFIG_CPU_MIPSR2
@@ -675,52 +718,62 @@ extern void spram_config(void);
 static inline void spram_config(void) {}
 #endif
 
-static inline void cpu_probe_mips(struct cpuinfo_mips *c)
+static inline void cpu_probe_mips(struct cpuinfo_mips *c, unsigned int cpu)
 {
         decode_configs(c);
-        mips_probe_watch_registers(c);
         switch (c->processor_id & 0xff00) {
         case PRID_IMP_4KC:
                 c->cputype = CPU_4KC;
+                __cpu_name[cpu] = "MIPS 4Kc";
                 break;
         case PRID_IMP_4KEC:
                 c->cputype = CPU_4KEC;
+                __cpu_name[cpu] = "MIPS 4KEc";
                 break;
         case PRID_IMP_4KECR2:
                 c->cputype = CPU_4KEC;
+                __cpu_name[cpu] = "MIPS 4KEc";
                 break;
         case PRID_IMP_4KSC:
         case PRID_IMP_4KSD:
                 c->cputype = CPU_4KSC;
+                __cpu_name[cpu] = "MIPS 4KSc";
                 break;
         case PRID_IMP_5KC:
                 c->cputype = CPU_5KC;
+                __cpu_name[cpu] = "MIPS 5Kc";
                 break;
         case PRID_IMP_20KC:
                 c->cputype = CPU_20KC;
+                __cpu_name[cpu] = "MIPS 20Kc";
                 break;
         case PRID_IMP_24K:
         case PRID_IMP_24KE:
                 c->cputype = CPU_24K;
+                __cpu_name[cpu] = "MIPS 24Kc";
                 break;
         case PRID_IMP_25KF:
                 c->cputype = CPU_25KF;
+                __cpu_name[cpu] = "MIPS 25Kc";
                 break;
         case PRID_IMP_34K:
                 c->cputype = CPU_34K;
+                __cpu_name[cpu] = "MIPS 34Kc";
                 break;
         case PRID_IMP_74K:
                 c->cputype = CPU_74K;
+                __cpu_name[cpu] = "MIPS 74Kc";
                 break;
         case PRID_IMP_1004K:
                 c->cputype = CPU_1004K;
+                __cpu_name[cpu] = "MIPS 1004Kc";
                 break;
         }
 
         spram_config();
 }
 
-static inline void cpu_probe_alchemy(struct cpuinfo_mips *c)
+static inline void cpu_probe_alchemy(struct cpuinfo_mips *c, unsigned int cpu)
 {
         decode_configs(c);
         switch (c->processor_id & 0xff00) {
@@ -729,23 +782,31 @@ static inline void cpu_probe_alchemy(struct cpuinfo_mips *c)
                 switch ((c->processor_id >> 24) & 0xff) {
                 case 0:
                         c->cputype = CPU_AU1000;
+                        __cpu_name[cpu] = "Au1000";
                         break;
                 case 1:
                         c->cputype = CPU_AU1500;
+                        __cpu_name[cpu] = "Au1500";
                         break;
                 case 2:
                         c->cputype = CPU_AU1100;
+                        __cpu_name[cpu] = "Au1100";
                         break;
                 case 3:
                         c->cputype = CPU_AU1550;
+                        __cpu_name[cpu] = "Au1550";
                         break;
                 case 4:
                         c->cputype = CPU_AU1200;
-                        if (2 == (c->processor_id & 0xff))
+                        __cpu_name[cpu] = "Au1200";
+                        if ((c->processor_id & 0xff) == 2) {
                                 c->cputype = CPU_AU1250;
+                                __cpu_name[cpu] = "Au1250";
+                        }
                         break;
                 case 5:
                         c->cputype = CPU_AU1210;
+                        __cpu_name[cpu] = "Au1210";
                         break;
                 default:
                         panic("Unknown Au Core!");
@@ -755,154 +816,67 @@ static inline void cpu_probe_alchemy(struct cpuinfo_mips *c)
         }
 }
 
-static inline void cpu_probe_sibyte(struct cpuinfo_mips *c)
+static inline void cpu_probe_sibyte(struct cpuinfo_mips *c, unsigned int cpu)
 {
         decode_configs(c);
 
         switch (c->processor_id & 0xff00) {
         case PRID_IMP_SB1:
                 c->cputype = CPU_SB1;
+                __cpu_name[cpu] = "SiByte SB1";
                 /* FPU in pass1 is known to have issues. */
                 if ((c->processor_id & 0xff) < 0x02)
                         c->options &= ~(MIPS_CPU_FPU | MIPS_CPU_32FPR);
                 break;
         case PRID_IMP_SB1A:
                 c->cputype = CPU_SB1A;
+                __cpu_name[cpu] = "SiByte SB1A";
                 break;
         }
 }
 
-static inline void cpu_probe_sandcraft(struct cpuinfo_mips *c)
+static inline void cpu_probe_sandcraft(struct cpuinfo_mips *c, unsigned int cpu)
 {
         decode_configs(c);
         switch (c->processor_id & 0xff00) {
         case PRID_IMP_SR71000:
                 c->cputype = CPU_SR71000;
+                __cpu_name[cpu] = "Sandcraft SR71000";
                 c->scache.ways = 8;
                 c->tlbsize = 64;
                 break;
         }
 }
 
-static inline void cpu_probe_nxp(struct cpuinfo_mips *c)
+static inline void cpu_probe_nxp(struct cpuinfo_mips *c, unsigned int cpu)
 {
         decode_configs(c);
         switch (c->processor_id & 0xff00) {
         case PRID_IMP_PR4450:
                 c->cputype = CPU_PR4450;
+                __cpu_name[cpu] = "Philips PR4450";
                 c->isa_level = MIPS_CPU_ISA_M32R1;
                 break;
-        default:
-                panic("Unknown NXP Core!"); /* REVISIT: die? */
-                break;
         }
 }
 
-
-static inline void cpu_probe_broadcom(struct cpuinfo_mips *c)
+static inline void cpu_probe_broadcom(struct cpuinfo_mips *c, unsigned int cpu)
 {
         decode_configs(c);
         switch (c->processor_id & 0xff00) {
         case PRID_IMP_BCM3302:
                 c->cputype = CPU_BCM3302;
+                __cpu_name[cpu] = "Broadcom BCM3302";
                 break;
         case PRID_IMP_BCM4710:
                 c->cputype = CPU_BCM4710;
-                break;
-        default:
-                c->cputype = CPU_UNKNOWN;
+                __cpu_name[cpu] = "Broadcom BCM4710";
                 break;
         }
 }
 
 const char *__cpu_name[NR_CPUS];
 
-/*
- * Name a CPU
- */
-static __cpuinit const char *cpu_to_name(struct cpuinfo_mips *c)
-{
-        const char *name = NULL;
-
-        switch (c->cputype) {
-        case CPU_UNKNOWN:       name = "unknown"; break;
-        case CPU_R2000:         name = "R2000"; break;
-        case CPU_R3000:         name = "R3000"; break;
-        case CPU_R3000A:        name = "R3000A"; break;
-        case CPU_R3041:         name = "R3041"; break;
-        case CPU_R3051:         name = "R3051"; break;
-        case CPU_R3052:         name = "R3052"; break;
-        case CPU_R3081:         name = "R3081"; break;
-        case CPU_R3081E:        name = "R3081E"; break;
-        case CPU_R4000PC:       name = "R4000PC"; break;
-        case CPU_R4000SC:       name = "R4000SC"; break;
-        case CPU_R4000MC:       name = "R4000MC"; break;
-        case CPU_R4200:         name = "R4200"; break;
-        case CPU_R4400PC:       name = "R4400PC"; break;
-        case CPU_R4400SC:       name = "R4400SC"; break;
-        case CPU_R4400MC:       name = "R4400MC"; break;
-        case CPU_R4600:         name = "R4600"; break;
-        case CPU_R6000:         name = "R6000"; break;
-        case CPU_R6000A:        name = "R6000A"; break;
-        case CPU_R8000:         name = "R8000"; break;
-        case CPU_R10000:        name = "R10000"; break;
-        case CPU_R12000:        name = "R12000"; break;
-        case CPU_R14000:        name = "R14000"; break;
-        case CPU_R4300:         name = "R4300"; break;
-        case CPU_R4650:         name = "R4650"; break;
-        case CPU_R4700:         name = "R4700"; break;
-        case CPU_R5000:         name = "R5000"; break;
-        case CPU_R5000A:        name = "R5000A"; break;
-        case CPU_R4640:         name = "R4640"; break;
-        case CPU_NEVADA:        name = "Nevada"; break;
-        case CPU_RM7000:        name = "RM7000"; break;
-        case CPU_RM9000:        name = "RM9000"; break;
-        case CPU_R5432:         name = "R5432"; break;
-        case CPU_4KC:           name = "MIPS 4Kc"; break;
-        case CPU_5KC:           name = "MIPS 5Kc"; break;
-        case CPU_R4310:         name = "R4310"; break;
-        case CPU_SB1:           name = "SiByte SB1"; break;
-        case CPU_SB1A:          name = "SiByte SB1A"; break;
-        case CPU_TX3912:        name = "TX3912"; break;
-        case CPU_TX3922:        name = "TX3922"; break;
-        case CPU_TX3927:        name = "TX3927"; break;
-        case CPU_AU1000:        name = "Au1000"; break;
-        case CPU_AU1500:        name = "Au1500"; break;
-        case CPU_AU1100:        name = "Au1100"; break;
-        case CPU_AU1550:        name = "Au1550"; break;
-        case CPU_AU1200:        name = "Au1200"; break;
-        case CPU_AU1210:        name = "Au1210"; break;
-        case CPU_AU1250:        name = "Au1250"; break;
-        case CPU_4KEC:          name = "MIPS 4KEc"; break;
-        case CPU_4KSC:          name = "MIPS 4KSc"; break;
-        case CPU_VR41XX:        name = "NEC Vr41xx"; break;
-        case CPU_R5500:         name = "R5500"; break;
-        case CPU_TX49XX:        name = "TX49xx"; break;
-        case CPU_20KC:          name = "MIPS 20Kc"; break;
-        case CPU_24K:           name = "MIPS 24K"; break;
-        case CPU_25KF:          name = "MIPS 25Kf"; break;
-        case CPU_34K:           name = "MIPS 34K"; break;
-        case CPU_1004K:         name = "MIPS 1004K"; break;
-        case CPU_74K:           name = "MIPS 74K"; break;
-        case CPU_VR4111:        name = "NEC VR4111"; break;
-        case CPU_VR4121:        name = "NEC VR4121"; break;
-        case CPU_VR4122:        name = "NEC VR4122"; break;
-        case CPU_VR4131:        name = "NEC VR4131"; break;
-        case CPU_VR4133:        name = "NEC VR4133"; break;
-        case CPU_VR4181:        name = "NEC VR4181"; break;
-        case CPU_VR4181A:       name = "NEC VR4181A"; break;
-        case CPU_SR71000:       name = "Sandcraft SR71000"; break;
-        case CPU_BCM3302:       name = "Broadcom BCM3302"; break;
-        case CPU_BCM4710:       name = "Broadcom BCM4710"; break;
-        case CPU_PR4450:        name = "Philips PR4450"; break;
-        case CPU_LOONGSON2:     name = "ICT Loongson-2"; break;
-        default:
-                BUG();
-        }
-
-        return name;
-}
-
 __cpuinit void cpu_probe(void)
 {
         struct cpuinfo_mips *c = &current_cpu_data;
@@ -915,30 +889,31 @@ __cpuinit void cpu_probe(void)
         c->processor_id = read_c0_prid();
         switch (c->processor_id & 0xff0000) {
         case PRID_COMP_LEGACY:
-                cpu_probe_legacy(c);
+                cpu_probe_legacy(c, cpu);
                 break;
         case PRID_COMP_MIPS:
-                cpu_probe_mips(c);
+                cpu_probe_mips(c, cpu);
                 break;
         case PRID_COMP_ALCHEMY:
-                cpu_probe_alchemy(c);
+                cpu_probe_alchemy(c, cpu);
                 break;
         case PRID_COMP_SIBYTE:
-                cpu_probe_sibyte(c);
+                cpu_probe_sibyte(c, cpu);
                 break;
         case PRID_COMP_BROADCOM:
-                cpu_probe_broadcom(c);
+                cpu_probe_broadcom(c, cpu);
                 break;
         case PRID_COMP_SANDCRAFT:
-                cpu_probe_sandcraft(c);
+                cpu_probe_sandcraft(c, cpu);
                 break;
         case PRID_COMP_NXP:
-                cpu_probe_nxp(c);
+                cpu_probe_nxp(c, cpu);
                 break;
-        default:
-                c->cputype = CPU_UNKNOWN;
         }
 
+        BUG_ON(!__cpu_name[cpu]);
+        BUG_ON(c->cputype == CPU_UNKNOWN);
+
         /*
          * Platform code can force the cpu type to optimize code
          * generation. In that case be sure the cpu type is correctly
@@ -958,8 +933,6 @@ __cpuinit void cpu_probe(void)
                 }
         }
 
-        __cpu_name[cpu] = cpu_to_name(c);
-
         if (cpu_has_mips_r2)
                 c->srsets = ((read_c0_srsctl() >> 26) & 0x0f) + 1;
         else
diff --git a/arch/mips/kernel/smp.c b/arch/mips/kernel/smp.c
index b79ea7055ec3..8bf88faf5afd 100644
--- a/arch/mips/kernel/smp.c
+++ b/arch/mips/kernel/smp.c
@@ -195,12 +195,6 @@ void __init smp_prepare_cpus(unsigned int max_cpus)
 /* preload SMP state for boot cpu */
 void __devinit smp_prepare_boot_cpu(void)
 {
-        /*
-         * This assumes that bootup is always handled by the processor
-         * with the logic and physical number 0.
-         */
-        __cpu_number_map[0] = 0;
-        __cpu_logical_map[0] = 0;
         cpu_set(0, phys_cpu_present_map);
         cpu_set(0, cpu_online_map);
         cpu_set(0, cpu_callin_map);
diff --git a/arch/mips/kernel/traps.c b/arch/mips/kernel/traps.c
index 80b9e070c207..353056110f2b 100644
--- a/arch/mips/kernel/traps.c
+++ b/arch/mips/kernel/traps.c
@@ -32,6 +32,7 @@
 #include <asm/cpu.h>
 #include <asm/dsp.h>
 #include <asm/fpu.h>
+#include <asm/fpu_emulator.h>
 #include <asm/mipsregs.h>
 #include <asm/mipsmtregs.h>
 #include <asm/module.h>
@@ -722,6 +723,21 @@ static void do_trap_or_bp(struct pt_regs *regs, unsigned int code,
                 die_if_kernel("Kernel bug detected", regs);
                 force_sig(SIGTRAP, current);
                 break;
+        case BRK_MEMU:
+                /*
+                 * Address errors may be deliberately induced by the FPU
+                 * emulator to retake control of the CPU after executing the
+                 * instruction in the delay slot of an emulated branch.
+                 *
+                 * Terminate if exception was recognized as a delay slot return
+                 * otherwise handle as normal.
+                 */
+                if (do_dsemulret(regs))
+                        return;
+
+                die_if_kernel("Math emu break/trap", regs);
+                force_sig(SIGTRAP, current);
+                break;
         default:
                 scnprintf(b, sizeof(b), "%s instruction in kernel code", str);
                 die_if_kernel(b, regs);
@@ -1555,6 +1571,8 @@ void __cpuinit set_uncached_handler(unsigned long offset, void *addr,
 #ifdef CONFIG_64BIT
         unsigned long uncached_ebase = TO_UNCAC(ebase);
 #endif
+        if (cpu_has_mips_r2)
+                ebase += (read_c0_ebase() & 0x3ffff000);
 
         if (!addr)
                 panic(panic_null_cerr);
@@ -1588,8 +1606,11 @@ void __init trap_init(void)
 
         if (cpu_has_veic || cpu_has_vint)
                 ebase = (unsigned long) alloc_bootmem_low_pages(0x200 + VECTORSPACING*64);
-        else
+        else {
                 ebase = CAC_BASE;
+                if (cpu_has_mips_r2)
+                        ebase += (read_c0_ebase() & 0x3ffff000);
+        }
 
         per_cpu_trap_init();
 
@@ -1697,11 +1718,11 @@ void __init trap_init(void)
 
         if (cpu_has_vce)
                 /* Special exception: R4[04]00 uses also the divec space. */
-                memcpy((void *)(CAC_BASE + 0x180), &except_vec3_r4000, 0x100);
+                memcpy((void *)(ebase + 0x180), &except_vec3_r4000, 0x100);
         else if (cpu_has_4kex)
-                memcpy((void *)(CAC_BASE + 0x180), &except_vec3_generic, 0x80);
+                memcpy((void *)(ebase + 0x180), &except_vec3_generic, 0x80);
         else
-                memcpy((void *)(CAC_BASE + 0x080), &except_vec3_generic, 0x80);
+                memcpy((void *)(ebase + 0x080), &except_vec3_generic, 0x80);
 
         signal_init();
 #ifdef CONFIG_MIPS32_COMPAT
diff --git a/arch/mips/kernel/unaligned.c b/arch/mips/kernel/unaligned.c
index 20709669e592..bf4c4a979abb 100644
--- a/arch/mips/kernel/unaligned.c
+++ b/arch/mips/kernel/unaligned.c
@@ -499,22 +499,10 @@ sigill:
 
 asmlinkage void do_ade(struct pt_regs *regs)
 {
-        extern int do_dsemulret(struct pt_regs *);
         unsigned int __user *pc;
         mm_segment_t seg;
 
         /*
-         * Address errors may be deliberately induced by the FPU emulator to
-         * retake control of the CPU after executing the instruction in the
-         * delay slot of an emulated branch.
-         */
-        /* Terminate if exception was recognized as a delay slot return */
-        if (do_dsemulret(regs))
-                return;
-
-        /* Otherwise handle as normal */
-
-        /*
          * Did we catch a fault trying to load an instruction?
          * Or are we running in MIPS16 mode?
          */
diff --git a/arch/mips/math-emu/cp1emu.c b/arch/mips/math-emu/cp1emu.c
index 7ec0b217dfd3..890f77927d62 100644
--- a/arch/mips/math-emu/cp1emu.c
+++ b/arch/mips/math-emu/cp1emu.c
@@ -48,7 +48,6 @@
 #include <asm/branch.h>
 
 #include "ieee754.h"
-#include "dsemul.h"
 
 /* Strap kernel emulator for full MIPS IV emulation */
 
@@ -346,9 +345,6 @@ static int cop1Emulate(struct pt_regs *xcp, struct mips_fpu_struct *ctx)
                         /* cop control register rd -> gpr[rt] */
                         u32 value;
 
-                        if (ir == CP1UNDEF) {
-                                return do_dsemulret(xcp);
-                        }
                         if (MIPSInst_RD(ir) == FPCREG_CSR) {
                                 value = ctx->fcr31;
                                 value = (value & ~0x3) | mips_rm[value & 0x3];
diff --git a/arch/mips/math-emu/dsemul.c b/arch/mips/math-emu/dsemul.c
index 653e325849e4..df7b9d928efc 100644
--- a/arch/mips/math-emu/dsemul.c
+++ b/arch/mips/math-emu/dsemul.c
@@ -18,7 +18,6 @@
 #include <asm/fpu_emulator.h>
 
 #include "ieee754.h"
-#include "dsemul.h"
 
 /* Strap kernel emulator for full MIPS IV emulation */
 
@@ -94,7 +93,7 @@ int mips_dsemul(struct pt_regs *regs, mips_instruction ir, unsigned long cpc)
                 return SIGBUS;
 
         err = __put_user(ir, &fr->emul);
-        err |= __put_user((mips_instruction)BADINST, &fr->badinst);
+        err |= __put_user((mips_instruction)BREAK_MATH, &fr->badinst);
         err |= __put_user((mips_instruction)BD_COOKIE, &fr->cookie);
         err |= __put_user(cpc, &fr->epc);
 
@@ -130,13 +129,13 @@ int do_dsemulret(struct pt_regs *xcp)
         /*
          * Do some sanity checking on the stackframe:
          *
-         *  - Is the instruction pointed to by the EPC an BADINST?
+         *  - Is the instruction pointed to by the EPC an BREAK_MATH?
          *  - Is the following memory word the BD_COOKIE?
          */
         err = __get_user(insn, &fr->badinst);
         err |= __get_user(cookie, &fr->cookie);
 
-        if (unlikely(err || (insn != BADINST) || (cookie != BD_COOKIE))) {
+        if (unlikely(err || (insn != BREAK_MATH) || (cookie != BD_COOKIE))) {
                 fpuemustats.errors++;
                 return 0;
         }
diff --git a/arch/mips/math-emu/dsemul.h b/arch/mips/math-emu/dsemul.h
deleted file mode 100644
index 091f0e76730f..000000000000
--- a/arch/mips/math-emu/dsemul.h
+++ /dev/null
@@ -1,17 +0,0 @@
-extern int mips_dsemul(struct pt_regs *regs, mips_instruction ir, unsigned long cpc);
-extern int do_dsemulret(struct pt_regs *xcp);
-
-/* Instruction which will always cause an address error */
-#define AdELOAD 0x8c000001      /* lw $0,1($0) */
-/* Instruction which will plainly cause a CP1 exception when FPU is disabled */
-#define CP1UNDEF 0x44400001    /* cfc1 $0,$0 undef  */
-
-/* Instruction inserted following the badinst to further tag the sequence */
-#define BD_COOKIE 0x0000bd36 /* tne $0,$0 with baggage */
-
-/* Setup which instruction to use for trampoline */
-#ifdef STANDALONE_EMULATOR
-#define BADINST CP1UNDEF
-#else
-#define BADINST AdELOAD
-#endif
diff --git a/arch/mips/txx9/rbtx4927/setup.c b/arch/mips/txx9/rbtx4927/setup.c
index 4a74423b2ba8..01129a9d50fa 100644
--- a/arch/mips/txx9/rbtx4927/setup.c
+++ b/arch/mips/txx9/rbtx4927/setup.c
@@ -49,6 +49,7 @@
 #include <linux/platform_device.h>
 #include <linux/delay.h>
 #include <linux/gpio.h>
+#include <linux/leds.h>
 #include <asm/io.h>
 #include <asm/reboot.h>
 #include <asm/txx9/generic.h>
@@ -210,10 +211,6 @@ static void __init rbtx4927_mem_setup(void)
         /* TX4927-SIO DTR on (PIO[15]) */
         gpio_request(15, "sio-dtr");
         gpio_direction_output(15, 1);
-        gpio_request(0, "led");
-        gpio_direction_output(0, 1);
-        gpio_request(1, "led");
-        gpio_direction_output(1, 1);
 
         tx4927_sio_init(0, 0);
 #ifdef CONFIG_SERIAL_TXX9_CONSOLE
@@ -315,6 +312,25 @@ static void __init rbtx4927_mtd_init(void)
                 tx4927_mtd_init(i);
 }
 
+static void __init rbtx4927_gpioled_init(void)
+{
+        static struct gpio_led leds[] = {
+                { .name = "gpioled:green:0", .gpio = 0, .active_low = 1, },
+                { .name = "gpioled:green:1", .gpio = 1, .active_low = 1, },
+        };
+        static struct gpio_led_platform_data pdata = {
+                .num_leds = ARRAY_SIZE(leds),
+                .leds = leds,
+        };
+        struct platform_device *pdev = platform_device_alloc("leds-gpio", 0);
+
+        if (!pdev)
+                return;
+        pdev->dev.platform_data = &pdata;
+        if (platform_device_add(pdev))
+                platform_device_put(pdev);
+}
+
 static void __init rbtx4927_device_init(void)
 {
         toshiba_rbtx4927_rtc_init();
@@ -322,6 +338,7 @@ static void __init rbtx4927_device_init(void)
         tx4927_wdt_init();
         rbtx4927_mtd_init();
         txx9_iocled_init(RBTX4927_LED_ADDR - IO_BASE, -1, 3, 1, "green", NULL);
+        rbtx4927_gpioled_init();
 }
 
 struct txx9_board_vec rbtx4927_vec __initdata = {
diff --git a/arch/mips/txx9/rbtx4939/setup.c b/arch/mips/txx9/rbtx4939/setup.c
index 6daee9b1cd5e..98fbd9391bf8 100644
--- a/arch/mips/txx9/rbtx4939/setup.c
+++ b/arch/mips/txx9/rbtx4939/setup.c
@@ -308,16 +308,22 @@ static void __init rbtx4939_device_init(void)
 #if defined(CONFIG_TC35815) || defined(CONFIG_TC35815_MODULE)
         int i, j;
         unsigned char ethaddr[2][6];
+        u8 bdipsw = readb(rbtx4939_bdipsw_addr) & 0x0f;
+
         for (i = 0; i < 2; i++) {
                 unsigned long area = CKSEG1 + 0x1fff0000 + (i * 0x10);
-                if (readb(rbtx4939_bdipsw_addr) & 8) {
+                if (bdipsw == 0)
+                        memcpy(ethaddr[i], (void *)area, 6);
+                else {
                         u16 buf[3];
-                        area -= 0x03000000;
+                        if (bdipsw & 8)
+                                area -= 0x03000000;
+                        else
+                                area -= 0x01000000;
                         for (j = 0; j < 3; j++)
                                 buf[j] = le16_to_cpup((u16 *)(area + j * 2));
                         memcpy(ethaddr[i], buf, 6);
-                } else
-                        memcpy(ethaddr[i], (void *)area, 6);
+                }
         }
         tx4939_ethaddr_init(ethaddr[0], ethaddr[1]);
 #endif
diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig
index 5b1527883fcb..525c13a4de93 100644
--- a/arch/powerpc/Kconfig
+++ b/arch/powerpc/Kconfig
@@ -108,8 +108,7 @@ config ARCH_NO_VIRT_TO_BUS
 config PPC
         bool
         default y
-        select HAVE_DYNAMIC_FTRACE
-        select HAVE_FTRACE
+        select HAVE_FUNCTION_TRACER
         select ARCH_WANT_OPTIONAL_GPIOLIB
         select HAVE_IDE
         select HAVE_IOREMAP_PROT
diff --git a/arch/powerpc/Makefile b/arch/powerpc/Makefile
index 24dd1a37f8fb..1f0667069940 100644
--- a/arch/powerpc/Makefile
+++ b/arch/powerpc/Makefile
@@ -122,7 +122,7 @@ KBUILD_CFLAGS		+= -mcpu=powerpc
 endif
 
 # Work around a gcc code-gen bug with -fno-omit-frame-pointer.
-ifeq ($(CONFIG_FTRACE),y)
+ifeq ($(CONFIG_FUNCTION_TRACER),y)
 KBUILD_CFLAGS           += -mno-sched-epilog
 endif
 
diff --git a/arch/powerpc/include/asm/ftrace.h b/arch/powerpc/include/asm/ftrace.h
index de921326cca8..b298f7a631e6 100644
--- a/arch/powerpc/include/asm/ftrace.h
+++ b/arch/powerpc/include/asm/ftrace.h
@@ -1,7 +1,7 @@
 #ifndef _ASM_POWERPC_FTRACE
 #define _ASM_POWERPC_FTRACE
 
-#ifdef CONFIG_FTRACE
+#ifdef CONFIG_FUNCTION_TRACER
 #define MCOUNT_ADDR             ((long)(_mcount))
 #define MCOUNT_INSN_SIZE        4 /* sizeof mcount call */
 
diff --git a/arch/powerpc/kernel/Makefile b/arch/powerpc/kernel/Makefile
index fdb58253fa5b..92673b43858d 100644
--- a/arch/powerpc/kernel/Makefile
+++ b/arch/powerpc/kernel/Makefile
@@ -12,7 +12,7 @@ CFLAGS_prom_init.o      += -fPIC
 CFLAGS_btext.o          += -fPIC
 endif
 
-ifdef CONFIG_FTRACE
+ifdef CONFIG_FUNCTION_TRACER
 # Do not trace early boot code
 CFLAGS_REMOVE_cputable.o = -pg -mno-sched-epilog
 CFLAGS_REMOVE_prom_init.o = -pg -mno-sched-epilog
diff --git a/arch/powerpc/kernel/entry_32.S b/arch/powerpc/kernel/entry_32.S
index 1cbbf7033641..7ecc0d1855c3 100644
--- a/arch/powerpc/kernel/entry_32.S
+++ b/arch/powerpc/kernel/entry_32.S
@@ -1158,7 +1158,7 @@ machine_check_in_rtas:
 
 #endif /* CONFIG_PPC_RTAS */
 
-#ifdef CONFIG_FTRACE
+#ifdef CONFIG_FUNCTION_TRACER
 #ifdef CONFIG_DYNAMIC_FTRACE
 _GLOBAL(mcount)
 _GLOBAL(_mcount)
diff --git a/arch/powerpc/kernel/entry_64.S b/arch/powerpc/kernel/entry_64.S
index fd8b4bae9b04..e6d52845854f 100644
--- a/arch/powerpc/kernel/entry_64.S
+++ b/arch/powerpc/kernel/entry_64.S
@@ -884,7 +884,7 @@ _GLOBAL(enter_prom)
         mtlr    r0
         blr
 
-#ifdef CONFIG_FTRACE
+#ifdef CONFIG_FUNCTION_TRACER
 #ifdef CONFIG_DYNAMIC_FTRACE
 _GLOBAL(mcount)
 _GLOBAL(_mcount)
diff --git a/arch/powerpc/kernel/ftrace.c b/arch/powerpc/kernel/ftrace.c
index 3855ceb937b0..f4b006ed0ab1 100644
--- a/arch/powerpc/kernel/ftrace.c
+++ b/arch/powerpc/kernel/ftrace.c
@@ -28,17 +28,17 @@ static unsigned int ftrace_nop = 0x60000000;
 #endif
 
 
-static unsigned int notrace ftrace_calc_offset(long ip, long addr)
+static unsigned int ftrace_calc_offset(long ip, long addr)
 {
         return (int)(addr - ip);
 }
 
-notrace unsigned char *ftrace_nop_replace(void)
+unsigned char *ftrace_nop_replace(void)
 {
         return (char *)&ftrace_nop;
 }
 
-notrace unsigned char *ftrace_call_replace(unsigned long ip, unsigned long addr)
+unsigned char *ftrace_call_replace(unsigned long ip, unsigned long addr)
 {
         static unsigned int op;
 
@@ -68,7 +68,7 @@ notrace unsigned char *ftrace_call_replace(unsigned long ip, unsigned long addr)
 # define _ASM_PTR       " .long "
 #endif
 
-notrace int
+int
 ftrace_modify_code(unsigned long ip, unsigned char *old_code,
                    unsigned char *new_code)
 {
@@ -113,7 +113,7 @@ ftrace_modify_code(unsigned long ip, unsigned char *old_code,
         return faulted;
 }
 
-notrace int ftrace_update_ftrace_func(ftrace_func_t func)
+int ftrace_update_ftrace_func(ftrace_func_t func)
 {
         unsigned long ip = (unsigned long)(&ftrace_call);
         unsigned char old[MCOUNT_INSN_SIZE], *new;
@@ -126,23 +126,6 @@ notrace int ftrace_update_ftrace_func(ftrace_func_t func)
         return ret;
 }
 
-notrace int ftrace_mcount_set(unsigned long *data)
-{
-        unsigned long ip = (long)(&mcount_call);
-        unsigned long *addr = data;
-        unsigned char old[MCOUNT_INSN_SIZE], *new;
-
-        /*
-         * Replace the mcount stub with a pointer to the
-         * ip recorder function.
-         */
-        memcpy(old, &mcount_call, MCOUNT_INSN_SIZE);
-        new = ftrace_call_replace(ip, *addr);
-        *addr = ftrace_modify_code(ip, old, new);
-
-        return 0;
-}
-
 int __init ftrace_dyn_arch_init(void *data)
 {
         /* This is running in kstop_machine */
diff --git a/arch/powerpc/kernel/ppc_ksyms.c b/arch/powerpc/kernel/ppc_ksyms.c
index 8edc2359c419..260089dccfb0 100644
--- a/arch/powerpc/kernel/ppc_ksyms.c
+++ b/arch/powerpc/kernel/ppc_ksyms.c
@@ -68,7 +68,7 @@ EXPORT_SYMBOL(single_step_exception);
 EXPORT_SYMBOL(sys_sigreturn);
 #endif
 
-#ifdef CONFIG_FTRACE
+#ifdef CONFIG_FUNCTION_TRACER
 EXPORT_SYMBOL(_mcount);
 #endif
 
diff --git a/arch/powerpc/platforms/powermac/Makefile b/arch/powerpc/platforms/powermac/Makefile
index be60d64be7ad..50f169392551 100644
--- a/arch/powerpc/platforms/powermac/Makefile
+++ b/arch/powerpc/platforms/powermac/Makefile
@@ -1,6 +1,6 @@
 CFLAGS_bootx_init.o             += -fPIC
 
-ifdef CONFIG_FTRACE
+ifdef CONFIG_FUNCTION_TRACER
 # Do not trace early boot code
 CFLAGS_REMOVE_bootx_init.o = -pg -mno-sched-epilog
 endif
diff --git a/arch/s390/Kconfig b/arch/s390/Kconfig
index 70b7645ce745..8116a3328a19 100644
--- a/arch/s390/Kconfig
+++ b/arch/s390/Kconfig
@@ -241,19 +241,17 @@ config PACK_STACK
           Say Y if you are unsure.
 
 config SMALL_STACK
-        bool "Use 4kb/8kb for kernel stack instead of 8kb/16kb"
-        depends on PACK_STACK && !LOCKDEP
+        bool "Use 8kb for kernel stack instead of 16kb"
+        depends on PACK_STACK && 64BIT && !LOCKDEP
         help
           If you say Y here and the compiler supports the -mkernel-backchain
-          option the kernel will use a smaller kernel stack size. For 31 bit
-          the reduced size is 4kb instead of 8kb and for 64 bit it is 8kb
-          instead of 16kb. This allows to run more thread on a system and
-          reduces the pressure on the memory management for higher order
-          page allocations.
+          option the kernel will use a smaller kernel stack size. The reduced
+          size is 8kb instead of 16kb. This allows to run more threads on a
+          system and reduces the pressure on the memory management for higher
+          order page allocations.
 
           Say N if you are unsure.
 
-
 config CHECK_STACK
         bool "Detect kernel stack overflow"
         help
@@ -384,7 +382,7 @@ config IPL
 choice
         prompt "IPL method generated into head.S"
         depends on IPL
-        default IPL_TAPE
+        default IPL_VM
         help
           Select "tape" if you want to IPL the image from a Tape.
 
diff --git a/arch/s390/appldata/appldata_base.c b/arch/s390/appldata/appldata_base.c
index a7f8979fb925..a06a47cdd5e0 100644
--- a/arch/s390/appldata/appldata_base.c
+++ b/arch/s390/appldata/appldata_base.c
@@ -424,7 +424,7 @@ out:
  */
 int appldata_register_ops(struct appldata_ops *ops)
 {
-        if ((ops->size > APPLDATA_MAX_REC_SIZE) || (ops->size < 0))
+        if (ops->size > APPLDATA_MAX_REC_SIZE)
                 return -EINVAL;
 
         ops->ctl_table = kzalloc(4 * sizeof(struct ctl_table), GFP_KERNEL);
diff --git a/arch/s390/include/asm/kvm_virtio.h b/arch/s390/include/asm/kvm_virtio.h
index 146100224def..c13568b9351c 100644
--- a/arch/s390/include/asm/kvm_virtio.h
+++ b/arch/s390/include/asm/kvm_virtio.h
@@ -52,7 +52,7 @@ struct kvm_vqconfig {
 
 #ifdef __KERNEL__
 /* early virtio console setup */
-#ifdef CONFIG_VIRTIO_CONSOLE
+#ifdef CONFIG_S390_GUEST
 extern void s390_virtio_console_init(void);
 #else
 static inline void s390_virtio_console_init(void)
diff --git a/arch/s390/include/asm/mmu.h b/arch/s390/include/asm/mmu.h
index 5dd5e7b3476f..d2b4ff831477 100644
--- a/arch/s390/include/asm/mmu.h
+++ b/arch/s390/include/asm/mmu.h
@@ -7,7 +7,8 @@ typedef struct {
         unsigned long asce_bits;
         unsigned long asce_limit;
         int noexec;
-        int pgstes;
+        int has_pgste;   /* The mmu context has extended page tables */
+        int alloc_pgste; /* cloned contexts will have extended page tables */
 } mm_context_t;
 
 #endif
diff --git a/arch/s390/include/asm/mmu_context.h b/arch/s390/include/asm/mmu_context.h
index 4c2fbf48c9c4..28ec870655af 100644
--- a/arch/s390/include/asm/mmu_context.h
+++ b/arch/s390/include/asm/mmu_context.h
@@ -20,12 +20,25 @@ static inline int init_new_context(struct task_struct *tsk,
 #ifdef CONFIG_64BIT
         mm->context.asce_bits |= _ASCE_TYPE_REGION3;
 #endif
-        if (current->mm->context.pgstes) {
+        if (current->mm->context.alloc_pgste) {
+                /*
+                 * alloc_pgste indicates, that any NEW context will be created
+                 * with extended page tables. The old context is unchanged. The
+                 * page table allocation and the page table operations will
+                 * look at has_pgste to distinguish normal and extended page
+                 * tables. The only way to create extended page tables is to
+                 * set alloc_pgste and then create a new context (e.g. dup_mm).
+                 * The page table allocation is called after init_new_context
+                 * and if has_pgste is set, it will create extended page
+                 * tables.
+                 */
                 mm->context.noexec = 0;
-                mm->context.pgstes = 1;
+                mm->context.has_pgste = 1;
+                mm->context.alloc_pgste = 1;
         } else {
                 mm->context.noexec = s390_noexec;
-                mm->context.pgstes = 0;
+                mm->context.has_pgste = 0;
+                mm->context.alloc_pgste = 0;
         }
         mm->context.asce_limit = STACK_TOP_MAX;
         crst_table_init((unsigned long *) mm->pgd, pgd_entry_type(mm));
diff --git a/arch/s390/include/asm/pgtable.h b/arch/s390/include/asm/pgtable.h
index 1a928f84afd6..7fc76133b3e4 100644
--- a/arch/s390/include/asm/pgtable.h
+++ b/arch/s390/include/asm/pgtable.h
@@ -679,7 +679,7 @@ static inline void pmd_clear(pmd_t *pmd)
 
 static inline void pte_clear(struct mm_struct *mm, unsigned long addr, pte_t *ptep)
 {
-        if (mm->context.pgstes)
+        if (mm->context.has_pgste)
                 ptep_rcp_copy(ptep);
         pte_val(*ptep) = _PAGE_TYPE_EMPTY;
         if (mm->context.noexec)
@@ -763,7 +763,7 @@ static inline int kvm_s390_test_and_clear_page_dirty(struct mm_struct *mm,
         struct page *page;
         unsigned int skey;
 
-        if (!mm->context.pgstes)
+        if (!mm->context.has_pgste)
                 return -EINVAL;
         rcp_lock(ptep);
         pgste = (unsigned long *) (ptep + PTRS_PER_PTE);
@@ -794,7 +794,7 @@ static inline int ptep_test_and_clear_young(struct vm_area_struct *vma,
         int young;
         unsigned long *pgste;
 
-        if (!vma->vm_mm->context.pgstes)
+        if (!vma->vm_mm->context.has_pgste)
                 return 0;
         physpage = pte_val(*ptep) & PAGE_MASK;
         pgste = (unsigned long *) (ptep + PTRS_PER_PTE);
@@ -844,7 +844,7 @@ static inline void __ptep_ipte(unsigned long address, pte_t *ptep)
 static inline void ptep_invalidate(struct mm_struct *mm,
                                    unsigned long address, pte_t *ptep)
 {
-        if (mm->context.pgstes) {
+        if (mm->context.has_pgste) {
                 rcp_lock(ptep);
                 __ptep_ipte(address, ptep);
                 ptep_rcp_copy(ptep);
diff --git a/arch/s390/include/asm/thread_info.h b/arch/s390/include/asm/thread_info.h
index de3fad60c682..c1eaf9604da7 100644
--- a/arch/s390/include/asm/thread_info.h
+++ b/arch/s390/include/asm/thread_info.h
@@ -15,13 +15,8 @@
  * Size of kernel stack for each process
  */
 #ifndef __s390x__
-#ifndef __SMALL_STACK
 #define THREAD_ORDER 1
 #define ASYNC_ORDER  1
-#else
-#define THREAD_ORDER 0
-#define ASYNC_ORDER  0
-#endif
 #else /* __s390x__ */
 #ifndef __SMALL_STACK
 #define THREAD_ORDER 2
diff --git a/arch/s390/kernel/smp.c b/arch/s390/kernel/smp.c
index 9e8b1f9b8f4d..b5595688a477 100644
--- a/arch/s390/kernel/smp.c
+++ b/arch/s390/kernel/smp.c
@@ -1119,9 +1119,7 @@ out:
         return rc;
 }
 
-static ssize_t __ref rescan_store(struct sys_device *dev,
-                                  struct sysdev_attribute *attr,
-                                  const char *buf,
+static ssize_t __ref rescan_store(struct sysdev_class *class, const char *buf,
                                   size_t count)
 {
         int rc;
@@ -1129,12 +1127,10 @@ static ssize_t __ref rescan_store(struct sys_device *dev,
         rc = smp_rescan_cpus();
         return rc ? rc : count;
 }
-static SYSDEV_ATTR(rescan, 0200, NULL, rescan_store);
+static SYSDEV_CLASS_ATTR(rescan, 0200, NULL, rescan_store);
 #endif /* CONFIG_HOTPLUG_CPU */
 
-static ssize_t dispatching_show(struct sys_device *dev,
-                                struct sysdev_attribute *attr,
-                                char *buf)
+static ssize_t dispatching_show(struct sysdev_class *class, char *buf)
 {
         ssize_t count;
 
@@ -1144,9 +1140,8 @@ static ssize_t dispatching_show(struct sys_device *dev,
         return count;
 }
 
-static ssize_t dispatching_store(struct sys_device *dev,
-                                 struct sysdev_attribute *attr,
-                                 const char *buf, size_t count)
+static ssize_t dispatching_store(struct sysdev_class *dev, const char *buf,
+                                 size_t count)
 {
         int val, rc;
         char delim;
@@ -1168,7 +1163,8 @@ out:
         put_online_cpus();
         return rc ? rc : count;
 }
-static SYSDEV_ATTR(dispatching, 0644, dispatching_show, dispatching_store);
+static SYSDEV_CLASS_ATTR(dispatching, 0644, dispatching_show,
+                         dispatching_store);
 
 static int __init topology_init(void)
 {
@@ -1178,13 +1174,11 @@ static int __init topology_init(void)
         register_cpu_notifier(&smp_cpu_nb);
 
 #ifdef CONFIG_HOTPLUG_CPU
-        rc = sysfs_create_file(&cpu_sysdev_class.kset.kobj,
-                               &attr_rescan.attr);
+        rc = sysdev_class_create_file(&cpu_sysdev_class, &attr_rescan);
         if (rc)
                 return rc;
 #endif
-        rc = sysfs_create_file(&cpu_sysdev_class.kset.kobj,
-                               &attr_dispatching.attr);
+        rc = sysdev_class_create_file(&cpu_sysdev_class, &attr_dispatching);
         if (rc)
                 return rc;
         for_each_present_cpu(cpu) {
diff --git a/arch/s390/mm/pgtable.c b/arch/s390/mm/pgtable.c
index 3d98ba82ea67..ef3635b52fc0 100644
--- a/arch/s390/mm/pgtable.c
+++ b/arch/s390/mm/pgtable.c
@@ -169,7 +169,7 @@ unsigned long *page_table_alloc(struct mm_struct *mm)
         unsigned long *table;
         unsigned long bits;
 
-        bits = (mm->context.noexec || mm->context.pgstes) ? 3UL : 1UL;
+        bits = (mm->context.noexec || mm->context.has_pgste) ? 3UL : 1UL;
         spin_lock(&mm->page_table_lock);
         page = NULL;
         if (!list_empty(&mm->context.pgtable_list)) {
@@ -186,7 +186,7 @@ unsigned long *page_table_alloc(struct mm_struct *mm)
                 pgtable_page_ctor(page);
                 page->flags &= ~FRAG_MASK;
                 table = (unsigned long *) page_to_phys(page);
-                if (mm->context.pgstes)
+                if (mm->context.has_pgste)
                         clear_table_pgstes(table);
                 else
                         clear_table(table, _PAGE_TYPE_EMPTY, PAGE_SIZE);
@@ -210,7 +210,7 @@ void page_table_free(struct mm_struct *mm, unsigned long *table)
         struct page *page;
         unsigned long bits;
 
-        bits = (mm->context.noexec || mm->context.pgstes) ? 3UL : 1UL;
+        bits = (mm->context.noexec || mm->context.has_pgste) ? 3UL : 1UL;
         bits <<= (__pa(table) & (PAGE_SIZE - 1)) / 256 / sizeof(unsigned long);
         page = pfn_to_page(__pa(table) >> PAGE_SHIFT);
         spin_lock(&mm->page_table_lock);
@@ -257,7 +257,7 @@ int s390_enable_sie(void)
         struct mm_struct *mm, *old_mm;
 
         /* Do we have pgstes? if yes, we are done */
-        if (tsk->mm->context.pgstes)
+        if (tsk->mm->context.has_pgste)
                 return 0;
 
         /* lets check if we are allowed to replace the mm */
@@ -269,14 +269,14 @@ int s390_enable_sie(void)
         }
         task_unlock(tsk);
 
-        /* we copy the mm with pgstes enabled */
-        tsk->mm->context.pgstes = 1;
+        /* we copy the mm and let dup_mm create the page tables with_pgstes */
+        tsk->mm->context.alloc_pgste = 1;
         mm = dup_mm(tsk);
-        tsk->mm->context.pgstes = 0;
+        tsk->mm->context.alloc_pgste = 0;
         if (!mm)
                 return -ENOMEM;
 
-        /* Now lets check again if somebody attached ptrace etc */
+        /* Now lets check again if something happened */
         task_lock(tsk);
         if (!tsk->mm || atomic_read(&tsk->mm->mm_users) > 1 ||
             tsk->mm != tsk->active_mm || tsk->mm->ioctx_list) {
diff --git a/arch/sparc64/Kconfig b/arch/sparc64/Kconfig
index 035b15af90d8..3b96e70b4670 100644
--- a/arch/sparc64/Kconfig
+++ b/arch/sparc64/Kconfig
@@ -11,8 +11,7 @@ config SPARC
 config SPARC64
         bool
         default y
-        select HAVE_DYNAMIC_FTRACE
-        select HAVE_FTRACE
+        select HAVE_FUNCTION_TRACER
         select HAVE_IDE
         select HAVE_LMB
         select HAVE_ARCH_KGDB
diff --git a/arch/sparc64/Kconfig.debug b/arch/sparc64/Kconfig.debug
index d6d32d178fc8..c40515c06690 100644
--- a/arch/sparc64/Kconfig.debug
+++ b/arch/sparc64/Kconfig.debug
@@ -33,7 +33,7 @@ config DEBUG_PAGEALLOC
 
 config MCOUNT
         bool
-        depends on STACK_DEBUG || FTRACE
+        depends on STACK_DEBUG || FUNCTION_TRACER
         default y
 
 config FRAME_POINTER
diff --git a/arch/sparc64/kernel/Makefile b/arch/sparc64/kernel/Makefile
index c0b8009ab196..b3e0b986bef8 100644
--- a/arch/sparc64/kernel/Makefile
+++ b/arch/sparc64/kernel/Makefile
@@ -5,6 +5,8 @@
 EXTRA_AFLAGS := -ansi
 EXTRA_CFLAGS := -Werror
 
+CFLAGS_REMOVE_ftrace.o = -pg
+
 extra-y         := head.o init_task.o vmlinux.lds
 
 obj-y           := process.o setup.o cpu.o idprom.o reboot.o \
diff --git a/arch/sparc64/kernel/ftrace.c b/arch/sparc64/kernel/ftrace.c
index 4298d0aee713..d0218e73f982 100644
--- a/arch/sparc64/kernel/ftrace.c
+++ b/arch/sparc64/kernel/ftrace.c
@@ -9,12 +9,12 @@
 
 static const u32 ftrace_nop = 0x01000000;
 
-notrace unsigned char *ftrace_nop_replace(void)
+unsigned char *ftrace_nop_replace(void)
 {
         return (char *)&ftrace_nop;
 }
 
-notrace unsigned char *ftrace_call_replace(unsigned long ip, unsigned long addr)
+unsigned char *ftrace_call_replace(unsigned long ip, unsigned long addr)
 {
         static u32 call;
         s32 off;
@@ -25,7 +25,7 @@ notrace unsigned char *ftrace_call_replace(unsigned long ip, unsigned long addr)
         return (unsigned char *) &call;
 }
 
-notrace int
+int
 ftrace_modify_code(unsigned long ip, unsigned char *old_code,
                    unsigned char *new_code)
 {
@@ -59,7 +59,7 @@ ftrace_modify_code(unsigned long ip, unsigned char *old_code,
         return faulted;
 }
 
-notrace int ftrace_update_ftrace_func(ftrace_func_t func)
+int ftrace_update_ftrace_func(ftrace_func_t func)
 {
         unsigned long ip = (unsigned long)(&ftrace_call);
         unsigned char old[MCOUNT_INSN_SIZE], *new;
@@ -69,24 +69,6 @@ notrace int ftrace_update_ftrace_func(ftrace_func_t func)
         return ftrace_modify_code(ip, old, new);
 }
 
-notrace int ftrace_mcount_set(unsigned long *data)
-{
-        unsigned long ip = (long)(&mcount_call);
-        unsigned long *addr = data;
-        unsigned char old[MCOUNT_INSN_SIZE], *new;
-
-        /*
-         * Replace the mcount stub with a pointer to the
-         * ip recorder function.
-         */
-        memcpy(old, &mcount_call, MCOUNT_INSN_SIZE);
-        new = ftrace_call_replace(ip, *addr);
-        *addr = ftrace_modify_code(ip, old, new);
-
-        return 0;
-}
-
-
 int __init ftrace_dyn_arch_init(void *data)
 {
         ftrace_mcount_set(data);
diff --git a/arch/sparc64/lib/mcount.S b/arch/sparc64/lib/mcount.S
index fad90ddb3a28..7ce9c65f3592 100644
--- a/arch/sparc64/lib/mcount.S
+++ b/arch/sparc64/lib/mcount.S
@@ -93,7 +93,7 @@ mcount:
          nop
 1:
 #endif
-#ifdef CONFIG_FTRACE
+#ifdef CONFIG_FUNCTION_TRACER
 #ifdef CONFIG_DYNAMIC_FTRACE
         mov             %o7, %o0
         .globl          mcount_call
@@ -119,7 +119,7 @@ mcount_call:
         .size           _mcount,.-_mcount
         .size           mcount,.-mcount
 
-#ifdef CONFIG_FTRACE
+#ifdef CONFIG_FUNCTION_TRACER
         .globl          ftrace_stub
         .type           ftrace_stub,#function
 ftrace_stub:
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
index 350bee1d54dc..6f20718d3156 100644
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@ -28,7 +28,7 @@ config X86
         select HAVE_KRETPROBES
         select HAVE_FTRACE_MCOUNT_RECORD
         select HAVE_DYNAMIC_FTRACE
-        select HAVE_FTRACE
+        select HAVE_FUNCTION_TRACER
         select HAVE_KVM if ((X86_32 && !X86_VOYAGER && !X86_VISWS && !X86_NUMAQ) || X86_64)
         select HAVE_ARCH_KGDB if !X86_VOYAGER
         select HAVE_ARCH_TRACEHOOK
@@ -231,6 +231,10 @@ config SMP
 
           If you don't know what to do here, say N.
 
+config X86_HAS_BOOT_CPU_ID
+        def_bool y
+        depends on X86_VOYAGER
+
 config X86_FIND_SMP_CONFIG
         def_bool y
         depends on X86_MPPARSE || X86_VOYAGER
diff --git a/arch/x86/Kconfig.cpu b/arch/x86/Kconfig.cpu
index 0b7c4a3f0651..b815664fe370 100644
--- a/arch/x86/Kconfig.cpu
+++ b/arch/x86/Kconfig.cpu
@@ -513,19 +513,19 @@ config CPU_SUP_UMC_32
           If unsure, say N.
 
 config X86_DS
-        bool "Debug Store support"
-        default y
-        help
-          Add support for Debug Store.
-          This allows the kernel to provide a memory buffer to the hardware
-          to store various profiling and tracing events.
+        def_bool X86_PTRACE_BTS
+        depends on X86_DEBUGCTLMSR
 
 config X86_PTRACE_BTS
-        bool "ptrace interface to Branch Trace Store"
+        bool "Branch Trace Store"
         default y
-        depends on (X86_DS && X86_DEBUGCTLMSR)
+        depends on X86_DEBUGCTLMSR
         help
-          Add a ptrace interface to allow collecting an execution trace
-          of the traced task.
-          This collects control flow changes in a (cyclic) buffer and allows
-          debuggers to fill in the gaps and show an execution trace of the debuggee.
+          This adds a ptrace interface to the hardware's branch trace store.
+
+          Debuggers may use it to collect an execution trace of the debugged
+          application in order to answer the question 'how did I get here?'.
+          Debuggers may trace user mode as well as kernel mode.
+
+          Say Y unless there is no application development on this machine
+          and you want to save a small amount of code size.
diff --git a/arch/x86/boot/compressed/.gitignore b/arch/x86/boot/compressed/.gitignore
index be0ed065249b..63eff3b04d01 100644
--- a/arch/x86/boot/compressed/.gitignore
+++ b/arch/x86/boot/compressed/.gitignore
@@ -1 +1,3 @@
 relocs
+vmlinux.bin.all
+vmlinux.relocs
diff --git a/arch/x86/include/asm/dma-mapping.h b/arch/x86/include/asm/dma-mapping.h
index 4a5397bfce27..7f225a4b2a26 100644
--- a/arch/x86/include/asm/dma-mapping.h
+++ b/arch/x86/include/asm/dma-mapping.h
@@ -255,9 +255,11 @@ static inline unsigned long dma_alloc_coherent_mask(struct device *dev,
 
 static inline gfp_t dma_alloc_coherent_gfp_flags(struct device *dev, gfp_t gfp)
 {
-#ifdef CONFIG_X86_64
         unsigned long dma_mask = dma_alloc_coherent_mask(dev, gfp);
 
+        if (dma_mask <= DMA_24BIT_MASK)
+                gfp |= GFP_DMA;
+#ifdef CONFIG_X86_64
         if (dma_mask <= DMA_32BIT_MASK && !(gfp & GFP_DMA))
                 gfp |= GFP_DMA32;
 #endif
diff --git a/arch/x86/include/asm/es7000/wakecpu.h b/arch/x86/include/asm/es7000/wakecpu.h
index 3ffc5a7bf667..398493461913 100644
--- a/arch/x86/include/asm/es7000/wakecpu.h
+++ b/arch/x86/include/asm/es7000/wakecpu.h
@@ -50,10 +50,9 @@ static inline void restore_NMI_vector(unsigned short *high, unsigned short *low)
 {
 }
 
-#if APIC_DEBUG
- #define inquire_remote_apic(apicid) __inquire_remote_apic(apicid)
-#else
- #define inquire_remote_apic(apicid) {}
-#endif
+#define inquire_remote_apic(apicid) do {                \
+                if (apic_verbosity >= APIC_DEBUG)       \
+                        __inquire_remote_apic(apicid);  \
+        } while (0)
 
 #endif /* __ASM_MACH_WAKECPU_H */
diff --git a/arch/x86/include/asm/ftrace.h b/arch/x86/include/asm/ftrace.h
index 47f7e65e6c1d..9e8bc29b8b17 100644
--- a/arch/x86/include/asm/ftrace.h
+++ b/arch/x86/include/asm/ftrace.h
@@ -1,7 +1,7 @@
 #ifndef _ASM_X86_FTRACE_H
 #define _ASM_X86_FTRACE_H
 
-#ifdef CONFIG_FTRACE
+#ifdef CONFIG_FUNCTION_TRACER
 #define MCOUNT_ADDR             ((long)(mcount))
 #define MCOUNT_INSN_SIZE        5 /* sizeof mcount call */
 
@@ -19,6 +19,6 @@ static inline unsigned long ftrace_call_adjust(unsigned long addr)
 }
 #endif
 
-#endif /* CONFIG_FTRACE */
+#endif /* CONFIG_FUNCTION_TRACER */
 
 #endif /* _ASM_X86_FTRACE_H */
diff --git a/arch/x86/include/asm/io.h b/arch/x86/include/asm/io.h
index 5618a103f395..ac2abc88cd95 100644
--- a/arch/x86/include/asm/io.h
+++ b/arch/x86/include/asm/io.h
@@ -82,9 +82,9 @@ extern void __iomem *ioremap_wc(unsigned long offset, unsigned long size);
 extern void early_ioremap_init(void);
 extern void early_ioremap_clear(void);
 extern void early_ioremap_reset(void);
-extern void *early_ioremap(unsigned long offset, unsigned long size);
-extern void *early_memremap(unsigned long offset, unsigned long size);
-extern void early_iounmap(void *addr, unsigned long size);
+extern void __iomem *early_ioremap(unsigned long offset, unsigned long size);
+extern void __iomem *early_memremap(unsigned long offset, unsigned long size);
+extern void early_iounmap(void __iomem *addr, unsigned long size);
 extern void __iomem *fix_ioremap(unsigned idx, unsigned long phys);
 
 
diff --git a/arch/x86/include/asm/iommu.h b/arch/x86/include/asm/iommu.h
index 98e28ea8cd16..e4a552d44465 100644
--- a/arch/x86/include/asm/iommu.h
+++ b/arch/x86/include/asm/iommu.h
@@ -7,7 +7,6 @@ extern struct dma_mapping_ops nommu_dma_ops;
 extern int force_iommu, no_iommu;
 extern int iommu_detected;
 extern int dmar_disabled;
-extern int forbid_dac;
 
 extern unsigned long iommu_nr_pages(unsigned long addr, unsigned long len);
 
diff --git a/arch/x86/include/asm/kvm_host.h b/arch/x86/include/asm/kvm_host.h
index 65679d006337..8346be87cfa1 100644
--- a/arch/x86/include/asm/kvm_host.h
+++ b/arch/x86/include/asm/kvm_host.h
@@ -364,6 +364,9 @@ struct kvm_arch{
 
         struct page *ept_identity_pagetable;
         bool ept_identity_pagetable_done;
+
+        unsigned long irq_sources_bitmap;
+        unsigned long irq_states[KVM_IOAPIC_NUM_PINS];
 };
 
 struct kvm_vm_stat {
diff --git a/arch/x86/include/asm/mach-default/mach_wakecpu.h b/arch/x86/include/asm/mach-default/mach_wakecpu.h
index d5c0b826a4ff..9d80db91e992 100644
--- a/arch/x86/include/asm/mach-default/mach_wakecpu.h
+++ b/arch/x86/include/asm/mach-default/mach_wakecpu.h
@@ -33,10 +33,9 @@ static inline void restore_NMI_vector(unsigned short *high, unsigned short *low)
 {
 }
 
-#if APIC_DEBUG
- #define inquire_remote_apic(apicid) __inquire_remote_apic(apicid)
-#else
- #define inquire_remote_apic(apicid) {}
-#endif
+#define inquire_remote_apic(apicid) do {                \
+                if (apic_verbosity >= APIC_DEBUG)       \
+                        __inquire_remote_apic(apicid);  \
+        } while (0)
 
 #endif /* _ASM_X86_MACH_DEFAULT_MACH_WAKECPU_H */
diff --git a/arch/x86/include/asm/pgtable-3level.h b/arch/x86/include/asm/pgtable-3level.h
index fb16cec702e4..52597aeadfff 100644
--- a/arch/x86/include/asm/pgtable-3level.h
+++ b/arch/x86/include/asm/pgtable-3level.h
@@ -120,13 +120,13 @@ static inline void pud_clear(pud_t *pudp)
                 write_cr3(pgd);
 }
 
-#define pud_page(pud) ((struct page *) __va(pud_val(pud) & PTE_PFN_MASK))
+#define pud_page(pud) pfn_to_page(pud_val(pud) >> PAGE_SHIFT)
 
 #define pud_page_vaddr(pud) ((unsigned long) __va(pud_val(pud) & PTE_PFN_MASK))
 
 
 /* Find an entry in the second-level page table.. */
-#define pmd_offset(pud, address) ((pmd_t *)pud_page(*(pud)) +   \
+#define pmd_offset(pud, address) ((pmd_t *)pud_page_vaddr(*(pud)) +     \
                                   pmd_index(address))
 
 #ifdef CONFIG_SMP
diff --git a/arch/x86/include/asm/smp.h b/arch/x86/include/asm/smp.h
index 2766021aef80..d12811ce51d9 100644
--- a/arch/x86/include/asm/smp.h
+++ b/arch/x86/include/asm/smp.h
@@ -225,5 +225,11 @@ static inline int hard_smp_processor_id(void)
 
 #endif /* CONFIG_X86_LOCAL_APIC */
 
+#ifdef CONFIG_X86_HAS_BOOT_CPU_ID
+extern unsigned char boot_cpu_id;
+#else
+#define boot_cpu_id     0
+#endif
+
 #endif /* __ASSEMBLY__ */
 #endif /* _ASM_X86_SMP_H */
diff --git a/arch/x86/include/asm/uv/uv_hub.h b/arch/x86/include/asm/uv/uv_hub.h
index c6ad93e315c8..7a5782610b2b 100644
--- a/arch/x86/include/asm/uv/uv_hub.h
+++ b/arch/x86/include/asm/uv/uv_hub.h
@@ -13,6 +13,7 @@
 
 #include <linux/numa.h>
 #include <linux/percpu.h>
+#include <linux/timer.h>
 #include <asm/types.h>
 #include <asm/percpu.h>
 
diff --git a/arch/x86/kernel/Makefile b/arch/x86/kernel/Makefile
index d7e5a58ee22f..e489ff9cb3e2 100644
--- a/arch/x86/kernel/Makefile
+++ b/arch/x86/kernel/Makefile
@@ -6,11 +6,12 @@ extra-y                := head_$(BITS).o head$(BITS).o head.o init_task.o vmlinu
 
 CPPFLAGS_vmlinux.lds += -U$(UTS_MACHINE)
 
-ifdef CONFIG_FTRACE
+ifdef CONFIG_FUNCTION_TRACER
 # Do not profile debug and lowlevel utilities
 CFLAGS_REMOVE_tsc.o = -pg
 CFLAGS_REMOVE_rtc.o = -pg
 CFLAGS_REMOVE_paravirt-spinlocks.o = -pg
+CFLAGS_REMOVE_ftrace.o = -pg
 endif
 
 #
diff --git a/arch/x86/kernel/cpu/addon_cpuid_features.c b/arch/x86/kernel/cpu/addon_cpuid_features.c
index 0d9c993aa93e..ef8f831af823 100644
--- a/arch/x86/kernel/cpu/addon_cpuid_features.c
+++ b/arch/x86/kernel/cpu/addon_cpuid_features.c
@@ -69,7 +69,7 @@ void __cpuinit init_scattered_cpuid_features(struct cpuinfo_x86 *c)
  */
 void __cpuinit detect_extended_topology(struct cpuinfo_x86 *c)
 {
-#ifdef CONFIG_SMP
+#ifdef CONFIG_X86_SMP
         unsigned int eax, ebx, ecx, edx, sub_index;
         unsigned int ht_mask_width, core_plus_mask_width;
         unsigned int core_select_mask, core_level_siblings;
diff --git a/arch/x86/kernel/cpu/common.c b/arch/x86/kernel/cpu/common.c
index 25581dcb280e..003a65395bd5 100644
--- a/arch/x86/kernel/cpu/common.c
+++ b/arch/x86/kernel/cpu/common.c
@@ -549,6 +549,10 @@ static void __init early_identify_cpu(struct cpuinfo_x86 *c)
                 this_cpu->c_early_init(c);
 
         validate_pat_support(c);
+
+#ifdef CONFIG_SMP
+        c->cpu_index = boot_cpu_id;
+#endif
 }
 
 void __init early_cpu_init(void)
@@ -1134,7 +1138,7 @@ void __cpuinit cpu_init(void)
         /*
          * Boot processor to setup the FP and extended state context info.
          */
-        if (!smp_processor_id())
+        if (smp_processor_id() == boot_cpu_id)
                 init_thread_xstate();
 
         xsave_init();
diff --git a/arch/x86/kernel/entry_32.S b/arch/x86/kernel/entry_32.S
index dd65143941a8..28b597ef9ca1 100644
--- a/arch/x86/kernel/entry_32.S
+++ b/arch/x86/kernel/entry_32.S
@@ -1149,7 +1149,7 @@ ENDPROC(xen_failsafe_callback)
 
 #endif  /* CONFIG_XEN */
 
-#ifdef CONFIG_FTRACE
+#ifdef CONFIG_FUNCTION_TRACER
 #ifdef CONFIG_DYNAMIC_FTRACE
 
 ENTRY(mcount)
@@ -1204,7 +1204,7 @@ trace:
         jmp ftrace_stub
 END(mcount)
 #endif /* CONFIG_DYNAMIC_FTRACE */
-#endif /* CONFIG_FTRACE */
+#endif /* CONFIG_FUNCTION_TRACER */
 
 .section .rodata,"a"
 #include "syscall_table_32.S"
diff --git a/arch/x86/kernel/entry_64.S b/arch/x86/kernel/entry_64.S
index 09e7145484c5..b86f332c96a6 100644
--- a/arch/x86/kernel/entry_64.S
+++ b/arch/x86/kernel/entry_64.S
@@ -61,7 +61,7 @@
 
         .code64
 
-#ifdef CONFIG_FTRACE
+#ifdef CONFIG_FUNCTION_TRACER
 #ifdef CONFIG_DYNAMIC_FTRACE
 ENTRY(mcount)
         retq
@@ -138,7 +138,7 @@ trace:
         jmp ftrace_stub
 END(mcount)
 #endif /* CONFIG_DYNAMIC_FTRACE */
-#endif /* CONFIG_FTRACE */
+#endif /* CONFIG_FUNCTION_TRACER */
 
 #ifndef CONFIG_PREEMPT
 #define retint_kernel retint_restore_args
diff --git a/arch/x86/kernel/ftrace.c b/arch/x86/kernel/ftrace.c
index d073d981a730..50ea0ac8c9bf 100644
--- a/arch/x86/kernel/ftrace.c
+++ b/arch/x86/kernel/ftrace.c
@@ -21,8 +21,7 @@
 #include <asm/nops.h>
 
 
-/* Long is fine, even if it is only 4 bytes ;-) */
-static unsigned long *ftrace_nop;
+static unsigned char ftrace_nop[MCOUNT_INSN_SIZE];
 
 union ftrace_code_union {
         char code[MCOUNT_INSN_SIZE];
@@ -33,17 +32,17 @@ union ftrace_code_union {
 };
 
 
-static int notrace ftrace_calc_offset(long ip, long addr)
+static int ftrace_calc_offset(long ip, long addr)
 {
         return (int)(addr - ip);
 }
 
-notrace unsigned char *ftrace_nop_replace(void)
+unsigned char *ftrace_nop_replace(void)
 {
-        return (char *)ftrace_nop;
+        return ftrace_nop;
 }
 
-notrace unsigned char *ftrace_call_replace(unsigned long ip, unsigned long addr)
+unsigned char *ftrace_call_replace(unsigned long ip, unsigned long addr)
 {
         static union ftrace_code_union calc;
 
@@ -57,7 +56,7 @@ notrace unsigned char *ftrace_call_replace(unsigned long ip, unsigned long addr)
         return calc.code;
 }
 
-notrace int
+int
 ftrace_modify_code(unsigned long ip, unsigned char *old_code,
                    unsigned char *new_code)
 {
@@ -66,26 +65,31 @@ ftrace_modify_code(unsigned long ip, unsigned char *old_code,
         /*
          * Note: Due to modules and __init, code can
          *  disappear and change, we need to protect against faulting
-         *  as well as code changing.
+         *  as well as code changing. We do this by using the
+         *  probe_kernel_* functions.
          *
          * No real locking needed, this code is run through
          * kstop_machine, or before SMP starts.
          */
-        if (__copy_from_user_inatomic(replaced, (char __user *)ip, MCOUNT_INSN_SIZE))
-                return 1;
 
+        /* read the text we want to modify */
+        if (probe_kernel_read(replaced, (void *)ip, MCOUNT_INSN_SIZE))
+                return -EFAULT;
+
+        /* Make sure it is what we expect it to be */
         if (memcmp(replaced, old_code, MCOUNT_INSN_SIZE) != 0)
-                return 2;
+                return -EINVAL;
 
-        WARN_ON_ONCE(__copy_to_user_inatomic((char __user *)ip, new_code,
-                                    MCOUNT_INSN_SIZE));
+        /* replace the text with the new text */
+        if (probe_kernel_write((void *)ip, new_code, MCOUNT_INSN_SIZE))
+                return -EPERM;
 
         sync_core();
 
         return 0;
 }
 
-notrace int ftrace_update_ftrace_func(ftrace_func_t func)
+int ftrace_update_ftrace_func(ftrace_func_t func)
 {
         unsigned long ip = (unsigned long)(&ftrace_call);
         unsigned char old[MCOUNT_INSN_SIZE], *new;
@@ -98,13 +102,6 @@ notrace int ftrace_update_ftrace_func(ftrace_func_t func)
         return ret;
 }
 
-notrace int ftrace_mcount_set(unsigned long *data)
-{
-        /* mcount is initialized as a nop */
-        *data = 0;
-        return 0;
-}
-
 int __init ftrace_dyn_arch_init(void *data)
 {
         extern const unsigned char ftrace_test_p6nop[];
@@ -127,9 +124,6 @@ int __init ftrace_dyn_arch_init(void *data)
          * TODO: check the cpuid to determine the best nop.
          */
         asm volatile (
-                "jmp ftrace_test_jmp\n"
-                /* This code needs to stay around */
-                ".section .text, \"ax\"\n"
                 "ftrace_test_jmp:"
                 "jmp ftrace_test_p6nop\n"
                 "nop\n"
@@ -140,8 +134,6 @@ int __init ftrace_dyn_arch_init(void *data)
                 "jmp 1f\n"
                 "ftrace_test_nop5:"
                 ".byte 0x66,0x66,0x66,0x66,0x90\n"
-                "jmp 1f\n"
-                ".previous\n"
                 "1:"
                 ".section .fixup, \"ax\"\n"
                 "2:     movl $1, %0\n"
@@ -156,15 +148,15 @@ int __init ftrace_dyn_arch_init(void *data)
         switch (faulted) {
         case 0:
                 pr_info("ftrace: converting mcount calls to 0f 1f 44 00 00\n");
-                ftrace_nop = (unsigned long *)ftrace_test_p6nop;
+                memcpy(ftrace_nop, ftrace_test_p6nop, MCOUNT_INSN_SIZE);
                 break;
         case 1:
                 pr_info("ftrace: converting mcount calls to 66 66 66 66 90\n");
-                ftrace_nop = (unsigned long *)ftrace_test_nop5;
+                memcpy(ftrace_nop, ftrace_test_nop5, MCOUNT_INSN_SIZE);
                 break;
         case 2:
                 pr_info("ftrace: converting mcount calls to jmp . + 5\n");
-                ftrace_nop = (unsigned long *)ftrace_test_jmp;
+                memcpy(ftrace_nop, ftrace_test_jmp, MCOUNT_INSN_SIZE);
                 break;
         }
 
diff --git a/arch/x86/kernel/genx2apic_uv_x.c b/arch/x86/kernel/genx2apic_uv_x.c
index 680a06557c5e..2c7dbdb98278 100644
--- a/arch/x86/kernel/genx2apic_uv_x.c
+++ b/arch/x86/kernel/genx2apic_uv_x.c
@@ -15,7 +15,6 @@
 #include <linux/ctype.h>
 #include <linux/init.h>
 #include <linux/sched.h>
-#include <linux/bootmem.h>
 #include <linux/module.h>
 #include <linux/hardirq.h>
 #include <asm/smp.h>
@@ -398,16 +397,16 @@ void __init uv_system_init(void)
         printk(KERN_DEBUG "UV: Found %d blades\n", uv_num_possible_blades());
 
         bytes = sizeof(struct uv_blade_info) * uv_num_possible_blades();
-        uv_blade_info = alloc_bootmem_pages(bytes);
+        uv_blade_info = kmalloc(bytes, GFP_KERNEL);
 
         get_lowmem_redirect(&lowmem_redir_base, &lowmem_redir_size);
 
         bytes = sizeof(uv_node_to_blade[0]) * num_possible_nodes();
-        uv_node_to_blade = alloc_bootmem_pages(bytes);
+        uv_node_to_blade = kmalloc(bytes, GFP_KERNEL);
         memset(uv_node_to_blade, 255, bytes);
 
         bytes = sizeof(uv_cpu_to_blade[0]) * num_possible_cpus();
-        uv_cpu_to_blade = alloc_bootmem_pages(bytes);
+        uv_cpu_to_blade = kmalloc(bytes, GFP_KERNEL);
         memset(uv_cpu_to_blade, 255, bytes);
 
         blade = 0;
diff --git a/arch/x86/kernel/i386_ksyms_32.c b/arch/x86/kernel/i386_ksyms_32.c
index dd7ebee446af..43cec6bdda63 100644
--- a/arch/x86/kernel/i386_ksyms_32.c
+++ b/arch/x86/kernel/i386_ksyms_32.c
@@ -5,7 +5,7 @@
 #include <asm/desc.h>
 #include <asm/ftrace.h>
 
-#ifdef CONFIG_FTRACE
+#ifdef CONFIG_FUNCTION_TRACER
 /* mcount is defined in assembly */
 EXPORT_SYMBOL(mcount);
 #endif
diff --git a/arch/x86/kernel/k8.c b/arch/x86/kernel/k8.c
index 304d8bad6559..cbc4332a77b2 100644
--- a/arch/x86/kernel/k8.c
+++ b/arch/x86/kernel/k8.c
@@ -18,7 +18,6 @@ static u32 *flush_words;
 struct pci_device_id k8_nb_ids[] = {
         { PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_K8_NB_MISC) },
         { PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_10H_NB_MISC) },
-        { PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_11H_NB_MISC) },
         {}
 };
 EXPORT_SYMBOL(k8_nb_ids);
diff --git a/arch/x86/kernel/machine_kexec_32.c b/arch/x86/kernel/machine_kexec_32.c
index 0732adba05ca..7a385746509a 100644
--- a/arch/x86/kernel/machine_kexec_32.c
+++ b/arch/x86/kernel/machine_kexec_32.c
@@ -162,7 +162,10 @@ void machine_kexec(struct kimage *image)
         page_list[VA_PTE_0] = (unsigned long)kexec_pte0;
         page_list[PA_PTE_1] = __pa(kexec_pte1);
         page_list[VA_PTE_1] = (unsigned long)kexec_pte1;
-        page_list[PA_SWAP_PAGE] = (page_to_pfn(image->swap_page) << PAGE_SHIFT);
+
+        if (image->type == KEXEC_TYPE_DEFAULT)
+                page_list[PA_SWAP_PAGE] = (page_to_pfn(image->swap_page)
+                                                << PAGE_SHIFT);
 
         /* The segment registers are funny things, they have both a
          * visible and an invisible part.  Whenever the visible part is
diff --git a/arch/x86/kernel/microcode_amd.c b/arch/x86/kernel/microcode_amd.c
index 7a1f8eeac2c7..5f8e5d75a254 100644
--- a/arch/x86/kernel/microcode_amd.c
+++ b/arch/x86/kernel/microcode_amd.c
@@ -39,7 +39,7 @@
 #include <asm/microcode.h>
 
 MODULE_DESCRIPTION("AMD Microcode Update Driver");
-MODULE_AUTHOR("Peter Oruba <peter.oruba@amd.com>");
+MODULE_AUTHOR("Peter Oruba");
 MODULE_LICENSE("GPL v2");
 
 #define UCODE_MAGIC                0x00414d44
diff --git a/arch/x86/kernel/microcode_core.c b/arch/x86/kernel/microcode_core.c
index 936d8d55f230..82fb2809ce32 100644
--- a/arch/x86/kernel/microcode_core.c
+++ b/arch/x86/kernel/microcode_core.c
@@ -480,8 +480,8 @@ static int __init microcode_init(void)
 
         printk(KERN_INFO
                "Microcode Update Driver: v" MICROCODE_VERSION
-               " <tigran@aivazian.fsnet.co.uk>"
-               " <peter.oruba@amd.com>\n");
+               " <tigran@aivazian.fsnet.co.uk>,"
+               " Peter Oruba\n");
 
         return 0;
 }
diff --git a/arch/x86/kernel/pci-dma.c b/arch/x86/kernel/pci-dma.c
index 1972266e8ba5..192624820217 100644
--- a/arch/x86/kernel/pci-dma.c
+++ b/arch/x86/kernel/pci-dma.c
@@ -9,6 +9,8 @@
 #include <asm/calgary.h>
 #include <asm/amd_iommu.h>
 
+static int forbid_dac __read_mostly;
+
 struct dma_mapping_ops *dma_ops;
 EXPORT_SYMBOL(dma_ops);
 
@@ -291,3 +293,17 @@ void pci_iommu_shutdown(void)
 }
 /* Must execute after PCI subsystem */
 fs_initcall(pci_iommu_init);
+
+#ifdef CONFIG_PCI
+/* Many VIA bridges seem to corrupt data for DAC. Disable it here */
+
+static __devinit void via_no_dac(struct pci_dev *dev)
+{
+        if ((dev->class >> 8) == PCI_CLASS_BRIDGE_PCI && forbid_dac == 0) {
+                printk(KERN_INFO "PCI: VIA PCI bridge detected."
+                                 "Disabling DAC.\n");
+                forbid_dac = 1;
+        }
+}
+DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_VIA, PCI_ANY_ID, via_no_dac);
+#endif
diff --git a/arch/x86/kernel/pci-gart_64.c b/arch/x86/kernel/pci-gart_64.c
index e3f75bbcedea..a42b02b4df68 100644
--- a/arch/x86/kernel/pci-gart_64.c
+++ b/arch/x86/kernel/pci-gart_64.c
@@ -744,7 +744,7 @@ void __init gart_iommu_init(void)
         long i;
 
         if (cache_k8_northbridges() < 0 || num_k8_northbridges == 0) {
-                printk(KERN_INFO "PCI-GART: No AMD northbridge found.\n");
+                printk(KERN_INFO "PCI-GART: No AMD GART found.\n");
                 return;
         }
 
diff --git a/arch/x86/kernel/pci-swiotlb_64.c b/arch/x86/kernel/pci-swiotlb_64.c
index c4ce0332759e..3c539d111abb 100644
--- a/arch/x86/kernel/pci-swiotlb_64.c
+++ b/arch/x86/kernel/pci-swiotlb_64.c
@@ -18,9 +18,21 @@ swiotlb_map_single_phys(struct device *hwdev, phys_addr_t paddr, size_t size,
         return swiotlb_map_single(hwdev, phys_to_virt(paddr), size, direction);
 }
 
+static void *x86_swiotlb_alloc_coherent(struct device *hwdev, size_t size,
+                                        dma_addr_t *dma_handle, gfp_t flags)
+{
+        void *vaddr;
+
+        vaddr = dma_generic_alloc_coherent(hwdev, size, dma_handle, flags);
+        if (vaddr)
+                return vaddr;
+
+        return swiotlb_alloc_coherent(hwdev, size, dma_handle, flags);
+}
+
 struct dma_mapping_ops swiotlb_dma_ops = {
         .mapping_error = swiotlb_dma_mapping_error,
-        .alloc_coherent = swiotlb_alloc_coherent,
+        .alloc_coherent = x86_swiotlb_alloc_coherent,
         .free_coherent = swiotlb_free_coherent,
         .map_single = swiotlb_map_single_phys,
         .unmap_single = swiotlb_unmap_single,
diff --git a/arch/x86/kernel/tsc.c b/arch/x86/kernel/tsc.c
index 161bb850fc47..62348e4fd8d1 100644
--- a/arch/x86/kernel/tsc.c
+++ b/arch/x86/kernel/tsc.c
@@ -759,7 +759,7 @@ __cpuinit int unsynchronized_tsc(void)
         if (!cpu_has_tsc || tsc_unstable)
                 return 1;
 
-#ifdef CONFIG_SMP
+#ifdef CONFIG_X86_SMP
         if (apic_is_clustered_box())
                 return 1;
 #endif
diff --git a/arch/x86/kernel/vsmp_64.c b/arch/x86/kernel/vsmp_64.c
index 7766d36983fc..a688f3bfaec2 100644
--- a/arch/x86/kernel/vsmp_64.c
+++ b/arch/x86/kernel/vsmp_64.c
@@ -78,7 +78,7 @@ static unsigned __init_or_module vsmp_patch(u8 type, u16 clobbers, void *ibuf,
 
 static void __init set_vsmp_pv_ops(void)
 {
-        void *address;
+        void __iomem *address;
         unsigned int cap, ctl, cfg;
 
         /* set vSMP magic bits to indicate vSMP capable kernel */
diff --git a/arch/x86/kernel/x8664_ksyms_64.c b/arch/x86/kernel/x8664_ksyms_64.c
index b545f371b5f5..695e426aa354 100644
--- a/arch/x86/kernel/x8664_ksyms_64.c
+++ b/arch/x86/kernel/x8664_ksyms_64.c
@@ -12,7 +12,7 @@
 #include <asm/desc.h>
 #include <asm/ftrace.h>
 
-#ifdef CONFIG_FTRACE
+#ifdef CONFIG_FUNCTION_TRACER
 /* mcount is defined in assembly */
 EXPORT_SYMBOL(mcount);
 #endif
diff --git a/arch/x86/kvm/i8254.c b/arch/x86/kvm/i8254.c
index 11c6725fb798..8772dc946823 100644
--- a/arch/x86/kvm/i8254.c
+++ b/arch/x86/kvm/i8254.c
@@ -545,6 +545,12 @@ struct kvm_pit *kvm_create_pit(struct kvm *kvm)
         if (!pit)
                 return NULL;
 
+        mutex_lock(&kvm->lock);
+        pit->irq_source_id = kvm_request_irq_source_id(kvm);
+        mutex_unlock(&kvm->lock);
+        if (pit->irq_source_id < 0)
+                return NULL;
+
         mutex_init(&pit->pit_state.lock);
         mutex_lock(&pit->pit_state.lock);
         spin_lock_init(&pit->pit_state.inject_lock);
@@ -587,6 +593,7 @@ void kvm_free_pit(struct kvm *kvm)
                 mutex_lock(&kvm->arch.vpit->pit_state.lock);
                 timer = &kvm->arch.vpit->pit_state.pit_timer.timer;
                 hrtimer_cancel(timer);
+                kvm_free_irq_source_id(kvm, kvm->arch.vpit->irq_source_id);
                 mutex_unlock(&kvm->arch.vpit->pit_state.lock);
                 kfree(kvm->arch.vpit);
         }
@@ -595,8 +602,8 @@ void kvm_free_pit(struct kvm *kvm)
 static void __inject_pit_timer_intr(struct kvm *kvm)
 {
         mutex_lock(&kvm->lock);
-        kvm_set_irq(kvm, 0, 1);
-        kvm_set_irq(kvm, 0, 0);
+        kvm_set_irq(kvm, kvm->arch.vpit->irq_source_id, 0, 1);
+        kvm_set_irq(kvm, kvm->arch.vpit->irq_source_id, 0, 0);
         mutex_unlock(&kvm->lock);
 }
 
diff --git a/arch/x86/kvm/i8254.h b/arch/x86/kvm/i8254.h
index e436d4983aa1..4178022b97aa 100644
--- a/arch/x86/kvm/i8254.h
+++ b/arch/x86/kvm/i8254.h
@@ -44,6 +44,7 @@ struct kvm_pit {
         struct kvm_io_device speaker_dev;
         struct kvm *kvm;
         struct kvm_kpit_state pit_state;
+        int irq_source_id;
 };
 
 #define KVM_PIT_BASE_ADDRESS        0x40
diff --git a/arch/x86/kvm/mmu.c b/arch/x86/kvm/mmu.c
index 99c239c5c0ac..2a5e64881d9b 100644
--- a/arch/x86/kvm/mmu.c
+++ b/arch/x86/kvm/mmu.c
@@ -2634,6 +2634,7 @@ static int kvm_pv_mmu_write(struct kvm_vcpu *vcpu,
 static int kvm_pv_mmu_flush_tlb(struct kvm_vcpu *vcpu)
 {
         kvm_x86_ops->tlb_flush(vcpu);
+        set_bit(KVM_REQ_MMU_SYNC, &vcpu->requests);
         return 1;
 }
 
diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c
index 4f0677d1eae8..f1f8ff2f1fa2 100644
--- a/arch/x86/kvm/x86.c
+++ b/arch/x86/kvm/x86.c
@@ -1742,7 +1742,8 @@ long kvm_arch_vm_ioctl(struct file *filp,
                         goto out;
                 if (irqchip_in_kernel(kvm)) {
                         mutex_lock(&kvm->lock);
-                        kvm_set_irq(kvm, irq_event.irq, irq_event.level);
+                        kvm_set_irq(kvm, KVM_USERSPACE_IRQ_SOURCE_ID,
+                                    irq_event.irq, irq_event.level);
                         mutex_unlock(&kvm->lock);
                         r = 0;
                 }
@@ -4013,6 +4014,9 @@ struct  kvm *kvm_arch_create_vm(void)
         INIT_LIST_HEAD(&kvm->arch.active_mmu_pages);
         INIT_LIST_HEAD(&kvm->arch.assigned_dev_head);
 
+        /* Reserve bit 0 of irq_sources_bitmap for userspace irq source */
+        set_bit(KVM_USERSPACE_IRQ_SOURCE_ID, &kvm->arch.irq_sources_bitmap);
+
         return kvm;
 }
 
diff --git a/arch/x86/lguest/boot.c b/arch/x86/lguest/boot.c
index 48ee4f9435f4..a5d8e1ace1cf 100644
--- a/arch/x86/lguest/boot.c
+++ b/arch/x86/lguest/boot.c
@@ -367,10 +367,9 @@ static void lguest_cpuid(unsigned int *ax, unsigned int *bx,
  * lazily after a task switch, and Linux uses that gratefully, but wouldn't a
  * name like "FPUTRAP bit" be a little less cryptic?
  *
- * We store cr0 (and cr3) locally, because the Host never changes it.  The
- * Guest sometimes wants to read it and we'd prefer not to bother the Host
- * unnecessarily. */
-static unsigned long current_cr0, current_cr3;
+ * We store cr0 locally because the Host never changes it.  The Guest sometimes
+ * wants to read it and we'd prefer not to bother the Host unnecessarily. */
+static unsigned long current_cr0;
 static void lguest_write_cr0(unsigned long val)
 {
         lazy_hcall(LHCALL_TS, val & X86_CR0_TS, 0, 0);
@@ -399,17 +398,23 @@ static unsigned long lguest_read_cr2(void)
         return lguest_data.cr2;
 }
 
+/* See lguest_set_pte() below. */
+static bool cr3_changed = false;
+
 /* cr3 is the current toplevel pagetable page: the principle is the same as
- * cr0.  Keep a local copy, and tell the Host when it changes. */
+ * cr0.  Keep a local copy, and tell the Host when it changes.  The only
+ * difference is that our local copy is in lguest_data because the Host needs
+ * to set it upon our initial hypercall. */
 static void lguest_write_cr3(unsigned long cr3)
 {
+        lguest_data.pgdir = cr3;
         lazy_hcall(LHCALL_NEW_PGTABLE, cr3, 0, 0);
-        current_cr3 = cr3;
+        cr3_changed = true;
 }
 
 static unsigned long lguest_read_cr3(void)
 {
-        return current_cr3;
+        return lguest_data.pgdir;
 }
 
 /* cr4 is used to enable and disable PGE, but we don't care. */
@@ -498,13 +503,13 @@ static void lguest_set_pmd(pmd_t *pmdp, pmd_t pmdval)
  * to forget all of them.  Fortunately, this is very rare.
  *
  * ... except in early boot when the kernel sets up the initial pagetables,
- * which makes booting astonishingly slow.  So we don't even tell the Host
- * anything changed until we've done the first page table switch. */
+ * which makes booting astonishingly slow: 1.83 seconds!  So we don't even tell
+ * the Host anything changed until we've done the first page table switch,
+ * which brings boot back to 0.25 seconds. */
 static void lguest_set_pte(pte_t *ptep, pte_t pteval)
 {
         *ptep = pteval;
-        /* Don't bother with hypercall before initial setup. */
-        if (current_cr3)
+        if (cr3_changed)
                 lazy_hcall(LHCALL_FLUSH_TLB, 1, 0, 0);
 }
 
@@ -521,7 +526,7 @@ static void lguest_set_pte(pte_t *ptep, pte_t pteval)
 static void lguest_flush_tlb_single(unsigned long addr)
 {
         /* Simply set it to zero: if it was not, it will fault back in. */
-        lazy_hcall(LHCALL_SET_PTE, current_cr3, addr, 0);
+        lazy_hcall(LHCALL_SET_PTE, lguest_data.pgdir, addr, 0);
 }
 
 /* This is what happens after the Guest has removed a large number of entries.
@@ -581,6 +586,9 @@ static void __init lguest_init_IRQ(void)
 
         for (i = 0; i < LGUEST_IRQS; i++) {
                 int vector = FIRST_EXTERNAL_VECTOR + i;
+                /* Some systems map "vectors" to interrupts weirdly.  Lguest has
+                 * a straightforward 1 to 1 mapping, so force that here. */
+                __get_cpu_var(vector_irq)[vector] = i;
                 if (vector != SYSCALL_VECTOR) {
                         set_intr_gate(vector, interrupt[vector]);
                         set_irq_chip_and_handler_name(i, &lguest_irq_controller,
diff --git a/arch/x86/mach-voyager/voyager_smp.c b/arch/x86/mach-voyager/voyager_smp.c
index 0f6e8a6523ae..7f4c6af14351 100644
--- a/arch/x86/mach-voyager/voyager_smp.c
+++ b/arch/x86/mach-voyager/voyager_smp.c
@@ -90,6 +90,7 @@ static void ack_vic_irq(unsigned int irq);
 static void vic_enable_cpi(void);
 static void do_boot_cpu(__u8 cpuid);
 static void do_quad_bootstrap(void);
+static void initialize_secondary(void);
 
 int hard_smp_processor_id(void);
 int safe_smp_processor_id(void);
@@ -344,6 +345,12 @@ static void do_quad_bootstrap(void)
         }
 }
 
+void prefill_possible_map(void)
+{
+        /* This is empty on voyager because we need a much
+         * earlier detection which is done in find_smp_config */
+}
+
 /* Set up all the basic stuff: read the SMP config and make all the
  * SMP information reflect only the boot cpu.  All others will be
  * brought on-line later. */
@@ -413,6 +420,7 @@ void __init smp_store_cpu_info(int id)
         struct cpuinfo_x86 *c = &cpu_data(id);
 
         *c = boot_cpu_data;
+        c->cpu_index = id;
 
         identify_secondary_cpu(c);
 }
@@ -650,6 +658,8 @@ void __init smp_boot_cpus(void)
          smp_tune_scheduling();
          */
         smp_store_cpu_info(boot_cpu_id);
+        /* setup the jump vector */
+        initial_code = (unsigned long)initialize_secondary;
         printk("CPU%d: ", boot_cpu_id);
         print_cpu_info(&cpu_data(boot_cpu_id));
 
@@ -702,7 +712,7 @@ void __init smp_boot_cpus(void)
 
 /* Reload the secondary CPUs task structure (this function does not
  * return ) */
-void __init initialize_secondary(void)
+static void __init initialize_secondary(void)
 {
 #if 0
         // AC kernels only
diff --git a/arch/x86/mm/gup.c b/arch/x86/mm/gup.c
index 4ba373c5b8c8..be54176e9eb2 100644
--- a/arch/x86/mm/gup.c
+++ b/arch/x86/mm/gup.c
@@ -233,7 +233,7 @@ int get_user_pages_fast(unsigned long start, int nr_pages, int write,
         len = (unsigned long) nr_pages << PAGE_SHIFT;
         end = start + len;
         if (unlikely(!access_ok(write ? VERIFY_WRITE : VERIFY_READ,
-                                        start, len)))
+                                        (void __user *)start, len)))
                 goto slow_irqon;
 
         /*
diff --git a/arch/x86/mm/init_64.c b/arch/x86/mm/init_64.c
index b8e461d49412..9db01db6e3cd 100644
--- a/arch/x86/mm/init_64.c
+++ b/arch/x86/mm/init_64.c
@@ -350,8 +350,10 @@ phys_pte_init(pte_t *pte_page, unsigned long addr, unsigned long end,
                  * pagetable pages as RO. So assume someone who pre-setup
                  * these mappings are more intelligent.
                  */
-                if (pte_val(*pte))
+                if (pte_val(*pte)) {
+                        pages++;
                         continue;
+                }
 
                 if (0)
                         printk("   pte=%p addr=%lx pte=%016lx\n",
@@ -418,8 +420,10 @@ phys_pmd_init(pmd_t *pmd_page, unsigned long address, unsigned long end,
                          * not differ with respect to page frame and
                          * attributes.
                          */
-                        if (page_size_mask & (1 << PG_LEVEL_2M))
+                        if (page_size_mask & (1 << PG_LEVEL_2M)) {
+                                pages++;
                                 continue;
+                        }
                         new_prot = pte_pgprot(pte_clrhuge(*(pte_t *)pmd));
                 }
 
@@ -499,8 +503,10 @@ phys_pud_init(pud_t *pud_page, unsigned long addr, unsigned long end,
                          * not differ with respect to page frame and
                          * attributes.
                          */
-                        if (page_size_mask & (1 << PG_LEVEL_1G))
+                        if (page_size_mask & (1 << PG_LEVEL_1G)) {
+                                pages++;
                                 continue;
+                        }
                         prot = pte_pgprot(pte_clrhuge(*(pte_t *)pud));
                 }
 
@@ -665,12 +671,13 @@ unsigned long __init_refok init_memory_mapping(unsigned long start,
         unsigned long last_map_addr = 0;
         unsigned long page_size_mask = 0;
         unsigned long start_pfn, end_pfn;
+        unsigned long pos;
 
         struct map_range mr[NR_RANGE_MR];
         int nr_range, i;
         int use_pse, use_gbpages;
 
-        printk(KERN_INFO "init_memory_mapping\n");
+        printk(KERN_INFO "init_memory_mapping: %016lx-%016lx\n", start, end);
 
         /*
          * Find space for the kernel direct mapping tables.
@@ -704,35 +711,50 @@ unsigned long __init_refok init_memory_mapping(unsigned long start,
 
         /* head if not big page alignment ?*/
         start_pfn = start >> PAGE_SHIFT;
-        end_pfn = ((start + (PMD_SIZE - 1)) >> PMD_SHIFT)
+        pos = start_pfn << PAGE_SHIFT;
+        end_pfn = ((pos + (PMD_SIZE - 1)) >> PMD_SHIFT)
                         << (PMD_SHIFT - PAGE_SHIFT);
-        nr_range = save_mr(mr, nr_range, start_pfn, end_pfn, 0);
+        if (start_pfn < end_pfn) {
+                nr_range = save_mr(mr, nr_range, start_pfn, end_pfn, 0);
+                pos = end_pfn << PAGE_SHIFT;
+        }
 
         /* big page (2M) range*/
-        start_pfn = ((start + (PMD_SIZE - 1))>>PMD_SHIFT)
+        start_pfn = ((pos + (PMD_SIZE - 1))>>PMD_SHIFT)
                          << (PMD_SHIFT - PAGE_SHIFT);
-        end_pfn = ((start + (PUD_SIZE - 1))>>PUD_SHIFT)
+        end_pfn = ((pos + (PUD_SIZE - 1))>>PUD_SHIFT)
                          << (PUD_SHIFT - PAGE_SHIFT);
-        if (end_pfn > ((end>>PUD_SHIFT)<<(PUD_SHIFT - PAGE_SHIFT)))
-                end_pfn = ((end>>PUD_SHIFT)<<(PUD_SHIFT - PAGE_SHIFT));
-        nr_range = save_mr(mr, nr_range, start_pfn, end_pfn,
-                        page_size_mask & (1<<PG_LEVEL_2M));
+        if (end_pfn > ((end>>PMD_SHIFT)<<(PMD_SHIFT - PAGE_SHIFT)))
+                end_pfn = ((end>>PMD_SHIFT)<<(PMD_SHIFT - PAGE_SHIFT));
+        if (start_pfn < end_pfn) {
+                nr_range = save_mr(mr, nr_range, start_pfn, end_pfn,
+                                page_size_mask & (1<<PG_LEVEL_2M));
+                pos = end_pfn << PAGE_SHIFT;
+        }
 
         /* big page (1G) range */
-        start_pfn = end_pfn;
-        end_pfn = (end>>PUD_SHIFT) << (PUD_SHIFT - PAGE_SHIFT);
-        nr_range = save_mr(mr, nr_range, start_pfn, end_pfn,
+        start_pfn = ((pos + (PUD_SIZE - 1))>>PUD_SHIFT)
+                         << (PUD_SHIFT - PAGE_SHIFT);
+        end_pfn = (end >> PUD_SHIFT) << (PUD_SHIFT - PAGE_SHIFT);
+        if (start_pfn < end_pfn) {
+                nr_range = save_mr(mr, nr_range, start_pfn, end_pfn,
                                 page_size_mask &
                                  ((1<<PG_LEVEL_2M)|(1<<PG_LEVEL_1G)));
+                pos = end_pfn << PAGE_SHIFT;
+        }
 
         /* tail is not big page (1G) alignment */
-        start_pfn = end_pfn;
-        end_pfn = (end>>PMD_SHIFT) << (PMD_SHIFT - PAGE_SHIFT);
-        nr_range = save_mr(mr, nr_range, start_pfn, end_pfn,
-                        page_size_mask & (1<<PG_LEVEL_2M));
+        start_pfn = ((pos + (PMD_SIZE - 1))>>PMD_SHIFT)
+                         << (PMD_SHIFT - PAGE_SHIFT);
+        end_pfn = (end >> PMD_SHIFT) << (PMD_SHIFT - PAGE_SHIFT);
+        if (start_pfn < end_pfn) {
+                nr_range = save_mr(mr, nr_range, start_pfn, end_pfn,
+                                page_size_mask & (1<<PG_LEVEL_2M));
+                pos = end_pfn << PAGE_SHIFT;
+        }
 
         /* tail is not big page (2M) alignment */
-        start_pfn = end_pfn;
+        start_pfn = pos>>PAGE_SHIFT;
         end_pfn = end>>PAGE_SHIFT;
         nr_range = save_mr(mr, nr_range, start_pfn, end_pfn, 0);
 
@@ -831,12 +853,12 @@ int arch_add_memory(int nid, u64 start, u64 size)
         unsigned long nr_pages = size >> PAGE_SHIFT;
         int ret;
 
-        last_mapped_pfn = init_memory_mapping(start, start + size-1);
+        last_mapped_pfn = init_memory_mapping(start, start + size);
         if (last_mapped_pfn > max_pfn_mapped)
                 max_pfn_mapped = last_mapped_pfn;
 
         ret = __add_pages(zone, start_pfn, nr_pages);
-        WARN_ON(1);
+        WARN_ON_ONCE(ret);
 
         return ret;
 }
@@ -878,6 +900,7 @@ static struct kcore_list kcore_mem, kcore_vmalloc, kcore_kernel,
 void __init mem_init(void)
 {
         long codesize, reservedpages, datasize, initsize;
+        unsigned long absent_pages;
 
         start_periodic_check_for_corruption();
 
@@ -893,8 +916,9 @@ void __init mem_init(void)
 #else
         totalram_pages = free_all_bootmem();
 #endif
-        reservedpages = max_pfn - totalram_pages -
-                                        absent_pages_in_range(0, max_pfn);
+
+        absent_pages = absent_pages_in_range(0, max_pfn);
+        reservedpages = max_pfn - totalram_pages - absent_pages;
         after_bootmem = 1;
 
         codesize =  (unsigned long) &_etext - (unsigned long) &_text;
@@ -911,10 +935,11 @@ void __init mem_init(void)
                                  VSYSCALL_END - VSYSCALL_START);
 
         printk(KERN_INFO "Memory: %luk/%luk available (%ldk kernel code, "
-                                "%ldk reserved, %ldk data, %ldk init)\n",
+                         "%ldk absent, %ldk reserved, %ldk data, %ldk init)\n",
                 (unsigned long) nr_free_pages() << (PAGE_SHIFT-10),
                 max_pfn << (PAGE_SHIFT-10),
                 codesize >> 10,
+                absent_pages << (PAGE_SHIFT-10),
                 reservedpages << (PAGE_SHIFT-10),
                 datasize >> 10,
                 initsize >> 10);
diff --git a/arch/x86/mm/ioremap.c b/arch/x86/mm/ioremap.c
index ae71e11eb3e5..d4c4307ff3e0 100644
--- a/arch/x86/mm/ioremap.c
+++ b/arch/x86/mm/ioremap.c
@@ -387,7 +387,7 @@ static void __iomem *ioremap_default(resource_size_t phys_addr,
                                         unsigned long size)
 {
         unsigned long flags;
-        void *ret;
+        void __iomem *ret;
         int err;
 
         /*
@@ -399,11 +399,11 @@ static void __iomem *ioremap_default(resource_size_t phys_addr,
         if (err < 0)
                 return NULL;
 
-        ret = (void *) __ioremap_caller(phys_addr, size, flags,
-                                        __builtin_return_address(0));
+        ret = __ioremap_caller(phys_addr, size, flags,
+                               __builtin_return_address(0));
 
         free_memtype(phys_addr, phys_addr + size);
-        return (void __iomem *)ret;
+        return ret;
 }
 
 void __iomem *ioremap_prot(resource_size_t phys_addr, unsigned long size,
@@ -622,7 +622,7 @@ static inline void __init early_clear_fixmap(enum fixed_addresses idx)
                 __early_set_fixmap(idx, 0, __pgprot(0));
 }
 
-static void *prev_map[FIX_BTMAPS_SLOTS] __initdata;
+static void __iomem *prev_map[FIX_BTMAPS_SLOTS] __initdata;
 static unsigned long prev_size[FIX_BTMAPS_SLOTS] __initdata;
 static int __init check_early_ioremap_leak(void)
 {
@@ -645,7 +645,7 @@ static int __init check_early_ioremap_leak(void)
 }
 late_initcall(check_early_ioremap_leak);
 
-static void __init *__early_ioremap(unsigned long phys_addr, unsigned long size, pgprot_t prot)
+static void __init __iomem *__early_ioremap(unsigned long phys_addr, unsigned long size, pgprot_t prot)
 {
         unsigned long offset, last_addr;
         unsigned int nrpages;
@@ -713,23 +713,23 @@ static void __init *__early_ioremap(unsigned long phys_addr, unsigned long size,
         if (early_ioremap_debug)
                 printk(KERN_CONT "%08lx + %08lx\n", offset, fix_to_virt(idx0));
 
-        prev_map[slot] = (void *) (offset + fix_to_virt(idx0));
+        prev_map[slot] = (void __iomem *)(offset + fix_to_virt(idx0));
         return prev_map[slot];
 }
 
 /* Remap an IO device */
-void __init *early_ioremap(unsigned long phys_addr, unsigned long size)
+void __init __iomem *early_ioremap(unsigned long phys_addr, unsigned long size)
 {
         return __early_ioremap(phys_addr, size, PAGE_KERNEL_IO);
 }
 
 /* Remap memory */
-void __init *early_memremap(unsigned long phys_addr, unsigned long size)
+void __init __iomem *early_memremap(unsigned long phys_addr, unsigned long size)
 {
         return __early_ioremap(phys_addr, size, PAGE_KERNEL);
 }
 
-void __init early_iounmap(void *addr, unsigned long size)
+void __init early_iounmap(void __iomem *addr, unsigned long size)
 {
         unsigned long virt_addr;
         unsigned long offset;
@@ -779,7 +779,7 @@ void __init early_iounmap(void *addr, unsigned long size)
                 --idx;
                 --nrpages;
         }
-        prev_map[slot] = 0;
+        prev_map[slot] = NULL;
 }
 
 void __this_fixmap_does_not_exist(void)
diff --git a/arch/x86/mm/pat.c b/arch/x86/mm/pat.c
index 738fd0f24958..eb1bf000d12e 100644
--- a/arch/x86/mm/pat.c
+++ b/arch/x86/mm/pat.c
@@ -481,12 +481,16 @@ static inline int range_is_allowed(unsigned long pfn, unsigned long size)
         return 1;
 }
 #else
+/* This check is needed to avoid cache aliasing when PAT is enabled */
 static inline int range_is_allowed(unsigned long pfn, unsigned long size)
 {
         u64 from = ((u64)pfn) << PAGE_SHIFT;
         u64 to = from + size;
         u64 cursor = from;
 
+        if (!pat_enabled)
+                return 1;
+
         while (cursor < to) {
                 if (!devmem_is_allowed(pfn)) {
                         printk(KERN_INFO
diff --git a/arch/x86/xen/Makefile b/arch/x86/xen/Makefile
index 313947940a1a..6dcefba7836f 100644
--- a/arch/x86/xen/Makefile
+++ b/arch/x86/xen/Makefile
@@ -1,4 +1,4 @@
-ifdef CONFIG_FTRACE
+ifdef CONFIG_FUNCTION_TRACER
 # Do not profile debug and lowlevel utilities
 CFLAGS_REMOVE_spinlock.o = -pg
 CFLAGS_REMOVE_time.o = -pg
diff --git a/arch/x86/xen/mmu.c b/arch/x86/xen/mmu.c
index d4d52f5a1cf7..aba77b2b7d18 100644
--- a/arch/x86/xen/mmu.c
+++ b/arch/x86/xen/mmu.c
@@ -246,11 +246,21 @@ xmaddr_t arbitrary_virt_to_machine(void *vaddr)
 {
         unsigned long address = (unsigned long)vaddr;
         unsigned int level;
-        pte_t *pte = lookup_address(address, &level);
-        unsigned offset = address & ~PAGE_MASK;
+        pte_t *pte;
+        unsigned offset;
 
-        BUG_ON(pte == NULL);
+        /*
+         * if the PFN is in the linear mapped vaddr range, we can just use
+         * the (quick) virt_to_machine() p2m lookup
+         */
+        if (virt_addr_valid(vaddr))
+                return virt_to_machine(vaddr);
 
+        /* otherwise we have to do a (slower) full page-table walk */
+
+        pte = lookup_address(address, &level);
+        BUG_ON(pte == NULL);
+        offset = address & ~PAGE_MASK;
         return XMADDR(((phys_addr_t)pte_mfn(*pte) << PAGE_SHIFT) + offset);
 }
 
@@ -410,7 +420,7 @@ void xen_ptep_modify_prot_commit(struct mm_struct *mm, unsigned long addr,
 
         xen_mc_batch();
 
-        u.ptr = virt_to_machine(ptep).maddr | MMU_PT_UPDATE_PRESERVE_AD;
+        u.ptr = arbitrary_virt_to_machine(ptep).maddr | MMU_PT_UPDATE_PRESERVE_AD;
         u.val = pte_val_ma(pte);
         xen_extend_mmu_update(&u);