676 files changed, 9525 insertions, 12448 deletions

diff --git a/arch/Kconfig b/arch/Kconfig
index 1455579791ec..99f0e17df429 100644
--- a/arch/Kconfig
+++ b/arch/Kconfig
@@ -157,9 +157,6 @@ config ARCH_USE_BUILTIN_BSWAP
          instructions should set this. And it shouldn't hurt to set it
          on architectures that don't have such instructions.
 
-config HAVE_SYSCALL_WRAPPERS
-        bool
-
 config KRETPROBES
         def_bool y
         depends on KPROBES && HAVE_KRETPROBES
diff --git a/arch/alpha/Kconfig b/arch/alpha/Kconfig
index 8a33ba01301f..8629127640cf 100644
--- a/arch/alpha/Kconfig
+++ b/arch/alpha/Kconfig
@@ -4,7 +4,6 @@ config ALPHA
         select HAVE_AOUT
         select HAVE_IDE
         select HAVE_OPROFILE
-        select HAVE_SYSCALL_WRAPPERS
         select HAVE_PCSPKR_PLATFORM
         select HAVE_PERF_EVENTS
         select HAVE_DMA_ATTRS
diff --git a/arch/alpha/include/asm/linkage.h b/arch/alpha/include/asm/linkage.h
index 291c2d01c44f..7cfd06e8c935 100644
--- a/arch/alpha/include/asm/linkage.h
+++ b/arch/alpha/include/asm/linkage.h
@@ -1,6 +1,8 @@
 #ifndef __ASM_LINKAGE_H
 #define __ASM_LINKAGE_H
 
-/* Nothing to see here... */
+#define cond_syscall(x)  asm(".weak\t" #x "\n" #x " = sys_ni_syscall")
+#define SYSCALL_ALIAS(alias, name)                                      \
+        asm ( #alias " = " #name "\n\t.globl " #alias)
 
 #endif
diff --git a/arch/alpha/include/asm/thread_info.h b/arch/alpha/include/asm/thread_info.h
index 1f8c72959fb6..52cd2a4a3ff4 100644
--- a/arch/alpha/include/asm/thread_info.h
+++ b/arch/alpha/include/asm/thread_info.h
@@ -95,8 +95,6 @@ register struct thread_info *__current_thread_info __asm__("$8");
 #define TS_POLLING              0x0010  /* idle task polling need_resched,
                                            skip sending interrupt */
 
-#define tsk_is_polling(t) (task_thread_info(t)->status & TS_POLLING)
-
 #ifndef __ASSEMBLY__
 #define HAVE_SET_RESTORE_SIGMASK        1
 static inline void set_restore_sigmask(void)
diff --git a/arch/alpha/include/asm/unistd.h b/arch/alpha/include/asm/unistd.h
index 6d6fe7ab5473..43baee17acdf 100644
--- a/arch/alpha/include/asm/unistd.h
+++ b/arch/alpha/include/asm/unistd.h
@@ -18,16 +18,4 @@
 #define __ARCH_WANT_SYS_VFORK
 #define __ARCH_WANT_SYS_CLONE
 
-/* "Conditional" syscalls.  What we want is
-
-        __attribute__((weak,alias("sys_ni_syscall")))
-
-   but that raises the problem of what type to give the symbol.  If we use
-   a prototype, it'll conflict with the definition given in this file and
-   others.  If we use __typeof, we discover that not all symbols actually
-   have declarations.  If we use no prototype, then we get warnings from
-   -Wstrict-prototypes.  Ho hum.  */
-
-#define cond_syscall(x)  asm(".weak\t" #x "\n" #x " = sys_ni_syscall")
-
 #endif /* _ALPHA_UNISTD_H */
diff --git a/arch/alpha/kernel/process.c b/arch/alpha/kernel/process.c
index 63d27fb9b023..ab80a80d38a2 100644
--- a/arch/alpha/kernel/process.c
+++ b/arch/alpha/kernel/process.c
@@ -46,25 +46,6 @@
 void (*pm_power_off)(void) = machine_power_off;
 EXPORT_SYMBOL(pm_power_off);
 
-void
-cpu_idle(void)
-{
-        current_thread_info()->status |= TS_POLLING;
-
-        while (1) {
-                /* FIXME -- EV6 and LCA45 know how to power down
-                   the CPU.  */
-
-                rcu_idle_enter();
-                while (!need_resched())
-                        cpu_relax();
-
-                rcu_idle_exit();
-                schedule_preempt_disabled();
-        }
-}
-
-
 struct halt_info {
         int mode;
         char *restart_cmd;
@@ -194,6 +175,7 @@ machine_power_off(void)
 void
 show_regs(struct pt_regs *regs)
 {
+        show_regs_print_info(KERN_DEFAULT);
         dik_show_regs(regs, NULL);
 }
 
diff --git a/arch/alpha/kernel/smp.c b/arch/alpha/kernel/smp.c
index 9603bc234b47..7b60834fb4b2 100644
--- a/arch/alpha/kernel/smp.c
+++ b/arch/alpha/kernel/smp.c
@@ -167,8 +167,7 @@ smp_callin(void)
               cpuid, current, current->active_mm));
 
         preempt_disable();
-        /* Do nothing.  */
-        cpu_idle();
+        cpu_startup_entry(CPUHP_ONLINE);
 }
 
 /* Wait until hwrpb->txrdy is clear for cpu.  Return -1 on timeout.  */
diff --git a/arch/alpha/kernel/sys_nautilus.c b/arch/alpha/kernel/sys_nautilus.c
index 1383f8601a93..1d4aabfcf9a1 100644
--- a/arch/alpha/kernel/sys_nautilus.c
+++ b/arch/alpha/kernel/sys_nautilus.c
@@ -185,7 +185,6 @@ nautilus_machine_check(unsigned long vector, unsigned long la_ptr)
         mb();
 }
 
-extern void free_reserved_mem(void *, void *);
 extern void pcibios_claim_one_bus(struct pci_bus *);
 
 static struct resource irongate_io = {
@@ -239,8 +238,8 @@ nautilus_init_pci(void)
         if (pci_mem < memtop)
                 memtop = pci_mem;
         if (memtop > alpha_mv.min_mem_address) {
-                free_reserved_mem(__va(alpha_mv.min_mem_address),
-                                  __va(memtop));
+                free_reserved_area((unsigned long)__va(alpha_mv.min_mem_address),
+                                   (unsigned long)__va(memtop), 0, NULL);
                 printk("nautilus_init_pci: %ldk freed\n",
                         (memtop - alpha_mv.min_mem_address) >> 10);
         }
diff --git a/arch/alpha/kernel/traps.c b/arch/alpha/kernel/traps.c
index 4037461a6493..affccb959a9e 100644
--- a/arch/alpha/kernel/traps.c
+++ b/arch/alpha/kernel/traps.c
@@ -169,13 +169,6 @@ void show_stack(struct task_struct *task, unsigned long *sp)
         dik_show_trace(sp);
 }
 
-void dump_stack(void)
-{
-        show_stack(NULL, NULL);
-}
-
-EXPORT_SYMBOL(dump_stack);
-
 void
 die_if_kernel(char * str, struct pt_regs *regs, long err, unsigned long *r9_15)
 {
diff --git a/arch/alpha/mm/init.c b/arch/alpha/mm/init.c
index 1ad6ca74bed2..0ba85ee4a466 100644
--- a/arch/alpha/mm/init.c
+++ b/arch/alpha/mm/init.c
@@ -31,6 +31,7 @@
 #include <asm/console.h>
 #include <asm/tlb.h>
 #include <asm/setup.h>
+#include <asm/sections.h>
 
 extern void die_if_kernel(char *,struct pt_regs *,long);
 
@@ -281,8 +282,6 @@ printk_memory_info(void)
 {
         unsigned long codesize, reservedpages, datasize, initsize, tmp;
         extern int page_is_ram(unsigned long) __init;
-        extern char _text, _etext, _data, _edata;
-        extern char __init_begin, __init_end;
 
         /* printk all informations */
         reservedpages = 0;
@@ -318,32 +317,15 @@ mem_init(void)
 #endif /* CONFIG_DISCONTIGMEM */
 
 void
-free_reserved_mem(void *start, void *end)
-{
-        void *__start = start;
-        for (; __start < end; __start += PAGE_SIZE) {
-                ClearPageReserved(virt_to_page(__start));
-                init_page_count(virt_to_page(__start));
-                free_page((long)__start);
-                totalram_pages++;
-        }
-}
-
-void
 free_initmem(void)
 {
-        extern char __init_begin, __init_end;
-
-        free_reserved_mem(&__init_begin, &__init_end);
-        printk ("Freeing unused kernel memory: %ldk freed\n",
-                (&__init_end - &__init_begin) >> 10);
+        free_initmem_default(0);
 }
 
 #ifdef CONFIG_BLK_DEV_INITRD
 void
 free_initrd_mem(unsigned long start, unsigned long end)
 {
-        free_reserved_mem((void *)start, (void *)end);
-        printk ("Freeing initrd memory: %ldk freed\n", (end - start) >> 10);
+        free_reserved_area(start, end, 0, "initrd");
 }
 #endif
diff --git a/arch/alpha/mm/numa.c b/arch/alpha/mm/numa.c
index 3973ae395772..33885048fa36 100644
--- a/arch/alpha/mm/numa.c
+++ b/arch/alpha/mm/numa.c
@@ -17,6 +17,7 @@
 
 #include <asm/hwrpb.h>
 #include <asm/pgalloc.h>
+#include <asm/sections.h>
 
 pg_data_t node_data[MAX_NUMNODES];
 EXPORT_SYMBOL(node_data);
@@ -325,8 +326,6 @@ void __init mem_init(void)
 {
         unsigned long codesize, reservedpages, datasize, initsize, pfn;
         extern int page_is_ram(unsigned long) __init;
-        extern char _text, _etext, _data, _edata;
-        extern char __init_begin, __init_end;
         unsigned long nid, i;
         high_memory = (void *) __va(max_low_pfn << PAGE_SHIFT);
 
diff --git a/arch/arc/kernel/disasm.c b/arch/arc/kernel/disasm.c
index 2f390289a792..d14764ae2c60 100644
--- a/arch/arc/kernel/disasm.c
+++ b/arch/arc/kernel/disasm.c
@@ -535,4 +535,4 @@ int __kprobes disasm_next_pc(unsigned long pc, struct pt_regs *regs,
         return instr.is_branch;
 }
 
-#endif /* CONFIG_KGDB || CONFIG_MISALIGN_ACCESS || CONFIG_KPROBES */
+#endif /* CONFIG_KGDB || CONFIG_ARC_MISALIGN_ACCESS || CONFIG_KPROBES */
diff --git a/arch/arc/kernel/process.c b/arch/arc/kernel/process.c
index 0a7531d99294..cad66851e0c4 100644
--- a/arch/arc/kernel/process.c
+++ b/arch/arc/kernel/process.c
@@ -41,37 +41,12 @@ SYSCALL_DEFINE0(arc_gettls)
         return task_thread_info(current)->thr_ptr;
 }
 
-static inline void arch_idle(void)
+void arch_cpu_idle(void)
 {
         /* sleep, but enable all interrupts before committing */
         __asm__("sleep 0x3");
 }
 
-void cpu_idle(void)
-{
-        /* Since we SLEEP in idle loop, TIF_POLLING_NRFLAG can't be set */
-
-        /* endless idle loop with no priority at all */
-        while (1) {
-                tick_nohz_idle_enter();
-                rcu_idle_enter();
-
-doze:
-                local_irq_disable();
-                if (!need_resched()) {
-                        arch_idle();
-                        goto doze;
-                } else {
-                        local_irq_enable();
-                }
-
-                rcu_idle_exit();
-                tick_nohz_idle_exit();
-
-                schedule_preempt_disabled();
-        }
-}
-
 asmlinkage void ret_from_fork(void);
 
 /* Layout of Child kernel mode stack as setup at the end of this function is
diff --git a/arch/arc/kernel/smp.c b/arch/arc/kernel/smp.c
index 3af3e06dcf02..5c7fd603d216 100644
--- a/arch/arc/kernel/smp.c
+++ b/arch/arc/kernel/smp.c
@@ -141,7 +141,7 @@ void __cpuinit start_kernel_secondary(void)
 
         local_irq_enable();
         preempt_disable();
-        cpu_idle();
+        cpu_startup_entry(CPUHP_ONLINE);
 }
 
 /*
diff --git a/arch/arc/kernel/stacktrace.c b/arch/arc/kernel/stacktrace.c
index a63ff842564b..ca0207b9d5b6 100644
--- a/arch/arc/kernel/stacktrace.c
+++ b/arch/arc/kernel/stacktrace.c
@@ -220,13 +220,6 @@ void show_stack(struct task_struct *tsk, unsigned long *sp)
         show_stacktrace(tsk, NULL);
 }
 
-/* Expected by Rest of kernel code */
-void dump_stack(void)
-{
-        show_stacktrace(NULL, NULL);
-}
-EXPORT_SYMBOL(dump_stack);
-
 /* Another API expected by schedular, shows up in "ps" as Wait Channel
  * Ofcourse just returning schedule( ) would be pointless so unwind until
  * the function is not in schedular code
diff --git a/arch/arc/kernel/troubleshoot.c b/arch/arc/kernel/troubleshoot.c
index 7c10873c311f..0aec01985bf9 100644
--- a/arch/arc/kernel/troubleshoot.c
+++ b/arch/arc/kernel/troubleshoot.c
@@ -71,7 +71,7 @@ void print_task_path_n_nm(struct task_struct *tsk, char *buf)
         }
 
 done:
-        pr_info("%s, TGID %u\n", path_nm, tsk->tgid);
+        pr_info("Path: %s\n", path_nm);
 }
 EXPORT_SYMBOL(print_task_path_n_nm);
 
@@ -163,6 +163,7 @@ void show_regs(struct pt_regs *regs)
                 return;
 
         print_task_path_n_nm(tsk, buf);
+        show_regs_print_info(KERN_INFO);
 
         if (current->thread.cause_code)
                 show_ecr_verbose(regs);
diff --git a/arch/arc/mm/init.c b/arch/arc/mm/init.c
index caf797de23fc..727d4794ea0f 100644
--- a/arch/arc/mm/init.c
+++ b/arch/arc/mm/init.c
@@ -144,37 +144,18 @@ void __init mem_init(void)
                 PAGES_TO_KB(reserved_pages));
 }
 
-static void __init free_init_pages(const char *what, unsigned long begin,
-                                   unsigned long end)
-{
-        unsigned long addr;
-
-        pr_info("Freeing %s: %ldk [%lx] to [%lx]\n",
-                what, TO_KB(end - begin), begin, end);
-
-        /* need to check that the page we free is not a partial page */
-        for (addr = begin; addr + PAGE_SIZE <= end; addr += PAGE_SIZE) {
-                ClearPageReserved(virt_to_page(addr));
-                init_page_count(virt_to_page(addr));
-                free_page(addr);
-                totalram_pages++;
-        }
-}
-
 /*
  * free_initmem: Free all the __init memory.
  */
 void __init_refok free_initmem(void)
 {
-        free_init_pages("unused kernel memory",
-                        (unsigned long)__init_begin,
-                        (unsigned long)__init_end);
+        free_initmem_default(0);
 }
 
 #ifdef CONFIG_BLK_DEV_INITRD
 void __init free_initrd_mem(unsigned long start, unsigned long end)
 {
-        free_init_pages("initrd memory", start, end);
+        free_reserved_area(start, end, 0, "initrd");
 }
 #endif
 
diff --git a/arch/arc/plat-arcfpga/Kconfig b/arch/arc/plat-arcfpga/Kconfig
index b41e786cdbc0..295cefeb25d3 100644
--- a/arch/arc/plat-arcfpga/Kconfig
+++ b/arch/arc/plat-arcfpga/Kconfig
@@ -53,7 +53,7 @@ menuconfig ARC_HAS_BVCI_LAT_UNIT
         bool "BVCI Bus Latency Unit"
         depends on ARC_BOARD_ML509 || ARC_BOARD_ANGEL4
         help
-          IP to add artifical latency to BVCI Bus Based FPGA builds.
+          IP to add artificial latency to BVCI Bus Based FPGA builds.
           The default latency (even worst case) for FPGA is non-realistic
           (~10 SDRAM, ~5 SSRAM).
 
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 1cacda426a0e..006f9838dd43 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -15,6 +15,7 @@ config ARM
         select GENERIC_IRQ_SHOW
         select GENERIC_PCI_IOMAP
         select GENERIC_SMP_IDLE_THREAD
+        select GENERIC_IDLE_POLL_SETUP
         select GENERIC_STRNCPY_FROM_USER
         select GENERIC_STRNLEN_USER
         select HARDIRQS_SW_RESEND
@@ -549,6 +550,8 @@ config ARCH_IXP4XX
         select GENERIC_CLOCKEVENTS
         select MIGHT_HAVE_PCI
         select NEED_MACH_IO_H
+        select USB_EHCI_BIG_ENDIAN_MMIO
+        select USB_EHCI_BIG_ENDIAN_DESC
         help
           Support for Intel's IXP4XX (XScale) family of processors.
 
@@ -2160,7 +2163,6 @@ endmenu
 menu "CPU Power Management"
 
 if ARCH_HAS_CPUFREQ
-
 source "drivers/cpufreq/Kconfig"
 
 config CPU_FREQ_IMX
@@ -2170,30 +2172,6 @@ config CPU_FREQ_IMX
         help
           This enables the CPUfreq driver for i.MX CPUs.
 
-config CPU_FREQ_SA1100
-        bool
-
-config CPU_FREQ_SA1110
-        bool
-
-config CPU_FREQ_INTEGRATOR
-        tristate "CPUfreq driver for ARM Integrator CPUs"
-        depends on ARCH_INTEGRATOR && CPU_FREQ
-        default y
-        help
-          This enables the CPUfreq driver for ARM Integrator CPUs.
-
-          For details, take a look at <file:Documentation/cpu-freq>.
-
-          If in doubt, say Y.
-
-config CPU_FREQ_PXA
-        bool
-        depends on CPU_FREQ && ARCH_PXA && PXA25x
-        default y
-        select CPU_FREQ_DEFAULT_GOV_USERSPACE
-        select CPU_FREQ_TABLE
-
 config CPU_FREQ_S3C
         bool
         help
diff --git a/arch/arm/boot/dts/at91sam9260.dtsi b/arch/arm/boot/dts/at91sam9260.dtsi
index cb7bcc51608d..39253b9aedd1 100644
--- a/arch/arm/boot/dts/at91sam9260.dtsi
+++ b/arch/arm/boot/dts/at91sam9260.dtsi
@@ -322,6 +322,24 @@
                                         };
                                 };
 
+                                spi0 {
+                                        pinctrl_spi0: spi0-0 {
+                                                atmel,pins =
+                                                        <0 0 0x1 0x0    /* PA0 periph A SPI0_MISO pin */
+                                                         0 1 0x1 0x0    /* PA1 periph A SPI0_MOSI pin */
+                                                         0 2 0x1 0x0>;  /* PA2 periph A SPI0_SPCK pin */
+                                        };
+                                };
+
+                                spi1 {
+                                        pinctrl_spi1: spi1-0 {
+                                                atmel,pins =
+                                                        <1 0 0x1 0x0    /* PB0 periph A SPI1_MISO pin */
+                                                         1 1 0x1 0x0    /* PB1 periph A SPI1_MOSI pin */
+                                                         1 2 0x1 0x0>;  /* PB2 periph A SPI1_SPCK pin */
+                                        };
+                                };
+
                                 pioA: gpio@fffff400 {
                                         compatible = "atmel,at91rm9200-gpio";
                                         reg = <0xfffff400 0x200>;
@@ -471,6 +489,28 @@
                                 status = "disabled";
                         };
 
+                        spi0: spi@fffc8000 {
+                                #address-cells = <1>;
+                                #size-cells = <0>;
+                                compatible = "atmel,at91rm9200-spi";
+                                reg = <0xfffc8000 0x200>;
+                                interrupts = <12 4 3>;
+                                pinctrl-names = "default";
+                                pinctrl-0 = <&pinctrl_spi0>;
+                                status = "disabled";
+                        };
+
+                        spi1: spi@fffcc000 {
+                                #address-cells = <1>;
+                                #size-cells = <0>;
+                                compatible = "atmel,at91rm9200-spi";
+                                reg = <0xfffcc000 0x200>;
+                                interrupts = <13 4 3>;
+                                pinctrl-names = "default";
+                                pinctrl-0 = <&pinctrl_spi1>;
+                                status = "disabled";
+                        };
+
                         adc0: adc@fffe0000 {
                                 compatible = "atmel,at91sam9260-adc";
                                 reg = <0xfffe0000 0x100>;
diff --git a/arch/arm/boot/dts/at91sam9263.dtsi b/arch/arm/boot/dts/at91sam9263.dtsi
index 271d4de026e9..94b58ab2cc08 100644
--- a/arch/arm/boot/dts/at91sam9263.dtsi
+++ b/arch/arm/boot/dts/at91sam9263.dtsi
@@ -303,6 +303,24 @@
                                         };
                                 };
 
+                                spi0 {
+                                        pinctrl_spi0: spi0-0 {
+                                                atmel,pins =
+                                                        <0 0 0x2 0x0    /* PA0 periph B SPI0_MISO pin */
+                                                         0 1 0x2 0x0    /* PA1 periph B SPI0_MOSI pin */
+                                                         0 2 0x2 0x0>;  /* PA2 periph B SPI0_SPCK pin */
+                                        };
+                                };
+
+                                spi1 {
+                                        pinctrl_spi1: spi1-0 {
+                                                atmel,pins =
+                                                        <1 12 0x1 0x0   /* PB12 periph A SPI1_MISO pin */
+                                                         1 13 0x1 0x0   /* PB13 periph A SPI1_MOSI pin */
+                                                         1 14 0x1 0x0>; /* PB14 periph A SPI1_SPCK pin */
+                                        };
+                                };
+
                                 pioA: gpio@fffff200 {
                                         compatible = "atmel,at91rm9200-gpio";
                                         reg = <0xfffff200 0x200>;
@@ -462,6 +480,28 @@
                                 reg = <0xfffffd40 0x10>;
                                 status = "disabled";
                         };
+
+                        spi0: spi@fffa4000 {
+                                #address-cells = <1>;
+                                #size-cells = <0>;
+                                compatible = "atmel,at91rm9200-spi";
+                                reg = <0xfffa4000 0x200>;
+                                interrupts = <14 4 3>;
+                                pinctrl-names = "default";
+                                pinctrl-0 = <&pinctrl_spi0>;
+                                status = "disabled";
+                        };
+
+                        spi1: spi@fffa8000 {
+                                #address-cells = <1>;
+                                #size-cells = <0>;
+                                compatible = "atmel,at91rm9200-spi";
+                                reg = <0xfffa8000 0x200>;
+                                interrupts = <15 4 3>;
+                                pinctrl-names = "default";
+                                pinctrl-0 = <&pinctrl_spi1>;
+                                status = "disabled";
+                        };
                 };
 
                 nand0: nand@40000000 {
diff --git a/arch/arm/boot/dts/at91sam9263ek.dts b/arch/arm/boot/dts/at91sam9263ek.dts
index 1eb08728f527..a14e424b2e81 100644
--- a/arch/arm/boot/dts/at91sam9263ek.dts
+++ b/arch/arm/boot/dts/at91sam9263ek.dts
@@ -79,6 +79,16 @@
                                         };
                                 };
                         };
+
+                        spi0: spi@fffa4000 {
+                                status = "okay";
+                                cs-gpios = <&pioA 5 0>, <0>, <0>, <0>;
+                                mtd_dataflash@0 {
+                                        compatible = "atmel,at45", "atmel,dataflash";
+                                        spi-max-frequency = <50000000>;
+                                        reg = <0>;
+                                };
+                        };
                 };
 
                 nand0: nand@40000000 {
diff --git a/arch/arm/boot/dts/at91sam9g20ek_common.dtsi b/arch/arm/boot/dts/at91sam9g20ek_common.dtsi
index da15e83e7f17..23d1f468f27f 100644
--- a/arch/arm/boot/dts/at91sam9g20ek_common.dtsi
+++ b/arch/arm/boot/dts/at91sam9g20ek_common.dtsi
@@ -96,6 +96,16 @@
                                 status = "okay";
                                 pinctrl-0 = <&pinctrl_ssc0_tx>;
                         };
+
+                        spi0: spi@fffc8000 {
+                                status = "okay";
+                                cs-gpios = <0>, <&pioC 11 0>, <0>, <0>;
+                                mtd_dataflash@0 {
+                                        compatible = "atmel,at45", "atmel,dataflash";
+                                        spi-max-frequency = <50000000>;
+                                        reg = <1>;
+                                };
+                        };
                 };
 
                 nand0: nand@40000000 {
diff --git a/arch/arm/boot/dts/at91sam9g45.dtsi b/arch/arm/boot/dts/at91sam9g45.dtsi
index 6b1d4cab24c2..cfdf429578b5 100644
--- a/arch/arm/boot/dts/at91sam9g45.dtsi
+++ b/arch/arm/boot/dts/at91sam9g45.dtsi
@@ -322,6 +322,24 @@
                                         };
                                 };
 
+                                spi0 {
+                                        pinctrl_spi0: spi0-0 {
+                                                atmel,pins =
+                                                        <1 0 0x1 0x0    /* PB0 periph A SPI0_MISO pin */
+                                                         1 1 0x1 0x0    /* PB1 periph A SPI0_MOSI pin */
+                                                         1 2 0x1 0x0>;  /* PB2 periph A SPI0_SPCK pin */
+                                        };
+                                };
+
+                                spi1 {
+                                        pinctrl_spi1: spi1-0 {
+                                                atmel,pins =
+                                                        <1 14 0x1 0x0   /* PB14 periph A SPI1_MISO pin */
+                                                         1 15 0x1 0x0   /* PB15 periph A SPI1_MOSI pin */
+                                                         1 16 0x1 0x0>; /* PB16 periph A SPI1_SPCK pin */
+                                        };
+                                };
+
                                 pioA: gpio@fffff200 {
                                         compatible = "atmel,at91rm9200-gpio";
                                         reg = <0xfffff200 0x200>;
@@ -531,6 +549,28 @@
                                 reg = <0xfffffd40 0x10>;
                                 status = "disabled";
                         };
+
+                        spi0: spi@fffa4000 {
+                                #address-cells = <1>;
+                                #size-cells = <0>;
+                                compatible = "atmel,at91rm9200-spi";
+                                reg = <0xfffa4000 0x200>;
+                                interrupts = <14 4 3>;
+                                pinctrl-names = "default";
+                                pinctrl-0 = <&pinctrl_spi0>;
+                                status = "disabled";
+                        };
+
+                        spi1: spi@fffa8000 {
+                                #address-cells = <1>;
+                                #size-cells = <0>;
+                                compatible = "atmel,at91rm9200-spi";
+                                reg = <0xfffa8000 0x200>;
+                                interrupts = <15 4 3>;
+                                pinctrl-names = "default";
+                                pinctrl-0 = <&pinctrl_spi1>;
+                                status = "disabled";
+                        };
                 };
 
                 nand0: nand@40000000 {
diff --git a/arch/arm/boot/dts/at91sam9m10g45ek.dts b/arch/arm/boot/dts/at91sam9m10g45ek.dts
index 20c31913c270..92c52a7d70bc 100644
--- a/arch/arm/boot/dts/at91sam9m10g45ek.dts
+++ b/arch/arm/boot/dts/at91sam9m10g45ek.dts
@@ -102,6 +102,16 @@
                                         };
                                 };
                         };
+
+                        spi0: spi@fffa4000{
+                                status = "okay";
+                                cs-gpios = <&pioB 3 0>, <0>, <0>, <0>;
+                                mtd_dataflash@0 {
+                                        compatible = "atmel,at45", "atmel,dataflash";
+                                        spi-max-frequency = <13000000>;
+                                        reg = <0>;
+                                };
+                        };
                 };
 
                 nand0: nand@40000000 {
diff --git a/arch/arm/boot/dts/at91sam9n12.dtsi b/arch/arm/boot/dts/at91sam9n12.dtsi
index 7750f98dd764..b2961f1ea51b 100644
--- a/arch/arm/boot/dts/at91sam9n12.dtsi
+++ b/arch/arm/boot/dts/at91sam9n12.dtsi
@@ -261,6 +261,24 @@
                                         };
                                 };
 
+                                spi0 {
+                                        pinctrl_spi0: spi0-0 {
+                                                atmel,pins =
+                                                        <0 11 0x1 0x0   /* PA11 periph A SPI0_MISO pin */
+                                                         0 12 0x1 0x0   /* PA12 periph A SPI0_MOSI pin */
+                                                         0 13 0x1 0x0>; /* PA13 periph A SPI0_SPCK pin */
+                                        };
+                                };
+
+                                spi1 {
+                                        pinctrl_spi1: spi1-0 {
+                                                atmel,pins =
+                                                        <0 21 0x2 0x0   /* PA21 periph B SPI1_MISO pin */
+                                                         0 22 0x2 0x0   /* PA22 periph B SPI1_MOSI pin */
+                                                         0 23 0x2 0x0>; /* PA23 periph B SPI1_SPCK pin */
+                                        };
+                                };
+
                                 pioA: gpio@fffff400 {
                                         compatible = "atmel,at91sam9x5-gpio", "atmel,at91rm9200-gpio";
                                         reg = <0xfffff400 0x200>;
@@ -373,6 +391,28 @@
                                 #size-cells = <0>;
                                 status = "disabled";
                         };
+
+                        spi0: spi@f0000000 {
+                                #address-cells = <1>;
+                                #size-cells = <0>;
+                                compatible = "atmel,at91rm9200-spi";
+                                reg = <0xf0000000 0x100>;
+                                interrupts = <13 4 3>;
+                                pinctrl-names = "default";
+                                pinctrl-0 = <&pinctrl_spi0>;
+                                status = "disabled";
+                        };
+
+                        spi1: spi@f0004000 {
+                                #address-cells = <1>;
+                                #size-cells = <0>;
+                                compatible = "atmel,at91rm9200-spi";
+                                reg = <0xf0004000 0x100>;
+                                interrupts = <14 4 3>;
+                                pinctrl-names = "default";
+                                pinctrl-0 = <&pinctrl_spi1>;
+                                status = "disabled";
+                        };
                 };
 
                 nand0: nand@40000000 {
diff --git a/arch/arm/boot/dts/at91sam9n12ek.dts b/arch/arm/boot/dts/at91sam9n12ek.dts
index d400f8de4387..34c842b1efb2 100644
--- a/arch/arm/boot/dts/at91sam9n12ek.dts
+++ b/arch/arm/boot/dts/at91sam9n12ek.dts
@@ -67,6 +67,16 @@
                                         };
                                 };
                         };
+
+                        spi0: spi@f0000000 {
+                                status = "okay";
+                                cs-gpios = <&pioA 14 0>, <0>, <0>, <0>;
+                                m25p80@0 {
+                                        compatible = "atmel,at25df321a";
+                                        spi-max-frequency = <50000000>;
+                                        reg = <0>;
+                                };
+                        };
                 };
 
                 nand0: nand@40000000 {
diff --git a/arch/arm/boot/dts/at91sam9x5.dtsi b/arch/arm/boot/dts/at91sam9x5.dtsi
index a98c0d50fbbe..347b438d47fa 100644
--- a/arch/arm/boot/dts/at91sam9x5.dtsi
+++ b/arch/arm/boot/dts/at91sam9x5.dtsi
@@ -343,6 +343,24 @@
                                         };
                                 };
 
+                                spi0 {
+                                        pinctrl_spi0: spi0-0 {
+                                                atmel,pins =
+                                                        <0 11 0x1 0x0   /* PA11 periph A SPI0_MISO pin */
+                                                         0 12 0x1 0x0   /* PA12 periph A SPI0_MOSI pin */
+                                                         0 13 0x1 0x0>; /* PA13 periph A SPI0_SPCK pin */
+                                        };
+                                };
+
+                                spi1 {
+                                        pinctrl_spi1: spi1-0 {
+                                                atmel,pins =
+                                                        <0 21 0x2 0x0   /* PA21 periph B SPI1_MISO pin */
+                                                         0 22 0x2 0x0   /* PA22 periph B SPI1_MOSI pin */
+                                                         0 23 0x2 0x0>; /* PA23 periph B SPI1_SPCK pin */
+                                        };
+                                };
+
                                 pioA: gpio@fffff400 {
                                         compatible = "atmel,at91sam9x5-gpio", "atmel,at91rm9200-gpio";
                                         reg = <0xfffff400 0x200>;
@@ -529,6 +547,28 @@
                                         trigger-value = <0x6>;
                                 };
                         };
+
+                        spi0: spi@f0000000 {
+                                #address-cells = <1>;
+                                #size-cells = <0>;
+                                compatible = "atmel,at91rm9200-spi";
+                                reg = <0xf0000000 0x100>;
+                                interrupts = <13 4 3>;
+                                pinctrl-names = "default";
+                                pinctrl-0 = <&pinctrl_spi0>;
+                                status = "disabled";
+                        };
+
+                        spi1: spi@f0004000 {
+                                #address-cells = <1>;
+                                #size-cells = <0>;
+                                compatible = "atmel,at91rm9200-spi";
+                                reg = <0xf0004000 0x100>;
+                                interrupts = <14 4 3>;
+                                pinctrl-names = "default";
+                                pinctrl-0 = <&pinctrl_spi1>;
+                                status = "disabled";
+                        };
                 };
 
                 nand0: nand@40000000 {
diff --git a/arch/arm/boot/dts/at91sam9x5ek.dtsi b/arch/arm/boot/dts/at91sam9x5ek.dtsi
index 8a7cf1d9cf5d..09f5e667ca7a 100644
--- a/arch/arm/boot/dts/at91sam9x5ek.dtsi
+++ b/arch/arm/boot/dts/at91sam9x5ek.dtsi
@@ -84,6 +84,16 @@
                                         };
                                 };
                         };
+
+                        spi0: spi@f0000000 {
+                                status = "okay";
+                                cs-gpios = <&pioA 14 0>, <0>, <0>, <0>;
+                                m25p80@0 {
+                                        compatible = "atmel,at25df321a";
+                                        spi-max-frequency = <50000000>;
+                                        reg = <0>;
+                                };
+                        };
                 };
 
                 usb0: ohci@00600000 {
diff --git a/arch/arm/boot/dts/msm8660-surf.dts b/arch/arm/boot/dts/msm8660-surf.dts
index 31f2157cd7d7..67f8670c4d6a 100644
--- a/arch/arm/boot/dts/msm8660-surf.dts
+++ b/arch/arm/boot/dts/msm8660-surf.dts
@@ -38,4 +38,10 @@
                       <0x19c00000 0x1000>;
                 interrupts = <0 195 0x0>;
         };
+
+        qcom,ssbi@500000 {
+                compatible = "qcom,ssbi";
+                reg = <0x500000 0x1000>;
+                qcom,controller-type = "pmic-arbiter";
+        };
 };
diff --git a/arch/arm/boot/dts/msm8960-cdp.dts b/arch/arm/boot/dts/msm8960-cdp.dts
index 9e621b5ad3dd..c9b09a813a4b 100644
--- a/arch/arm/boot/dts/msm8960-cdp.dts
+++ b/arch/arm/boot/dts/msm8960-cdp.dts
@@ -38,4 +38,10 @@
                       <0x16400000 0x1000>;
                 interrupts = <0 154 0x0>;
         };
+
+        qcom,ssbi@500000 {
+                compatible = "qcom,ssbi";
+                reg = <0x500000 0x1000>;
+                qcom,controller-type = "pmic-arbiter";
+        };
 };
diff --git a/arch/arm/boot/dts/spear1310.dtsi b/arch/arm/boot/dts/spear1310.dtsi
index 1513c1927cc8..122ae94076c8 100644
--- a/arch/arm/boot/dts/spear1310.dtsi
+++ b/arch/arm/boot/dts/spear1310.dtsi
@@ -89,7 +89,7 @@
                 pinmux: pinmux@e0700000 {
                         compatible = "st,spear1310-pinmux";
                         reg = <0xe0700000 0x1000>;
-                        #gpio-range-cells = <2>;
+                        #gpio-range-cells = <3>;
                 };
 
                 apb {
@@ -212,7 +212,7 @@
                                 interrupt-controller;
                                 gpio-controller;
                                 #gpio-cells = <2>;
-                                gpio-ranges = <&pinmux 0 246>;
+                                gpio-ranges = <&pinmux 0 0 246>;
                                 status = "disabled";
 
                                 st-plgpio,ngpio = <246>;
diff --git a/arch/arm/boot/dts/spear1340.dtsi b/arch/arm/boot/dts/spear1340.dtsi
index 34da11aa6795..c511c4772efd 100644
--- a/arch/arm/boot/dts/spear1340.dtsi
+++ b/arch/arm/boot/dts/spear1340.dtsi
@@ -63,7 +63,7 @@
                 pinmux: pinmux@e0700000 {
                         compatible = "st,spear1340-pinmux";
                         reg = <0xe0700000 0x1000>;
-                        #gpio-range-cells = <2>;
+                        #gpio-range-cells = <3>;
                 };
 
                 pwm: pwm@e0180000 {
@@ -127,7 +127,7 @@
                                 interrupt-controller;
                                 gpio-controller;
                                 #gpio-cells = <2>;
-                                gpio-ranges = <&pinmux 0 252>;
+                                gpio-ranges = <&pinmux 0 0 252>;
                                 status = "disabled";
 
                                 st-plgpio,ngpio = <250>;
diff --git a/arch/arm/boot/dts/spear310.dtsi b/arch/arm/boot/dts/spear310.dtsi
index ab45b8c81982..95372080eea6 100644
--- a/arch/arm/boot/dts/spear310.dtsi
+++ b/arch/arm/boot/dts/spear310.dtsi
@@ -25,7 +25,7 @@
                 pinmux: pinmux@b4000000 {
                         compatible = "st,spear310-pinmux";
                         reg = <0xb4000000 0x1000>;
-                        #gpio-range-cells = <2>;
+                        #gpio-range-cells = <3>;
                 };
 
                 fsmc: flash@44000000 {
@@ -102,7 +102,7 @@
                                 interrupt-controller;
                                 gpio-controller;
                                 #gpio-cells = <2>;
-                                gpio-ranges = <&pinmux 0 102>;
+                                gpio-ranges = <&pinmux 0 0 102>;
                                 status = "disabled";
 
                                 st-plgpio,ngpio = <102>;
diff --git a/arch/arm/boot/dts/spear320.dtsi b/arch/arm/boot/dts/spear320.dtsi
index caa5520b1fd4..ffea342aeec9 100644
--- a/arch/arm/boot/dts/spear320.dtsi
+++ b/arch/arm/boot/dts/spear320.dtsi
@@ -24,7 +24,7 @@
                 pinmux: pinmux@b3000000 {
                         compatible = "st,spear320-pinmux";
                         reg = <0xb3000000 0x1000>;
-                        #gpio-range-cells = <2>;
+                        #gpio-range-cells = <3>;
                 };
 
                 clcd@90000000 {
@@ -130,7 +130,7 @@
                                 interrupt-controller;
                                 gpio-controller;
                                 #gpio-cells = <2>;
-                                gpio-ranges = <&pinmux 0 102>;
+                                gpio-ranges = <&pinmux 0 0 102>;
                                 status = "disabled";
 
                                 st-plgpio,ngpio = <102>;
diff --git a/arch/arm/boot/dts/vt8500-bv07.dts b/arch/arm/boot/dts/vt8500-bv07.dts
index 567cf4e8ab84..877b33afa7ed 100644
--- a/arch/arm/boot/dts/vt8500-bv07.dts
+++ b/arch/arm/boot/dts/vt8500-bv07.dts
@@ -11,26 +11,22 @@
 
 / {
         model = "Benign BV07 Netbook";
+};
 
-        /*
-         * Display node is based on Sascha Hauer's patch on dri-devel.
-         * Added a bpp property to calculate the size of the framebuffer
-         * until the binding is formalized.
-         */
-        display: display@0 {
-                modes {
-                        mode0: mode@0 {
-                                hactive = <800>;
-                                vactive = <480>;
-                                hback-porch = <88>;
-                                hfront-porch = <40>;
-                                hsync-len = <0>;
-                                vback-porch = <32>;
-                                vfront-porch = <11>;
-                                vsync-len = <1>;
-                                clock = <0>;    /* unused but required */
-                                bpp = <16>;     /* non-standard but required */
-                        };
+&fb {
+        bits-per-pixel = <16>;
+        display-timings {
+                native-mode = <&timing0>;
+                timing0: 800x480 {
+                        clock-frequency = <0>; /* unused but required */
+                        hactive = <800>;
+                        vactive = <480>;
+                        hfront-porch = <40>;
+                        hback-porch = <88>;
+                        hsync-len = <0>;
+                        vback-porch = <32>;
+                        vfront-porch = <11>;
+                        vsync-len = <1>;
                 };
         };
 };
diff --git a/arch/arm/boot/dts/vt8500.dtsi b/arch/arm/boot/dts/vt8500.dtsi
index cf31ced46602..68c8dc644383 100644
--- a/arch/arm/boot/dts/vt8500.dtsi
+++ b/arch/arm/boot/dts/vt8500.dtsi
@@ -98,12 +98,10 @@
                         interrupts = <43>;
                 };
 
-                fb@d800e400 {
+                fb: fb@d8050800 {
                         compatible = "via,vt8500-fb";
                         reg = <0xd800e400 0x400>;
                         interrupts = <12>;
-                        display = <&display>;
-                        default-mode = <&mode0>;
                 };
 
                 ge_rops@d8050400 {
diff --git a/arch/arm/boot/dts/wm8505-ref.dts b/arch/arm/boot/dts/wm8505-ref.dts
index fd4e248074c6..edd2cec3d37f 100644
--- a/arch/arm/boot/dts/wm8505-ref.dts
+++ b/arch/arm/boot/dts/wm8505-ref.dts
@@ -11,26 +11,22 @@
 
 / {
         model = "Wondermedia WM8505 Netbook";
+};
 
-        /*
-         * Display node is based on Sascha Hauer's patch on dri-devel.
-         * Added a bpp property to calculate the size of the framebuffer
-         * until the binding is formalized.
-         */
-        display: display@0 {
-                modes {
-                        mode0: mode@0 {
-                                hactive = <800>;
-                                vactive = <480>;
-                                hback-porch = <88>;
-                                hfront-porch = <40>;
-                                hsync-len = <0>;
-                                vback-porch = <32>;
-                                vfront-porch = <11>;
-                                vsync-len = <1>;
-                                clock = <0>;    /* unused but required */
-                                bpp = <32>;     /* non-standard but required */
-                        };
+&fb {
+        bits-per-pixel = <32>;
+        display-timings {
+                native-mode = <&timing0>;
+                timing0: 800x480 {
+                        clock-frequency = <0>; /* unused but required */
+                        hactive = <800>;
+                        vactive = <480>;
+                        hfront-porch = <40>;
+                        hback-porch = <88>;
+                        hsync-len = <0>;
+                        vback-porch = <32>;
+                        vfront-porch = <11>;
+                        vsync-len = <1>;
                 };
         };
 };
diff --git a/arch/arm/boot/dts/wm8505.dtsi b/arch/arm/boot/dts/wm8505.dtsi
index e74a1c0fb9a2..bcf668d31b28 100644
--- a/arch/arm/boot/dts/wm8505.dtsi
+++ b/arch/arm/boot/dts/wm8505.dtsi
@@ -128,11 +128,9 @@
                         interrupts = <0>;
                 };
 
-                fb@d8050800 {
+                fb: fb@d8050800 {
                         compatible = "wm,wm8505-fb";
                         reg = <0xd8050800 0x200>;
-                        display = <&display>;
-                        default-mode = <&mode0>;
                 };
 
                 ge_rops@d8050400 {
diff --git a/arch/arm/boot/dts/wm8650-mid.dts b/arch/arm/boot/dts/wm8650-mid.dts
index cefd938f842f..61671a0d9ede 100644
--- a/arch/arm/boot/dts/wm8650-mid.dts
+++ b/arch/arm/boot/dts/wm8650-mid.dts
@@ -11,26 +11,24 @@
 
 / {
         model = "Wondermedia WM8650-MID Tablet";
+};
+
+&fb {
+        bits-per-pixel = <16>;
 
-        /*
-         * Display node is based on Sascha Hauer's patch on dri-devel.
-         * Added a bpp property to calculate the size of the framebuffer
-         * until the binding is formalized.
-         */
-        display: display@0 {
-                modes {
-                        mode0: mode@0 {
-                                hactive = <800>;
-                                vactive = <480>;
-                                hback-porch = <88>;
-                                hfront-porch = <40>;
-                                hsync-len = <0>;
-                                vback-porch = <32>;
-                                vfront-porch = <11>;
-                                vsync-len = <1>;
-                                clock = <0>;    /* unused but required */
-                                bpp = <16>;     /* non-standard but required */
-                        };
+        display-timings {
+                native-mode = <&timing0>;
+                timing0: 800x480 {
+                        clock-frequency = <0>; /* unused but required */
+                        hactive = <800>;
+                        vactive = <480>;
+                        hfront-porch = <40>;
+                        hback-porch = <88>;
+                        hsync-len = <0>;
+                        vback-porch = <32>;
+                        vfront-porch = <11>;
+                        vsync-len = <1>;
                 };
         };
 };
+
diff --git a/arch/arm/boot/dts/wm8650.dtsi b/arch/arm/boot/dts/wm8650.dtsi
index db3c0a12e052..9313407bbc30 100644
--- a/arch/arm/boot/dts/wm8650.dtsi
+++ b/arch/arm/boot/dts/wm8650.dtsi
@@ -128,11 +128,9 @@
                         interrupts = <43>;
                 };
 
-                fb@d8050800 {
+                fb: fb@d8050800 {
                         compatible = "wm,wm8505-fb";
                         reg = <0xd8050800 0x200>;
-                        display = <&display>;
-                        default-mode = <&mode0>;
                 };
 
                 ge_rops@d8050400 {
diff --git a/arch/arm/boot/dts/wm8850-w70v2.dts b/arch/arm/boot/dts/wm8850-w70v2.dts
index fcc660c89540..32d22532cd6c 100644
--- a/arch/arm/boot/dts/wm8850-w70v2.dts
+++ b/arch/arm/boot/dts/wm8850-w70v2.dts
@@ -15,28 +15,6 @@
 / {
         model = "Wondermedia WM8850-W70v2 Tablet";
 
-        /*
-         * Display node is based on Sascha Hauer's patch on dri-devel.
-         * Added a bpp property to calculate the size of the framebuffer
-         * until the binding is formalized.
-         */
-        display: display@0 {
-                modes {
-                        mode0: mode@0 {
-                                hactive = <800>;
-                                vactive = <480>;
-                                hback-porch = <88>;
-                                hfront-porch = <40>;
-                                hsync-len = <0>;
-                                vback-porch = <32>;
-                                vfront-porch = <11>;
-                                vsync-len = <1>;
-                                clock = <0>;    /* unused but required */
-                                bpp = <16>;     /* non-standard but required */
-                        };
-                };
-        };
-
         backlight {
                 compatible = "pwm-backlight";
                 pwms = <&pwm 0 50000 1>;        /* duty inverted */
@@ -45,3 +23,21 @@
                 default-brightness-level = <5>;
         };
 };
+
+&fb {
+        bits-per-pixel = <16>;
+        display-timings {
+                native-mode = <&timing0>;
+                timing0: 800x480 {
+                        clock-frequency = <0>; /* unused but required */
+                        hactive = <800>;
+                        vactive = <480>;
+                        hfront-porch = <40>;
+                        hback-porch = <88>;
+                        hsync-len = <0>;
+                        vback-porch = <32>;
+                        vfront-porch = <11>;
+                        vsync-len = <1>;
+                };
+        };
+};
diff --git a/arch/arm/boot/dts/wm8850.dtsi b/arch/arm/boot/dts/wm8850.dtsi
index e8cbfdc87bba..7149cd13e3b9 100644
--- a/arch/arm/boot/dts/wm8850.dtsi
+++ b/arch/arm/boot/dts/wm8850.dtsi
@@ -135,11 +135,9 @@
                         };
                 };
 
-                fb@d8051700 {
+                fb: fb@d8051700 {
                         compatible = "wm,wm8505-fb";
                         reg = <0xd8051700 0x200>;
-                        display = <&display>;
-                        default-mode = <&mode0>;
                 };
 
                 ge_rops@d8050400 {
diff --git a/arch/arm/configs/imx_v6_v7_defconfig b/arch/arm/configs/imx_v6_v7_defconfig
index e36b01025321..088d6c11a0fa 100644
--- a/arch/arm/configs/imx_v6_v7_defconfig
+++ b/arch/arm/configs/imx_v6_v7_defconfig
@@ -188,6 +188,7 @@ CONFIG_USB_EHCI_HCD=y
 CONFIG_USB_EHCI_MXC=y
 CONFIG_USB_CHIPIDEA=y
 CONFIG_USB_CHIPIDEA_HOST=y
+CONFIG_USB_PHY=y
 CONFIG_USB_MXS_PHY=y
 CONFIG_USB_STORAGE=y
 CONFIG_MMC=y
diff --git a/arch/arm/configs/kirkwood_defconfig b/arch/arm/configs/kirkwood_defconfig
index 13482ea58b09..93f3794ba5cb 100644
--- a/arch/arm/configs/kirkwood_defconfig
+++ b/arch/arm/configs/kirkwood_defconfig
@@ -56,7 +56,6 @@ CONFIG_AEABI=y
 CONFIG_ZBOOT_ROM_TEXT=0x0
 CONFIG_ZBOOT_ROM_BSS=0x0
 CONFIG_CPU_IDLE=y
-CONFIG_CPU_IDLE_KIRKWOOD=y
 CONFIG_NET=y
 CONFIG_PACKET=y
 CONFIG_UNIX=y
diff --git a/arch/arm/configs/lpc32xx_defconfig b/arch/arm/configs/lpc32xx_defconfig
index 92386b20bd09..afa7249fac6e 100644
--- a/arch/arm/configs/lpc32xx_defconfig
+++ b/arch/arm/configs/lpc32xx_defconfig
@@ -134,6 +134,7 @@ CONFIG_SND_DEBUG_VERBOSE=y
 # CONFIG_SND_SPI is not set
 CONFIG_SND_SOC=y
 CONFIG_USB=y
+CONFIG_USB_PHY=y
 CONFIG_USB_OHCI_HCD=y
 CONFIG_USB_STORAGE=y
 CONFIG_USB_GADGET=y
diff --git a/arch/arm/configs/mxs_defconfig b/arch/arm/configs/mxs_defconfig
index 6a99e30f81d2..87924d671115 100644
--- a/arch/arm/configs/mxs_defconfig
+++ b/arch/arm/configs/mxs_defconfig
@@ -120,6 +120,7 @@ CONFIG_USB_EHCI_HCD=y
 CONFIG_USB_CHIPIDEA=y
 CONFIG_USB_CHIPIDEA_HOST=y
 CONFIG_USB_STORAGE=y
+CONFIG_USB_PHY=y
 CONFIG_USB_MXS_PHY=y
 CONFIG_MMC=y
 CONFIG_MMC_MXS=y
diff --git a/arch/arm/configs/omap1_defconfig b/arch/arm/configs/omap1_defconfig
index 42eab9a2a0fd..7e0ebb64a7f9 100644
--- a/arch/arm/configs/omap1_defconfig
+++ b/arch/arm/configs/omap1_defconfig
@@ -195,6 +195,7 @@ CONFIG_SND_SOC=y
 CONFIG_SND_OMAP_SOC=y
 # CONFIG_USB_HID is not set
 CONFIG_USB=y
+CONFIG_USB_PHY=y
 CONFIG_USB_DEBUG=y
 CONFIG_USB_DEVICEFS=y
 # CONFIG_USB_DEVICE_CLASS is not set
diff --git a/arch/arm/include/asm/pgtable.h b/arch/arm/include/asm/pgtable.h
index 80d6fc4dbe4a..9bcd262a9008 100644
--- a/arch/arm/include/asm/pgtable.h
+++ b/arch/arm/include/asm/pgtable.h
@@ -61,6 +61,15 @@ extern void __pgd_error(const char *file, int line, pgd_t);
 #define FIRST_USER_ADDRESS      PAGE_SIZE
 
 /*
+ * Use TASK_SIZE as the ceiling argument for free_pgtables() and
+ * free_pgd_range() to avoid freeing the modules pmd when LPAE is enabled (pmd
+ * page shared between user and kernel).
+ */
+#ifdef CONFIG_ARM_LPAE
+#define USER_PGTABLES_CEILING   TASK_SIZE
+#endif
+
+/*
  * The pgprot_* and protection_map entries will be fixed up in runtime
  * to include the cachable and bufferable bits based on memory policy,
  * as well as any architecture dependent bits like global/ASID and SMP
diff --git a/arch/arm/include/asm/system_misc.h b/arch/arm/include/asm/system_misc.h
index 5a85f148b607..21a23e378bbe 100644
--- a/arch/arm/include/asm/system_misc.h
+++ b/arch/arm/include/asm/system_misc.h
@@ -21,9 +21,6 @@ extern void (*arm_pm_idle)(void);
 
 extern unsigned int user_debug;
 
-extern void disable_hlt(void);
-extern void enable_hlt(void);
-
 #endif /* !__ASSEMBLY__ */
 
 #endif /* __ASM_ARM_SYSTEM_MISC_H */
diff --git a/arch/arm/include/asm/unistd.h b/arch/arm/include/asm/unistd.h
index e4ddfb39ca34..141baa3f9a72 100644
--- a/arch/arm/include/asm/unistd.h
+++ b/arch/arm/include/asm/unistd.h
@@ -44,14 +44,6 @@
 #define __ARCH_WANT_SYS_CLONE
 
 /*
- * "Conditional" syscalls
- *
- * What we want is __attribute__((weak,alias("sys_ni_syscall"))),
- * but it doesn't work on all toolchains, so we just do it by hand
- */
-#define cond_syscall(x) asm(".weak\t" #x "\n\t.set\t" #x ",sys_ni_syscall")
-
-/*
  * Unimplemented (or alternatively implemented) syscalls
  */
 #define __IGNORE_fadvise64_64
diff --git a/arch/arm/kernel/early_printk.c b/arch/arm/kernel/early_printk.c
index 85aa2b292692..43076536965c 100644
--- a/arch/arm/kernel/early_printk.c
+++ b/arch/arm/kernel/early_printk.c
@@ -29,28 +29,17 @@ static void early_console_write(struct console *con, const char *s, unsigned n)
         early_write(s, n);
 }
 
-static struct console early_console = {
+static struct console early_console_dev = {
         .name =         "earlycon",
         .write =        early_console_write,
         .flags =        CON_PRINTBUFFER | CON_BOOT,
         .index =        -1,
 };
 
-asmlinkage void early_printk(const char *fmt, ...)
-{
-        char buf[512];
-        int n;
-        va_list ap;
-
-        va_start(ap, fmt);
-        n = vscnprintf(buf, sizeof(buf), fmt, ap);
-        early_write(buf, n);
-        va_end(ap);
-}
-
 static int __init setup_early_printk(char *buf)
 {
-        register_console(&early_console);
+        early_console = &early_console_dev;
+        register_console(&early_console_dev);
         return 0;
 }
 
diff --git a/arch/arm/kernel/etm.c b/arch/arm/kernel/etm.c
index 9b6de8c988f3..8ff0ecdc637f 100644
--- a/arch/arm/kernel/etm.c
+++ b/arch/arm/kernel/etm.c
@@ -254,7 +254,7 @@ static void sysrq_etm_dump(int key)
 
 static struct sysrq_key_op sysrq_etm_op = {
         .handler = sysrq_etm_dump,
-        .help_msg = "ETM buffer dump",
+        .help_msg = "etm-buffer-dump(v)",
         .action_msg = "etm",
 };
 
diff --git a/arch/arm/kernel/process.c b/arch/arm/kernel/process.c
index 047d3e40e470..ae58d3b37d9d 100644
--- a/arch/arm/kernel/process.c
+++ b/arch/arm/kernel/process.c
@@ -57,38 +57,6 @@ static const char *isa_modes[] = {
   "ARM" , "Thumb" , "Jazelle", "ThumbEE"
 };
 
-static volatile int hlt_counter;
-
-void disable_hlt(void)
-{
-        hlt_counter++;
-}
-
-EXPORT_SYMBOL(disable_hlt);
-
-void enable_hlt(void)
-{
-        hlt_counter--;
-        BUG_ON(hlt_counter < 0);
-}
-
-EXPORT_SYMBOL(enable_hlt);
-
-static int __init nohlt_setup(char *__unused)
-{
-        hlt_counter = 1;
-        return 1;
-}
-
-static int __init hlt_setup(char *__unused)
-{
-        hlt_counter = 0;
-        return 1;
-}
-
-__setup("nohlt", nohlt_setup);
-__setup("hlt", hlt_setup);
-
 extern void call_with_stack(void (*fn)(void *), void *arg, void *sp);
 typedef void (*phys_reset_t)(unsigned long);
 
@@ -172,54 +140,38 @@ static void default_idle(void)
         local_irq_enable();
 }
 
-/*
- * The idle thread.
- * We always respect 'hlt_counter' to prevent low power idle.
- */
-void cpu_idle(void)
+void arch_cpu_idle_prepare(void)
 {
         local_fiq_enable();
+}
 
-        /* endless idle loop with no priority at all */
-        while (1) {
-                tick_nohz_idle_enter();
-                rcu_idle_enter();
-                ledtrig_cpu(CPU_LED_IDLE_START);
-                while (!need_resched()) {
-#ifdef CONFIG_HOTPLUG_CPU
-                        if (cpu_is_offline(smp_processor_id()))
-                                cpu_die();
+void arch_cpu_idle_enter(void)
+{
+        ledtrig_cpu(CPU_LED_IDLE_START);
+#ifdef CONFIG_PL310_ERRATA_769419
+        wmb();
 #endif
+}
 
-                        /*
-                         * We need to disable interrupts here
-                         * to ensure we don't miss a wakeup call.
-                         */
-                        local_irq_disable();
-#ifdef CONFIG_PL310_ERRATA_769419
-                        wmb();
+void arch_cpu_idle_exit(void)
+{
+        ledtrig_cpu(CPU_LED_IDLE_END);
+}
+
+#ifdef CONFIG_HOTPLUG_CPU
+void arch_cpu_idle_dead(void)
+{
+        cpu_die();
+}
 #endif
-                        if (hlt_counter) {
-                                local_irq_enable();
-                                cpu_relax();
-                        } else if (!need_resched()) {
-                                stop_critical_timings();
-                                if (cpuidle_idle_call())
-                                        default_idle();
-                                start_critical_timings();
-                                /*
-                                 * default_idle functions must always
-                                 * return with IRQs enabled.
-                                 */
-                                WARN_ON(irqs_disabled());
-                        } else
-                                local_irq_enable();
-                }
-                ledtrig_cpu(CPU_LED_IDLE_END);
-                rcu_idle_exit();
-                tick_nohz_idle_exit();
-                schedule_preempt_disabled();
-        }
+
+/*
+ * Called from the core idle loop.
+ */
+void arch_cpu_idle(void)
+{
+        if (cpuidle_idle_call())
+                default_idle();
 }
 
 static char reboot_mode = 'h';
@@ -273,11 +225,8 @@ void __show_regs(struct pt_regs *regs)
         unsigned long flags;
         char buf[64];
 
-        printk("CPU: %d    %s  (%s %.*s)\n",
-                raw_smp_processor_id(), print_tainted(),
-                init_utsname()->release,
-                (int)strcspn(init_utsname()->version, " "),
-                init_utsname()->version);
+        show_regs_print_info(KERN_DEFAULT);
+
         print_symbol("PC is at %s\n", instruction_pointer(regs));
         print_symbol("LR is at %s\n", regs->ARM_lr);
         printk("pc : [<%08lx>]    lr : [<%08lx>]    psr: %08lx\n"
@@ -332,7 +281,6 @@ void __show_regs(struct pt_regs *regs)
 void show_regs(struct pt_regs * regs)
 {
         printk("\n");
-        printk("Pid: %d, comm: %20s\n", task_pid_nr(current), current->comm);
         __show_regs(regs);
         dump_stack();
 }
diff --git a/arch/arm/kernel/smp.c b/arch/arm/kernel/smp.c
index 1f2ccccaf009..4619177bcfe6 100644
--- a/arch/arm/kernel/smp.c
+++ b/arch/arm/kernel/smp.c
@@ -336,7 +336,7 @@ asmlinkage void __cpuinit secondary_start_kernel(void)
         /*
          * OK, it's off to the idle thread for us
          */
-        cpu_idle();
+        cpu_startup_entry(CPUHP_ONLINE);
 }
 
 void __init smp_cpus_done(unsigned int max_cpus)
diff --git a/arch/arm/kernel/topology.c b/arch/arm/kernel/topology.c
index 79282ebcd939..f10316b4ecdc 100644
--- a/arch/arm/kernel/topology.c
+++ b/arch/arm/kernel/topology.c
@@ -100,7 +100,7 @@ static void __init parse_dt_topology(void)
         int alloc_size, cpu = 0;
 
         alloc_size = nr_cpu_ids * sizeof(struct cpu_capacity);
-        cpu_capacity = (struct cpu_capacity *)kzalloc(alloc_size, GFP_NOWAIT);
+        cpu_capacity = kzalloc(alloc_size, GFP_NOWAIT);
 
         while ((cn = of_find_node_by_type(cn, "cpu"))) {
                 const u32 *rate, *reg;
diff --git a/arch/arm/kernel/traps.c b/arch/arm/kernel/traps.c
index 1c089119b2d7..18b32e8e4497 100644
--- a/arch/arm/kernel/traps.c
+++ b/arch/arm/kernel/traps.c
@@ -204,13 +204,6 @@ static void dump_backtrace(struct pt_regs *regs, struct task_struct *tsk)
 }
 #endif
 
-void dump_stack(void)
-{
-        dump_backtrace(NULL, NULL);
-}
-
-EXPORT_SYMBOL(dump_stack);
-
 void show_stack(struct task_struct *tsk, unsigned long *sp)
 {
         dump_backtrace(NULL, tsk);
diff --git a/arch/arm/kvm/arm.c b/arch/arm/kvm/arm.c
index c1fe498983ac..842098d78f58 100644
--- a/arch/arm/kvm/arm.c
+++ b/arch/arm/kvm/arm.c
@@ -614,7 +614,7 @@ static int handle_exit(struct kvm_vcpu *vcpu, struct kvm_run *run,
 
                 if (hsr_ec >= ARRAY_SIZE(arm_exit_handlers)
                     || !arm_exit_handlers[hsr_ec]) {
-                        kvm_err("Unkown exception class: %#08lx, "
+                        kvm_err("Unknown exception class: %#08lx, "
                                 "hsr: %#08x\n", hsr_ec,
                                 (unsigned int)vcpu->arch.hsr);
                         BUG();
diff --git a/arch/arm/mach-at91/at91sam9260.c b/arch/arm/mach-at91/at91sam9260.c
index b67cd5374117..44199bc2c665 100644
--- a/arch/arm/mach-at91/at91sam9260.c
+++ b/arch/arm/mach-at91/at91sam9260.c
@@ -232,6 +232,8 @@ static struct clk_lookup periph_clocks_lookups[] = {
         CLKDEV_CON_DEV_ID("t2_clk", "fffdc000.timer", &tc5_clk),
         CLKDEV_CON_DEV_ID("hclk", "500000.ohci", &ohci_clk),
         CLKDEV_CON_DEV_ID("mci_clk", "fffa8000.mmc", &mmc_clk),
+        CLKDEV_CON_DEV_ID("spi_clk", "fffc8000.spi", &spi0_clk),
+        CLKDEV_CON_DEV_ID("spi_clk", "fffcc000.spi", &spi1_clk),
         /* fake hclk clock */
         CLKDEV_CON_DEV_ID("hclk", "at91_ohci", &ohci_clk),
         CLKDEV_CON_ID("pioA", &pioA_clk),
diff --git a/arch/arm/mach-at91/at91sam9g45.c b/arch/arm/mach-at91/at91sam9g45.c
index d3addee43d8d..2ec5efea3f03 100644
--- a/arch/arm/mach-at91/at91sam9g45.c
+++ b/arch/arm/mach-at91/at91sam9g45.c
@@ -262,6 +262,8 @@ static struct clk_lookup periph_clocks_lookups[] = {
         CLKDEV_CON_DEV_ID("mci_clk", "fffd0000.mmc", &mmc1_clk),
         CLKDEV_CON_DEV_ID(NULL, "fff84000.i2c", &twi0_clk),
         CLKDEV_CON_DEV_ID(NULL, "fff88000.i2c", &twi1_clk),
+        CLKDEV_CON_DEV_ID("spi_clk", "fffa4000.spi", &spi0_clk),
+        CLKDEV_CON_DEV_ID("spi_clk", "fffa8000.spi", &spi1_clk),
         /* fake hclk clock */
         CLKDEV_CON_DEV_ID("hclk", "at91_ohci", &uhphs_clk),
         CLKDEV_CON_DEV_ID(NULL, "fffff200.gpio", &pioA_clk),
diff --git a/arch/arm/mach-at91/at91sam9n12.c b/arch/arm/mach-at91/at91sam9n12.c
index 5dfc8fd87103..ccd078355eed 100644
--- a/arch/arm/mach-at91/at91sam9n12.c
+++ b/arch/arm/mach-at91/at91sam9n12.c
@@ -172,6 +172,8 @@ static struct clk_lookup periph_clocks_lookups[] = {
         CLKDEV_CON_DEV_ID("dma_clk", "ffffec00.dma-controller", &dma_clk),
         CLKDEV_CON_DEV_ID(NULL, "f8010000.i2c", &twi0_clk),
         CLKDEV_CON_DEV_ID(NULL, "f8014000.i2c", &twi1_clk),
+        CLKDEV_CON_DEV_ID("spi_clk", "f0000000.spi", &spi0_clk),
+        CLKDEV_CON_DEV_ID("spi_clk", "f0004000.spi", &spi1_clk),
         CLKDEV_CON_DEV_ID(NULL, "fffff400.gpio", &pioAB_clk),
         CLKDEV_CON_DEV_ID(NULL, "fffff600.gpio", &pioAB_clk),
         CLKDEV_CON_DEV_ID(NULL, "fffff800.gpio", &pioCD_clk),
diff --git a/arch/arm/mach-at91/at91sam9x5.c b/arch/arm/mach-at91/at91sam9x5.c
index 44a9a62dcc13..a200d8a17123 100644
--- a/arch/arm/mach-at91/at91sam9x5.c
+++ b/arch/arm/mach-at91/at91sam9x5.c
@@ -237,6 +237,8 @@ static struct clk_lookup periph_clocks_lookups[] = {
         CLKDEV_CON_DEV_ID(NULL, "f8010000.i2c", &twi0_clk),
         CLKDEV_CON_DEV_ID(NULL, "f8014000.i2c", &twi1_clk),
         CLKDEV_CON_DEV_ID(NULL, "f8018000.i2c", &twi2_clk),
+        CLKDEV_CON_DEV_ID("spi_clk", "f0000000.spi", &spi0_clk),
+        CLKDEV_CON_DEV_ID("spi_clk", "f0004000.spi", &spi1_clk),
         CLKDEV_CON_DEV_ID(NULL, "fffff400.gpio", &pioAB_clk),
         CLKDEV_CON_DEV_ID(NULL, "fffff600.gpio", &pioAB_clk),
         CLKDEV_CON_DEV_ID(NULL, "fffff800.gpio", &pioCD_clk),
diff --git a/arch/arm/mach-at91/cpuidle.c b/arch/arm/mach-at91/cpuidle.c
index 0c6381516a5a..48f1228c611c 100644
--- a/arch/arm/mach-at91/cpuidle.c
+++ b/arch/arm/mach-at91/cpuidle.c
@@ -27,8 +27,6 @@
 
 #define AT91_MAX_STATES 2
 
-static DEFINE_PER_CPU(struct cpuidle_device, at91_cpuidle_device);
-
 /* Actual code that puts the SoC in different idle states */
 static int at91_enter_idle(struct cpuidle_device *dev,
                         struct cpuidle_driver *drv,
@@ -47,7 +45,6 @@ static int at91_enter_idle(struct cpuidle_device *dev,
 static struct cpuidle_driver at91_idle_driver = {
         .name                   = "at91_idle",
         .owner                  = THIS_MODULE,
-        .en_core_tk_irqen       = 1,
         .states[0]              = ARM_CPUIDLE_WFI_STATE,
         .states[1]              = {
                 .enter                  = at91_enter_idle,
@@ -61,20 +58,9 @@ static struct cpuidle_driver at91_idle_driver = {
 };
 
 /* Initialize CPU idle by registering the idle states */
-static int at91_init_cpuidle(void)
+static int __init at91_init_cpuidle(void)
 {
-        struct cpuidle_device *device;
-
-        device = &per_cpu(at91_cpuidle_device, smp_processor_id());
-        device->state_count = AT91_MAX_STATES;
-
-        cpuidle_register_driver(&at91_idle_driver);
-
-        if (cpuidle_register_device(device)) {
-                printk(KERN_ERR "at91_init_cpuidle: Failed registering\n");
-                return -EIO;
-        }
-        return 0;
+        return cpuidle_register(&at91_idle_driver, NULL);
 }
 
 device_initcall(at91_init_cpuidle);
diff --git a/arch/arm/mach-bcm/Kconfig b/arch/arm/mach-bcm/Kconfig
index bf02471d7e7c..f11289519c39 100644
--- a/arch/arm/mach-bcm/Kconfig
+++ b/arch/arm/mach-bcm/Kconfig
@@ -6,6 +6,7 @@ config ARCH_BCM
         select ARM_ERRATA_764369 if SMP
         select ARM_GIC
         select CPU_V7
+        select CLKSRC_OF
         select GENERIC_CLOCKEVENTS
         select GENERIC_TIME
         select GPIO_BCM
diff --git a/arch/arm/mach-bcm/board_bcm.c b/arch/arm/mach-bcm/board_bcm.c
index f0f9abafad29..259593540477 100644
--- a/arch/arm/mach-bcm/board_bcm.c
+++ b/arch/arm/mach-bcm/board_bcm.c
@@ -16,14 +16,11 @@
 #include <linux/device.h>
 #include <linux/platform_device.h>
 #include <linux/irqchip.h>
+#include <linux/clocksource.h>
 
 #include <asm/mach/arch.h>
 #include <asm/mach/time.h>
 
-static void timer_init(void)
-{
-}
-
 
 static void __init board_init(void)
 {
@@ -35,7 +32,7 @@ static const char * const bcm11351_dt_compat[] = { "bcm,bcm11351", NULL, };
 
 DT_MACHINE_START(BCM11351_DT, "Broadcom Application Processor")
         .init_irq = irqchip_init,
-        .init_time = timer_init,
+        .init_time = clocksource_of_init,
         .init_machine = board_init,
         .dt_compat = bcm11351_dt_compat,
 MACHINE_END
diff --git a/arch/arm/mach-davinci/Makefile b/arch/arm/mach-davinci/Makefile
index fb5c1aa98a63..dd1ffccc75e9 100644
--- a/arch/arm/mach-davinci/Makefile
+++ b/arch/arm/mach-davinci/Makefile
@@ -37,7 +37,6 @@ obj-$(CONFIG_MACH_MITYOMAPL138)		+= board-mityomapl138.o
 obj-$(CONFIG_MACH_OMAPL138_HAWKBOARD)   += board-omapl138-hawk.o
 
 # Power Management
-obj-$(CONFIG_CPU_FREQ)                  += cpufreq.o
 obj-$(CONFIG_CPU_IDLE)                  += cpuidle.o
 obj-$(CONFIG_SUSPEND)                   += pm.o sleep.o
 obj-$(CONFIG_HAVE_CLK)                  += pm_domain.o
diff --git a/arch/arm/mach-davinci/board-dm355-evm.c b/arch/arm/mach-davinci/board-dm355-evm.c
index 147b8e1a4407..886481c12173 100644
--- a/arch/arm/mach-davinci/board-dm355-evm.c
+++ b/arch/arm/mach-davinci/board-dm355-evm.c
@@ -242,6 +242,73 @@ static struct vpfe_config vpfe_cfg = {
         .ccdc = "DM355 CCDC",
 };
 
+/* venc standards timings */
+static struct vpbe_enc_mode_info dm355evm_enc_preset_timing[] = {
+        {
+                .name           = "ntsc",
+                .timings_type   = VPBE_ENC_STD,
+                .std_id         = V4L2_STD_NTSC,
+                .interlaced     = 1,
+                .xres           = 720,
+                .yres           = 480,
+                .aspect         = {11, 10},
+                .fps            = {30000, 1001},
+                .left_margin    = 0x79,
+                .upper_margin   = 0x10,
+        },
+        {
+                .name           = "pal",
+                .timings_type   = VPBE_ENC_STD,
+                .std_id         = V4L2_STD_PAL,
+                .interlaced     = 1,
+                .xres           = 720,
+                .yres           = 576,
+                .aspect         = {54, 59},
+                .fps            = {25, 1},
+                .left_margin    = 0x7E,
+                .upper_margin   = 0x16
+        },
+};
+
+#define VENC_STD_ALL    (V4L2_STD_NTSC | V4L2_STD_PAL)
+
+/*
+ * The outputs available from VPBE + ecnoders. Keep the
+ * the order same as that of encoders. First those from venc followed by that
+ * from encoders. Index in the output refers to index on a particular encoder.
+ * Driver uses this index to pass it to encoder when it supports more than
+ * one output. Application uses index of the array to set an output.
+ */
+static struct vpbe_output dm355evm_vpbe_outputs[] = {
+        {
+                .output         = {
+                        .index          = 0,
+                        .name           = "Composite",
+                        .type           = V4L2_OUTPUT_TYPE_ANALOG,
+                        .std            = VENC_STD_ALL,
+                        .capabilities   = V4L2_OUT_CAP_STD,
+                },
+                .subdev_name    = DM355_VPBE_VENC_SUBDEV_NAME,
+                .default_mode   = "ntsc",
+                .num_modes      = ARRAY_SIZE(dm355evm_enc_preset_timing),
+                .modes          = dm355evm_enc_preset_timing,
+                .if_params      = V4L2_MBUS_FMT_FIXED,
+        },
+};
+
+static struct vpbe_config dm355evm_display_cfg = {
+        .module_name    = "dm355-vpbe-display",
+        .i2c_adapter_id = 1,
+        .osd            = {
+                .module_name    = DM355_VPBE_OSD_SUBDEV_NAME,
+        },
+        .venc           = {
+                .module_name    = DM355_VPBE_VENC_SUBDEV_NAME,
+        },
+        .num_outputs    = ARRAY_SIZE(dm355evm_vpbe_outputs),
+        .outputs        = dm355evm_vpbe_outputs,
+};
+
 static struct platform_device *davinci_evm_devices[] __initdata = {
         &dm355evm_dm9000,
         &davinci_nand_device,
@@ -253,8 +320,6 @@ static struct davinci_uart_config uart_config __initdata = {
 
 static void __init dm355_evm_map_io(void)
 {
-        /* setup input configuration for VPFE input devices */
-        dm355_set_vpfe_config(&vpfe_cfg);
         dm355_init();
 }
 
@@ -344,6 +409,8 @@ static __init void dm355_evm_init(void)
         davinci_setup_mmc(0, &dm355evm_mmc_config);
         davinci_setup_mmc(1, &dm355evm_mmc_config);
 
+        dm355_init_video(&vpfe_cfg, &dm355evm_display_cfg);
+
         dm355_init_spi0(BIT(0), dm355_evm_spi_info,
                         ARRAY_SIZE(dm355_evm_spi_info));
 
diff --git a/arch/arm/mach-davinci/board-dm365-evm.c b/arch/arm/mach-davinci/board-dm365-evm.c
index c2d4958a0cb6..2a6674356585 100644
--- a/arch/arm/mach-davinci/board-dm365-evm.c
+++ b/arch/arm/mach-davinci/board-dm365-evm.c
@@ -27,6 +27,7 @@
 #include <linux/input.h>
 #include <linux/spi/spi.h>
 #include <linux/spi/eeprom.h>
+#include <linux/v4l2-dv-timings.h>
 
 #include <asm/mach-types.h>
 #include <asm/mach/arch.h>
@@ -39,6 +40,7 @@
 #include <linux/platform_data/mtd-davinci.h>
 #include <linux/platform_data/keyscan-davinci.h>
 
+#include <media/ths7303.h>
 #include <media/tvp514x.h>
 
 #include "davinci.h"
@@ -374,6 +376,166 @@ static struct vpfe_config vpfe_cfg = {
         .ccdc = "ISIF",
 };
 
+/* venc standards timings */
+static struct vpbe_enc_mode_info dm365evm_enc_std_timing[] = {
+        {
+                .name           = "ntsc",
+                .timings_type   = VPBE_ENC_STD,
+                .std_id         = V4L2_STD_NTSC,
+                .interlaced     = 1,
+                .xres           = 720,
+                .yres           = 480,
+                .aspect         = {11, 10},
+                .fps            = {30000, 1001},
+                .left_margin    = 0x79,
+                .upper_margin   = 0x10,
+        },
+        {
+                .name           = "pal",
+                .timings_type   = VPBE_ENC_STD,
+                .std_id         = V4L2_STD_PAL,
+                .interlaced     = 1,
+                .xres           = 720,
+                .yres           = 576,
+                .aspect         = {54, 59},
+                .fps            = {25, 1},
+                .left_margin    = 0x7E,
+                .upper_margin   = 0x16,
+        },
+};
+
+/* venc dv timings */
+static struct vpbe_enc_mode_info dm365evm_enc_preset_timing[] = {
+        {
+                .name           = "480p59_94",
+                .timings_type   = VPBE_ENC_DV_TIMINGS,
+                .dv_timings     = V4L2_DV_BT_CEA_720X480P59_94,
+                .interlaced     = 0,
+                .xres           = 720,
+                .yres           = 480,
+                .aspect         = {1, 1},
+                .fps            = {5994, 100},
+                .left_margin    = 0x8F,
+                .upper_margin   = 0x2D,
+        },
+        {
+                .name           = "576p50",
+                .timings_type   = VPBE_ENC_DV_TIMINGS,
+                .dv_timings     = V4L2_DV_BT_CEA_720X576P50,
+                .interlaced     = 0,
+                .xres           = 720,
+                .yres           = 576,
+                .aspect         = {1, 1},
+                .fps            = {50, 1},
+                .left_margin    = 0x8C,
+                .upper_margin   = 0x36,
+        },
+        {
+                .name           = "720p60",
+                .timings_type   = VPBE_ENC_DV_TIMINGS,
+                .dv_timings     = V4L2_DV_BT_CEA_1280X720P60,
+                .interlaced     = 0,
+                .xres           = 1280,
+                .yres           = 720,
+                .aspect         = {1, 1},
+                .fps            = {60, 1},
+                .left_margin    = 0x117,
+                .right_margin   = 70,
+                .upper_margin   = 38,
+                .lower_margin   = 3,
+                .hsync_len      = 80,
+                .vsync_len      = 5,
+        },
+        {
+                .name           = "1080i60",
+                .timings_type   = VPBE_ENC_DV_TIMINGS,
+                .dv_timings     = V4L2_DV_BT_CEA_1920X1080I60,
+                .interlaced     = 1,
+                .xres           = 1920,
+                .yres           = 1080,
+                .aspect         = {1, 1},
+                .fps            = {30, 1},
+                .left_margin    = 0xc9,
+                .right_margin   = 80,
+                .upper_margin   = 30,
+                .lower_margin   = 3,
+                .hsync_len      = 88,
+                .vsync_len      = 5,
+        },
+};
+
+#define VENC_STD_ALL    (V4L2_STD_NTSC | V4L2_STD_PAL)
+
+/*
+ * The outputs available from VPBE + ecnoders. Keep the
+ * the order same as that of encoders. First those from venc followed by that
+ * from encoders. Index in the output refers to index on a particular
+ * encoder.Driver uses this index to pass it to encoder when it supports more
+ * than one output. Application uses index of the array to set an output.
+ */
+static struct vpbe_output dm365evm_vpbe_outputs[] = {
+        {
+                .output         = {
+                        .index          = 0,
+                        .name           = "Composite",
+                        .type           = V4L2_OUTPUT_TYPE_ANALOG,
+                        .std            = VENC_STD_ALL,
+                        .capabilities   = V4L2_OUT_CAP_STD,
+                },
+                .subdev_name    = DM365_VPBE_VENC_SUBDEV_NAME,
+                .default_mode   = "ntsc",
+                .num_modes      = ARRAY_SIZE(dm365evm_enc_std_timing),
+                .modes          = dm365evm_enc_std_timing,
+                .if_params      = V4L2_MBUS_FMT_FIXED,
+        },
+        {
+                .output         = {
+                        .index          = 1,
+                        .name           = "Component",
+                        .type           = V4L2_OUTPUT_TYPE_ANALOG,
+                        .capabilities   = V4L2_OUT_CAP_DV_TIMINGS,
+                },
+                .subdev_name    = DM365_VPBE_VENC_SUBDEV_NAME,
+                .default_mode   = "480p59_94",
+                .num_modes      = ARRAY_SIZE(dm365evm_enc_preset_timing),
+                .modes          = dm365evm_enc_preset_timing,
+                .if_params      = V4L2_MBUS_FMT_FIXED,
+        },
+};
+
+/*
+ * Amplifiers on the board
+ */
+struct ths7303_platform_data ths7303_pdata = {
+        .ch_1 = 3,
+        .ch_2 = 3,
+        .ch_3 = 3,
+        .init_enable = 1,
+};
+
+static struct amp_config_info vpbe_amp = {
+        .module_name    = "ths7303",
+        .is_i2c         = 1,
+        .board_info     = {
+                I2C_BOARD_INFO("ths7303", 0x2c),
+                .platform_data = &ths7303_pdata,
+        }
+};
+
+static struct vpbe_config dm365evm_display_cfg = {
+        .module_name    = "dm365-vpbe-display",
+        .i2c_adapter_id = 1,
+        .amp            = &vpbe_amp,
+        .osd            = {
+                .module_name    = DM365_VPBE_OSD_SUBDEV_NAME,
+        },
+        .venc           = {
+                .module_name    = DM365_VPBE_VENC_SUBDEV_NAME,
+        },
+        .num_outputs    = ARRAY_SIZE(dm365evm_vpbe_outputs),
+        .outputs        = dm365evm_vpbe_outputs,
+};
+
 static void __init evm_init_i2c(void)
 {
         davinci_init_i2c(&i2c_pdata);
@@ -564,8 +726,6 @@ static struct davinci_uart_config uart_config __initdata = {
 
 static void __init dm365_evm_map_io(void)
 {
-        /* setup input configuration for VPFE input devices */
-        dm365_set_vpfe_config(&vpfe_cfg);
         dm365_init();
 }
 
@@ -597,6 +757,8 @@ static __init void dm365_evm_init(void)
 
         davinci_setup_mmc(0, &dm365evm_mmc_config);
 
+        dm365_init_video(&vpfe_cfg, &dm365evm_display_cfg);
+
         /* maybe setup mmc1/etc ... _after_ mmc0 */
         evm_init_cpld();
 
diff --git a/arch/arm/mach-davinci/board-dm644x-evm.c b/arch/arm/mach-davinci/board-dm644x-evm.c
index 71735e7797cc..745280d4144c 100644
--- a/arch/arm/mach-davinci/board-dm644x-evm.c
+++ b/arch/arm/mach-davinci/board-dm644x-evm.c
@@ -622,7 +622,7 @@ static struct vpbe_enc_mode_info dm644xevm_enc_std_timing[] = {
         {
                 .name           = "ntsc",
                 .timings_type   = VPBE_ENC_STD,
-                .std_id         = V4L2_STD_525_60,
+                .std_id         = V4L2_STD_NTSC,
                 .interlaced     = 1,
                 .xres           = 720,
                 .yres           = 480,
@@ -634,7 +634,7 @@ static struct vpbe_enc_mode_info dm644xevm_enc_std_timing[] = {
         {
                 .name           = "pal",
                 .timings_type   = VPBE_ENC_STD,
-                .std_id         = V4L2_STD_625_50,
+                .std_id         = V4L2_STD_PAL,
                 .interlaced     = 1,
                 .xres           = 720,
                 .yres           = 576,
@@ -649,7 +649,7 @@ static struct vpbe_enc_mode_info dm644xevm_enc_std_timing[] = {
 static struct vpbe_enc_mode_info dm644xevm_enc_preset_timing[] = {
         {
                 .name           = "480p59_94",
-                .timings_type   = VPBE_ENC_CUSTOM_TIMINGS,
+                .timings_type   = VPBE_ENC_DV_TIMINGS,
                 .dv_timings     = V4L2_DV_BT_CEA_720X480P59_94,
                 .interlaced     = 0,
                 .xres           = 720,
@@ -661,7 +661,7 @@ static struct vpbe_enc_mode_info dm644xevm_enc_preset_timing[] = {
         },
         {
                 .name           = "576p50",
-                .timings_type   = VPBE_ENC_CUSTOM_TIMINGS,
+                .timings_type   = VPBE_ENC_DV_TIMINGS,
                 .dv_timings     = V4L2_DV_BT_CEA_720X576P50,
                 .interlaced     = 0,
                 .xres           = 720,
diff --git a/arch/arm/mach-davinci/board-dm646x-evm.c b/arch/arm/mach-davinci/board-dm646x-evm.c
index de7adff324dc..fc4871ac1c2c 100644
--- a/arch/arm/mach-davinci/board-dm646x-evm.c
+++ b/arch/arm/mach-davinci/board-dm646x-evm.c
@@ -514,7 +514,7 @@ static const struct vpif_output dm6467_ch0_outputs[] = {
                         .index = 1,
                         .name = "Component",
                         .type = V4L2_OUTPUT_TYPE_ANALOG,
-                        .capabilities = V4L2_OUT_CAP_CUSTOM_TIMINGS,
+                        .capabilities = V4L2_OUT_CAP_DV_TIMINGS,
                 },
                 .subdev_name = "adv7343",
                 .output_route = ADV7343_COMPONENT_ID,
diff --git a/arch/arm/mach-davinci/cpufreq.c b/arch/arm/mach-davinci/cpufreq.c
deleted file mode 100644
index 4729eaab0f40..000000000000
--- a/arch/arm/mach-davinci/cpufreq.c
+++ /dev/null
@@ -1,248 +0,0 @@
-/*
- * CPU frequency scaling for DaVinci
- *
- * Copyright (C) 2009 Texas Instruments Incorporated - http://www.ti.com/
- *
- * Based on linux/arch/arm/plat-omap/cpu-omap.c. Original Copyright follows:
- *
- *  Copyright (C) 2005 Nokia Corporation
- *  Written by Tony Lindgren <tony@atomide.com>
- *
- *  Based on cpu-sa1110.c, Copyright (C) 2001 Russell King
- *
- * Copyright (C) 2007-2008 Texas Instruments, Inc.
- * Updated to support OMAP3
- * Rajendra Nayak <rnayak@ti.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
- */
-#include <linux/types.h>
-#include <linux/cpufreq.h>
-#include <linux/init.h>
-#include <linux/err.h>
-#include <linux/clk.h>
-#include <linux/platform_device.h>
-#include <linux/export.h>
-
-#include <mach/hardware.h>
-#include <mach/cpufreq.h>
-#include <mach/common.h>
-
-#include "clock.h"
-
-struct davinci_cpufreq {
-        struct device *dev;
-        struct clk *armclk;
-        struct clk *asyncclk;
-        unsigned long asyncrate;
-};
-static struct davinci_cpufreq cpufreq;
-
-static int davinci_verify_speed(struct cpufreq_policy *policy)
-{
-        struct davinci_cpufreq_config *pdata = cpufreq.dev->platform_data;
-        struct cpufreq_frequency_table *freq_table = pdata->freq_table;
-        struct clk *armclk = cpufreq.armclk;
-
-        if (freq_table)
-                return cpufreq_frequency_table_verify(policy, freq_table);
-
-        if (policy->cpu)
-                return -EINVAL;
-
-        cpufreq_verify_within_limits(policy, policy->cpuinfo.min_freq,
-                                     policy->cpuinfo.max_freq);
-
-        policy->min = clk_round_rate(armclk, policy->min * 1000) / 1000;
-        policy->max = clk_round_rate(armclk, policy->max * 1000) / 1000;
-        cpufreq_verify_within_limits(policy, policy->cpuinfo.min_freq,
-                                                policy->cpuinfo.max_freq);
-        return 0;
-}
-
-static unsigned int davinci_getspeed(unsigned int cpu)
-{
-        if (cpu)
-                return 0;
-
-        return clk_get_rate(cpufreq.armclk) / 1000;
-}
-
-static int davinci_target(struct cpufreq_policy *policy,
-                                unsigned int target_freq, unsigned int relation)
-{
-        int ret = 0;
-        unsigned int idx;
-        struct cpufreq_freqs freqs;
-        struct davinci_cpufreq_config *pdata = cpufreq.dev->platform_data;
-        struct clk *armclk = cpufreq.armclk;
-
-        /*
-         * Ensure desired rate is within allowed range.  Some govenors
-         * (ondemand) will just pass target_freq=0 to get the minimum.
-         */
-        if (target_freq < policy->cpuinfo.min_freq)
-                target_freq = policy->cpuinfo.min_freq;
-        if (target_freq > policy->cpuinfo.max_freq)
-                target_freq = policy->cpuinfo.max_freq;
-
-        freqs.old = davinci_getspeed(0);
-        freqs.new = clk_round_rate(armclk, target_freq * 1000) / 1000;
-        freqs.cpu = 0;
-
-        if (freqs.old == freqs.new)
-                return ret;
-
-        dev_dbg(cpufreq.dev, "transition: %u --> %u\n", freqs.old, freqs.new);
-
-        ret = cpufreq_frequency_table_target(policy, pdata->freq_table,
-                                                freqs.new, relation, &idx);
-        if (ret)
-                return -EINVAL;
-
-        cpufreq_notify_transition(&freqs, CPUFREQ_PRECHANGE);
-
-        /* if moving to higher frequency, up the voltage beforehand */
-        if (pdata->set_voltage && freqs.new > freqs.old) {
-                ret = pdata->set_voltage(idx);
-                if (ret)
-                        goto out;
-        }
-
-        ret = clk_set_rate(armclk, idx);
-        if (ret)
-                goto out;
-
-        if (cpufreq.asyncclk) {
-                ret = clk_set_rate(cpufreq.asyncclk, cpufreq.asyncrate);
-                if (ret)
-                        goto out;
-        }
-
-        /* if moving to lower freq, lower the voltage after lowering freq */
-        if (pdata->set_voltage && freqs.new < freqs.old)
-                pdata->set_voltage(idx);
-
-out:
-        cpufreq_notify_transition(&freqs, CPUFREQ_POSTCHANGE);
-
-        return ret;
-}
-
-static int davinci_cpu_init(struct cpufreq_policy *policy)
-{
-        int result = 0;
-        struct davinci_cpufreq_config *pdata = cpufreq.dev->platform_data;
-        struct cpufreq_frequency_table *freq_table = pdata->freq_table;
-
-        if (policy->cpu != 0)
-                return -EINVAL;
-
-        /* Finish platform specific initialization */
-        if (pdata->init) {
-                result = pdata->init();
-                if (result)
-                        return result;
-        }
-
-        policy->cur = policy->min = policy->max = davinci_getspeed(0);
-
-        if (freq_table) {
-                result = cpufreq_frequency_table_cpuinfo(policy, freq_table);
-                if (!result)
-                        cpufreq_frequency_table_get_attr(freq_table,
-                                                        policy->cpu);
-        } else {
-                policy->cpuinfo.min_freq = policy->min;
-                policy->cpuinfo.max_freq = policy->max;
-        }
-
-        policy->min = policy->cpuinfo.min_freq;
-        policy->max = policy->cpuinfo.max_freq;
-        policy->cur = davinci_getspeed(0);
-
-        /*
-         * Time measurement across the target() function yields ~1500-1800us
-         * time taken with no drivers on notification list.
-         * Setting the latency to 2000 us to accommodate addition of drivers
-         * to pre/post change notification list.
-         */
-        policy->cpuinfo.transition_latency = 2000 * 1000;
-        return 0;
-}
-
-static int davinci_cpu_exit(struct cpufreq_policy *policy)
-{
-        cpufreq_frequency_table_put_attr(policy->cpu);
-        return 0;
-}
-
-static struct freq_attr *davinci_cpufreq_attr[] = {
-        &cpufreq_freq_attr_scaling_available_freqs,
-        NULL,
-};
-
-static struct cpufreq_driver davinci_driver = {
-        .flags          = CPUFREQ_STICKY,
-        .verify         = davinci_verify_speed,
-        .target         = davinci_target,
-        .get            = davinci_getspeed,
-        .init           = davinci_cpu_init,
-        .exit           = davinci_cpu_exit,
-        .name           = "davinci",
-        .attr           = davinci_cpufreq_attr,
-};
-
-static int __init davinci_cpufreq_probe(struct platform_device *pdev)
-{
-        struct davinci_cpufreq_config *pdata = pdev->dev.platform_data;
-        struct clk *asyncclk;
-
-        if (!pdata)
-                return -EINVAL;
-        if (!pdata->freq_table)
-                return -EINVAL;
-
-        cpufreq.dev = &pdev->dev;
-
-        cpufreq.armclk = clk_get(NULL, "arm");
-        if (IS_ERR(cpufreq.armclk)) {
-                dev_err(cpufreq.dev, "Unable to get ARM clock\n");
-                return PTR_ERR(cpufreq.armclk);
-        }
-
-        asyncclk = clk_get(cpufreq.dev, "async");
-        if (!IS_ERR(asyncclk)) {
-                cpufreq.asyncclk = asyncclk;
-                cpufreq.asyncrate = clk_get_rate(asyncclk);
-        }
-
-        return cpufreq_register_driver(&davinci_driver);
-}
-
-static int __exit davinci_cpufreq_remove(struct platform_device *pdev)
-{
-        clk_put(cpufreq.armclk);
-
-        if (cpufreq.asyncclk)
-                clk_put(cpufreq.asyncclk);
-
-        return cpufreq_unregister_driver(&davinci_driver);
-}
-
-static struct platform_driver davinci_cpufreq_driver = {
-        .driver = {
-                .name    = "cpufreq-davinci",
-                .owner   = THIS_MODULE,
-        },
-        .remove = __exit_p(davinci_cpufreq_remove),
-};
-
-int __init davinci_cpufreq_init(void)
-{
-        return platform_driver_probe(&davinci_cpufreq_driver,
-                                                        davinci_cpufreq_probe);
-}
-
diff --git a/arch/arm/mach-davinci/cpuidle.c b/arch/arm/mach-davinci/cpuidle.c
index 5ac9e9384b15..36aef3a7dedb 100644
--- a/arch/arm/mach-davinci/cpuidle.c
+++ b/arch/arm/mach-davinci/cpuidle.c
@@ -25,7 +25,6 @@
 
 #define DAVINCI_CPUIDLE_MAX_STATES      2
 
-static DEFINE_PER_CPU(struct cpuidle_device, davinci_cpuidle_device);
 static void __iomem *ddr2_reg_base;
 static bool ddr2_pdown;
 
@@ -50,14 +49,10 @@ static void davinci_save_ddr_power(int enter, bool pdown)
 
 /* Actual code that puts the SoC in different idle states */
 static int davinci_enter_idle(struct cpuidle_device *dev,
-                                struct cpuidle_driver *drv,
-                                                int index)
+                              struct cpuidle_driver *drv, int index)
 {
         davinci_save_ddr_power(1, ddr2_pdown);
-
-        index = cpuidle_wrap_enter(dev, drv, index,
-                                arm_cpuidle_simple_enter);
-
+        cpu_do_idle();
         davinci_save_ddr_power(0, ddr2_pdown);
 
         return index;
@@ -66,7 +61,6 @@ static int davinci_enter_idle(struct cpuidle_device *dev,
 static struct cpuidle_driver davinci_idle_driver = {
         .name                   = "cpuidle-davinci",
         .owner                  = THIS_MODULE,
-        .en_core_tk_irqen       = 1,
         .states[0]              = ARM_CPUIDLE_WFI_STATE,
         .states[1]              = {
                 .enter                  = davinci_enter_idle,
@@ -81,12 +75,8 @@ static struct cpuidle_driver davinci_idle_driver = {
 
 static int __init davinci_cpuidle_probe(struct platform_device *pdev)
 {
-        int ret;
-        struct cpuidle_device *device;
         struct davinci_cpuidle_config *pdata = pdev->dev.platform_data;
 
-        device = &per_cpu(davinci_cpuidle_device, smp_processor_id());
-
         if (!pdata) {
                 dev_err(&pdev->dev, "cannot get platform data\n");
                 return -ENOENT;
@@ -96,20 +86,7 @@ static int __init davinci_cpuidle_probe(struct platform_device *pdev)
 
         ddr2_pdown = pdata->ddr2_pdown;
 
-        ret = cpuidle_register_driver(&davinci_idle_driver);
-        if (ret) {
-                dev_err(&pdev->dev, "failed to register driver\n");
-                return ret;
-        }
-
-        ret = cpuidle_register_device(device);
-        if (ret) {
-                dev_err(&pdev->dev, "failed to register device\n");
-                cpuidle_unregister_driver(&davinci_idle_driver);
-                return ret;
-        }
-
-        return 0;
+        return cpuidle_register(&davinci_idle_driver, NULL);
 }
 
 static struct platform_driver davinci_cpuidle_driver = {
diff --git a/arch/arm/mach-davinci/davinci.h b/arch/arm/mach-davinci/davinci.h
index 12d544befcfa..1ab3df423dac 100644
--- a/arch/arm/mach-davinci/davinci.h
+++ b/arch/arm/mach-davinci/davinci.h
@@ -36,12 +36,19 @@
 #include <media/davinci/vpbe_osd.h>
 
 #define DAVINCI_SYSTEM_MODULE_BASE      0x01c40000
+#define SYSMOD_VDAC_CONFIG              0x2c
 #define SYSMOD_VIDCLKCTL                0x38
 #define SYSMOD_VPSS_CLKCTL              0x44
 #define SYSMOD_VDD3P3VPWDN              0x48
 #define SYSMOD_VSCLKDIS                 0x6c
 #define SYSMOD_PUPDCTL1                 0x7c
 
+/* VPSS CLKCTL bit definitions */
+#define VPSS_MUXSEL_EXTCLK_ENABLE       BIT(1)
+#define VPSS_VENCCLKEN_ENABLE           BIT(3)
+#define VPSS_DACCLKEN_ENABLE            BIT(4)
+#define VPSS_PLLC2SYSCLK5_ENABLE        BIT(5)
+
 extern void __iomem *davinci_sysmod_base;
 #define DAVINCI_SYSMOD_VIRT(x)  (davinci_sysmod_base + (x))
 void davinci_map_sysmod(void);
@@ -74,7 +81,7 @@ void __init dm355_init(void);
 void dm355_init_spi0(unsigned chipselect_mask,
                 const struct spi_board_info *info, unsigned len);
 void __init dm355_init_asp1(u32 evt_enable, struct snd_platform_data *pdata);
-void dm355_set_vpfe_config(struct vpfe_config *cfg);
+int dm355_init_video(struct vpfe_config *, struct vpbe_config *);
 
 /* DM365 function declarations */
 void __init dm365_init(void);
@@ -84,7 +91,7 @@ void __init dm365_init_ks(struct davinci_ks_platform_data *pdata);
 void __init dm365_init_rtc(void);
 void dm365_init_spi0(unsigned chipselect_mask,
                         const struct spi_board_info *info, unsigned len);
-void dm365_set_vpfe_config(struct vpfe_config *cfg);
+int dm365_init_video(struct vpfe_config *, struct vpbe_config *);
 
 /* DM644x function declarations */
 void __init dm644x_init(void);
diff --git a/arch/arm/mach-davinci/dm355.c b/arch/arm/mach-davinci/dm355.c
index b49c3b77d55e..bf9a9d4ad9f5 100644
--- a/arch/arm/mach-davinci/dm355.c
+++ b/arch/arm/mach-davinci/dm355.c
@@ -35,6 +35,8 @@
 #include "asp.h"
 
 #define DM355_UART2_BASE        (IO_PHYS + 0x206000)
+#define DM355_OSD_BASE          (IO_PHYS + 0x70200)
+#define DM355_VENC_BASE         (IO_PHYS + 0x70400)
 
 /*
  * Device specific clocks
@@ -345,8 +347,8 @@ static struct clk_lookup dm355_clks[] = {
         CLK(NULL, "pll1_aux", &pll1_aux_clk),
         CLK(NULL, "pll1_sysclkbp", &pll1_sysclkbp),
         CLK(NULL, "vpss_dac", &vpss_dac_clk),
-        CLK(NULL, "vpss_master", &vpss_master_clk),
-        CLK(NULL, "vpss_slave", &vpss_slave_clk),
+        CLK("vpss", "master", &vpss_master_clk),
+        CLK("vpss", "slave", &vpss_slave_clk),
         CLK(NULL, "clkout1", &clkout1_clk),
         CLK(NULL, "clkout2", &clkout2_clk),
         CLK(NULL, "pll2", &pll2_clk),
@@ -744,11 +746,146 @@ static struct platform_device vpfe_capture_dev = {
         },
 };
 
-void dm355_set_vpfe_config(struct vpfe_config *cfg)
+static struct resource dm355_osd_resources[] = {
+        {
+                .start  = DM355_OSD_BASE,
+                .end    = DM355_OSD_BASE + 0x17f,
+                .flags  = IORESOURCE_MEM,
+        },
+};
+
+static struct platform_device dm355_osd_dev = {
+        .name           = DM355_VPBE_OSD_SUBDEV_NAME,
+        .id             = -1,
+        .num_resources  = ARRAY_SIZE(dm355_osd_resources),
+        .resource       = dm355_osd_resources,
+        .dev            = {
+                .dma_mask               = &vpfe_capture_dma_mask,
+                .coherent_dma_mask      = DMA_BIT_MASK(32),
+        },
+};
+
+static struct resource dm355_venc_resources[] = {
+        {
+                .start  = IRQ_VENCINT,
+                .end    = IRQ_VENCINT,
+                .flags  = IORESOURCE_IRQ,
+        },
+        /* venc registers io space */
+        {
+                .start  = DM355_VENC_BASE,
+                .end    = DM355_VENC_BASE + 0x17f,
+                .flags  = IORESOURCE_MEM,
+        },
+        /* VDAC config register io space */
+        {
+                .start  = DAVINCI_SYSTEM_MODULE_BASE + SYSMOD_VDAC_CONFIG,
+                .end    = DAVINCI_SYSTEM_MODULE_BASE + SYSMOD_VDAC_CONFIG + 3,
+                .flags  = IORESOURCE_MEM,
+        },
+};
+
+static struct resource dm355_v4l2_disp_resources[] = {
+        {
+                .start  = IRQ_VENCINT,
+                .end    = IRQ_VENCINT,
+                .flags  = IORESOURCE_IRQ,
+        },
+        /* venc registers io space */
+        {
+                .start  = DM355_VENC_BASE,
+                .end    = DM355_VENC_BASE + 0x17f,
+                .flags  = IORESOURCE_MEM,
+        },
+};
+
+static int dm355_vpbe_setup_pinmux(enum v4l2_mbus_pixelcode if_type,
+                            int field)
+{
+        switch (if_type) {
+        case V4L2_MBUS_FMT_SGRBG8_1X8:
+                davinci_cfg_reg(DM355_VOUT_FIELD_G70);
+                break;
+        case V4L2_MBUS_FMT_YUYV10_1X20:
+                if (field)
+                        davinci_cfg_reg(DM355_VOUT_FIELD);
+                else
+                        davinci_cfg_reg(DM355_VOUT_FIELD_G70);
+                break;
+        default:
+                return -EINVAL;
+        }
+
+        davinci_cfg_reg(DM355_VOUT_COUTL_EN);
+        davinci_cfg_reg(DM355_VOUT_COUTH_EN);
+
+        return 0;
+}
+
+static int dm355_venc_setup_clock(enum vpbe_enc_timings_type type,
+                                   unsigned int pclock)
 {
-        vpfe_capture_dev.dev.platform_data = cfg;
+        void __iomem *vpss_clk_ctrl_reg;
+
+        vpss_clk_ctrl_reg = DAVINCI_SYSMOD_VIRT(SYSMOD_VPSS_CLKCTL);
+
+        switch (type) {
+        case VPBE_ENC_STD:
+                writel(VPSS_DACCLKEN_ENABLE | VPSS_VENCCLKEN_ENABLE,
+                       vpss_clk_ctrl_reg);
+                break;
+        case VPBE_ENC_DV_TIMINGS:
+                if (pclock > 27000000)
+                        /*
+                         * For HD, use external clock source since we cannot
+                         * support HD mode with internal clocks.
+                         */
+                        writel(VPSS_MUXSEL_EXTCLK_ENABLE, vpss_clk_ctrl_reg);
+                break;
+        default:
+                return -EINVAL;
+        }
+
+        return 0;
 }
 
+static struct platform_device dm355_vpbe_display = {
+        .name           = "vpbe-v4l2",
+        .id             = -1,
+        .num_resources  = ARRAY_SIZE(dm355_v4l2_disp_resources),
+        .resource       = dm355_v4l2_disp_resources,
+        .dev            = {
+                .dma_mask               = &vpfe_capture_dma_mask,
+                .coherent_dma_mask      = DMA_BIT_MASK(32),
+        },
+};
+
+struct venc_platform_data dm355_venc_pdata = {
+        .setup_pinmux   = dm355_vpbe_setup_pinmux,
+        .setup_clock    = dm355_venc_setup_clock,
+};
+
+static struct platform_device dm355_venc_dev = {
+        .name           = DM355_VPBE_VENC_SUBDEV_NAME,
+        .id             = -1,
+        .num_resources  = ARRAY_SIZE(dm355_venc_resources),
+        .resource       = dm355_venc_resources,
+        .dev            = {
+                .dma_mask               = &vpfe_capture_dma_mask,
+                .coherent_dma_mask      = DMA_BIT_MASK(32),
+                .platform_data          = (void *)&dm355_venc_pdata,
+        },
+};
+
+static struct platform_device dm355_vpbe_dev = {
+        .name           = "vpbe_controller",
+        .id             = -1,
+        .dev            = {
+                .dma_mask               = &vpfe_capture_dma_mask,
+                .coherent_dma_mask      = DMA_BIT_MASK(32),
+        },
+};
+
 /*----------------------------------------------------------------------*/
 
 static struct map_desc dm355_io_desc[] = {
@@ -868,19 +1005,36 @@ void __init dm355_init(void)
         davinci_map_sysmod();
 }
 
+int __init dm355_init_video(struct vpfe_config *vpfe_cfg,
+                                struct vpbe_config *vpbe_cfg)
+{
+        if (vpfe_cfg || vpbe_cfg)
+                platform_device_register(&dm355_vpss_device);
+
+        if (vpfe_cfg) {
+                vpfe_capture_dev.dev.platform_data = vpfe_cfg;
+                platform_device_register(&dm355_ccdc_dev);
+                platform_device_register(&vpfe_capture_dev);
+        }
+
+        if (vpbe_cfg) {
+                dm355_vpbe_dev.dev.platform_data = vpbe_cfg;
+                platform_device_register(&dm355_osd_dev);
+                platform_device_register(&dm355_venc_dev);
+                platform_device_register(&dm355_vpbe_dev);
+                platform_device_register(&dm355_vpbe_display);
+        }
+
+        return 0;
+}
+
 static int __init dm355_init_devices(void)
 {
         if (!cpu_is_davinci_dm355())
                 return 0;
 
-        /* Add ccdc clock aliases */
-        clk_add_alias("master", dm355_ccdc_dev.name, "vpss_master", NULL);
-        clk_add_alias("slave", dm355_ccdc_dev.name, "vpss_master", NULL);
         davinci_cfg_reg(DM355_INT_EDMA_CC);
         platform_device_register(&dm355_edma_device);
-        platform_device_register(&dm355_vpss_device);
-        platform_device_register(&dm355_ccdc_dev);
-        platform_device_register(&vpfe_capture_dev);
 
         return 0;
 }
diff --git a/arch/arm/mach-davinci/dm365.c b/arch/arm/mach-davinci/dm365.c
index 6c3980540be0..ff771ceac3f1 100644
--- a/arch/arm/mach-davinci/dm365.c
+++ b/arch/arm/mach-davinci/dm365.c
@@ -39,16 +39,13 @@
 #include "asp.h"
 
 #define DM365_REF_FREQ          24000000        /* 24 MHz on the DM365 EVM */
-
-/* Base of key scan register bank */
-#define DM365_KEYSCAN_BASE              0x01c69400
-
 #define DM365_RTC_BASE                  0x01c69000
-
+#define DM365_KEYSCAN_BASE              0x01c69400
+#define DM365_OSD_BASE                  0x01c71c00
+#define DM365_VENC_BASE                 0x01c71e00
 #define DAVINCI_DM365_VC_BASE           0x01d0c000
 #define DAVINCI_DMA_VC_TX               2
 #define DAVINCI_DMA_VC_RX               3
-
 #define DM365_EMAC_BASE                 0x01d07000
 #define DM365_EMAC_MDIO_BASE            (DM365_EMAC_BASE + 0x4000)
 #define DM365_EMAC_CNTRL_OFFSET         0x0000
@@ -257,6 +254,12 @@ static struct clk vpss_master_clk = {
         .flags          = CLK_PSC,
 };
 
+static struct clk vpss_slave_clk = {
+        .name           = "vpss_slave",
+        .parent         = &pll1_sysclk5,
+        .lpsc           = DAVINCI_LPSC_VPSSSLV,
+};
+
 static struct clk arm_clk = {
         .name           = "arm_clk",
         .parent         = &pll2_sysclk2,
@@ -449,7 +452,8 @@ static struct clk_lookup dm365_clks[] = {
         CLK(NULL, "pll2_sysclk8", &pll2_sysclk8),
         CLK(NULL, "pll2_sysclk9", &pll2_sysclk9),
         CLK(NULL, "vpss_dac", &vpss_dac_clk),
-        CLK(NULL, "vpss_master", &vpss_master_clk),
+        CLK("vpss", "master", &vpss_master_clk),
+        CLK("vpss", "slave", &vpss_slave_clk),
         CLK(NULL, "arm", &arm_clk),
         CLK(NULL, "uart0", &uart0_clk),
         CLK(NULL, "uart1", &uart1_clk),
@@ -1226,6 +1230,173 @@ static struct platform_device dm365_isif_dev = {
         },
 };
 
+static struct resource dm365_osd_resources[] = {
+        {
+                .start = DM365_OSD_BASE,
+                .end   = DM365_OSD_BASE + 0xff,
+                .flags = IORESOURCE_MEM,
+        },
+};
+
+static u64 dm365_video_dma_mask = DMA_BIT_MASK(32);
+
+static struct platform_device dm365_osd_dev = {
+        .name           = DM365_VPBE_OSD_SUBDEV_NAME,
+        .id             = -1,
+        .num_resources  = ARRAY_SIZE(dm365_osd_resources),
+        .resource       = dm365_osd_resources,
+        .dev            = {
+                .dma_mask               = &dm365_video_dma_mask,
+                .coherent_dma_mask      = DMA_BIT_MASK(32),
+        },
+};
+
+static struct resource dm365_venc_resources[] = {
+        {
+                .start = IRQ_VENCINT,
+                .end   = IRQ_VENCINT,
+                .flags = IORESOURCE_IRQ,
+        },
+        /* venc registers io space */
+        {
+                .start = DM365_VENC_BASE,
+                .end   = DM365_VENC_BASE + 0x177,
+                .flags = IORESOURCE_MEM,
+        },
+        /* vdaccfg registers io space */
+        {
+                .start = DAVINCI_SYSTEM_MODULE_BASE + SYSMOD_VDAC_CONFIG,
+                .end   = DAVINCI_SYSTEM_MODULE_BASE + SYSMOD_VDAC_CONFIG + 3,
+                .flags = IORESOURCE_MEM,
+        },
+};
+
+static struct resource dm365_v4l2_disp_resources[] = {
+        {
+                .start = IRQ_VENCINT,
+                .end   = IRQ_VENCINT,
+                .flags = IORESOURCE_IRQ,
+        },
+        /* venc registers io space */
+        {
+                .start = DM365_VENC_BASE,
+                .end   = DM365_VENC_BASE + 0x177,
+                .flags = IORESOURCE_MEM,
+        },
+};
+
+static int dm365_vpbe_setup_pinmux(enum v4l2_mbus_pixelcode if_type,
+                            int field)
+{
+        switch (if_type) {
+        case V4L2_MBUS_FMT_SGRBG8_1X8:
+                davinci_cfg_reg(DM365_VOUT_FIELD_G81);
+                davinci_cfg_reg(DM365_VOUT_COUTL_EN);
+                davinci_cfg_reg(DM365_VOUT_COUTH_EN);
+                break;
+        case V4L2_MBUS_FMT_YUYV10_1X20:
+                if (field)
+                        davinci_cfg_reg(DM365_VOUT_FIELD);
+                else
+                        davinci_cfg_reg(DM365_VOUT_FIELD_G81);
+                davinci_cfg_reg(DM365_VOUT_COUTL_EN);
+                davinci_cfg_reg(DM365_VOUT_COUTH_EN);
+                break;
+        default:
+                return -EINVAL;
+        }
+
+        return 0;
+}
+
+static int dm365_venc_setup_clock(enum vpbe_enc_timings_type type,
+                                  unsigned int pclock)
+{
+        void __iomem *vpss_clkctl_reg;
+        u32 val;
+
+        vpss_clkctl_reg = DAVINCI_SYSMOD_VIRT(SYSMOD_VPSS_CLKCTL);
+
+        switch (type) {
+        case VPBE_ENC_STD:
+                val = VPSS_VENCCLKEN_ENABLE | VPSS_DACCLKEN_ENABLE;
+                break;
+        case VPBE_ENC_DV_TIMINGS:
+                if (pclock <= 27000000) {
+                        val = VPSS_VENCCLKEN_ENABLE | VPSS_DACCLKEN_ENABLE;
+                } else {
+                        /* set sysclk4 to output 74.25 MHz from pll1 */
+                        val = VPSS_PLLC2SYSCLK5_ENABLE | VPSS_DACCLKEN_ENABLE |
+                              VPSS_VENCCLKEN_ENABLE;
+                }
+                break;
+        default:
+                return -EINVAL;
+        }
+        writel(val, vpss_clkctl_reg);
+
+        return 0;
+}
+
+static struct platform_device dm365_vpbe_display = {
+        .name           = "vpbe-v4l2",
+        .id             = -1,
+        .num_resources  = ARRAY_SIZE(dm365_v4l2_disp_resources),
+        .resource       = dm365_v4l2_disp_resources,
+        .dev            = {
+                .dma_mask               = &dm365_video_dma_mask,
+                .coherent_dma_mask      = DMA_BIT_MASK(32),
+        },
+};
+
+struct venc_platform_data dm365_venc_pdata = {
+        .setup_pinmux   = dm365_vpbe_setup_pinmux,
+        .setup_clock    = dm365_venc_setup_clock,
+};
+
+static struct platform_device dm365_venc_dev = {
+        .name           = DM365_VPBE_VENC_SUBDEV_NAME,
+        .id             = -1,
+        .num_resources  = ARRAY_SIZE(dm365_venc_resources),
+        .resource       = dm365_venc_resources,
+        .dev            = {
+                .dma_mask               = &dm365_video_dma_mask,
+                .coherent_dma_mask      = DMA_BIT_MASK(32),
+                .platform_data          = (void *)&dm365_venc_pdata,
+        },
+};
+
+static struct platform_device dm365_vpbe_dev = {
+        .name           = "vpbe_controller",
+        .id             = -1,
+        .dev            = {
+                .dma_mask               = &dm365_video_dma_mask,
+                .coherent_dma_mask      = DMA_BIT_MASK(32),
+        },
+};
+
+int __init dm365_init_video(struct vpfe_config *vpfe_cfg,
+                                struct vpbe_config *vpbe_cfg)
+{
+        if (vpfe_cfg || vpbe_cfg)
+                platform_device_register(&dm365_vpss_device);
+
+        if (vpfe_cfg) {
+                vpfe_capture_dev.dev.platform_data = vpfe_cfg;
+                platform_device_register(&dm365_isif_dev);
+                platform_device_register(&vpfe_capture_dev);
+        }
+        if (vpbe_cfg) {
+                dm365_vpbe_dev.dev.platform_data = vpbe_cfg;
+                platform_device_register(&dm365_osd_dev);
+                platform_device_register(&dm365_venc_dev);
+                platform_device_register(&dm365_vpbe_dev);
+                platform_device_register(&dm365_vpbe_display);
+        }
+
+        return 0;
+}
+
 static int __init dm365_init_devices(void)
 {
         if (!cpu_is_davinci_dm365())
@@ -1239,16 +1410,6 @@ static int __init dm365_init_devices(void)
         clk_add_alias(NULL, dev_name(&dm365_mdio_device.dev),
                       NULL, &dm365_emac_device.dev);
 
-        /* Add isif clock alias */
-        clk_add_alias("master", dm365_isif_dev.name, "vpss_master", NULL);
-        platform_device_register(&dm365_vpss_device);
-        platform_device_register(&dm365_isif_dev);
-        platform_device_register(&vpfe_capture_dev);
         return 0;
 }
 postcore_initcall(dm365_init_devices);
-
-void dm365_set_vpfe_config(struct vpfe_config *cfg)
-{
-       vpfe_capture_dev.dev.platform_data = cfg;
-}
diff --git a/arch/arm/mach-davinci/dm644x.c b/arch/arm/mach-davinci/dm644x.c
index db1dd92e00af..c2a9273330bf 100644
--- a/arch/arm/mach-davinci/dm644x.c
+++ b/arch/arm/mach-davinci/dm644x.c
@@ -300,8 +300,8 @@ static struct clk_lookup dm644x_clks[] = {
         CLK(NULL, "dsp", &dsp_clk),
         CLK(NULL, "arm", &arm_clk),
         CLK(NULL, "vicp", &vicp_clk),
-        CLK(NULL, "vpss_master", &vpss_master_clk),
-        CLK(NULL, "vpss_slave", &vpss_slave_clk),
+        CLK("vpss", "master", &vpss_master_clk),
+        CLK("vpss", "slave", &vpss_slave_clk),
         CLK(NULL, "arm", &arm_clk),
         CLK(NULL, "uart0", &uart0_clk),
         CLK(NULL, "uart1", &uart1_clk),
@@ -706,7 +706,7 @@ static int dm644x_venc_setup_clock(enum vpbe_enc_timings_type type,
                 v |= DM644X_VPSS_DACCLKEN;
                 writel(v, DAVINCI_SYSMOD_VIRT(SYSMOD_VPSS_CLKCTL));
                 break;
-        case VPBE_ENC_CUSTOM_TIMINGS:
+        case VPBE_ENC_DV_TIMINGS:
                 if (pclock <= 27000000) {
                         v |= DM644X_VPSS_DACCLKEN;
                         writel(v, DAVINCI_SYSMOD_VIRT(SYSMOD_VPSS_CLKCTL));
@@ -901,11 +901,6 @@ int __init dm644x_init_video(struct vpfe_config *vpfe_cfg,
                 dm644x_vpfe_dev.dev.platform_data = vpfe_cfg;
                 platform_device_register(&dm644x_ccdc_dev);
                 platform_device_register(&dm644x_vpfe_dev);
-                /* Add ccdc clock aliases */
-                clk_add_alias("master", dm644x_ccdc_dev.name,
-                              "vpss_master", NULL);
-                clk_add_alias("slave", dm644x_ccdc_dev.name,
-                              "vpss_slave", NULL);
         }
 
         if (vpbe_cfg) {
diff --git a/arch/arm/mach-davinci/pm_domain.c b/arch/arm/mach-davinci/pm_domain.c
index c90250e3bef8..6b98413cebd6 100644
--- a/arch/arm/mach-davinci/pm_domain.c
+++ b/arch/arm/mach-davinci/pm_domain.c
@@ -53,7 +53,7 @@ static struct dev_pm_domain davinci_pm_domain = {
 
 static struct pm_clk_notifier_block platform_bus_notifier = {
         .pm_domain = &davinci_pm_domain,
-        .con_ids = { "fck", NULL, },
+        .con_ids = { "fck", "master", "slave", NULL },
 };
 
 static int __init davinci_pm_runtime_init(void)
diff --git a/arch/arm/mach-exynos/Kconfig b/arch/arm/mach-exynos/Kconfig
index 70f94c87479d..d5dde0727339 100644
--- a/arch/arm/mach-exynos/Kconfig
+++ b/arch/arm/mach-exynos/Kconfig
@@ -72,10 +72,12 @@ config SOC_EXYNOS5440
         bool "SAMSUNG EXYNOS5440"
         default y
         depends on ARCH_EXYNOS5
+        select ARCH_HAS_OPP
         select ARM_ARCH_TIMER
         select AUTO_ZRELADDR
         select PINCTRL
         select PINCTRL_EXYNOS5440
+        select PM_OPP
         help
           Enable EXYNOS5440 SoC support
 
diff --git a/arch/arm/mach-exynos/cpuidle.c b/arch/arm/mach-exynos/cpuidle.c
index fcfe0251aa3e..498a7a23e260 100644
--- a/arch/arm/mach-exynos/cpuidle.c
+++ b/arch/arm/mach-exynos/cpuidle.c
@@ -58,7 +58,6 @@ static DEFINE_PER_CPU(struct cpuidle_device, exynos4_cpuidle_device);
 static struct cpuidle_driver exynos4_idle_driver = {
         .name                   = "exynos4_idle",
         .owner                  = THIS_MODULE,
-        .en_core_tk_irqen       = 1,
 };
 
 /* Ext-GIC nIRQ/nFIQ is the only wakeup source in AFTR */
diff --git a/arch/arm/mach-exynos/mach-universal_c210.c b/arch/arm/mach-exynos/mach-universal_c210.c
index 497fcb793dc1..d28c7fbaba2d 100644
--- a/arch/arm/mach-exynos/mach-universal_c210.c
+++ b/arch/arm/mach-exynos/mach-universal_c210.c
@@ -97,6 +97,19 @@ static struct s3c2410_uartcfg universal_uartcfgs[] __initdata = {
 static struct regulator_consumer_supply max8952_consumer =
         REGULATOR_SUPPLY("vdd_arm", NULL);
 
+static struct regulator_init_data universal_max8952_reg_data = {
+        .constraints    = {
+                .name           = "VARM_1.2V",
+                .min_uV         = 770000,
+                .max_uV         = 1400000,
+                .valid_ops_mask = REGULATOR_CHANGE_VOLTAGE,
+                .always_on      = 1,
+                .boot_on        = 1,
+        },
+        .num_consumer_supplies  = 1,
+        .consumer_supplies      = &max8952_consumer,
+};
+
 static struct max8952_platform_data universal_max8952_pdata __initdata = {
         .gpio_vid0      = EXYNOS4_GPX0(3),
         .gpio_vid1      = EXYNOS4_GPX0(4),
@@ -105,19 +118,7 @@ static struct max8952_platform_data universal_max8952_pdata __initdata = {
         .dvs_mode       = { 48, 32, 28, 18 }, /* 1.25, 1.20, 1.05, 0.95V */
         .sync_freq      = 0, /* default: fastest */
         .ramp_speed     = 0, /* default: fastest */
-
-        .reg_data       = {
-                .constraints    = {
-                        .name           = "VARM_1.2V",
-                        .min_uV         = 770000,
-                        .max_uV         = 1400000,
-                        .valid_ops_mask = REGULATOR_CHANGE_VOLTAGE,
-                        .always_on      = 1,
-                        .boot_on        = 1,
-                },
-                .num_consumer_supplies  = 1,
-                .consumer_supplies      = &max8952_consumer,
-        },
+        .reg_data       = &universal_max8952_reg_data,
 };
 
 static struct regulator_consumer_supply lp3974_buck1_consumer =
diff --git a/arch/arm/mach-exynos/setup-usb-phy.c b/arch/arm/mach-exynos/setup-usb-phy.c
index b81cc569a8dd..6af40662a449 100644
--- a/arch/arm/mach-exynos/setup-usb-phy.c
+++ b/arch/arm/mach-exynos/setup-usb-phy.c
@@ -204,9 +204,9 @@ static int exynos4210_usb_phy1_exit(struct platform_device *pdev)
 
 int s5p_usb_phy_init(struct platform_device *pdev, int type)
 {
-        if (type == S5P_USB_PHY_DEVICE)
+        if (type == USB_PHY_TYPE_DEVICE)
                 return exynos4210_usb_phy0_init(pdev);
-        else if (type == S5P_USB_PHY_HOST)
+        else if (type == USB_PHY_TYPE_HOST)
                 return exynos4210_usb_phy1_init(pdev);
 
         return -EINVAL;
@@ -214,9 +214,9 @@ int s5p_usb_phy_init(struct platform_device *pdev, int type)
 
 int s5p_usb_phy_exit(struct platform_device *pdev, int type)
 {
-        if (type == S5P_USB_PHY_DEVICE)
+        if (type == USB_PHY_TYPE_DEVICE)
                 return exynos4210_usb_phy0_exit(pdev);
-        else if (type == S5P_USB_PHY_HOST)
+        else if (type == USB_PHY_TYPE_HOST)
                 return exynos4210_usb_phy1_exit(pdev);
 
         return -EINVAL;
diff --git a/arch/arm/mach-gemini/idle.c b/arch/arm/mach-gemini/idle.c
index 92bbd6bb600a..87dff4f5059e 100644
--- a/arch/arm/mach-gemini/idle.c
+++ b/arch/arm/mach-gemini/idle.c
@@ -13,9 +13,11 @@ static void gemini_idle(void)
          * will never wakeup... Acctualy it is not very good to enable
          * interrupts first since scheduler can miss a tick, but there is
          * no other way around this. Platforms that needs it for power saving
-         * should call enable_hlt() in init code, since by default it is
+         * should enable it in init code, since by default it is
          * disabled.
          */
+
+        /* FIXME: Enabling interrupts here is racy! */
         local_irq_enable();
         cpu_do_idle();
 }
diff --git a/arch/arm/mach-gemini/irq.c b/arch/arm/mach-gemini/irq.c
index 020852d3bdd8..6d8f6d1669ff 100644
--- a/arch/arm/mach-gemini/irq.c
+++ b/arch/arm/mach-gemini/irq.c
@@ -15,6 +15,8 @@
 #include <linux/stddef.h>
 #include <linux/list.h>
 #include <linux/sched.h>
+#include <linux/cpu.h>
+
 #include <asm/irq.h>
 #include <asm/mach/irq.h>
 #include <asm/system_misc.h>
@@ -77,7 +79,7 @@ void __init gemini_init_irq(void)
          * Disable the idle handler by default since it is buggy
          * For more info see arch/arm/mach-gemini/idle.c
          */
-        disable_hlt();
+        cpu_idle_poll_ctrl(true);
 
         request_resource(&iomem_resource, &irq_resource);
 
diff --git a/arch/arm/mach-imx/Makefile b/arch/arm/mach-imx/Makefile
index c4ce0906d76a..cb70961b6239 100644
--- a/arch/arm/mach-imx/Makefile
+++ b/arch/arm/mach-imx/Makefile
@@ -30,7 +30,7 @@ obj-$(CONFIG_MXC_DEBUG_BOARD) += 3ds_debugboard.o
 obj-$(CONFIG_CPU_FREQ_IMX)    += cpufreq.o
 
 ifeq ($(CONFIG_CPU_IDLE),y)
-obj-y += cpuidle.o
+obj-$(CONFIG_SOC_IMX5) += cpuidle-imx5.o
 obj-$(CONFIG_SOC_IMX6Q) += cpuidle-imx6q.o
 endif
 
diff --git a/arch/arm/mach-imx/clk-busy.c b/arch/arm/mach-imx/clk-busy.c
index 1ab91b5209e6..85b728cc27ab 100644
--- a/arch/arm/mach-imx/clk-busy.c
+++ b/arch/arm/mach-imx/clk-busy.c
@@ -169,7 +169,7 @@ struct clk *imx_clk_busy_mux(const char *name, void __iomem *reg, u8 shift,
 
         busy->mux.reg = reg;
         busy->mux.shift = shift;
-        busy->mux.width = width;
+        busy->mux.mask = BIT(width) - 1;
         busy->mux.lock = &imx_ccm_lock;
         busy->mux_ops = &clk_mux_ops;
 
diff --git a/arch/arm/mach-imx/cpufreq.c b/arch/arm/mach-imx/cpufreq.c
index d8c75c3c925d..387dc4cceca2 100644
--- a/arch/arm/mach-imx/cpufreq.c
+++ b/arch/arm/mach-imx/cpufreq.c
@@ -87,13 +87,12 @@ static int mxc_set_target(struct cpufreq_policy *policy,
 
         freqs.old = clk_get_rate(cpu_clk) / 1000;
         freqs.new = freq_Hz / 1000;
-        freqs.cpu = 0;
         freqs.flags = 0;
-        cpufreq_notify_transition(&freqs, CPUFREQ_PRECHANGE);
+        cpufreq_notify_transition(policy, &freqs, CPUFREQ_PRECHANGE);
 
         ret = set_cpu_freq(freq_Hz);
 
-        cpufreq_notify_transition(&freqs, CPUFREQ_POSTCHANGE);
+        cpufreq_notify_transition(policy, &freqs, CPUFREQ_POSTCHANGE);
 
         return ret;
 }
@@ -145,14 +144,11 @@ static int mxc_cpufreq_init(struct cpufreq_policy *policy)
         imx_freq_table[i].frequency = CPUFREQ_TABLE_END;
 
         policy->cur = clk_get_rate(cpu_clk) / 1000;
-        policy->min = policy->cpuinfo.min_freq = cpu_freq_khz_min;
-        policy->max = policy->cpuinfo.max_freq = cpu_freq_khz_max;
 
         /* Manual states, that PLL stabilizes in two CLK32 periods */
         policy->cpuinfo.transition_latency = 2 * NANOSECOND / CLK32_FREQ;
 
         ret = cpufreq_frequency_table_cpuinfo(policy, imx_freq_table);
-
         if (ret < 0) {
                 printk(KERN_ERR "%s: failed to register i.MXC CPUfreq with error code %d\n",
                        __func__, ret);
diff --git a/arch/arm/mach-imx/cpuidle-imx5.c b/arch/arm/mach-imx/cpuidle-imx5.c
new file mode 100644
index 000000000000..5a47e3c6172f
--- /dev/null
+++ b/arch/arm/mach-imx/cpuidle-imx5.c
@@ -0,0 +1,37 @@
+/*
+ * Copyright (C) 2012 Freescale Semiconductor, Inc.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ */
+
+#include <linux/cpuidle.h>
+#include <linux/module.h>
+#include <asm/system_misc.h>
+
+static int imx5_cpuidle_enter(struct cpuidle_device *dev,
+                              struct cpuidle_driver *drv, int index)
+{
+        arm_pm_idle();
+        return index;
+}
+
+static struct cpuidle_driver imx5_cpuidle_driver = {
+        .name             = "imx5_cpuidle",
+        .owner            = THIS_MODULE,
+        .states[0] = {
+                .enter            = imx5_cpuidle_enter,
+                .exit_latency     = 2,
+                .target_residency = 1,
+                .flags            = CPUIDLE_FLAG_TIME_VALID,
+                .name             = "IMX5 SRPG",
+                .desc             = "CPU state retained,powered off",
+        },
+        .state_count = 1,
+};
+
+int __init imx5_cpuidle_init(void)
+{
+        return cpuidle_register(&imx5_cpuidle_driver, NULL);
+}
diff --git a/arch/arm/mach-imx/cpuidle-imx6q.c b/arch/arm/mach-imx/cpuidle-imx6q.c
index d533e2695f0e..23ddfb693b2d 100644
--- a/arch/arm/mach-imx/cpuidle-imx6q.c
+++ b/arch/arm/mach-imx/cpuidle-imx6q.c
@@ -6,7 +6,6 @@
  * published by the Free Software Foundation.
  */
 
-#include <linux/clockchips.h>
 #include <linux/cpuidle.h>
 #include <linux/module.h>
 #include <asm/cpuidle.h>
@@ -21,10 +20,6 @@ static DEFINE_SPINLOCK(master_lock);
 static int imx6q_enter_wait(struct cpuidle_device *dev,
                             struct cpuidle_driver *drv, int index)
 {
-        int cpu = dev->cpu;
-
-        clockevents_notify(CLOCK_EVT_NOTIFY_BROADCAST_ENTER, &cpu);
-
         if (atomic_inc_return(&master) == num_online_cpus()) {
                 /*
                  * With this lock, we prevent other cpu to exit and enter
@@ -43,26 +38,13 @@ idle:
         cpu_do_idle();
 done:
         atomic_dec(&master);
-        clockevents_notify(CLOCK_EVT_NOTIFY_BROADCAST_EXIT, &cpu);
 
         return index;
 }
 
-/*
- * For each cpu, setup the broadcast timer because local timer
- * stops for the states other than WFI.
- */
-static void imx6q_setup_broadcast_timer(void *arg)
-{
-        int cpu = smp_processor_id();
-
-        clockevents_notify(CLOCK_EVT_NOTIFY_BROADCAST_ON, &cpu);
-}
-
 static struct cpuidle_driver imx6q_cpuidle_driver = {
         .name = "imx6q_cpuidle",
         .owner = THIS_MODULE,
-        .en_core_tk_irqen = 1,
         .states = {
                 /* WFI */
                 ARM_CPUIDLE_WFI_STATE,
@@ -70,7 +52,8 @@ static struct cpuidle_driver imx6q_cpuidle_driver = {
                 {
                         .exit_latency = 50,
                         .target_residency = 75,
-                        .flags = CPUIDLE_FLAG_TIME_VALID,
+                        .flags = CPUIDLE_FLAG_TIME_VALID |
+                                 CPUIDLE_FLAG_TIMER_STOP,
                         .enter = imx6q_enter_wait,
                         .name = "WAIT",
                         .desc = "Clock off",
@@ -88,8 +71,5 @@ int __init imx6q_cpuidle_init(void)
         /* Set chicken bit to get a reliable WAIT mode support */
         imx6q_set_chicken_bit();
 
-        /* Configure the broadcast timer on each cpu */
-        on_each_cpu(imx6q_setup_broadcast_timer, NULL, 1);
-
-        return imx_cpuidle_init(&imx6q_cpuidle_driver);
+        return cpuidle_register(&imx6q_cpuidle_driver, NULL);
 }
diff --git a/arch/arm/mach-imx/cpuidle.c b/arch/arm/mach-imx/cpuidle.c
deleted file mode 100644
index d4cb511a44a8..000000000000
--- a/arch/arm/mach-imx/cpuidle.c
+++ /dev/null
@@ -1,80 +0,0 @@
-/*
- * Copyright 2012 Freescale Semiconductor, Inc.
- * Copyright 2012 Linaro Ltd.
- *
- * The code contained herein is licensed under the GNU General Public
- * License. You may obtain a copy of the GNU General Public License
- * Version 2 or later at the following locations:
- *
- * http://www.opensource.org/licenses/gpl-license.html
- * http://www.gnu.org/copyleft/gpl.html
- */
-
-#include <linux/cpuidle.h>
-#include <linux/err.h>
-#include <linux/hrtimer.h>
-#include <linux/io.h>
-#include <linux/kernel.h>
-#include <linux/slab.h>
-
-static struct cpuidle_device __percpu * imx_cpuidle_devices;
-
-static void __init imx_cpuidle_devices_uninit(void)
-{
-        int cpu_id;
-        struct cpuidle_device *dev;
-
-        for_each_possible_cpu(cpu_id) {
-                dev = per_cpu_ptr(imx_cpuidle_devices, cpu_id);
-                cpuidle_unregister_device(dev);
-        }
-
-        free_percpu(imx_cpuidle_devices);
-}
-
-int __init imx_cpuidle_init(struct cpuidle_driver *drv)
-{
-        struct cpuidle_device *dev;
-        int cpu_id, ret;
-
-        if (drv->state_count > CPUIDLE_STATE_MAX) {
-                pr_err("%s: state_count exceeds maximum\n", __func__);
-                return -EINVAL;
-        }
-
-        ret = cpuidle_register_driver(drv);
-        if (ret) {
-                pr_err("%s: Failed to register cpuidle driver with error: %d\n",
-                         __func__, ret);
-                return ret;
-        }
-
-        imx_cpuidle_devices = alloc_percpu(struct cpuidle_device);
-        if (imx_cpuidle_devices == NULL) {
-                ret = -ENOMEM;
-                goto unregister_drv;
-        }
-
-        /* initialize state data for each cpuidle_device */
-        for_each_possible_cpu(cpu_id) {
-                dev = per_cpu_ptr(imx_cpuidle_devices, cpu_id);
-                dev->cpu = cpu_id;
-                dev->state_count = drv->state_count;
-
-                ret = cpuidle_register_device(dev);
-                if (ret) {
-                        pr_err("%s: Failed to register cpu %u, error: %d\n",
-                                __func__, cpu_id, ret);
-                        goto uninit;
-                }
-        }
-
-        return 0;
-
-uninit:
-        imx_cpuidle_devices_uninit();
-
-unregister_drv:
-        cpuidle_unregister_driver(drv);
-        return ret;
-}
diff --git a/arch/arm/mach-imx/cpuidle.h b/arch/arm/mach-imx/cpuidle.h
index e092d1359d94..786f98ecc145 100644
--- a/arch/arm/mach-imx/cpuidle.h
+++ b/arch/arm/mach-imx/cpuidle.h
@@ -10,18 +10,16 @@
  * http://www.gnu.org/copyleft/gpl.html
  */
 
-#include <linux/cpuidle.h>
-
 #ifdef CONFIG_CPU_IDLE
-extern int imx_cpuidle_init(struct cpuidle_driver *drv);
+extern int imx5_cpuidle_init(void);
 extern int imx6q_cpuidle_init(void);
 #else
-static inline int imx_cpuidle_init(struct cpuidle_driver *drv)
+static inline int imx5_cpuidle_init(void)
 {
-        return -ENODEV;
+        return 0;
 }
 static inline int imx6q_cpuidle_init(void)
 {
-        return -ENODEV;
+        return 0;
 }
 #endif
diff --git a/arch/arm/mach-imx/pm-imx5.c b/arch/arm/mach-imx/pm-imx5.c
index f67fd7ee8127..82e79c658eb2 100644
--- a/arch/arm/mach-imx/pm-imx5.c
+++ b/arch/arm/mach-imx/pm-imx5.c
@@ -149,33 +149,6 @@ static void imx5_pm_idle(void)
         imx5_cpu_do_idle();
 }
 
-static int imx5_cpuidle_enter(struct cpuidle_device *dev,
-                                struct cpuidle_driver *drv, int idx)
-{
-        int ret;
-
-        ret = imx5_cpu_do_idle();
-        if (ret < 0)
-                return ret;
-
-        return idx;
-}
-
-static struct cpuidle_driver imx5_cpuidle_driver = {
-        .name                   = "imx5_cpuidle",
-        .owner                  = THIS_MODULE,
-        .en_core_tk_irqen       = 1,
-        .states[0]      = {
-                .enter                  = imx5_cpuidle_enter,
-                .exit_latency           = 2,
-                .target_residency       = 1,
-                .flags                  = CPUIDLE_FLAG_TIME_VALID,
-                .name                   = "IMX5 SRPG",
-                .desc                   = "CPU state retained,powered off",
-        },
-        .state_count            = 1,
-};
-
 static int __init imx5_pm_common_init(void)
 {
         int ret;
@@ -193,8 +166,7 @@ static int __init imx5_pm_common_init(void)
         /* Set the registers to the default cpu idle state. */
         mx5_cpu_lp_set(IMX5_DEFAULT_CPU_IDLE_STATE);
 
-        imx_cpuidle_init(&imx5_cpuidle_driver);
-        return 0;
+        return imx5_cpuidle_init();
 }
 
 void __init imx51_pm_init(void)
diff --git a/arch/arm/mach-integrator/Makefile b/arch/arm/mach-integrator/Makefile
index 5521d18bf19a..d14d6b76f4c2 100644
--- a/arch/arm/mach-integrator/Makefile
+++ b/arch/arm/mach-integrator/Makefile
@@ -9,5 +9,4 @@ obj-$(CONFIG_ARCH_INTEGRATOR_AP)	+= integrator_ap.o
 obj-$(CONFIG_ARCH_INTEGRATOR_CP)        += integrator_cp.o
 
 obj-$(CONFIG_PCI)                       += pci_v3.o pci.o
-obj-$(CONFIG_CPU_FREQ_INTEGRATOR)       += cpu.o
 obj-$(CONFIG_INTEGRATOR_IMPD1)          += impd1.o
diff --git a/arch/arm/mach-integrator/cpu.c b/arch/arm/mach-integrator/cpu.c
deleted file mode 100644
index 590c192cdf4d..000000000000
--- a/arch/arm/mach-integrator/cpu.c
+++ /dev/null
@@ -1,224 +0,0 @@
-/*
- *  linux/arch/arm/mach-integrator/cpu.c
- *
- *  Copyright (C) 2001-2002 Deep Blue Solutions Ltd.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
- *
- * CPU support functions
- */
-#include <linux/module.h>
-#include <linux/types.h>
-#include <linux/kernel.h>
-#include <linux/cpufreq.h>
-#include <linux/sched.h>
-#include <linux/smp.h>
-#include <linux/init.h>
-#include <linux/io.h>
-
-#include <mach/hardware.h>
-#include <mach/platform.h>
-#include <asm/mach-types.h>
-#include <asm/hardware/icst.h>
-
-static struct cpufreq_driver integrator_driver;
-
-#define CM_ID   __io_address(INTEGRATOR_HDR_ID)
-#define CM_OSC  __io_address(INTEGRATOR_HDR_OSC)
-#define CM_STAT __io_address(INTEGRATOR_HDR_STAT)
-#define CM_LOCK __io_address(INTEGRATOR_HDR_LOCK)
-
-static const struct icst_params lclk_params = {
-        .ref            = 24000000,
-        .vco_max        = ICST525_VCO_MAX_5V,
-        .vco_min        = ICST525_VCO_MIN,
-        .vd_min         = 8,
-        .vd_max         = 132,
-        .rd_min         = 24,
-        .rd_max         = 24,
-        .s2div          = icst525_s2div,
-        .idx2s          = icst525_idx2s,
-};
-
-static const struct icst_params cclk_params = {
-        .ref            = 24000000,
-        .vco_max        = ICST525_VCO_MAX_5V,
-        .vco_min        = ICST525_VCO_MIN,
-        .vd_min         = 12,
-        .vd_max         = 160,
-        .rd_min         = 24,
-        .rd_max         = 24,
-        .s2div          = icst525_s2div,
-        .idx2s          = icst525_idx2s,
-};
-
-/*
- * Validate the speed policy.
- */
-static int integrator_verify_policy(struct cpufreq_policy *policy)
-{
-        struct icst_vco vco;
-
-        cpufreq_verify_within_limits(policy, 
-                                     policy->cpuinfo.min_freq, 
-                                     policy->cpuinfo.max_freq);
-
-        vco = icst_hz_to_vco(&cclk_params, policy->max * 1000);
-        policy->max = icst_hz(&cclk_params, vco) / 1000;
-
-        vco = icst_hz_to_vco(&cclk_params, policy->min * 1000);
-        policy->min = icst_hz(&cclk_params, vco) / 1000;
-
-        cpufreq_verify_within_limits(policy, 
-                                     policy->cpuinfo.min_freq, 
-                                     policy->cpuinfo.max_freq);
-
-        return 0;
-}
-
-
-static int integrator_set_target(struct cpufreq_policy *policy,
-                                 unsigned int target_freq,
-                                 unsigned int relation)
-{
-        cpumask_t cpus_allowed;
-        int cpu = policy->cpu;
-        struct icst_vco vco;
-        struct cpufreq_freqs freqs;
-        u_int cm_osc;
-
-        /*
-         * Save this threads cpus_allowed mask.
-         */
-        cpus_allowed = current->cpus_allowed;
-
-        /*
-         * Bind to the specified CPU.  When this call returns,
-         * we should be running on the right CPU.
-         */
-        set_cpus_allowed(current, cpumask_of_cpu(cpu));
-        BUG_ON(cpu != smp_processor_id());
-
-        /* get current setting */
-        cm_osc = __raw_readl(CM_OSC);
-
-        if (machine_is_integrator()) {
-                vco.s = (cm_osc >> 8) & 7;
-        } else if (machine_is_cintegrator()) {
-                vco.s = 1;
-        }
-        vco.v = cm_osc & 255;
-        vco.r = 22;
-        freqs.old = icst_hz(&cclk_params, vco) / 1000;
-
-        /* icst_hz_to_vco rounds down -- so we need the next
-         * larger freq in case of CPUFREQ_RELATION_L.
-         */
-        if (relation == CPUFREQ_RELATION_L)
-                target_freq += 999;
-        if (target_freq > policy->max)
-                target_freq = policy->max;
-        vco = icst_hz_to_vco(&cclk_params, target_freq * 1000);
-        freqs.new = icst_hz(&cclk_params, vco) / 1000;
-
-        freqs.cpu = policy->cpu;
-
-        if (freqs.old == freqs.new) {
-                set_cpus_allowed(current, cpus_allowed);
-                return 0;
-        }
-
-        cpufreq_notify_transition(&freqs, CPUFREQ_PRECHANGE);
-
-        cm_osc = __raw_readl(CM_OSC);
-
-        if (machine_is_integrator()) {
-                cm_osc &= 0xfffff800;
-                cm_osc |= vco.s << 8;
-        } else if (machine_is_cintegrator()) {
-                cm_osc &= 0xffffff00;
-        }
-        cm_osc |= vco.v;
-
-        __raw_writel(0xa05f, CM_LOCK);
-        __raw_writel(cm_osc, CM_OSC);
-        __raw_writel(0, CM_LOCK);
-
-        /*
-         * Restore the CPUs allowed mask.
-         */
-        set_cpus_allowed(current, cpus_allowed);
-
-        cpufreq_notify_transition(&freqs, CPUFREQ_POSTCHANGE);
-
-        return 0;
-}
-
-static unsigned int integrator_get(unsigned int cpu)
-{
-        cpumask_t cpus_allowed;
-        unsigned int current_freq;
-        u_int cm_osc;
-        struct icst_vco vco;
-
-        cpus_allowed = current->cpus_allowed;
-
-        set_cpus_allowed(current, cpumask_of_cpu(cpu));
-        BUG_ON(cpu != smp_processor_id());
-
-        /* detect memory etc. */
-        cm_osc = __raw_readl(CM_OSC);
-
-        if (machine_is_integrator()) {
-                vco.s = (cm_osc >> 8) & 7;
-        } else {
-                vco.s = 1;
-        }
-        vco.v = cm_osc & 255;
-        vco.r = 22;
-
-        current_freq = icst_hz(&cclk_params, vco) / 1000; /* current freq */
-
-        set_cpus_allowed(current, cpus_allowed);
-
-        return current_freq;
-}
-
-static int integrator_cpufreq_init(struct cpufreq_policy *policy)
-{
-
-        /* set default policy and cpuinfo */
-        policy->cpuinfo.max_freq = 160000;
-        policy->cpuinfo.min_freq = 12000;
-        policy->cpuinfo.transition_latency = 1000000; /* 1 ms, assumed */
-        policy->cur = policy->min = policy->max = integrator_get(policy->cpu);
-
-        return 0;
-}
-
-static struct cpufreq_driver integrator_driver = {
-        .verify         = integrator_verify_policy,
-        .target         = integrator_set_target,
-        .get            = integrator_get,
-        .init           = integrator_cpufreq_init,
-        .name           = "integrator",
-};
-
-static int __init integrator_cpu_init(void)
-{
-        return cpufreq_register_driver(&integrator_driver);
-}
-
-static void __exit integrator_cpu_exit(void)
-{
-        cpufreq_unregister_driver(&integrator_driver);
-}
-
-MODULE_AUTHOR ("Russell M. King");
-MODULE_DESCRIPTION ("cpufreq driver for ARM Integrator CPUs");
-MODULE_LICENSE ("GPL");
-
-module_init(integrator_cpu_init);
-module_exit(integrator_cpu_exit);
diff --git a/arch/arm/mach-ixp4xx/common.c b/arch/arm/mach-ixp4xx/common.c
index 1dbeb7c99d58..6600cff6bd92 100644
--- a/arch/arm/mach-ixp4xx/common.c
+++ b/arch/arm/mach-ixp4xx/common.c
@@ -29,6 +29,7 @@
 #include <linux/io.h>
 #include <linux/export.h>
 #include <linux/gpio.h>
+#include <linux/cpu.h>
 
 #include <mach/udc.h>
 #include <mach/hardware.h>
@@ -239,7 +240,7 @@ void __init ixp4xx_init_irq(void)
          * ixp4xx does not implement the XScale PWRMODE register
          * so it must not call cpu_do_idle().
          */
-        disable_hlt();
+        cpu_idle_poll_ctrl(true);
 
         /* Route all sources to IRQ instead of FIQ */
         *IXP4XX_ICLR = 0x0;
diff --git a/arch/arm/mach-mmp/aspenite.c b/arch/arm/mach-mmp/aspenite.c
index 9f64d5632e07..76901f4ce611 100644
--- a/arch/arm/mach-mmp/aspenite.c
+++ b/arch/arm/mach-mmp/aspenite.c
@@ -223,13 +223,7 @@ static struct pxa27x_keypad_platform_data aspenite_keypad_info __initdata = {
 };
 
 #if defined(CONFIG_USB_EHCI_MV)
-static char *pxa168_sph_clock_name[] = {
-        [0] = "PXA168-USBCLK",
-};
-
 static struct mv_usb_platform_data pxa168_sph_pdata = {
-        .clknum         = 1,
-        .clkname        = pxa168_sph_clock_name,
         .mode           = MV_USB_MODE_HOST,
         .phy_init       = pxa_usb_phy_init,
         .phy_deinit     = pxa_usb_phy_deinit,
diff --git a/arch/arm/mach-mmp/ttc_dkb.c b/arch/arm/mach-mmp/ttc_dkb.c
index 22a9058f9f4d..6528a5fa6a26 100644
--- a/arch/arm/mach-mmp/ttc_dkb.c
+++ b/arch/arm/mach-mmp/ttc_dkb.c
@@ -162,13 +162,7 @@ static struct i2c_board_info ttc_dkb_i2c_info[] = {
 #ifdef CONFIG_USB_SUPPORT
 #if defined(CONFIG_USB_MV_UDC) || defined(CONFIG_USB_EHCI_MV_U2O)
 
-static char *pxa910_usb_clock_name[] = {
-        [0] = "U2OCLK",
-};
-
 static struct mv_usb_platform_data ttc_usb_pdata = {
-        .clknum         = 1,
-        .clkname        = pxa910_usb_clock_name,
         .vbus           = NULL,
         .mode           = MV_USB_MODE_OTG,
         .otg_force_a_bus_req = 1,
diff --git a/arch/arm/mach-mvebu/irq-armada-370-xp.c b/arch/arm/mach-mvebu/irq-armada-370-xp.c
index d5970f5a1e8d..830139a3e2ba 100644
--- a/arch/arm/mach-mvebu/irq-armada-370-xp.c
+++ b/arch/arm/mach-mvebu/irq-armada-370-xp.c
@@ -57,7 +57,7 @@ static struct irq_domain *armada_370_xp_mpic_domain;
 /*
  * In SMP mode:
  * For shared global interrupts, mask/unmask global enable bit
- * For CPU interrtups, mask/unmask the calling CPU's bit
+ * For CPU interrupts, mask/unmask the calling CPU's bit
  */
 static void armada_370_xp_irq_mask(struct irq_data *d)
 {
diff --git a/arch/arm/mach-omap1/pm.c b/arch/arm/mach-omap1/pm.c
index 7a7690ab6cb8..db37f49da5ac 100644
--- a/arch/arm/mach-omap1/pm.c
+++ b/arch/arm/mach-omap1/pm.c
@@ -43,6 +43,7 @@
 #include <linux/module.h>
 #include <linux/io.h>
 #include <linux/atomic.h>
+#include <linux/cpu.h>
 
 #include <asm/fncpy.h>
 #include <asm/system_misc.h>
@@ -584,8 +585,7 @@ static void omap_pm_init_proc(void)
 static int omap_pm_prepare(void)
 {
         /* We cannot sleep in idle until we have resumed */
-        disable_hlt();
-
+        cpu_idle_poll_ctrl(true);
         return 0;
 }
 
@@ -621,7 +621,7 @@ static int omap_pm_enter(suspend_state_t state)
 
 static void omap_pm_finish(void)
 {
-        enable_hlt();
+        cpu_idle_poll_ctrl(false);
 }
 
 
diff --git a/arch/arm/mach-omap2/common.h b/arch/arm/mach-omap2/common.h
index d6ba13e1c540..14522d077c88 100644
--- a/arch/arm/mach-omap2/common.h
+++ b/arch/arm/mach-omap2/common.h
@@ -249,7 +249,6 @@ extern int omap4_enter_lowpower(unsigned int cpu, unsigned int power_state);
 extern int omap4_finish_suspend(unsigned long cpu_state);
 extern void omap4_cpu_resume(void);
 extern int omap4_hotplug_cpu(unsigned int cpu, unsigned int power_state);
-extern u32 omap4_mpuss_read_prev_context_state(void);
 #else
 static inline int omap4_enter_lowpower(unsigned int cpu,
                                         unsigned int power_state)
@@ -277,10 +276,6 @@ static inline int omap4_finish_suspend(unsigned long cpu_state)
 static inline void omap4_cpu_resume(void)
 {}
 
-static inline u32 omap4_mpuss_read_prev_context_state(void)
-{
-        return 0;
-}
 #endif
 
 struct omap_sdrc_params;
diff --git a/arch/arm/mach-omap2/cpuidle34xx.c b/arch/arm/mach-omap2/cpuidle34xx.c
index 80392fca86c6..cca045c95fbf 100644
--- a/arch/arm/mach-omap2/cpuidle34xx.c
+++ b/arch/arm/mach-omap2/cpuidle34xx.c
@@ -26,6 +26,7 @@
 #include <linux/cpuidle.h>
 #include <linux/export.h>
 #include <linux/cpu_pm.h>
+#include <asm/cpuidle.h>
 
 #include "powerdomain.h"
 #include "clockdomain.h"
@@ -99,11 +100,15 @@ static struct omap3_idle_statedata omap3_idle_data[] = {
         },
 };
 
-/* Private functions */
-
-static int __omap3_enter_idle(struct cpuidle_device *dev,
-                                struct cpuidle_driver *drv,
-                                int index)
+/**
+ * omap3_enter_idle - Programs OMAP3 to enter the specified state
+ * @dev: cpuidle device
+ * @drv: cpuidle driver
+ * @index: the index of state to be entered
+ */
+static int omap3_enter_idle(struct cpuidle_device *dev,
+                            struct cpuidle_driver *drv,
+                            int index)
 {
         struct omap3_idle_statedata *cx = &omap3_idle_data[index];
 
@@ -149,22 +154,6 @@ return_sleep_time:
 }
 
 /**
- * omap3_enter_idle - Programs OMAP3 to enter the specified state
- * @dev: cpuidle device
- * @drv: cpuidle driver
- * @index: the index of state to be entered
- *
- * Called from the CPUidle framework to program the device to the
- * specified target state selected by the governor.
- */
-static inline int omap3_enter_idle(struct cpuidle_device *dev,
-                                struct cpuidle_driver *drv,
-                                int index)
-{
-        return cpuidle_wrap_enter(dev, drv, index, __omap3_enter_idle);
-}
-
-/**
  * next_valid_state - Find next valid C-state
  * @dev: cpuidle device
  * @drv: cpuidle driver
@@ -271,11 +260,9 @@ static int omap3_enter_idle_bm(struct cpuidle_device *dev,
         return ret;
 }
 
-static DEFINE_PER_CPU(struct cpuidle_device, omap3_idle_dev);
-
 static struct cpuidle_driver omap3_idle_driver = {
-        .name =         "omap3_idle",
-        .owner =        THIS_MODULE,
+        .name             = "omap3_idle",
+        .owner            = THIS_MODULE,
         .states = {
                 {
                         .enter            = omap3_enter_idle_bm,
@@ -348,8 +335,6 @@ static struct cpuidle_driver omap3_idle_driver = {
  */
 int __init omap3_idle_init(void)
 {
-        struct cpuidle_device *dev;
-
         mpu_pd = pwrdm_lookup("mpu_pwrdm");
         core_pd = pwrdm_lookup("core_pwrdm");
         per_pd = pwrdm_lookup("per_pwrdm");
@@ -358,16 +343,5 @@ int __init omap3_idle_init(void)
         if (!mpu_pd || !core_pd || !per_pd || !cam_pd)
                 return -ENODEV;
 
-        cpuidle_register_driver(&omap3_idle_driver);
-
-        dev = &per_cpu(omap3_idle_dev, smp_processor_id());
-        dev->cpu = 0;
-
-        if (cpuidle_register_device(dev)) {
-                printk(KERN_ERR "%s: CPUidle register device failed\n",
-                       __func__);
-                return -EIO;
-        }
-
-        return 0;
+        return cpuidle_register(&omap3_idle_driver, NULL);
 }
diff --git a/arch/arm/mach-omap2/cpuidle44xx.c b/arch/arm/mach-omap2/cpuidle44xx.c
index d639aef0deda..5a286b56205e 100644
--- a/arch/arm/mach-omap2/cpuidle44xx.c
+++ b/arch/arm/mach-omap2/cpuidle44xx.c
@@ -1,7 +1,7 @@
 /*
- * OMAP4 CPU idle Routines
+ * OMAP4+ CPU idle Routines
  *
- * Copyright (C) 2011 Texas Instruments, Inc.
+ * Copyright (C) 2011-2013 Texas Instruments, Inc.
  * Santosh Shilimkar <santosh.shilimkar@ti.com>
  * Rajendra Nayak <rnayak@ti.com>
  *
@@ -14,8 +14,8 @@
 #include <linux/cpuidle.h>
 #include <linux/cpu_pm.h>
 #include <linux/export.h>
-#include <linux/clockchips.h>
 
+#include <asm/cpuidle.h>
 #include <asm/proc-fns.h>
 
 #include "common.h"
@@ -24,13 +24,13 @@
 #include "clockdomain.h"
 
 /* Machine specific information */
-struct omap4_idle_statedata {
+struct idle_statedata {
         u32 cpu_state;
         u32 mpu_logic_state;
         u32 mpu_state;
 };
 
-static struct omap4_idle_statedata omap4_idle_data[] = {
+static struct idle_statedata omap4_idle_data[] = {
         {
                 .cpu_state = PWRDM_POWER_ON,
                 .mpu_state = PWRDM_POWER_ON,
@@ -53,11 +53,12 @@ static struct clockdomain *cpu_clkdm[NR_CPUS];
 
 static atomic_t abort_barrier;
 static bool cpu_done[NR_CPUS];
+static struct idle_statedata *state_ptr = &omap4_idle_data[0];
 
 /* Private functions */
 
 /**
- * omap4_enter_idle_coupled_[simple/coupled] - OMAP4 cpuidle entry functions
+ * omap_enter_idle_[simple/coupled] - OMAP4PLUS cpuidle entry functions
  * @dev: cpuidle device
  * @drv: cpuidle driver
  * @index: the index of state to be entered
@@ -66,7 +67,7 @@ static bool cpu_done[NR_CPUS];
  * specified low power state selected by the governor.
  * Returns the amount of time spent in the low power state.
  */
-static int omap4_enter_idle_simple(struct cpuidle_device *dev,
+static int omap_enter_idle_simple(struct cpuidle_device *dev,
                         struct cpuidle_driver *drv,
                         int index)
 {
@@ -77,12 +78,11 @@ static int omap4_enter_idle_simple(struct cpuidle_device *dev,
         return index;
 }
 
-static int omap4_enter_idle_coupled(struct cpuidle_device *dev,
+static int omap_enter_idle_coupled(struct cpuidle_device *dev,
                         struct cpuidle_driver *drv,
                         int index)
 {
-        struct omap4_idle_statedata *cx = &omap4_idle_data[index];
-        int cpu_id = smp_processor_id();
+        struct idle_statedata *cx = state_ptr + index;
 
         local_fiq_disable();
 
@@ -109,8 +109,6 @@ static int omap4_enter_idle_coupled(struct cpuidle_device *dev,
                 }
         }
 
-        clockevents_notify(CLOCK_EVT_NOTIFY_BROADCAST_ENTER, &cpu_id);
-
         /*
          * Call idle CPU PM enter notifier chain so that
          * VFP and per CPU interrupt context is saved.
@@ -149,11 +147,10 @@ static int omap4_enter_idle_coupled(struct cpuidle_device *dev,
          * Call idle CPU cluster PM exit notifier chain
          * to restore GIC and wakeupgen context.
          */
-        if (omap4_mpuss_read_prev_context_state())
+        if ((cx->mpu_state == PWRDM_POWER_RET) &&
+                (cx->mpu_logic_state == PWRDM_POWER_OFF))
                 cpu_cluster_pm_exit();
 
-        clockevents_notify(CLOCK_EVT_NOTIFY_BROADCAST_EXIT, &cpu_id);
-
 fail:
         cpuidle_coupled_parallel_barrier(dev, &abort_barrier);
         cpu_done[dev->cpu] = false;
@@ -163,49 +160,38 @@ fail:
         return index;
 }
 
-/*
- * For each cpu, setup the broadcast timer because local timers
- * stops for the states above C1.
- */
-static void omap_setup_broadcast_timer(void *arg)
-{
-        int cpu = smp_processor_id();
-        clockevents_notify(CLOCK_EVT_NOTIFY_BROADCAST_ON, &cpu);
-}
-
-static DEFINE_PER_CPU(struct cpuidle_device, omap4_idle_dev);
-
 static struct cpuidle_driver omap4_idle_driver = {
         .name                           = "omap4_idle",
         .owner                          = THIS_MODULE,
-        .en_core_tk_irqen               = 1,
         .states = {
                 {
                         /* C1 - CPU0 ON + CPU1 ON + MPU ON */
                         .exit_latency = 2 + 2,
                         .target_residency = 5,
                         .flags = CPUIDLE_FLAG_TIME_VALID,
-                        .enter = omap4_enter_idle_simple,
+                        .enter = omap_enter_idle_simple,
                         .name = "C1",
-                        .desc = "MPUSS ON"
+                        .desc = "CPUx ON, MPUSS ON"
                 },
                 {
                         /* C2 - CPU0 OFF + CPU1 OFF + MPU CSWR */
                         .exit_latency = 328 + 440,
                         .target_residency = 960,
-                        .flags = CPUIDLE_FLAG_TIME_VALID | CPUIDLE_FLAG_COUPLED,
-                        .enter = omap4_enter_idle_coupled,
+                        .flags = CPUIDLE_FLAG_TIME_VALID | CPUIDLE_FLAG_COUPLED |
+                                 CPUIDLE_FLAG_TIMER_STOP,
+                        .enter = omap_enter_idle_coupled,
                         .name = "C2",
-                        .desc = "MPUSS CSWR",
+                        .desc = "CPUx OFF, MPUSS CSWR",
                 },
                 {
                         /* C3 - CPU0 OFF + CPU1 OFF + MPU OSWR */
                         .exit_latency = 460 + 518,
                         .target_residency = 1100,
-                        .flags = CPUIDLE_FLAG_TIME_VALID | CPUIDLE_FLAG_COUPLED,
-                        .enter = omap4_enter_idle_coupled,
+                        .flags = CPUIDLE_FLAG_TIME_VALID | CPUIDLE_FLAG_COUPLED |
+                                 CPUIDLE_FLAG_TIMER_STOP,
+                        .enter = omap_enter_idle_coupled,
                         .name = "C3",
-                        .desc = "MPUSS OSWR",
+                        .desc = "CPUx OFF, MPUSS OSWR",
                 },
         },
         .state_count = ARRAY_SIZE(omap4_idle_data),
@@ -215,16 +201,13 @@ static struct cpuidle_driver omap4_idle_driver = {
 /* Public functions */
 
 /**
- * omap4_idle_init - Init routine for OMAP4 idle
+ * omap4_idle_init - Init routine for OMAP4+ idle
  *
- * Registers the OMAP4 specific cpuidle driver to the cpuidle
+ * Registers the OMAP4+ specific cpuidle driver to the cpuidle
  * framework with the valid set of states.
  */
 int __init omap4_idle_init(void)
 {
-        struct cpuidle_device *dev;
-        unsigned int cpu_id = 0;
-
         mpu_pd = pwrdm_lookup("mpu_pwrdm");
         cpu_pd[0] = pwrdm_lookup("cpu0_pwrdm");
         cpu_pd[1] = pwrdm_lookup("cpu1_pwrdm");
@@ -236,22 +219,5 @@ int __init omap4_idle_init(void)
         if (!cpu_clkdm[0] || !cpu_clkdm[1])
                 return -ENODEV;
 
-        /* Configure the broadcast timer on each cpu */
-        on_each_cpu(omap_setup_broadcast_timer, NULL, 1);
-
-        for_each_cpu(cpu_id, cpu_online_mask) {
-                dev = &per_cpu(omap4_idle_dev, cpu_id);
-                dev->cpu = cpu_id;
-#ifdef CONFIG_ARCH_NEEDS_CPU_IDLE_COUPLED
-                dev->coupled_cpus = *cpu_online_mask;
-#endif
-                cpuidle_register_driver(&omap4_idle_driver);
-
-                if (cpuidle_register_device(dev)) {
-                        pr_err("%s: CPUidle register failed\n", __func__);
-                        return -EIO;
-                }
-        }
-
-        return 0;
+        return cpuidle_register(&omap4_idle_driver, cpu_online_mask);
 }
diff --git a/arch/arm/mach-omap2/omap-mpuss-lowpower.c b/arch/arm/mach-omap2/omap-mpuss-lowpower.c
index 8bcb64bcdcdb..e80327b6c81f 100644
--- a/arch/arm/mach-omap2/omap-mpuss-lowpower.c
+++ b/arch/arm/mach-omap2/omap-mpuss-lowpower.c
@@ -139,20 +139,6 @@ static inline void cpu_clear_prev_logic_pwrst(unsigned int cpu_id)
         }
 }
 
-/**
- * omap4_mpuss_read_prev_context_state:
- * Function returns the MPUSS previous context state
- */
-u32 omap4_mpuss_read_prev_context_state(void)
-{
-        u32 reg;
-
-        reg = omap4_prminst_read_inst_reg(OMAP4430_PRM_PARTITION,
-                OMAP4430_PRM_MPU_INST, OMAP4_RM_MPU_MPU_CONTEXT_OFFSET);
-        reg &= OMAP4430_LOSTCONTEXT_DFF_MASK;
-        return reg;
-}
-
 /*
  * Store the CPU cluster state for L2X0 low power operations.
  */
diff --git a/arch/arm/mach-omap2/omap_hwmod.c b/arch/arm/mach-omap2/omap_hwmod.c
index a202a4785104..e512253601c8 100644
--- a/arch/arm/mach-omap2/omap_hwmod.c
+++ b/arch/arm/mach-omap2/omap_hwmod.c
@@ -138,6 +138,7 @@
 #include <linux/spinlock.h>
 #include <linux/slab.h>
 #include <linux/bootmem.h>
+#include <linux/cpu.h>
 
 #include <asm/system_misc.h>
 
@@ -2157,7 +2158,7 @@ static int _enable(struct omap_hwmod *oh)
         if (soc_ops.enable_module)
                 soc_ops.enable_module(oh);
         if (oh->flags & HWMOD_BLOCK_WFI)
-                disable_hlt();
+                cpu_idle_poll_ctrl(true);
 
         if (soc_ops.update_context_lost)
                 soc_ops.update_context_lost(oh);
@@ -2221,7 +2222,7 @@ static int _idle(struct omap_hwmod *oh)
         _del_initiator_dep(oh, mpu_oh);
 
         if (oh->flags & HWMOD_BLOCK_WFI)
-                enable_hlt();
+                cpu_idle_poll_ctrl(false);
         if (soc_ops.disable_module)
                 soc_ops.disable_module(oh);
 
@@ -2331,7 +2332,7 @@ static int _shutdown(struct omap_hwmod *oh)
                 _del_initiator_dep(oh, mpu_oh);
                 /* XXX what about the other system initiators here? dma, dsp */
                 if (oh->flags & HWMOD_BLOCK_WFI)
-                        enable_hlt();
+                        cpu_idle_poll_ctrl(false);
                 if (soc_ops.disable_module)
                         soc_ops.disable_module(oh);
                 _disable_clocks(oh);
diff --git a/arch/arm/mach-omap2/pm.c b/arch/arm/mach-omap2/pm.c
index 673a4c1d1d76..e742118fcfd2 100644
--- a/arch/arm/mach-omap2/pm.c
+++ b/arch/arm/mach-omap2/pm.c
@@ -218,7 +218,7 @@ static int omap_pm_enter(suspend_state_t suspend_state)
 
 static int omap_pm_begin(suspend_state_t state)
 {
-        disable_hlt();
+        cpu_idle_poll_ctrl(true);
         if (cpu_is_omap34xx())
                 omap_prcm_irq_prepare();
         return 0;
@@ -226,8 +226,7 @@ static int omap_pm_begin(suspend_state_t state)
 
 static void omap_pm_end(void)
 {
-        enable_hlt();
-        return;
+        cpu_idle_poll_ctrl(false);
 }
 
 static void omap_pm_finish(void)
@@ -265,6 +264,12 @@ static void __init omap4_init_voltages(void)
         omap2_set_init_voltage("iva", "dpll_iva_m5x2_ck", "iva");
 }
 
+static inline void omap_init_cpufreq(void)
+{
+        struct platform_device_info devinfo = { .name = "omap-cpufreq", };
+        platform_device_register_full(&devinfo);
+}
+
 static int __init omap2_common_pm_init(void)
 {
         if (!of_have_populated_dt())
@@ -294,6 +299,9 @@ int __init omap2_common_pm_late_init(void)
 
                 /* Smartreflex device init */
                 omap_devinit_smartreflex();
+
+                /* cpufreq dummy device instantiation */
+                omap_init_cpufreq();
         }
 
 #ifdef CONFIG_SUSPEND
diff --git a/arch/arm/mach-omap2/pm44xx.c b/arch/arm/mach-omap2/pm44xx.c
index ea62e75ef21d..152a10cf4f1d 100644
--- a/arch/arm/mach-omap2/pm44xx.c
+++ b/arch/arm/mach-omap2/pm44xx.c
@@ -126,8 +126,8 @@ static int __init pwrdms_setup(struct powerdomain *pwrdm, void *unused)
  * omap_default_idle - OMAP4 default ilde routine.'
  *
  * Implements OMAP4 memory, IO ordering requirements which can't be addressed
- * with default cpu_do_idle() hook. Used by all CPUs with !CONFIG_CPUIDLE and
- * by secondary CPU with CONFIG_CPUIDLE.
+ * with default cpu_do_idle() hook. Used by all CPUs with !CONFIG_CPU_IDLE and
+ * by secondary CPU with CONFIG_CPU_IDLE.
  */
 static void omap_default_idle(void)
 {
diff --git a/arch/arm/mach-orion5x/board-dt.c b/arch/arm/mach-orion5x/board-dt.c
index 35a8014529ca..94fbb815680c 100644
--- a/arch/arm/mach-orion5x/board-dt.c
+++ b/arch/arm/mach-orion5x/board-dt.c
@@ -14,6 +14,7 @@
 #include <linux/init.h>
 #include <linux/of.h>
 #include <linux/of_platform.h>
+#include <linux/cpu.h>
 #include <asm/system_misc.h>
 #include <asm/mach/arch.h>
 #include <mach/orion5x.h>
@@ -52,7 +53,7 @@ static void __init orion5x_dt_init(void)
          */
         if (dev == MV88F5281_DEV_ID && rev == MV88F5281_REV_D0) {
                 printk(KERN_INFO "Orion: Applying 5281 D0 WFI workaround.\n");
-                disable_hlt();
+                cpu_idle_poll_ctrl(true);
         }
 
         if (of_machine_is_compatible("lacie,ethernet-disk-mini-v2"))
diff --git a/arch/arm/mach-orion5x/common.c b/arch/arm/mach-orion5x/common.c
index d068f1431c40..ad71c8a03ffd 100644
--- a/arch/arm/mach-orion5x/common.c
+++ b/arch/arm/mach-orion5x/common.c
@@ -293,7 +293,7 @@ void __init orion5x_init(void)
          */
         if (dev == MV88F5281_DEV_ID && rev == MV88F5281_REV_D0) {
                 printk(KERN_INFO "Orion: Applying 5281 D0 WFI workaround.\n");
-                disable_hlt();
+                cpu_idle_poll_ctrl(true);
         }
 
         /*
diff --git a/arch/arm/mach-pxa/Makefile b/arch/arm/mach-pxa/Makefile
index 12c500558387..648867a8caa8 100644
--- a/arch/arm/mach-pxa/Makefile
+++ b/arch/arm/mach-pxa/Makefile
@@ -7,12 +7,6 @@ obj-y				+= clock.o devices.o generic.o irq.o \
                                    time.o reset.o
 obj-$(CONFIG_PM)                += pm.o sleep.o standby.o
 
-ifeq ($(CONFIG_CPU_FREQ),y)
-obj-$(CONFIG_PXA25x)            += cpufreq-pxa2xx.o
-obj-$(CONFIG_PXA27x)            += cpufreq-pxa2xx.o
-obj-$(CONFIG_PXA3xx)            += cpufreq-pxa3xx.o
-endif
-
 # Generic drivers that other drivers may depend upon
 
 # SoC-specific code
diff --git a/arch/arm/mach-pxa/cpufreq-pxa2xx.c b/arch/arm/mach-pxa/cpufreq-pxa2xx.c
deleted file mode 100644
index 6a7aeab42f6c..000000000000
--- a/arch/arm/mach-pxa/cpufreq-pxa2xx.c
+++ /dev/null
@@ -1,494 +0,0 @@
-/*
- *  linux/arch/arm/mach-pxa/cpufreq-pxa2xx.c
- *
- *  Copyright (C) 2002,2003 Intrinsyc Software
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- * History:
- *   31-Jul-2002 : Initial version [FB]
- *   29-Jan-2003 : added PXA255 support [FB]
- *   20-Apr-2003 : ported to v2.5 (Dustin McIntire, Sensoria Corp.)
- *
- * Note:
- *   This driver may change the memory bus clock rate, but will not do any
- *   platform specific access timing changes... for example if you have flash
- *   memory connected to CS0, you will need to register a platform specific
- *   notifier which will adjust the memory access strobes to maintain a
- *   minimum strobe width.
- *
- */
-
-#include <linux/kernel.h>
-#include <linux/module.h>
-#include <linux/sched.h>
-#include <linux/init.h>
-#include <linux/cpufreq.h>
-#include <linux/err.h>
-#include <linux/regulator/consumer.h>
-#include <linux/io.h>
-
-#include <mach/pxa2xx-regs.h>
-#include <mach/smemc.h>
-
-#ifdef DEBUG
-static unsigned int freq_debug;
-module_param(freq_debug, uint, 0);
-MODULE_PARM_DESC(freq_debug, "Set the debug messages to on=1/off=0");
-#else
-#define freq_debug  0
-#endif
-
-static struct regulator *vcc_core;
-
-static unsigned int pxa27x_maxfreq;
-module_param(pxa27x_maxfreq, uint, 0);
-MODULE_PARM_DESC(pxa27x_maxfreq, "Set the pxa27x maxfreq in MHz"
-                 "(typically 624=>pxa270, 416=>pxa271, 520=>pxa272)");
-
-typedef struct {
-        unsigned int khz;
-        unsigned int membus;
-        unsigned int cccr;
-        unsigned int div2;
-        unsigned int cclkcfg;
-        int vmin;
-        int vmax;
-} pxa_freqs_t;
-
-/* Define the refresh period in mSec for the SDRAM and the number of rows */
-#define SDRAM_TREF      64      /* standard 64ms SDRAM */
-static unsigned int sdram_rows;
-
-#define CCLKCFG_TURBO           0x1
-#define CCLKCFG_FCS             0x2
-#define CCLKCFG_HALFTURBO       0x4
-#define CCLKCFG_FASTBUS         0x8
-#define MDREFR_DB2_MASK         (MDREFR_K2DB2 | MDREFR_K1DB2)
-#define MDREFR_DRI_MASK         0xFFF
-
-#define MDCNFG_DRAC2(mdcnfg) (((mdcnfg) >> 21) & 0x3)
-#define MDCNFG_DRAC0(mdcnfg) (((mdcnfg) >> 5) & 0x3)
-
-/*
- * PXA255 definitions
- */
-/* Use the run mode frequencies for the CPUFREQ_POLICY_PERFORMANCE policy */
-#define CCLKCFG                 CCLKCFG_TURBO | CCLKCFG_FCS
-
-static pxa_freqs_t pxa255_run_freqs[] =
-{
-        /* CPU   MEMBUS  CCCR  DIV2 CCLKCFG                run  turbo PXbus SDRAM */
-        { 99500,  99500, 0x121, 1,  CCLKCFG, -1, -1},   /*  99,   99,   50,   50  */
-        {132700, 132700, 0x123, 1,  CCLKCFG, -1, -1},   /* 133,  133,   66,   66  */
-        {199100,  99500, 0x141, 0,  CCLKCFG, -1, -1},   /* 199,  199,   99,   99  */
-        {265400, 132700, 0x143, 1,  CCLKCFG, -1, -1},   /* 265,  265,  133,   66  */
-        {331800, 165900, 0x145, 1,  CCLKCFG, -1, -1},   /* 331,  331,  166,   83  */
-        {398100,  99500, 0x161, 0,  CCLKCFG, -1, -1},   /* 398,  398,  196,   99  */
-};
-
-/* Use the turbo mode frequencies for the CPUFREQ_POLICY_POWERSAVE policy */
-static pxa_freqs_t pxa255_turbo_freqs[] =
-{
-        /* CPU   MEMBUS  CCCR  DIV2 CCLKCFG        run  turbo PXbus SDRAM */
-        { 99500, 99500,  0x121, 1,  CCLKCFG, -1, -1},   /*  99,   99,   50,   50  */
-        {199100, 99500,  0x221, 0,  CCLKCFG, -1, -1},   /*  99,  199,   50,   99  */
-        {298500, 99500,  0x321, 0,  CCLKCFG, -1, -1},   /*  99,  287,   50,   99  */
-        {298600, 99500,  0x1c1, 0,  CCLKCFG, -1, -1},   /* 199,  287,   99,   99  */
-        {398100, 99500,  0x241, 0,  CCLKCFG, -1, -1},   /* 199,  398,   99,   99  */
-};
-
-#define NUM_PXA25x_RUN_FREQS ARRAY_SIZE(pxa255_run_freqs)
-#define NUM_PXA25x_TURBO_FREQS ARRAY_SIZE(pxa255_turbo_freqs)
-
-static struct cpufreq_frequency_table
-        pxa255_run_freq_table[NUM_PXA25x_RUN_FREQS+1];
-static struct cpufreq_frequency_table
-        pxa255_turbo_freq_table[NUM_PXA25x_TURBO_FREQS+1];
-
-static unsigned int pxa255_turbo_table;
-module_param(pxa255_turbo_table, uint, 0);
-MODULE_PARM_DESC(pxa255_turbo_table, "Selects the frequency table (0 = run table, !0 = turbo table)");
-
-/*
- * PXA270 definitions
- *
- * For the PXA27x:
- * Control variables are A, L, 2N for CCCR; B, HT, T for CLKCFG.
- *
- * A = 0 => memory controller clock from table 3-7,
- * A = 1 => memory controller clock = system bus clock
- * Run mode frequency   = 13 MHz * L
- * Turbo mode frequency = 13 MHz * L * N
- * System bus frequency = 13 MHz * L / (B + 1)
- *
- * In CCCR:
- * A = 1
- * L = 16         oscillator to run mode ratio
- * 2N = 6         2 * (turbo mode to run mode ratio)
- *
- * In CCLKCFG:
- * B = 1          Fast bus mode
- * HT = 0         Half-Turbo mode
- * T = 1          Turbo mode
- *
- * For now, just support some of the combinations in table 3-7 of
- * PXA27x Processor Family Developer's Manual to simplify frequency
- * change sequences.
- */
-#define PXA27x_CCCR(A, L, N2) (A << 25 | N2 << 7 | L)
-#define CCLKCFG2(B, HT, T) \
-  (CCLKCFG_FCS | \
-   ((B)  ? CCLKCFG_FASTBUS : 0) | \
-   ((HT) ? CCLKCFG_HALFTURBO : 0) | \
-   ((T)  ? CCLKCFG_TURBO : 0))
-
-static pxa_freqs_t pxa27x_freqs[] = {
-        {104000, 104000, PXA27x_CCCR(1,  8, 2), 0, CCLKCFG2(1, 0, 1),  900000, 1705000 },
-        {156000, 104000, PXA27x_CCCR(1,  8, 3), 0, CCLKCFG2(1, 0, 1), 1000000, 1705000 },
-        {208000, 208000, PXA27x_CCCR(0, 16, 2), 1, CCLKCFG2(0, 0, 1), 1180000, 1705000 },
-        {312000, 208000, PXA27x_CCCR(1, 16, 3), 1, CCLKCFG2(1, 0, 1), 1250000, 1705000 },
-        {416000, 208000, PXA27x_CCCR(1, 16, 4), 1, CCLKCFG2(1, 0, 1), 1350000, 1705000 },
-        {520000, 208000, PXA27x_CCCR(1, 16, 5), 1, CCLKCFG2(1, 0, 1), 1450000, 1705000 },
-        {624000, 208000, PXA27x_CCCR(1, 16, 6), 1, CCLKCFG2(1, 0, 1), 1550000, 1705000 }
-};
-
-#define NUM_PXA27x_FREQS ARRAY_SIZE(pxa27x_freqs)
-static struct cpufreq_frequency_table
-        pxa27x_freq_table[NUM_PXA27x_FREQS+1];
-
-extern unsigned get_clk_frequency_khz(int info);
-
-#ifdef CONFIG_REGULATOR
-
-static int pxa_cpufreq_change_voltage(pxa_freqs_t *pxa_freq)
-{
-        int ret = 0;
-        int vmin, vmax;
-
-        if (!cpu_is_pxa27x())
-                return 0;
-
-        vmin = pxa_freq->vmin;
-        vmax = pxa_freq->vmax;
-        if ((vmin == -1) || (vmax == -1))
-                return 0;
-
-        ret = regulator_set_voltage(vcc_core, vmin, vmax);
-        if (ret)
-                pr_err("cpufreq: Failed to set vcc_core in [%dmV..%dmV]\n",
-                       vmin, vmax);
-        return ret;
-}
-
-static __init void pxa_cpufreq_init_voltages(void)
-{
-        vcc_core = regulator_get(NULL, "vcc_core");
-        if (IS_ERR(vcc_core)) {
-                pr_info("cpufreq: Didn't find vcc_core regulator\n");
-                vcc_core = NULL;
-        } else {
-                pr_info("cpufreq: Found vcc_core regulator\n");
-        }
-}
-#else
-static int pxa_cpufreq_change_voltage(pxa_freqs_t *pxa_freq)
-{
-        return 0;
-}
-
-static __init void pxa_cpufreq_init_voltages(void) { }
-#endif
-
-static void find_freq_tables(struct cpufreq_frequency_table **freq_table,
-                             pxa_freqs_t **pxa_freqs)
-{
-        if (cpu_is_pxa25x()) {
-                if (!pxa255_turbo_table) {
-                        *pxa_freqs = pxa255_run_freqs;
-                        *freq_table = pxa255_run_freq_table;
-                } else {
-                        *pxa_freqs = pxa255_turbo_freqs;
-                        *freq_table = pxa255_turbo_freq_table;
-                }
-        }
-        if (cpu_is_pxa27x()) {
-                *pxa_freqs = pxa27x_freqs;
-                *freq_table = pxa27x_freq_table;
-        }
-}
-
-static void pxa27x_guess_max_freq(void)
-{
-        if (!pxa27x_maxfreq) {
-                pxa27x_maxfreq = 416000;
-                printk(KERN_INFO "PXA CPU 27x max frequency not defined "
-                       "(pxa27x_maxfreq), assuming pxa271 with %dkHz maxfreq\n",
-                       pxa27x_maxfreq);
-        } else {
-                pxa27x_maxfreq *= 1000;
-        }
-}
-
-static void init_sdram_rows(void)
-{
-        uint32_t mdcnfg = __raw_readl(MDCNFG);
-        unsigned int drac2 = 0, drac0 = 0;
-
-        if (mdcnfg & (MDCNFG_DE2 | MDCNFG_DE3))
-                drac2 = MDCNFG_DRAC2(mdcnfg);
-
-        if (mdcnfg & (MDCNFG_DE0 | MDCNFG_DE1))
-                drac0 = MDCNFG_DRAC0(mdcnfg);
-
-        sdram_rows = 1 << (11 + max(drac0, drac2));
-}
-
-static u32 mdrefr_dri(unsigned int freq)
-{
-        u32 interval = freq * SDRAM_TREF / sdram_rows;
-
-        return (interval - (cpu_is_pxa27x() ? 31 : 0)) / 32;
-}
-
-/* find a valid frequency point */
-static int pxa_verify_policy(struct cpufreq_policy *policy)
-{
-        struct cpufreq_frequency_table *pxa_freqs_table;
-        pxa_freqs_t *pxa_freqs;
-        int ret;
-
-        find_freq_tables(&pxa_freqs_table, &pxa_freqs);
-        ret = cpufreq_frequency_table_verify(policy, pxa_freqs_table);
-
-        if (freq_debug)
-                pr_debug("Verified CPU policy: %dKhz min to %dKhz max\n",
-                         policy->min, policy->max);
-
-        return ret;
-}
-
-static unsigned int pxa_cpufreq_get(unsigned int cpu)
-{
-        return get_clk_frequency_khz(0);
-}
-
-static int pxa_set_target(struct cpufreq_policy *policy,
-                          unsigned int target_freq,
-                          unsigned int relation)
-{
-        struct cpufreq_frequency_table *pxa_freqs_table;
-        pxa_freqs_t *pxa_freq_settings;
-        struct cpufreq_freqs freqs;
-        unsigned int idx;
-        unsigned long flags;
-        unsigned int new_freq_cpu, new_freq_mem;
-        unsigned int unused, preset_mdrefr, postset_mdrefr, cclkcfg;
-        int ret = 0;
-
-        /* Get the current policy */
-        find_freq_tables(&pxa_freqs_table, &pxa_freq_settings);
-
-        /* Lookup the next frequency */
-        if (cpufreq_frequency_table_target(policy, pxa_freqs_table,
-                                           target_freq, relation, &idx)) {
-                return -EINVAL;
-        }
-
-        new_freq_cpu = pxa_freq_settings[idx].khz;
-        new_freq_mem = pxa_freq_settings[idx].membus;
-        freqs.old = policy->cur;
-        freqs.new = new_freq_cpu;
-        freqs.cpu = policy->cpu;
-
-        if (freq_debug)
-                pr_debug("Changing CPU frequency to %d Mhz, (SDRAM %d Mhz)\n",
-                         freqs.new / 1000, (pxa_freq_settings[idx].div2) ?
-                         (new_freq_mem / 2000) : (new_freq_mem / 1000));
-
-        if (vcc_core && freqs.new > freqs.old)
-                ret = pxa_cpufreq_change_voltage(&pxa_freq_settings[idx]);
-        if (ret)
-                return ret;
-        /*
-         * Tell everyone what we're about to do...
-         * you should add a notify client with any platform specific
-         * Vcc changing capability
-         */
-        cpufreq_notify_transition(&freqs, CPUFREQ_PRECHANGE);
-
-        /* Calculate the next MDREFR.  If we're slowing down the SDRAM clock
-         * we need to preset the smaller DRI before the change.  If we're
-         * speeding up we need to set the larger DRI value after the change.
-         */
-        preset_mdrefr = postset_mdrefr = __raw_readl(MDREFR);
-        if ((preset_mdrefr & MDREFR_DRI_MASK) > mdrefr_dri(new_freq_mem)) {
-                preset_mdrefr = (preset_mdrefr & ~MDREFR_DRI_MASK);
-                preset_mdrefr |= mdrefr_dri(new_freq_mem);
-        }
-        postset_mdrefr =
-                (postset_mdrefr & ~MDREFR_DRI_MASK) | mdrefr_dri(new_freq_mem);
-
-        /* If we're dividing the memory clock by two for the SDRAM clock, this
-         * must be set prior to the change.  Clearing the divide must be done
-         * after the change.
-         */
-        if (pxa_freq_settings[idx].div2) {
-                preset_mdrefr  |= MDREFR_DB2_MASK;
-                postset_mdrefr |= MDREFR_DB2_MASK;
-        } else {
-                postset_mdrefr &= ~MDREFR_DB2_MASK;
-        }
-
-        local_irq_save(flags);
-
-        /* Set new the CCCR and prepare CCLKCFG */
-        CCCR = pxa_freq_settings[idx].cccr;
-        cclkcfg = pxa_freq_settings[idx].cclkcfg;
-
-        asm volatile("                                                  \n\
-                ldr     r4, [%1]                /* load MDREFR */       \n\
-                b       2f                                              \n\
-                .align  5                                               \n\
-1:                                                                      \n\
-                str     %3, [%1]                /* preset the MDREFR */ \n\
-                mcr     p14, 0, %2, c6, c0, 0   /* set CCLKCFG[FCS] */  \n\
-                str     %4, [%1]                /* postset the MDREFR */ \n\
-                                                                        \n\
-                b       3f                                              \n\
-2:              b       1b                                              \n\
-3:              nop                                                     \n\
-          "
-                     : "=&r" (unused)
-                     : "r" (MDREFR), "r" (cclkcfg),
-                       "r" (preset_mdrefr), "r" (postset_mdrefr)
-                     : "r4", "r5");
-        local_irq_restore(flags);
-
-        /*
-         * Tell everyone what we've just done...
-         * you should add a notify client with any platform specific
-         * SDRAM refresh timer adjustments
-         */
-        cpufreq_notify_transition(&freqs, CPUFREQ_POSTCHANGE);
-
-        /*
-         * Even if voltage setting fails, we don't report it, as the frequency
-         * change succeeded. The voltage reduction is not a critical failure,
-         * only power savings will suffer from this.
-         *
-         * Note: if the voltage change fails, and a return value is returned, a
-         * bug is triggered (seems a deadlock). Should anybody find out where,
-         * the "return 0" should become a "return ret".
-         */
-        if (vcc_core && freqs.new < freqs.old)
-                ret = pxa_cpufreq_change_voltage(&pxa_freq_settings[idx]);
-
-        return 0;
-}
-
-static int pxa_cpufreq_init(struct cpufreq_policy *policy)
-{
-        int i;
-        unsigned int freq;
-        struct cpufreq_frequency_table *pxa255_freq_table;
-        pxa_freqs_t *pxa255_freqs;
-
-        /* try to guess pxa27x cpu */
-        if (cpu_is_pxa27x())
-                pxa27x_guess_max_freq();
-
-        pxa_cpufreq_init_voltages();
-
-        init_sdram_rows();
-
-        /* set default policy and cpuinfo */
-        policy->cpuinfo.transition_latency = 1000; /* FIXME: 1 ms, assumed */
-        policy->cur = get_clk_frequency_khz(0);    /* current freq */
-        policy->min = policy->max = policy->cur;
-
-        /* Generate pxa25x the run cpufreq_frequency_table struct */
-        for (i = 0; i < NUM_PXA25x_RUN_FREQS; i++) {
-                pxa255_run_freq_table[i].frequency = pxa255_run_freqs[i].khz;
-                pxa255_run_freq_table[i].index = i;
-        }
-        pxa255_run_freq_table[i].frequency = CPUFREQ_TABLE_END;
-
-        /* Generate pxa25x the turbo cpufreq_frequency_table struct */
-        for (i = 0; i < NUM_PXA25x_TURBO_FREQS; i++) {
-                pxa255_turbo_freq_table[i].frequency =
-                        pxa255_turbo_freqs[i].khz;
-                pxa255_turbo_freq_table[i].index = i;
-        }
-        pxa255_turbo_freq_table[i].frequency = CPUFREQ_TABLE_END;
-
-        pxa255_turbo_table = !!pxa255_turbo_table;
-
-        /* Generate the pxa27x cpufreq_frequency_table struct */
-        for (i = 0; i < NUM_PXA27x_FREQS; i++) {
-                freq = pxa27x_freqs[i].khz;
-                if (freq > pxa27x_maxfreq)
-                        break;
-                pxa27x_freq_table[i].frequency = freq;
-                pxa27x_freq_table[i].index = i;
-        }
-        pxa27x_freq_table[i].index = i;
-        pxa27x_freq_table[i].frequency = CPUFREQ_TABLE_END;
-
-        /*
-         * Set the policy's minimum and maximum frequencies from the tables
-         * just constructed.  This sets cpuinfo.mxx_freq, min and max.
-         */
-        if (cpu_is_pxa25x()) {
-                find_freq_tables(&pxa255_freq_table, &pxa255_freqs);
-                pr_info("PXA255 cpufreq using %s frequency table\n",
-                        pxa255_turbo_table ? "turbo" : "run");
-                cpufreq_frequency_table_cpuinfo(policy, pxa255_freq_table);
-        }
-        else if (cpu_is_pxa27x())
-                cpufreq_frequency_table_cpuinfo(policy, pxa27x_freq_table);
-
-        printk(KERN_INFO "PXA CPU frequency change support initialized\n");
-
-        return 0;
-}
-
-static struct cpufreq_driver pxa_cpufreq_driver = {
-        .verify = pxa_verify_policy,
-        .target = pxa_set_target,
-        .init   = pxa_cpufreq_init,
-        .get    = pxa_cpufreq_get,
-        .name   = "PXA2xx",
-};
-
-static int __init pxa_cpu_init(void)
-{
-        int ret = -ENODEV;
-        if (cpu_is_pxa25x() || cpu_is_pxa27x())
-                ret = cpufreq_register_driver(&pxa_cpufreq_driver);
-        return ret;
-}
-
-static void __exit pxa_cpu_exit(void)
-{
-        cpufreq_unregister_driver(&pxa_cpufreq_driver);
-}
-
-
-MODULE_AUTHOR("Intrinsyc Software Inc.");
-MODULE_DESCRIPTION("CPU frequency changing driver for the PXA architecture");
-MODULE_LICENSE("GPL");
-module_init(pxa_cpu_init);
-module_exit(pxa_cpu_exit);
diff --git a/arch/arm/mach-pxa/cpufreq-pxa3xx.c b/arch/arm/mach-pxa/cpufreq-pxa3xx.c
deleted file mode 100644
index b85b4ab7aac6..000000000000
--- a/arch/arm/mach-pxa/cpufreq-pxa3xx.c
+++ /dev/null
@@ -1,258 +0,0 @@
-/*
- * linux/arch/arm/mach-pxa/cpufreq-pxa3xx.c
- *
- * Copyright (C) 2008 Marvell International Ltd.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- */
-
-#include <linux/kernel.h>
-#include <linux/module.h>
-#include <linux/sched.h>
-#include <linux/init.h>
-#include <linux/cpufreq.h>
-#include <linux/slab.h>
-#include <linux/io.h>
-
-#include <mach/pxa3xx-regs.h>
-
-#include "generic.h"
-
-#define HSS_104M        (0)
-#define HSS_156M        (1)
-#define HSS_208M        (2)
-#define HSS_312M        (3)
-
-#define SMCFS_78M       (0)
-#define SMCFS_104M      (2)
-#define SMCFS_208M      (5)
-
-#define SFLFS_104M      (0)
-#define SFLFS_156M      (1)
-#define SFLFS_208M      (2)
-#define SFLFS_312M      (3)
-
-#define XSPCLK_156M     (0)
-#define XSPCLK_NONE     (3)
-
-#define DMCFS_26M       (0)
-#define DMCFS_260M      (3)
-
-struct pxa3xx_freq_info {
-        unsigned int cpufreq_mhz;
-        unsigned int core_xl : 5;
-        unsigned int core_xn : 3;
-        unsigned int hss : 2;
-        unsigned int dmcfs : 2;
-        unsigned int smcfs : 3;
-        unsigned int sflfs : 2;
-        unsigned int df_clkdiv : 3;
-
-        int     vcc_core;       /* in mV */
-        int     vcc_sram;       /* in mV */
-};
-
-#define OP(cpufreq, _xl, _xn, _hss, _dmc, _smc, _sfl, _dfi, vcore, vsram) \
-{                                                                       \
-        .cpufreq_mhz    = cpufreq,                                      \
-        .core_xl        = _xl,                                          \
-        .core_xn        = _xn,                                          \
-        .hss            = HSS_##_hss##M,                                \
-        .dmcfs          = DMCFS_##_dmc##M,                              \
-        .smcfs          = SMCFS_##_smc##M,                              \
-        .sflfs          = SFLFS_##_sfl##M,                              \
-        .df_clkdiv      = _dfi,                                         \
-        .vcc_core       = vcore,                                        \
-        .vcc_sram       = vsram,                                        \
-}
-
-static struct pxa3xx_freq_info pxa300_freqs[] = {
-        /*  CPU XL XN  HSS DMEM SMEM SRAM DFI VCC_CORE VCC_SRAM */
-        OP(104,  8, 1, 104, 260,  78, 104, 3, 1000, 1100), /* 104MHz */
-        OP(208, 16, 1, 104, 260, 104, 156, 2, 1000, 1100), /* 208MHz */
-        OP(416, 16, 2, 156, 260, 104, 208, 2, 1100, 1200), /* 416MHz */
-        OP(624, 24, 2, 208, 260, 208, 312, 3, 1375, 1400), /* 624MHz */
-};
-
-static struct pxa3xx_freq_info pxa320_freqs[] = {
-        /*  CPU XL XN  HSS DMEM SMEM SRAM DFI VCC_CORE VCC_SRAM */
-        OP(104,  8, 1, 104, 260,  78, 104, 3, 1000, 1100), /* 104MHz */
-        OP(208, 16, 1, 104, 260, 104, 156, 2, 1000, 1100), /* 208MHz */
-        OP(416, 16, 2, 156, 260, 104, 208, 2, 1100, 1200), /* 416MHz */
-        OP(624, 24, 2, 208, 260, 208, 312, 3, 1375, 1400), /* 624MHz */
-        OP(806, 31, 2, 208, 260, 208, 312, 3, 1400, 1400), /* 806MHz */
-};
-
-static unsigned int pxa3xx_freqs_num;
-static struct pxa3xx_freq_info *pxa3xx_freqs;
-static struct cpufreq_frequency_table *pxa3xx_freqs_table;
-
-static int setup_freqs_table(struct cpufreq_policy *policy,
-                             struct pxa3xx_freq_info *freqs, int num)
-{
-        struct cpufreq_frequency_table *table;
-        int i;
-
-        table = kzalloc((num + 1) * sizeof(*table), GFP_KERNEL);
-        if (table == NULL)
-                return -ENOMEM;
-
-        for (i = 0; i < num; i++) {
-                table[i].index = i;
-                table[i].frequency = freqs[i].cpufreq_mhz * 1000;
-        }
-        table[num].index = i;
-        table[num].frequency = CPUFREQ_TABLE_END;
-
-        pxa3xx_freqs = freqs;
-        pxa3xx_freqs_num = num;
-        pxa3xx_freqs_table = table;
-
-        return cpufreq_frequency_table_cpuinfo(policy, table);
-}
-
-static void __update_core_freq(struct pxa3xx_freq_info *info)
-{
-        uint32_t mask = ACCR_XN_MASK | ACCR_XL_MASK;
-        uint32_t accr = ACCR;
-        uint32_t xclkcfg;
-
-        accr &= ~(ACCR_XN_MASK | ACCR_XL_MASK | ACCR_XSPCLK_MASK);
-        accr |= ACCR_XN(info->core_xn) | ACCR_XL(info->core_xl);
-
-        /* No clock until core PLL is re-locked */
-        accr |= ACCR_XSPCLK(XSPCLK_NONE);
-
-        xclkcfg = (info->core_xn == 2) ? 0x3 : 0x2;     /* turbo bit */
-
-        ACCR = accr;
-        __asm__("mcr p14, 0, %0, c6, c0, 0\n" : : "r"(xclkcfg));
-
-        while ((ACSR & mask) != (accr & mask))
-                cpu_relax();
-}
-
-static void __update_bus_freq(struct pxa3xx_freq_info *info)
-{
-        uint32_t mask;
-        uint32_t accr = ACCR;
-
-        mask = ACCR_SMCFS_MASK | ACCR_SFLFS_MASK | ACCR_HSS_MASK |
-                ACCR_DMCFS_MASK;
-
-        accr &= ~mask;
-        accr |= ACCR_SMCFS(info->smcfs) | ACCR_SFLFS(info->sflfs) |
-                ACCR_HSS(info->hss) | ACCR_DMCFS(info->dmcfs);
-
-        ACCR = accr;
-
-        while ((ACSR & mask) != (accr & mask))
-                cpu_relax();
-}
-
-static int pxa3xx_cpufreq_verify(struct cpufreq_policy *policy)
-{
-        return cpufreq_frequency_table_verify(policy, pxa3xx_freqs_table);
-}
-
-static unsigned int pxa3xx_cpufreq_get(unsigned int cpu)
-{
-        return pxa3xx_get_clk_frequency_khz(0);
-}
-
-static int pxa3xx_cpufreq_set(struct cpufreq_policy *policy,
-                              unsigned int target_freq,
-                              unsigned int relation)
-{
-        struct pxa3xx_freq_info *next;
-        struct cpufreq_freqs freqs;
-        unsigned long flags;
-        int idx;
-
-        if (policy->cpu != 0)
-                return -EINVAL;
-
-        /* Lookup the next frequency */
-        if (cpufreq_frequency_table_target(policy, pxa3xx_freqs_table,
-                                target_freq, relation, &idx))
-                return -EINVAL;
-
-        next = &pxa3xx_freqs[idx];
-
-        freqs.old = policy->cur;
-        freqs.new = next->cpufreq_mhz * 1000;
-        freqs.cpu = policy->cpu;
-
-        pr_debug("CPU frequency from %d MHz to %d MHz%s\n",
-                        freqs.old / 1000, freqs.new / 1000,
-                        (freqs.old == freqs.new) ? " (skipped)" : "");
-
-        if (freqs.old == target_freq)
-                return 0;
-
-        cpufreq_notify_transition(&freqs, CPUFREQ_PRECHANGE);
-
-        local_irq_save(flags);
-        __update_core_freq(next);
-        __update_bus_freq(next);
-        local_irq_restore(flags);
-
-        cpufreq_notify_transition(&freqs, CPUFREQ_POSTCHANGE);
-
-        return 0;
-}
-
-static int pxa3xx_cpufreq_init(struct cpufreq_policy *policy)
-{
-        int ret = -EINVAL;
-
-        /* set default policy and cpuinfo */
-        policy->cpuinfo.min_freq = 104000;
-        policy->cpuinfo.max_freq = (cpu_is_pxa320()) ? 806000 : 624000;
-        policy->cpuinfo.transition_latency = 1000; /* FIXME: 1 ms, assumed */
-        policy->max = pxa3xx_get_clk_frequency_khz(0);
-        policy->cur = policy->min = policy->max;
-
-        if (cpu_is_pxa300() || cpu_is_pxa310())
-                ret = setup_freqs_table(policy, ARRAY_AND_SIZE(pxa300_freqs));
-
-        if (cpu_is_pxa320())
-                ret = setup_freqs_table(policy, ARRAY_AND_SIZE(pxa320_freqs));
-
-        if (ret) {
-                pr_err("failed to setup frequency table\n");
-                return ret;
-        }
-
-        pr_info("CPUFREQ support for PXA3xx initialized\n");
-        return 0;
-}
-
-static struct cpufreq_driver pxa3xx_cpufreq_driver = {
-        .verify         = pxa3xx_cpufreq_verify,
-        .target         = pxa3xx_cpufreq_set,
-        .init           = pxa3xx_cpufreq_init,
-        .get            = pxa3xx_cpufreq_get,
-        .name           = "pxa3xx-cpufreq",
-};
-
-static int __init cpufreq_init(void)
-{
-        if (cpu_is_pxa3xx())
-                return cpufreq_register_driver(&pxa3xx_cpufreq_driver);
-
-        return 0;
-}
-module_init(cpufreq_init);
-
-static void __exit cpufreq_exit(void)
-{
-        cpufreq_unregister_driver(&pxa3xx_cpufreq_driver);
-}
-module_exit(cpufreq_exit);
-
-MODULE_DESCRIPTION("CPU frequency scaling driver for PXA3xx");
-MODULE_LICENSE("GPL");
diff --git a/arch/arm/mach-pxa/include/mach/generic.h b/arch/arm/mach-pxa/include/mach/generic.h
new file mode 100644
index 000000000000..665542e0c9e2
--- /dev/null
+++ b/arch/arm/mach-pxa/include/mach/generic.h
@@ -0,0 +1 @@
+#include "../../generic.h"
diff --git a/arch/arm/mach-s3c24xx/clock-s3c2440.c b/arch/arm/mach-s3c24xx/clock-s3c2440.c
index 04b87ec92537..1069b5680826 100644
--- a/arch/arm/mach-s3c24xx/clock-s3c2440.c
+++ b/arch/arm/mach-s3c24xx/clock-s3c2440.c
@@ -123,6 +123,11 @@ static struct clk s3c2440_clk_ac97 = {
         .ctrlbit        = S3C2440_CLKCON_AC97,
 };
 
+#define S3C24XX_VA_UART0      (S3C_VA_UART)
+#define S3C24XX_VA_UART1      (S3C_VA_UART + 0x4000 )
+#define S3C24XX_VA_UART2      (S3C_VA_UART + 0x8000 )
+#define S3C24XX_VA_UART3      (S3C_VA_UART + 0xC000 )
+
 static unsigned long  s3c2440_fclk_n_getrate(struct clk *clk)
 {
         unsigned long ucon0, ucon1, ucon2, divisor;
diff --git a/arch/arm/mach-s3c24xx/common.c b/arch/arm/mach-s3c24xx/common.c
index 6bcf87f65f9e..92e609440c57 100644
--- a/arch/arm/mach-s3c24xx/common.c
+++ b/arch/arm/mach-s3c24xx/common.c
@@ -239,6 +239,11 @@ void __init s3c24xx_init_io(struct map_desc *mach_desc, int size)
 
 /* Serial port registrations */
 
+#define S3C2410_PA_UART0      (S3C24XX_PA_UART)
+#define S3C2410_PA_UART1      (S3C24XX_PA_UART + 0x4000 )
+#define S3C2410_PA_UART2      (S3C24XX_PA_UART + 0x8000 )
+#define S3C2443_PA_UART3      (S3C24XX_PA_UART + 0xC000 )
+
 static struct resource s3c2410_uart0_resource[] = {
         [0] = DEFINE_RES_MEM(S3C2410_PA_UART0, SZ_16K),
         [1] = DEFINE_RES_NAMED(IRQ_S3CUART_RX0, \
diff --git a/arch/arm/mach-s3c24xx/cpufreq.c b/arch/arm/mach-s3c24xx/cpufreq.c
index 5f181e733eee..3c0e78ede0da 100644
--- a/arch/arm/mach-s3c24xx/cpufreq.c
+++ b/arch/arm/mach-s3c24xx/cpufreq.c
@@ -204,7 +204,6 @@ static int s3c_cpufreq_settarget(struct cpufreq_policy *policy,
         freqs.old = cpu_cur.freq;
         freqs.new = cpu_new.freq;
 
-        freqs.freqs.cpu = 0;
         freqs.freqs.old = cpu_cur.freq.armclk / 1000;
         freqs.freqs.new = cpu_new.freq.armclk / 1000;
 
@@ -218,9 +217,7 @@ static int s3c_cpufreq_settarget(struct cpufreq_policy *policy,
         s3c_cpufreq_updateclk(clk_pclk, cpu_new.freq.pclk);
 
         /* start the frequency change */
-
-        if (policy)
-                cpufreq_notify_transition(&freqs.freqs, CPUFREQ_PRECHANGE);
+        cpufreq_notify_transition(policy, &freqs.freqs, CPUFREQ_PRECHANGE);
 
         /* If hclk is staying the same, then we do not need to
          * re-write the IO or the refresh timings whilst we are changing
@@ -264,8 +261,7 @@ static int s3c_cpufreq_settarget(struct cpufreq_policy *policy,
         local_irq_restore(flags);
 
         /* notify everyone we've done this */
-        if (policy)
-                cpufreq_notify_transition(&freqs.freqs, CPUFREQ_POSTCHANGE);
+        cpufreq_notify_transition(policy, &freqs.freqs, CPUFREQ_POSTCHANGE);
 
         s3c_freq_dbg("%s: finished\n", __func__);
         return 0;
diff --git a/arch/arm/mach-s3c64xx/cpuidle.c b/arch/arm/mach-s3c64xx/cpuidle.c
index ead5fab0dbb5..3c8ab07c2012 100644
--- a/arch/arm/mach-s3c64xx/cpuidle.c
+++ b/arch/arm/mach-s3c64xx/cpuidle.c
@@ -40,12 +40,9 @@ static int s3c64xx_enter_idle(struct cpuidle_device *dev,
         return index;
 }
 
-static DEFINE_PER_CPU(struct cpuidle_device, s3c64xx_cpuidle_device);
-
 static struct cpuidle_driver s3c64xx_cpuidle_driver = {
         .name   = "s3c64xx_cpuidle",
         .owner  = THIS_MODULE,
-        .en_core_tk_irqen = 1,
         .states = {
                 {
                         .enter            = s3c64xx_enter_idle,
@@ -61,16 +58,6 @@ static struct cpuidle_driver s3c64xx_cpuidle_driver = {
 
 static int __init s3c64xx_init_cpuidle(void)
 {
-        int ret;
-
-        cpuidle_register_driver(&s3c64xx_cpuidle_driver);
-
-        ret = cpuidle_register_device(&s3c64xx_cpuidle_device);
-        if (ret) {
-                pr_err("Failed to register cpuidle device: %d\n", ret);
-                return ret;
-        }
-
-        return 0;
+        return cpuidle_register(&s3c64xx_cpuidle_driver, NULL);
 }
 device_initcall(s3c64xx_init_cpuidle);
diff --git a/arch/arm/mach-s3c64xx/setup-usb-phy.c b/arch/arm/mach-s3c64xx/setup-usb-phy.c
index c8174d95339b..ca960bda02fd 100644
--- a/arch/arm/mach-s3c64xx/setup-usb-phy.c
+++ b/arch/arm/mach-s3c64xx/setup-usb-phy.c
@@ -76,7 +76,7 @@ static int s3c_usb_otgphy_exit(struct platform_device *pdev)
 
 int s5p_usb_phy_init(struct platform_device *pdev, int type)
 {
-        if (type == S5P_USB_PHY_DEVICE)
+        if (type == USB_PHY_TYPE_DEVICE)
                 return s3c_usb_otgphy_init(pdev);
 
         return -EINVAL;
@@ -84,7 +84,7 @@ int s5p_usb_phy_init(struct platform_device *pdev, int type)
 
 int s5p_usb_phy_exit(struct platform_device *pdev, int type)
 {
-        if (type == S5P_USB_PHY_DEVICE)
+        if (type == USB_PHY_TYPE_DEVICE)
                 return s3c_usb_otgphy_exit(pdev);
 
         return -EINVAL;
diff --git a/arch/arm/mach-s5pv210/setup-usb-phy.c b/arch/arm/mach-s5pv210/setup-usb-phy.c
index 356a0900af03..b2ee5333f89c 100644
--- a/arch/arm/mach-s5pv210/setup-usb-phy.c
+++ b/arch/arm/mach-s5pv210/setup-usb-phy.c
@@ -80,7 +80,7 @@ static int s5pv210_usb_otgphy_exit(struct platform_device *pdev)
 
 int s5p_usb_phy_init(struct platform_device *pdev, int type)
 {
-        if (type == S5P_USB_PHY_DEVICE)
+        if (type == USB_PHY_TYPE_DEVICE)
                 return s5pv210_usb_otgphy_init(pdev);
 
         return -EINVAL;
@@ -88,7 +88,7 @@ int s5p_usb_phy_init(struct platform_device *pdev, int type)
 
 int s5p_usb_phy_exit(struct platform_device *pdev, int type)
 {
-        if (type == S5P_USB_PHY_DEVICE)
+        if (type == USB_PHY_TYPE_DEVICE)
                 return s5pv210_usb_otgphy_exit(pdev);
 
         return -EINVAL;
diff --git a/arch/arm/mach-sa1100/Kconfig b/arch/arm/mach-sa1100/Kconfig
index ca14dbdcfb22..04f9784ff0ed 100644
--- a/arch/arm/mach-sa1100/Kconfig
+++ b/arch/arm/mach-sa1100/Kconfig
@@ -4,7 +4,7 @@ menu "SA11x0 Implementations"
 
 config SA1100_ASSABET
         bool "Assabet"
-        select CPU_FREQ_SA1110
+        select ARM_SA1110_CPUFREQ
         help
           Say Y here if you are using the Intel(R) StrongARM(R) SA-1110
           Microprocessor Development Board (also known as the Assabet).
@@ -20,7 +20,7 @@ config ASSABET_NEPONSET
 
 config SA1100_CERF
         bool "CerfBoard"
-        select CPU_FREQ_SA1110
+        select ARM_SA1110_CPUFREQ
         help
           The Intrinsyc CerfBoard is based on the StrongARM 1110 (Discontinued).
           More information is available at:
@@ -47,7 +47,7 @@ endchoice
 
 config SA1100_COLLIE
         bool "Sharp Zaurus SL5500"
-        # FIXME: select CPU_FREQ_SA11x0
+        # FIXME: select ARM_SA11x0_CPUFREQ
         select SHARP_LOCOMO
         select SHARP_PARAM
         select SHARP_SCOOP
@@ -56,7 +56,7 @@ config SA1100_COLLIE
 
 config SA1100_H3100
         bool "Compaq iPAQ H3100"
-        select CPU_FREQ_SA1110
+        select ARM_SA1110_CPUFREQ
         select HTC_EGPIO
         help
           Say Y here if you intend to run this kernel on the Compaq iPAQ
@@ -67,7 +67,7 @@ config SA1100_H3100
 
 config SA1100_H3600
         bool "Compaq iPAQ H3600/H3700"
-        select CPU_FREQ_SA1110
+        select ARM_SA1110_CPUFREQ
         select HTC_EGPIO
         help
           Say Y here if you intend to run this kernel on the Compaq iPAQ
@@ -78,7 +78,7 @@ config SA1100_H3600
 
 config SA1100_BADGE4
         bool "HP Labs BadgePAD 4"
-        select CPU_FREQ_SA1100
+        select ARM_SA1100_CPUFREQ
         select SA1111
         help
           Say Y here if you want to build a kernel for the HP Laboratories
@@ -86,7 +86,7 @@ config SA1100_BADGE4
 
 config SA1100_JORNADA720
         bool "HP Jornada 720"
-        # FIXME: select CPU_FREQ_SA11x0
+        # FIXME: select ARM_SA11x0_CPUFREQ
         select SA1111
         help
           Say Y here if you want to build a kernel for the HP Jornada 720
@@ -105,14 +105,14 @@ config SA1100_JORNADA720_SSP
 
 config SA1100_HACKKIT
         bool "HackKit Core CPU Board"
-        select CPU_FREQ_SA1100
+        select ARM_SA1100_CPUFREQ
         help
           Say Y here to support the HackKit Core CPU Board
           <http://hackkit.eletztrick.de>;
 
 config SA1100_LART
         bool "LART"
-        select CPU_FREQ_SA1100
+        select ARM_SA1100_CPUFREQ
         help
           Say Y here if you are using the Linux Advanced Radio Terminal
           (also known as the LART).  See <http://www.lartmaker.nl/> for
@@ -120,7 +120,7 @@ config SA1100_LART
 
 config SA1100_NANOENGINE
         bool "nanoEngine"
-        select CPU_FREQ_SA1110
+        select ARM_SA1110_CPUFREQ
         select PCI
         select PCI_NANOENGINE
         help
@@ -130,7 +130,7 @@ config SA1100_NANOENGINE
 
 config SA1100_PLEB
         bool "PLEB"
-        select CPU_FREQ_SA1100
+        select ARM_SA1100_CPUFREQ
         help
           Say Y here if you are using version 1 of the Portable Linux
           Embedded Board (also known as PLEB).
@@ -139,7 +139,7 @@ config SA1100_PLEB
 
 config SA1100_SHANNON
         bool "Shannon"
-        select CPU_FREQ_SA1100
+        select ARM_SA1100_CPUFREQ
         help
           The Shannon (also known as a Tuxscreen, and also as a IS2630) was a
           limited edition webphone produced by Philips. The Shannon is a SA1100
@@ -148,7 +148,7 @@ config SA1100_SHANNON
 
 config SA1100_SIMPAD
         bool "Simpad"
-        select CPU_FREQ_SA1110
+        select ARM_SA1110_CPUFREQ
         help
           The SIEMENS webpad SIMpad is based on the StrongARM 1110. There
           are two different versions CL4 and SL4. CL4 has 32MB RAM and 16MB
diff --git a/arch/arm/mach-sa1100/Makefile b/arch/arm/mach-sa1100/Makefile
index 1aed9e70465d..2732eef48966 100644
--- a/arch/arm/mach-sa1100/Makefile
+++ b/arch/arm/mach-sa1100/Makefile
@@ -8,9 +8,6 @@ obj-m :=
 obj-n :=
 obj-  :=
 
-obj-$(CONFIG_CPU_FREQ_SA1100)           += cpu-sa1100.o
-obj-$(CONFIG_CPU_FREQ_SA1110)           += cpu-sa1110.o
-
 # Specific board support
 obj-$(CONFIG_SA1100_ASSABET)            += assabet.o
 obj-$(CONFIG_ASSABET_NEPONSET)          += neponset.o
diff --git a/arch/arm/mach-sa1100/cpu-sa1100.c b/arch/arm/mach-sa1100/cpu-sa1100.c
deleted file mode 100644
index e8f4d1e19233..000000000000
--- a/arch/arm/mach-sa1100/cpu-sa1100.c
+++ /dev/null
@@ -1,249 +0,0 @@
-/*
- * cpu-sa1100.c: clock scaling for the SA1100
- *
- * Copyright (C) 2000 2001, The Delft University of Technology
- *
- * Authors:
- * - Johan Pouwelse (J.A.Pouwelse@its.tudelft.nl): initial version
- * - Erik Mouw (J.A.K.Mouw@its.tudelft.nl):
- *   - major rewrite for linux-2.3.99
- *   - rewritten for the more generic power management scheme in
- *     linux-2.4.5-rmk1
- *
- * This software has been developed while working on the LART
- * computing board (http://www.lartmaker.nl/), which is
- * sponsored by the Mobile Multi-media Communications
- * (http://www.mobimedia.org/) and Ubiquitous Communications
- * (http://www.ubicom.tudelft.nl/) projects.
- *
- * The authors can be reached at:
- *
- *  Erik Mouw
- *  Information and Communication Theory Group
- *  Faculty of Information Technology and Systems
- *  Delft University of Technology
- *  P.O. Box 5031
- *  2600 GA Delft
- *  The Netherlands
- *
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *
- * Theory of operations
- * ====================
- *
- * Clock scaling can be used to lower the power consumption of the CPU
- * core. This will give you a somewhat longer running time.
- *
- * The SA-1100 has a single register to change the core clock speed:
- *
- *   PPCR      0x90020014    PLL config
- *
- * However, the DRAM timings are closely related to the core clock
- * speed, so we need to change these, too. The used registers are:
- *
- *   MDCNFG    0xA0000000    DRAM config
- *   MDCAS0    0xA0000004    Access waveform
- *   MDCAS1    0xA0000008    Access waveform
- *   MDCAS2    0xA000000C    Access waveform
- *
- * Care must be taken to change the DRAM parameters the correct way,
- * because otherwise the DRAM becomes unusable and the kernel will
- * crash.
- *
- * The simple solution to avoid a kernel crash is to put the actual
- * clock change in ROM and jump to that code from the kernel. The main
- * disadvantage is that the ROM has to be modified, which is not
- * possible on all SA-1100 platforms. Another disadvantage is that
- * jumping to ROM makes clock switching unnecessary complicated.
- *
- * The idea behind this driver is that the memory configuration can be
- * changed while running from DRAM (even with interrupts turned on!)
- * as long as all re-configuration steps yield a valid DRAM
- * configuration. The advantages are clear: it will run on all SA-1100
- * platforms, and the code is very simple.
- *
- * If you really want to understand what is going on in
- * sa1100_update_dram_timings(), you'll have to read sections 8.2,
- * 9.5.7.3, and 10.2 from the "Intel StrongARM SA-1100 Microprocessor
- * Developers Manual" (available for free from Intel).
- *
- */
-
-#include <linux/kernel.h>
-#include <linux/types.h>
-#include <linux/init.h>
-#include <linux/cpufreq.h>
-#include <linux/io.h>
-
-#include <asm/cputype.h>
-
-#include <mach/hardware.h>
-
-#include "generic.h"
-
-struct sa1100_dram_regs {
-        int speed;
-        u32 mdcnfg;
-        u32 mdcas0;
-        u32 mdcas1;
-        u32 mdcas2;
-};
-
-
-static struct cpufreq_driver sa1100_driver;
-
-static struct sa1100_dram_regs sa1100_dram_settings[] = {
-        /*speed,     mdcnfg,     mdcas0,     mdcas1,     mdcas2,   clock freq */
-        { 59000, 0x00dc88a3, 0xcccccccf, 0xfffffffc, 0xffffffff},/*  59.0 MHz */
-        { 73700, 0x011490a3, 0xcccccccf, 0xfffffffc, 0xffffffff},/*  73.7 MHz */
-        { 88500, 0x014e90a3, 0xcccccccf, 0xfffffffc, 0xffffffff},/*  88.5 MHz */
-        {103200, 0x01889923, 0xcccccccf, 0xfffffffc, 0xffffffff},/* 103.2 MHz */
-        {118000, 0x01c29923, 0x9999998f, 0xfffffff9, 0xffffffff},/* 118.0 MHz */
-        {132700, 0x01fb2123, 0x9999998f, 0xfffffff9, 0xffffffff},/* 132.7 MHz */
-        {147500, 0x02352123, 0x3333330f, 0xfffffff3, 0xffffffff},/* 147.5 MHz */
-        {162200, 0x026b29a3, 0x38e38e1f, 0xfff8e38e, 0xffffffff},/* 162.2 MHz */
-        {176900, 0x02a329a3, 0x71c71c1f, 0xfff1c71c, 0xffffffff},/* 176.9 MHz */
-        {191700, 0x02dd31a3, 0xe38e383f, 0xffe38e38, 0xffffffff},/* 191.7 MHz */
-        {206400, 0x03153223, 0xc71c703f, 0xffc71c71, 0xffffffff},/* 206.4 MHz */
-        {221200, 0x034fba23, 0xc71c703f, 0xffc71c71, 0xffffffff},/* 221.2 MHz */
-        {235900, 0x03853a23, 0xe1e1e07f, 0xe1e1e1e1, 0xffffffe1},/* 235.9 MHz */
-        {250700, 0x03bf3aa3, 0xc3c3c07f, 0xc3c3c3c3, 0xffffffc3},/* 250.7 MHz */
-        {265400, 0x03f7c2a3, 0xc3c3c07f, 0xc3c3c3c3, 0xffffffc3},/* 265.4 MHz */
-        {280200, 0x0431c2a3, 0x878780ff, 0x87878787, 0xffffff87},/* 280.2 MHz */
-        { 0, 0, 0, 0, 0 } /* last entry */
-};
-
-static void sa1100_update_dram_timings(int current_speed, int new_speed)
-{
-        struct sa1100_dram_regs *settings = sa1100_dram_settings;
-
-        /* find speed */
-        while (settings->speed != 0) {
-                if (new_speed == settings->speed)
-                        break;
-
-                settings++;
-        }
-
-        if (settings->speed == 0) {
-                panic("%s: couldn't find dram setting for speed %d\n",
-                      __func__, new_speed);
-        }
-
-        /* No risk, no fun: run with interrupts on! */
-        if (new_speed > current_speed) {
-                /* We're going FASTER, so first relax the memory
-                 * timings before changing the core frequency
-                 */
-
-                /* Half the memory access clock */
-                MDCNFG |= MDCNFG_CDB2;
-
-                /* The order of these statements IS important, keep 8
-                 * pulses!!
-                 */
-                MDCAS2 = settings->mdcas2;
-                MDCAS1 = settings->mdcas1;
-                MDCAS0 = settings->mdcas0;
-                MDCNFG = settings->mdcnfg;
-        } else {
-                /* We're going SLOWER: first decrease the core
-                 * frequency and then tighten the memory settings.
-                 */
-
-                /* Half the memory access clock */
-                MDCNFG |= MDCNFG_CDB2;
-
-                /* The order of these statements IS important, keep 8
-                 * pulses!!
-                 */
-                MDCAS0 = settings->mdcas0;
-                MDCAS1 = settings->mdcas1;
-                MDCAS2 = settings->mdcas2;
-                MDCNFG = settings->mdcnfg;
-        }
-}
-
-static int sa1100_target(struct cpufreq_policy *policy,
-                         unsigned int target_freq,
-                         unsigned int relation)
-{
-        unsigned int cur = sa11x0_getspeed(0);
-        unsigned int new_ppcr;
-        struct cpufreq_freqs freqs;
-
-        new_ppcr = sa11x0_freq_to_ppcr(target_freq);
-        switch (relation) {
-        case CPUFREQ_RELATION_L:
-                if (sa11x0_ppcr_to_freq(new_ppcr) > policy->max)
-                        new_ppcr--;
-                break;
-        case CPUFREQ_RELATION_H:
-                if ((sa11x0_ppcr_to_freq(new_ppcr) > target_freq) &&
-                    (sa11x0_ppcr_to_freq(new_ppcr - 1) >= policy->min))
-                        new_ppcr--;
-                break;
-        }
-
-        freqs.old = cur;
-        freqs.new = sa11x0_ppcr_to_freq(new_ppcr);
-        freqs.cpu = 0;
-
-        cpufreq_notify_transition(&freqs, CPUFREQ_PRECHANGE);
-
-        if (freqs.new > cur)
-                sa1100_update_dram_timings(cur, freqs.new);
-
-        PPCR = new_ppcr;
-
-        if (freqs.new < cur)
-                sa1100_update_dram_timings(cur, freqs.new);
-
-        cpufreq_notify_transition(&freqs, CPUFREQ_POSTCHANGE);
-
-        return 0;
-}
-
-static int __init sa1100_cpu_init(struct cpufreq_policy *policy)
-{
-        if (policy->cpu != 0)
-                return -EINVAL;
-        policy->cur = policy->min = policy->max = sa11x0_getspeed(0);
-        policy->cpuinfo.min_freq = 59000;
-        policy->cpuinfo.max_freq = 287000;
-        policy->cpuinfo.transition_latency = CPUFREQ_ETERNAL;
-        return 0;
-}
-
-static struct cpufreq_driver sa1100_driver __refdata = {
-        .flags          = CPUFREQ_STICKY,
-        .verify         = sa11x0_verify_speed,
-        .target         = sa1100_target,
-        .get            = sa11x0_getspeed,
-        .init           = sa1100_cpu_init,
-        .name           = "sa1100",
-};
-
-static int __init sa1100_dram_init(void)
-{
-        if (cpu_is_sa1100())
-                return cpufreq_register_driver(&sa1100_driver);
-        else
-                return -ENODEV;
-}
-
-arch_initcall(sa1100_dram_init);
diff --git a/arch/arm/mach-sa1100/cpu-sa1110.c b/arch/arm/mach-sa1100/cpu-sa1110.c
deleted file mode 100644
index 48c45b0c92bb..000000000000
--- a/arch/arm/mach-sa1100/cpu-sa1110.c
+++ /dev/null
@@ -1,408 +0,0 @@
-/*
- *  linux/arch/arm/mach-sa1100/cpu-sa1110.c
- *
- *  Copyright (C) 2001 Russell King
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
- *
- * Note: there are two erratas that apply to the SA1110 here:
- *  7 - SDRAM auto-power-up failure (rev A0)
- * 13 - Corruption of internal register reads/writes following
- *      SDRAM reads (rev A0, B0, B1)
- *
- * We ignore rev. A0 and B0 devices; I don't think they're worth supporting.
- *
- * The SDRAM type can be passed on the command line as cpu_sa1110.sdram=type
- */
-#include <linux/cpufreq.h>
-#include <linux/delay.h>
-#include <linux/init.h>
-#include <linux/io.h>
-#include <linux/kernel.h>
-#include <linux/moduleparam.h>
-#include <linux/types.h>
-
-#include <asm/cputype.h>
-#include <asm/mach-types.h>
-
-#include <mach/hardware.h>
-
-#include "generic.h"
-
-#undef DEBUG
-
-struct sdram_params {
-        const char name[20];
-        u_char  rows;           /* bits                          */
-        u_char  cas_latency;    /* cycles                        */
-        u_char  tck;            /* clock cycle time (ns)         */
-        u_char  trcd;           /* activate to r/w (ns)          */
-        u_char  trp;            /* precharge to activate (ns)    */
-        u_char  twr;            /* write recovery time (ns)      */
-        u_short refresh;        /* refresh time for array (us)   */
-};
-
-struct sdram_info {
-        u_int   mdcnfg;
-        u_int   mdrefr;
-        u_int   mdcas[3];
-};
-
-static struct sdram_params sdram_tbl[] __initdata = {
-        {       /* Toshiba TC59SM716 CL2 */
-                .name           = "TC59SM716-CL2",
-                .rows           = 12,
-                .tck            = 10,
-                .trcd           = 20,
-                .trp            = 20,
-                .twr            = 10,
-                .refresh        = 64000,
-                .cas_latency    = 2,
-        }, {    /* Toshiba TC59SM716 CL3 */
-                .name           = "TC59SM716-CL3",
-                .rows           = 12,
-                .tck            = 8,
-                .trcd           = 20,
-                .trp            = 20,
-                .twr            = 8,
-                .refresh        = 64000,
-                .cas_latency    = 3,
-        }, {    /* Samsung K4S641632D TC75 */
-                .name           = "K4S641632D",
-                .rows           = 14,
-                .tck            = 9,
-                .trcd           = 27,
-                .trp            = 20,
-                .twr            = 9,
-                .refresh        = 64000,
-                .cas_latency    = 3,
-        }, {    /* Samsung K4S281632B-1H */
-                .name           = "K4S281632B-1H",
-                .rows           = 12,
-                .tck            = 10,
-                .trp            = 20,
-                .twr            = 10,
-                .refresh        = 64000,
-                .cas_latency    = 3,
-        }, {    /* Samsung KM416S4030CT */
-                .name           = "KM416S4030CT",
-                .rows           = 13,
-                .tck            = 8,
-                .trcd           = 24,   /* 3 CLKs */
-                .trp            = 24,   /* 3 CLKs */
-                .twr            = 16,   /* Trdl: 2 CLKs */
-                .refresh        = 64000,
-                .cas_latency    = 3,
-        }, {    /* Winbond W982516AH75L CL3 */
-                .name           = "W982516AH75L",
-                .rows           = 16,
-                .tck            = 8,
-                .trcd           = 20,
-                .trp            = 20,
-                .twr            = 8,
-                .refresh        = 64000,
-                .cas_latency    = 3,
-        }, {    /* Micron MT48LC8M16A2TG-75 */
-                .name           = "MT48LC8M16A2TG-75",
-                .rows           = 12,
-                .tck            = 8,
-                .trcd           = 20,
-                .trp            = 20,
-                .twr            = 8,
-                .refresh        = 64000,
-                .cas_latency    = 3,
-        },
-};
-
-static struct sdram_params sdram_params;
-
-/*
- * Given a period in ns and frequency in khz, calculate the number of
- * cycles of frequency in period.  Note that we round up to the next
- * cycle, even if we are only slightly over.
- */
-static inline u_int ns_to_cycles(u_int ns, u_int khz)
-{
-        return (ns * khz + 999999) / 1000000;
-}
-
-/*
- * Create the MDCAS register bit pattern.
- */
-static inline void set_mdcas(u_int *mdcas, int delayed, u_int rcd)
-{
-        u_int shift;
-
-        rcd = 2 * rcd - 1;
-        shift = delayed + 1 + rcd;
-
-        mdcas[0]  = (1 << rcd) - 1;
-        mdcas[0] |= 0x55555555 << shift;
-        mdcas[1]  = mdcas[2] = 0x55555555 << (shift & 1);
-}
-
-static void
-sdram_calculate_timing(struct sdram_info *sd, u_int cpu_khz,
-                       struct sdram_params *sdram)
-{
-        u_int mem_khz, sd_khz, trp, twr;
-
-        mem_khz = cpu_khz / 2;
-        sd_khz = mem_khz;
-
-        /*
-         * If SDCLK would invalidate the SDRAM timings,
-         * run SDCLK at half speed.
-         *
-         * CPU steppings prior to B2 must either run the memory at
-         * half speed or use delayed read latching (errata 13).
-         */
-        if ((ns_to_cycles(sdram->tck, sd_khz) > 1) ||
-            (CPU_REVISION < CPU_SA1110_B2 && sd_khz < 62000))
-                sd_khz /= 2;
-
-        sd->mdcnfg = MDCNFG & 0x007f007f;
-
-        twr = ns_to_cycles(sdram->twr, mem_khz);
-
-        /* trp should always be >1 */
-        trp = ns_to_cycles(sdram->trp, mem_khz) - 1;
-        if (trp < 1)
-                trp = 1;
-
-        sd->mdcnfg |= trp << 8;
-        sd->mdcnfg |= trp << 24;
-        sd->mdcnfg |= sdram->cas_latency << 12;
-        sd->mdcnfg |= sdram->cas_latency << 28;
-        sd->mdcnfg |= twr << 14;
-        sd->mdcnfg |= twr << 30;
-
-        sd->mdrefr = MDREFR & 0xffbffff0;
-        sd->mdrefr |= 7;
-
-        if (sd_khz != mem_khz)
-                sd->mdrefr |= MDREFR_K1DB2;
-
-        /* initial number of '1's in MDCAS + 1 */
-        set_mdcas(sd->mdcas, sd_khz >= 62000,
-                ns_to_cycles(sdram->trcd, mem_khz));
-
-#ifdef DEBUG
-        printk(KERN_DEBUG "MDCNFG: %08x MDREFR: %08x MDCAS0: %08x MDCAS1: %08x MDCAS2: %08x\n",
-                sd->mdcnfg, sd->mdrefr, sd->mdcas[0], sd->mdcas[1],
-                sd->mdcas[2]);
-#endif
-}
-
-/*
- * Set the SDRAM refresh rate.
- */
-static inline void sdram_set_refresh(u_int dri)
-{
-        MDREFR = (MDREFR & 0xffff000f) | (dri << 4);
-        (void) MDREFR;
-}
-
-/*
- * Update the refresh period.  We do this such that we always refresh
- * the SDRAMs within their permissible period.  The refresh period is
- * always a multiple of the memory clock (fixed at cpu_clock / 2).
- *
- * FIXME: we don't currently take account of burst accesses here,
- * but neither do Intels DM nor Angel.
- */
-static void
-sdram_update_refresh(u_int cpu_khz, struct sdram_params *sdram)
-{
-        u_int ns_row = (sdram->refresh * 1000) >> sdram->rows;
-        u_int dri = ns_to_cycles(ns_row, cpu_khz / 2) / 32;
-
-#ifdef DEBUG
-        mdelay(250);
-        printk(KERN_DEBUG "new dri value = %d\n", dri);
-#endif
-
-        sdram_set_refresh(dri);
-}
-
-/*
- * Ok, set the CPU frequency.
- */
-static int sa1110_target(struct cpufreq_policy *policy,
-                         unsigned int target_freq,
-                         unsigned int relation)
-{
-        struct sdram_params *sdram = &sdram_params;
-        struct cpufreq_freqs freqs;
-        struct sdram_info sd;
-        unsigned long flags;
-        unsigned int ppcr, unused;
-
-        switch (relation) {
-        case CPUFREQ_RELATION_L:
-                ppcr = sa11x0_freq_to_ppcr(target_freq);
-                if (sa11x0_ppcr_to_freq(ppcr) > policy->max)
-                        ppcr--;
-                break;
-        case CPUFREQ_RELATION_H:
-                ppcr = sa11x0_freq_to_ppcr(target_freq);
-                if (ppcr && (sa11x0_ppcr_to_freq(ppcr) > target_freq) &&
-                    (sa11x0_ppcr_to_freq(ppcr-1) >= policy->min))
-                        ppcr--;
-                break;
-        default:
-                return -EINVAL;
-        }
-
-        freqs.old = sa11x0_getspeed(0);
-        freqs.new = sa11x0_ppcr_to_freq(ppcr);
-        freqs.cpu = 0;
-
-        sdram_calculate_timing(&sd, freqs.new, sdram);
-
-#if 0
-        /*
-         * These values are wrong according to the SA1110 documentation
-         * and errata, but they seem to work.  Need to get a storage
-         * scope on to the SDRAM signals to work out why.
-         */
-        if (policy->max < 147500) {
-                sd.mdrefr |= MDREFR_K1DB2;
-                sd.mdcas[0] = 0xaaaaaa7f;
-        } else {
-                sd.mdrefr &= ~MDREFR_K1DB2;
-                sd.mdcas[0] = 0xaaaaaa9f;
-        }
-        sd.mdcas[1] = 0xaaaaaaaa;
-        sd.mdcas[2] = 0xaaaaaaaa;
-#endif
-
-        cpufreq_notify_transition(&freqs, CPUFREQ_PRECHANGE);
-
-        /*
-         * The clock could be going away for some time.  Set the SDRAMs
-         * to refresh rapidly (every 64 memory clock cycles).  To get
-         * through the whole array, we need to wait 262144 mclk cycles.
-         * We wait 20ms to be safe.
-         */
-        sdram_set_refresh(2);
-        if (!irqs_disabled())
-                msleep(20);
-        else
-                mdelay(20);
-
-        /*
-         * Reprogram the DRAM timings with interrupts disabled, and
-         * ensure that we are doing this within a complete cache line.
-         * This means that we won't access SDRAM for the duration of
-         * the programming.
-         */
-        local_irq_save(flags);
-        asm("mcr p15, 0, %0, c7, c10, 4" : : "r" (0));
-        udelay(10);
-        __asm__ __volatile__("\n\
-                b       2f                                      \n\
-                .align  5                                       \n\
-1:              str     %3, [%1, #0]            @ MDCNFG        \n\
-                str     %4, [%1, #28]           @ MDREFR        \n\
-                str     %5, [%1, #4]            @ MDCAS0        \n\
-                str     %6, [%1, #8]            @ MDCAS1        \n\
-                str     %7, [%1, #12]           @ MDCAS2        \n\
-                str     %8, [%2, #0]            @ PPCR          \n\
-                ldr     %0, [%1, #0]                            \n\
-                b       3f                                      \n\
-2:              b       1b                                      \n\
-3:              nop                                             \n\
-                nop"
-                : "=&r" (unused)
-                : "r" (&MDCNFG), "r" (&PPCR), "0" (sd.mdcnfg),
-                  "r" (sd.mdrefr), "r" (sd.mdcas[0]),
-                  "r" (sd.mdcas[1]), "r" (sd.mdcas[2]), "r" (ppcr));
-        local_irq_restore(flags);
-
-        /*
-         * Now, return the SDRAM refresh back to normal.
-         */
-        sdram_update_refresh(freqs.new, sdram);
-
-        cpufreq_notify_transition(&freqs, CPUFREQ_POSTCHANGE);
-
-        return 0;
-}
-
-static int __init sa1110_cpu_init(struct cpufreq_policy *policy)
-{
-        if (policy->cpu != 0)
-                return -EINVAL;
-        policy->cur = policy->min = policy->max = sa11x0_getspeed(0);
-        policy->cpuinfo.min_freq = 59000;
-        policy->cpuinfo.max_freq = 287000;
-        policy->cpuinfo.transition_latency = CPUFREQ_ETERNAL;
-        return 0;
-}
-
-/* sa1110_driver needs __refdata because it must remain after init registers
- * it with cpufreq_register_driver() */
-static struct cpufreq_driver sa1110_driver __refdata = {
-        .flags          = CPUFREQ_STICKY,
-        .verify         = sa11x0_verify_speed,
-        .target         = sa1110_target,
-        .get            = sa11x0_getspeed,
-        .init           = sa1110_cpu_init,
-        .name           = "sa1110",
-};
-
-static struct sdram_params *sa1110_find_sdram(const char *name)
-{
-        struct sdram_params *sdram;
-
-        for (sdram = sdram_tbl; sdram < sdram_tbl + ARRAY_SIZE(sdram_tbl);
-             sdram++)
-                if (strcmp(name, sdram->name) == 0)
-                        return sdram;
-
-        return NULL;
-}
-
-static char sdram_name[16];
-
-static int __init sa1110_clk_init(void)
-{
-        struct sdram_params *sdram;
-        const char *name = sdram_name;
-
-        if (!cpu_is_sa1110())
-                return -ENODEV;
-
-        if (!name[0]) {
-                if (machine_is_assabet())
-                        name = "TC59SM716-CL3";
-                if (machine_is_pt_system3())
-                        name = "K4S641632D";
-                if (machine_is_h3100())
-                        name = "KM416S4030CT";
-                if (machine_is_jornada720())
-                        name = "K4S281632B-1H";
-                if (machine_is_nanoengine())
-                        name = "MT48LC8M16A2TG-75";
-        }
-
-        sdram = sa1110_find_sdram(name);
-        if (sdram) {
-                printk(KERN_DEBUG "SDRAM: tck: %d trcd: %d trp: %d"
-                        " twr: %d refresh: %d cas_latency: %d\n",
-                        sdram->tck, sdram->trcd, sdram->trp,
-                        sdram->twr, sdram->refresh, sdram->cas_latency);
-
-                memcpy(&sdram_params, sdram, sizeof(sdram_params));
-
-                return cpufreq_register_driver(&sa1110_driver);
-        }
-
-        return 0;
-}
-
-module_param_string(sdram, sdram_name, sizeof(sdram_name), 0);
-arch_initcall(sa1110_clk_init);
diff --git a/arch/arm/mach-sa1100/include/mach/generic.h b/arch/arm/mach-sa1100/include/mach/generic.h
new file mode 100644
index 000000000000..665542e0c9e2
--- /dev/null
+++ b/arch/arm/mach-sa1100/include/mach/generic.h
@@ -0,0 +1 @@
+#include "../../generic.h"
diff --git a/arch/arm/mach-shark/core.c b/arch/arm/mach-shark/core.c
index b63dec848195..153555724988 100644
--- a/arch/arm/mach-shark/core.c
+++ b/arch/arm/mach-shark/core.c
@@ -10,6 +10,7 @@
 #include <linux/sched.h>
 #include <linux/serial_8250.h>
 #include <linux/io.h>
+#include <linux/cpu.h>
 
 #include <asm/setup.h>
 #include <asm/mach-types.h>
@@ -130,7 +131,7 @@ static void __init shark_timer_init(void)
 
 static void shark_init_early(void)
 {
-        disable_hlt();
+        cpu_idle_poll_ctrl(true);
 }
 
 MACHINE_START(SHARK, "Shark")
diff --git a/arch/arm/mach-shmobile/board-armadillo800eva.c b/arch/arm/mach-shmobile/board-armadillo800eva.c
index f2ec0777cfbe..ff8b7ba9b93c 100644
--- a/arch/arm/mach-shmobile/board-armadillo800eva.c
+++ b/arch/arm/mach-shmobile/board-armadillo800eva.c
@@ -169,7 +169,7 @@ static int usbhsf_get_id(struct platform_device *pdev)
         return USBHS_GADGET;
 }
 
-static void usbhsf_power_ctrl(struct platform_device *pdev,
+static int usbhsf_power_ctrl(struct platform_device *pdev,
                               void __iomem *base, int enable)
 {
         struct usbhsf_private *priv = usbhsf_get_priv(pdev);
@@ -223,6 +223,8 @@ static void usbhsf_power_ctrl(struct platform_device *pdev,
                 clk_disable(priv->pci);         /* usb work around */
                 clk_disable(priv->usb24);       /* usb work around */
         }
+
+        return 0;
 }
 
 static int usbhsf_get_vbus(struct platform_device *pdev)
@@ -239,7 +241,7 @@ static irqreturn_t usbhsf_interrupt(int irq, void *data)
         return IRQ_HANDLED;
 }
 
-static void usbhsf_hardware_exit(struct platform_device *pdev)
+static int usbhsf_hardware_exit(struct platform_device *pdev)
 {
         struct usbhsf_private *priv = usbhsf_get_priv(pdev);
 
@@ -264,6 +266,8 @@ static void usbhsf_hardware_exit(struct platform_device *pdev)
         priv->usbh_base = NULL;
 
         free_irq(IRQ7, pdev);
+
+        return 0;
 }
 
 static int usbhsf_hardware_init(struct platform_device *pdev)
diff --git a/arch/arm/mach-shmobile/board-kzm9g.c b/arch/arm/mach-shmobile/board-kzm9g.c
index 7f3a6b7e7b7c..a385f570bbfc 100644
--- a/arch/arm/mach-shmobile/board-kzm9g.c
+++ b/arch/arm/mach-shmobile/board-kzm9g.c
@@ -155,12 +155,14 @@ static int usbhs_get_vbus(struct platform_device *pdev)
         return !((1 << 7) & __raw_readw(priv->cr2));
 }
 
-static void usbhs_phy_reset(struct platform_device *pdev)
+static int usbhs_phy_reset(struct platform_device *pdev)
 {
         struct usbhs_private *priv = usbhs_get_priv(pdev);
 
         /* init phy */
         __raw_writew(0x8a0a, priv->cr2);
+
+        return 0;
 }
 
 static int usbhs_get_id(struct platform_device *pdev)
@@ -202,7 +204,7 @@ static int usbhs_hardware_init(struct platform_device *pdev)
         return 0;
 }
 
-static void usbhs_hardware_exit(struct platform_device *pdev)
+static int usbhs_hardware_exit(struct platform_device *pdev)
 {
         struct usbhs_private *priv = usbhs_get_priv(pdev);
 
@@ -210,6 +212,8 @@ static void usbhs_hardware_exit(struct platform_device *pdev)
         __raw_writew(USB_PHY_MODE | USB_PHY_INT_CLR, priv->phy);
 
         free_irq(IRQ15, pdev);
+
+        return 0;
 }
 
 static u32 usbhs_pipe_cfg[] = {
diff --git a/arch/arm/mach-shmobile/board-mackerel.c b/arch/arm/mach-shmobile/board-mackerel.c
index db968a585ff0..979237c18dad 100644
--- a/arch/arm/mach-shmobile/board-mackerel.c
+++ b/arch/arm/mach-shmobile/board-mackerel.c
@@ -596,12 +596,14 @@ static int usbhs_get_vbus(struct platform_device *pdev)
         return usbhs_is_connected(usbhs_get_priv(pdev));
 }
 
-static void usbhs_phy_reset(struct platform_device *pdev)
+static int usbhs_phy_reset(struct platform_device *pdev)
 {
         struct usbhs_private *priv = usbhs_get_priv(pdev);
 
         /* init phy */
         __raw_writew(0x8a0a, priv->usbcrcaddr);
+
+        return 0;
 }
 
 static int usbhs0_get_id(struct platform_device *pdev)
@@ -628,11 +630,13 @@ static int usbhs0_hardware_init(struct platform_device *pdev)
         return 0;
 }
 
-static void usbhs0_hardware_exit(struct platform_device *pdev)
+static int usbhs0_hardware_exit(struct platform_device *pdev)
 {
         struct usbhs_private *priv = usbhs_get_priv(pdev);
 
         cancel_delayed_work_sync(&priv->work);
+
+        return 0;
 }
 
 static struct usbhs_private usbhs0_private = {
@@ -735,7 +739,7 @@ static int usbhs1_hardware_init(struct platform_device *pdev)
         return 0;
 }
 
-static void usbhs1_hardware_exit(struct platform_device *pdev)
+static int usbhs1_hardware_exit(struct platform_device *pdev)
 {
         struct usbhs_private *priv = usbhs_get_priv(pdev);
 
@@ -743,6 +747,8 @@ static void usbhs1_hardware_exit(struct platform_device *pdev)
         __raw_writew(USB_PHY_MODE | USB_PHY_INT_CLR, priv->usbphyaddr);
 
         free_irq(IRQ8, pdev);
+
+        return 0;
 }
 
 static int usbhs1_get_id(struct platform_device *pdev)
diff --git a/arch/arm/mach-shmobile/cpuidle.c b/arch/arm/mach-shmobile/cpuidle.c
index 9e050268cde4..0afeb5c7061c 100644
--- a/arch/arm/mach-shmobile/cpuidle.c
+++ b/arch/arm/mach-shmobile/cpuidle.c
@@ -16,39 +16,22 @@
 #include <asm/cpuidle.h>
 #include <asm/io.h>
 
-int shmobile_enter_wfi(struct cpuidle_device *dev, struct cpuidle_driver *drv,
-                       int index)
-{
-        cpu_do_idle();
-        return 0;
-}
-
-static struct cpuidle_device shmobile_cpuidle_dev;
 static struct cpuidle_driver shmobile_cpuidle_default_driver = {
         .name                   = "shmobile_cpuidle",
         .owner                  = THIS_MODULE,
-        .en_core_tk_irqen       = 1,
         .states[0]              = ARM_CPUIDLE_WFI_STATE,
-        .states[0].enter        = shmobile_enter_wfi,
         .safe_state_index       = 0, /* C1 */
         .state_count            = 1,
 };
 
 static struct cpuidle_driver *cpuidle_drv = &shmobile_cpuidle_default_driver;
 
-void shmobile_cpuidle_set_driver(struct cpuidle_driver *drv)
+void __init shmobile_cpuidle_set_driver(struct cpuidle_driver *drv)
 {
         cpuidle_drv = drv;
 }
 
-int shmobile_cpuidle_init(void)
+int __init shmobile_cpuidle_init(void)
 {
-        struct cpuidle_device *dev = &shmobile_cpuidle_dev;
-
-        cpuidle_register_driver(cpuidle_drv);
-
-        dev->state_count = cpuidle_drv->state_count;
-        cpuidle_register_device(dev);
-
-        return 0;
+        return cpuidle_register(cpuidle_drv, NULL);
 }
diff --git a/arch/arm/mach-shmobile/include/mach/common.h b/arch/arm/mach-shmobile/include/mach/common.h
index e48606d8a2be..362f9b2d2c02 100644
--- a/arch/arm/mach-shmobile/include/mach/common.h
+++ b/arch/arm/mach-shmobile/include/mach/common.h
@@ -13,9 +13,6 @@ extern int shmobile_clk_init(void);
 extern void shmobile_handle_irq_intc(struct pt_regs *);
 extern struct platform_suspend_ops shmobile_suspend_ops;
 struct cpuidle_driver;
-struct cpuidle_device;
-extern int shmobile_enter_wfi(struct cpuidle_device *dev,
-                              struct cpuidle_driver *drv, int index);
 extern void shmobile_cpuidle_set_driver(struct cpuidle_driver *drv);
 
 extern void sh7372_init_irq(void);
diff --git a/arch/arm/mach-shmobile/pm-sh7372.c b/arch/arm/mach-shmobile/pm-sh7372.c
index a0826a48dd08..dec9293bb90d 100644
--- a/arch/arm/mach-shmobile/pm-sh7372.c
+++ b/arch/arm/mach-shmobile/pm-sh7372.c
@@ -410,11 +410,9 @@ static int sh7372_enter_a4s(struct cpuidle_device *dev,
 static struct cpuidle_driver sh7372_cpuidle_driver = {
         .name                   = "sh7372_cpuidle",
         .owner                  = THIS_MODULE,
-        .en_core_tk_irqen       = 1,
         .state_count            = 5,
         .safe_state_index       = 0, /* C1 */
         .states[0] = ARM_CPUIDLE_WFI_STATE,
-        .states[0].enter = shmobile_enter_wfi,
         .states[1] = {
                 .name = "C2",
                 .desc = "Core Standby Mode",
@@ -450,12 +448,12 @@ static struct cpuidle_driver sh7372_cpuidle_driver = {
         },
 };
 
-static void sh7372_cpuidle_init(void)
+static void __init sh7372_cpuidle_init(void)
 {
         shmobile_cpuidle_set_driver(&sh7372_cpuidle_driver);
 }
 #else
-static void sh7372_cpuidle_init(void) {}
+static void __init sh7372_cpuidle_init(void) {}
 #endif
 
 #ifdef CONFIG_SUSPEND
diff --git a/arch/arm/mach-shmobile/suspend.c b/arch/arm/mach-shmobile/suspend.c
index 47d83f7a70b6..5d92b5dd486b 100644
--- a/arch/arm/mach-shmobile/suspend.c
+++ b/arch/arm/mach-shmobile/suspend.c
@@ -12,6 +12,8 @@
 #include <linux/suspend.h>
 #include <linux/module.h>
 #include <linux/err.h>
+#include <linux/cpu.h>
+
 #include <asm/io.h>
 #include <asm/system_misc.h>
 
@@ -23,13 +25,13 @@ static int shmobile_suspend_default_enter(suspend_state_t suspend_state)
 
 static int shmobile_suspend_begin(suspend_state_t state)
 {
-        disable_hlt();
+        cpu_idle_poll_ctrl(true);
         return 0;
 }
 
 static void shmobile_suspend_end(void)
 {
-        enable_hlt();
+        cpu_idle_poll_ctrl(false);
 }
 
 struct platform_suspend_ops shmobile_suspend_ops = {
diff --git a/arch/arm/mach-tegra/Kconfig b/arch/arm/mach-tegra/Kconfig
index d1c4893894ce..dbc653ea851c 100644
--- a/arch/arm/mach-tegra/Kconfig
+++ b/arch/arm/mach-tegra/Kconfig
@@ -18,8 +18,8 @@ config ARCH_TEGRA_2x_SOC
         select PL310_ERRATA_727915 if CACHE_L2X0
         select PL310_ERRATA_769419 if CACHE_L2X0
         select USB_ARCH_HAS_EHCI if USB_SUPPORT
-        select USB_ULPI if USB
-        select USB_ULPI_VIEWPORT if USB_SUPPORT
+        select USB_ULPI if USB_PHY
+        select USB_ULPI_VIEWPORT if USB_PHY
         help
           Support for NVIDIA Tegra AP20 and T20 processors, based on the
           ARM CortexA9MP CPU and the ARM PL310 L2 cache controller
@@ -37,8 +37,8 @@ config ARCH_TEGRA_3x_SOC
         select PINCTRL_TEGRA30
         select PL310_ERRATA_769419 if CACHE_L2X0
         select USB_ARCH_HAS_EHCI if USB_SUPPORT
-        select USB_ULPI if USB
-        select USB_ULPI_VIEWPORT if USB_SUPPORT
+        select USB_ULPI if USB_PHY
+        select USB_ULPI_VIEWPORT if USB_PHY
         help
           Support for NVIDIA Tegra T30 processor family, based on the
           ARM CortexA9MP CPU and the ARM PL310 L2 cache controller
diff --git a/arch/arm/mach-tegra/Makefile b/arch/arm/mach-tegra/Makefile
index f6b46ae2b7f8..09b578f9eb84 100644
--- a/arch/arm/mach-tegra/Makefile
+++ b/arch/arm/mach-tegra/Makefile
@@ -24,7 +24,6 @@ obj-$(CONFIG_ARCH_TEGRA_3x_SOC)		+= cpuidle-tegra30.o
 endif
 obj-$(CONFIG_SMP)                       += platsmp.o headsmp.o
 obj-$(CONFIG_HOTPLUG_CPU)               += hotplug.o
-obj-$(CONFIG_CPU_FREQ)                  += cpu-tegra.o
 obj-$(CONFIG_TEGRA_PCI)                 += pcie.o
 
 obj-$(CONFIG_ARCH_TEGRA_2x_SOC)         += board-dt-tegra20.o
diff --git a/arch/arm/mach-tegra/cpu-tegra.c b/arch/arm/mach-tegra/cpu-tegra.c
deleted file mode 100644
index e3d6e15ff188..000000000000
--- a/arch/arm/mach-tegra/cpu-tegra.c
+++ /dev/null
@@ -1,293 +0,0 @@
-/*
- * arch/arm/mach-tegra/cpu-tegra.c
- *
- * Copyright (C) 2010 Google, Inc.
- *
- * Author:
- *      Colin Cross <ccross@google.com>
- *      Based on arch/arm/plat-omap/cpu-omap.c, (C) 2005 Nokia Corporation
- *
- * This software is licensed under the terms of the GNU General Public
- * License version 2, as published by the Free Software Foundation, and
- * may be copied, distributed, and modified under those terms.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- */
-
-#include <linux/kernel.h>
-#include <linux/module.h>
-#include <linux/types.h>
-#include <linux/sched.h>
-#include <linux/cpufreq.h>
-#include <linux/delay.h>
-#include <linux/init.h>
-#include <linux/err.h>
-#include <linux/clk.h>
-#include <linux/io.h>
-#include <linux/suspend.h>
-
-/* Frequency table index must be sequential starting at 0 */
-static struct cpufreq_frequency_table freq_table[] = {
-        { 0, 216000 },
-        { 1, 312000 },
-        { 2, 456000 },
-        { 3, 608000 },
-        { 4, 760000 },
-        { 5, 816000 },
-        { 6, 912000 },
-        { 7, 1000000 },
-        { 8, CPUFREQ_TABLE_END },
-};
-
-#define NUM_CPUS        2
-
-static struct clk *cpu_clk;
-static struct clk *pll_x_clk;
-static struct clk *pll_p_clk;
-static struct clk *emc_clk;
-
-static unsigned long target_cpu_speed[NUM_CPUS];
-static DEFINE_MUTEX(tegra_cpu_lock);
-static bool is_suspended;
-
-static int tegra_verify_speed(struct cpufreq_policy *policy)
-{
-        return cpufreq_frequency_table_verify(policy, freq_table);
-}
-
-static unsigned int tegra_getspeed(unsigned int cpu)
-{
-        unsigned long rate;
-
-        if (cpu >= NUM_CPUS)
-                return 0;
-
-        rate = clk_get_rate(cpu_clk) / 1000;
-        return rate;
-}
-
-static int tegra_cpu_clk_set_rate(unsigned long rate)
-{
-        int ret;
-
-        /*
-         * Take an extra reference to the main pll so it doesn't turn
-         * off when we move the cpu off of it
-         */
-        clk_prepare_enable(pll_x_clk);
-
-        ret = clk_set_parent(cpu_clk, pll_p_clk);
-        if (ret) {
-                pr_err("Failed to switch cpu to clock pll_p\n");
-                goto out;
-        }
-
-        if (rate == clk_get_rate(pll_p_clk))
-                goto out;
-
-        ret = clk_set_rate(pll_x_clk, rate);
-        if (ret) {
-                pr_err("Failed to change pll_x to %lu\n", rate);
-                goto out;
-        }
-
-        ret = clk_set_parent(cpu_clk, pll_x_clk);
-        if (ret) {
-                pr_err("Failed to switch cpu to clock pll_x\n");
-                goto out;
-        }
-
-out:
-        clk_disable_unprepare(pll_x_clk);
-        return ret;
-}
-
-static int tegra_update_cpu_speed(unsigned long rate)
-{
-        int ret = 0;
-        struct cpufreq_freqs freqs;
-
-        freqs.old = tegra_getspeed(0);
-        freqs.new = rate;
-
-        if (freqs.old == freqs.new)
-                return ret;
-
-        /*
-         * Vote on memory bus frequency based on cpu frequency
-         * This sets the minimum frequency, display or avp may request higher
-         */
-        if (rate >= 816000)
-                clk_set_rate(emc_clk, 600000000); /* cpu 816 MHz, emc max */
-        else if (rate >= 456000)
-                clk_set_rate(emc_clk, 300000000); /* cpu 456 MHz, emc 150Mhz */
-        else
-                clk_set_rate(emc_clk, 100000000);  /* emc 50Mhz */
-
-        for_each_online_cpu(freqs.cpu)
-                cpufreq_notify_transition(&freqs, CPUFREQ_PRECHANGE);
-
-#ifdef CONFIG_CPU_FREQ_DEBUG
-        printk(KERN_DEBUG "cpufreq-tegra: transition: %u --> %u\n",
-               freqs.old, freqs.new);
-#endif
-
-        ret = tegra_cpu_clk_set_rate(freqs.new * 1000);
-        if (ret) {
-                pr_err("cpu-tegra: Failed to set cpu frequency to %d kHz\n",
-                        freqs.new);
-                return ret;
-        }
-
-        for_each_online_cpu(freqs.cpu)
-                cpufreq_notify_transition(&freqs, CPUFREQ_POSTCHANGE);
-
-        return 0;
-}
-
-static unsigned long tegra_cpu_highest_speed(void)
-{
-        unsigned long rate = 0;
-        int i;
-
-        for_each_online_cpu(i)
-                rate = max(rate, target_cpu_speed[i]);
-        return rate;
-}
-
-static int tegra_target(struct cpufreq_policy *policy,
-                       unsigned int target_freq,
-                       unsigned int relation)
-{
-        unsigned int idx;
-        unsigned int freq;
-        int ret = 0;
-
-        mutex_lock(&tegra_cpu_lock);
-
-        if (is_suspended) {
-                ret = -EBUSY;
-                goto out;
-        }
-
-        cpufreq_frequency_table_target(policy, freq_table, target_freq,
-                relation, &idx);
-
-        freq = freq_table[idx].frequency;
-
-        target_cpu_speed[policy->cpu] = freq;
-
-        ret = tegra_update_cpu_speed(tegra_cpu_highest_speed());
-
-out:
-        mutex_unlock(&tegra_cpu_lock);
-        return ret;
-}
-
-static int tegra_pm_notify(struct notifier_block *nb, unsigned long event,
-        void *dummy)
-{
-        mutex_lock(&tegra_cpu_lock);
-        if (event == PM_SUSPEND_PREPARE) {
-                is_suspended = true;
-                pr_info("Tegra cpufreq suspend: setting frequency to %d kHz\n",
-                        freq_table[0].frequency);
-                tegra_update_cpu_speed(freq_table[0].frequency);
-        } else if (event == PM_POST_SUSPEND) {
-                is_suspended = false;
-        }
-        mutex_unlock(&tegra_cpu_lock);
-
-        return NOTIFY_OK;
-}
-
-static struct notifier_block tegra_cpu_pm_notifier = {
-        .notifier_call = tegra_pm_notify,
-};
-
-static int tegra_cpu_init(struct cpufreq_policy *policy)
-{
-        if (policy->cpu >= NUM_CPUS)
-                return -EINVAL;
-
-        clk_prepare_enable(emc_clk);
-        clk_prepare_enable(cpu_clk);
-
-        cpufreq_frequency_table_cpuinfo(policy, freq_table);
-        cpufreq_frequency_table_get_attr(freq_table, policy->cpu);
-        policy->cur = tegra_getspeed(policy->cpu);
-        target_cpu_speed[policy->cpu] = policy->cur;
-
-        /* FIXME: what's the actual transition time? */
-        policy->cpuinfo.transition_latency = 300 * 1000;
-
-        cpumask_copy(policy->cpus, cpu_possible_mask);
-
-        if (policy->cpu == 0)
-                register_pm_notifier(&tegra_cpu_pm_notifier);
-
-        return 0;
-}
-
-static int tegra_cpu_exit(struct cpufreq_policy *policy)
-{
-        cpufreq_frequency_table_cpuinfo(policy, freq_table);
-        clk_disable_unprepare(emc_clk);
-        return 0;
-}
-
-static struct freq_attr *tegra_cpufreq_attr[] = {
-        &cpufreq_freq_attr_scaling_available_freqs,
-        NULL,
-};
-
-static struct cpufreq_driver tegra_cpufreq_driver = {
-        .verify         = tegra_verify_speed,
-        .target         = tegra_target,
-        .get            = tegra_getspeed,
-        .init           = tegra_cpu_init,
-        .exit           = tegra_cpu_exit,
-        .name           = "tegra",
-        .attr           = tegra_cpufreq_attr,
-};
-
-static int __init tegra_cpufreq_init(void)
-{
-        cpu_clk = clk_get_sys(NULL, "cpu");
-        if (IS_ERR(cpu_clk))
-                return PTR_ERR(cpu_clk);
-
-        pll_x_clk = clk_get_sys(NULL, "pll_x");
-        if (IS_ERR(pll_x_clk))
-                return PTR_ERR(pll_x_clk);
-
-        pll_p_clk = clk_get_sys(NULL, "pll_p_cclk");
-        if (IS_ERR(pll_p_clk))
-                return PTR_ERR(pll_p_clk);
-
-        emc_clk = clk_get_sys("cpu", "emc");
-        if (IS_ERR(emc_clk)) {
-                clk_put(cpu_clk);
-                return PTR_ERR(emc_clk);
-        }
-
-        return cpufreq_register_driver(&tegra_cpufreq_driver);
-}
-
-static void __exit tegra_cpufreq_exit(void)
-{
-        cpufreq_unregister_driver(&tegra_cpufreq_driver);
-        clk_put(emc_clk);
-        clk_put(cpu_clk);
-}
-
-
-MODULE_AUTHOR("Colin Cross <ccross@android.com>");
-MODULE_DESCRIPTION("cpufreq driver for Nvidia Tegra2");
-MODULE_LICENSE("GPL");
-module_init(tegra_cpufreq_init);
-module_exit(tegra_cpufreq_exit);
diff --git a/arch/arm/mach-tegra/cpuidle-tegra114.c b/arch/arm/mach-tegra/cpuidle-tegra114.c
index 0f4e8c483b34..1d1c6023f4a2 100644
--- a/arch/arm/mach-tegra/cpuidle-tegra114.c
+++ b/arch/arm/mach-tegra/cpuidle-tegra114.c
@@ -23,39 +23,13 @@
 static struct cpuidle_driver tegra_idle_driver = {
         .name = "tegra_idle",
         .owner = THIS_MODULE,
-        .en_core_tk_irqen = 1,
         .state_count = 1,
         .states = {
                 [0] = ARM_CPUIDLE_WFI_STATE_PWR(600),
         },
 };
 
-static DEFINE_PER_CPU(struct cpuidle_device, tegra_idle_device);
-
 int __init tegra114_cpuidle_init(void)
 {
-        int ret;
-        unsigned int cpu;
-        struct cpuidle_device *dev;
-        struct cpuidle_driver *drv = &tegra_idle_driver;
-
-        ret = cpuidle_register_driver(&tegra_idle_driver);
-        if (ret) {
-                pr_err("CPUidle driver registration failed\n");
-                return ret;
-        }
-
-        for_each_possible_cpu(cpu) {
-                dev = &per_cpu(tegra_idle_device, cpu);
-                dev->cpu = cpu;
-
-                dev->state_count = drv->state_count;
-                ret = cpuidle_register_device(dev);
-                if (ret) {
-                        pr_err("CPU%u: CPUidle device registration failed\n",
-                                cpu);
-                        return ret;
-                }
-        }
-        return 0;
+        return cpuidle_register(&tegra_idle_driver, NULL);
 }
diff --git a/arch/arm/mach-tegra/cpuidle-tegra20.c b/arch/arm/mach-tegra/cpuidle-tegra20.c
index 825ced4f7a40..590ec25855dd 100644
--- a/arch/arm/mach-tegra/cpuidle-tegra20.c
+++ b/arch/arm/mach-tegra/cpuidle-tegra20.c
@@ -43,32 +43,33 @@ static atomic_t abort_barrier;
 static int tegra20_idle_lp2_coupled(struct cpuidle_device *dev,
                                     struct cpuidle_driver *drv,
                                     int index);
+#define TEGRA20_MAX_STATES 2
+#else
+#define TEGRA20_MAX_STATES 1
 #endif
 
-static struct cpuidle_state tegra_idle_states[] = {
-        [0] = ARM_CPUIDLE_WFI_STATE_PWR(600),
-#ifdef CONFIG_PM_SLEEP
-        [1] = {
-                .enter                  = tegra20_idle_lp2_coupled,
-                .exit_latency           = 5000,
-                .target_residency       = 10000,
-                .power_usage            = 0,
-                .flags                  = CPUIDLE_FLAG_TIME_VALID |
-                                          CPUIDLE_FLAG_COUPLED,
-                .name                   = "powered-down",
-                .desc                   = "CPU power gated",
-        },
-#endif
-};
-
 static struct cpuidle_driver tegra_idle_driver = {
         .name = "tegra_idle",
         .owner = THIS_MODULE,
-        .en_core_tk_irqen = 1,
+        .states = {
+                ARM_CPUIDLE_WFI_STATE_PWR(600),
+#ifdef CONFIG_PM_SLEEP
+                {
+                        .enter            = tegra20_idle_lp2_coupled,
+                        .exit_latency     = 5000,
+                        .target_residency = 10000,
+                        .power_usage      = 0,
+                        .flags            = CPUIDLE_FLAG_TIME_VALID |
+                        CPUIDLE_FLAG_COUPLED,
+                        .name             = "powered-down",
+                        .desc             = "CPU power gated",
+                },
+#endif
+        },
+        .state_count = TEGRA20_MAX_STATES,
+        .safe_state_index = 0,
 };
 
-static DEFINE_PER_CPU(struct cpuidle_device, tegra_idle_device);
-
 #ifdef CONFIG_PM_SLEEP
 #ifdef CONFIG_SMP
 static void __iomem *pmc = IO_ADDRESS(TEGRA_PMC_BASE);
@@ -217,39 +218,8 @@ static int tegra20_idle_lp2_coupled(struct cpuidle_device *dev,
 
 int __init tegra20_cpuidle_init(void)
 {
-        int ret;
-        unsigned int cpu;
-        struct cpuidle_device *dev;
-        struct cpuidle_driver *drv = &tegra_idle_driver;
-
 #ifdef CONFIG_PM_SLEEP
         tegra_tear_down_cpu = tegra20_tear_down_cpu;
 #endif
-
-        drv->state_count = ARRAY_SIZE(tegra_idle_states);
-        memcpy(drv->states, tegra_idle_states,
-                        drv->state_count * sizeof(drv->states[0]));
-
-        ret = cpuidle_register_driver(&tegra_idle_driver);
-        if (ret) {
-                pr_err("CPUidle driver registration failed\n");
-                return ret;
-        }
-
-        for_each_possible_cpu(cpu) {
-                dev = &per_cpu(tegra_idle_device, cpu);
-                dev->cpu = cpu;
-#ifdef CONFIG_ARCH_NEEDS_CPU_IDLE_COUPLED
-                dev->coupled_cpus = *cpu_possible_mask;
-#endif
-
-                dev->state_count = drv->state_count;
-                ret = cpuidle_register_device(dev);
-                if (ret) {
-                        pr_err("CPU%u: CPUidle device registration failed\n",
-                                cpu);
-                        return ret;
-                }
-        }
-        return 0;
+        return cpuidle_register(&tegra_idle_driver, cpu_possible_mask);
 }
diff --git a/arch/arm/mach-tegra/cpuidle-tegra30.c b/arch/arm/mach-tegra/cpuidle-tegra30.c
index 8b50cf4ddd6f..36dc2befa9d8 100644
--- a/arch/arm/mach-tegra/cpuidle-tegra30.c
+++ b/arch/arm/mach-tegra/cpuidle-tegra30.c
@@ -43,7 +43,6 @@ static int tegra30_idle_lp2(struct cpuidle_device *dev,
 static struct cpuidle_driver tegra_idle_driver = {
         .name = "tegra_idle",
         .owner = THIS_MODULE,
-        .en_core_tk_irqen = 1,
 #ifdef CONFIG_PM_SLEEP
         .state_count = 2,
 #else
@@ -65,8 +64,6 @@ static struct cpuidle_driver tegra_idle_driver = {
         },
 };
 
-static DEFINE_PER_CPU(struct cpuidle_device, tegra_idle_device);
-
 #ifdef CONFIG_PM_SLEEP
 static bool tegra30_cpu_cluster_power_down(struct cpuidle_device *dev,
                                            struct cpuidle_driver *drv,
@@ -157,32 +154,8 @@ static int tegra30_idle_lp2(struct cpuidle_device *dev,
 
 int __init tegra30_cpuidle_init(void)
 {
-        int ret;
-        unsigned int cpu;
-        struct cpuidle_device *dev;
-        struct cpuidle_driver *drv = &tegra_idle_driver;
-
 #ifdef CONFIG_PM_SLEEP
         tegra_tear_down_cpu = tegra30_tear_down_cpu;
 #endif
-
-        ret = cpuidle_register_driver(&tegra_idle_driver);
-        if (ret) {
-                pr_err("CPUidle driver registration failed\n");
-                return ret;
-        }
-
-        for_each_possible_cpu(cpu) {
-                dev = &per_cpu(tegra_idle_device, cpu);
-                dev->cpu = cpu;
-
-                dev->state_count = drv->state_count;
-                ret = cpuidle_register_device(dev);
-                if (ret) {
-                        pr_err("CPU%u: CPUidle device registration failed\n",
-                                cpu);
-                        return ret;
-                }
-        }
-        return 0;
+        return cpuidle_register(&tegra_idle_driver, NULL);
 }
diff --git a/arch/arm/mach-ux500/board-mop500-regulators.c b/arch/arm/mach-ux500/board-mop500-regulators.c
index 2a17bc506cff..ff3c9f016591 100644
--- a/arch/arm/mach-ux500/board-mop500-regulators.c
+++ b/arch/arm/mach-ux500/board-mop500-regulators.c
@@ -5,6 +5,7 @@
  *
  * Authors: Sundar Iyer <sundar.iyer@stericsson.com>
  *          Bengt Jonsson <bengt.g.jonsson@stericsson.com>
+ *          Daniel Willerud <daniel.willerud@stericsson.com>
  *
  * MOP500 board specific initialization for regulators
  */
@@ -12,6 +13,7 @@
 #include <linux/regulator/machine.h>
 #include <linux/regulator/ab8500.h>
 #include "board-mop500-regulators.h"
+#include "id.h"
 
 static struct regulator_consumer_supply gpio_en_3v3_consumers[] = {
        REGULATOR_SUPPLY("vdd33a", "smsc911x.0"),
@@ -53,21 +55,37 @@ struct regulator_init_data tps61052_regulator = {
 };
 
 static struct regulator_consumer_supply ab8500_vaux1_consumers[] = {
-        /* External displays, connector on board 2v5 power supply */
-        REGULATOR_SUPPLY("vaux12v5", "mcde.0"),
+        /* Main display, u8500 R3 uib */
+        REGULATOR_SUPPLY("vddi", "mcde_disp_sony_acx424akp.0"),
+        /* Main display, u8500 uib and ST uib */
+        REGULATOR_SUPPLY("vdd1", "samsung_s6d16d0.0"),
+        /* Secondary display, ST uib */
+        REGULATOR_SUPPLY("vdd1", "samsung_s6d16d0.1"),
         /* SFH7741 proximity sensor */
         REGULATOR_SUPPLY("vcc", "gpio-keys.0"),
         /* BH1780GLS ambient light sensor */
         REGULATOR_SUPPLY("vcc", "2-0029"),
         /* lsm303dlh accelerometer */
-        REGULATOR_SUPPLY("vdd", "3-0018"),
+        REGULATOR_SUPPLY("vdd", "2-0018"),
+        /* lsm303dlhc accelerometer */
+        REGULATOR_SUPPLY("vdd", "2-0019"),
         /* lsm303dlh magnetometer */
-        REGULATOR_SUPPLY("vdd", "3-001e"),
+        REGULATOR_SUPPLY("vdd", "2-001e"),
         /* Rohm BU21013 Touchscreen devices */
         REGULATOR_SUPPLY("avdd", "3-005c"),
         REGULATOR_SUPPLY("avdd", "3-005d"),
         /* Synaptics RMI4 Touchscreen device */
         REGULATOR_SUPPLY("vdd", "3-004b"),
+        /* L3G4200D Gyroscope device */
+        REGULATOR_SUPPLY("vdd", "2-0068"),
+        /* Ambient light sensor device */
+        REGULATOR_SUPPLY("vdd", "3-0029"),
+        /* Pressure sensor device */
+        REGULATOR_SUPPLY("vdd", "2-005c"),
+        /* Cypress TrueTouch Touchscreen device */
+        REGULATOR_SUPPLY("vcpin", "spi8.0"),
+        /* Camera device */
+        REGULATOR_SUPPLY("vaux12v5", "mmio_camera"),
 };
 
 static struct regulator_consumer_supply ab8500_vaux2_consumers[] = {
@@ -75,18 +93,50 @@ static struct regulator_consumer_supply ab8500_vaux2_consumers[] = {
         REGULATOR_SUPPLY("vmmc", "sdi4"),
         /* AB8500 audio codec */
         REGULATOR_SUPPLY("vcc-N2158", "ab8500-codec.0"),
+        /* AB8500 accessory detect 1 */
+        REGULATOR_SUPPLY("vcc-N2158", "ab8500-acc-det.0"),
+        /* AB8500 Tv-out device */
+        REGULATOR_SUPPLY("vcc-N2158", "mcde_tv_ab8500.4"),
+        /* AV8100 HDMI device */
+        REGULATOR_SUPPLY("vcc-N2158", "av8100_hdmi.3"),
 };
 
 static struct regulator_consumer_supply ab8500_vaux3_consumers[] = {
+        REGULATOR_SUPPLY("v-SD-STM", "stm"),
         /* External MMC slot power */
         REGULATOR_SUPPLY("vmmc", "sdi0"),
 };
 
+static struct regulator_consumer_supply ab8505_vaux4_consumers[] = {
+};
+
+static struct regulator_consumer_supply ab8505_vaux5_consumers[] = {
+};
+
+static struct regulator_consumer_supply ab8505_vaux6_consumers[] = {
+};
+
+static struct regulator_consumer_supply ab8505_vaux8_consumers[] = {
+        /* AB8500 audio codec device */
+        REGULATOR_SUPPLY("v-aux8", NULL),
+};
+
+static struct regulator_consumer_supply ab8505_vadc_consumers[] = {
+        /* Internal general-purpose ADC */
+        REGULATOR_SUPPLY("vddadc", "ab8500-gpadc.0"),
+        /* ADC for charger */
+        REGULATOR_SUPPLY("vddadc", "ab8500-charger.0"),
+};
+
 static struct regulator_consumer_supply ab8500_vtvout_consumers[] = {
         /* TV-out DENC supply */
         REGULATOR_SUPPLY("vtvout", "ab8500-denc.0"),
         /* Internal general-purpose ADC */
         REGULATOR_SUPPLY("vddadc", "ab8500-gpadc.0"),
+        /* ADC for charger */
+        REGULATOR_SUPPLY("vddadc", "ab8500-charger.0"),
+        /* AB8500 Tv-out device */
+        REGULATOR_SUPPLY("vtvout", "mcde_tv_ab8500.4"),
 };
 
 static struct regulator_consumer_supply ab8500_vaud_consumers[] = {
@@ -114,77 +164,90 @@ static struct regulator_consumer_supply ab8500_vintcore_consumers[] = {
         REGULATOR_SUPPLY("v-intcore", NULL),
         /* USB Transceiver */
         REGULATOR_SUPPLY("vddulpivio18", "ab8500-usb.0"),
+        /* Handled by abx500 clk driver */
+        REGULATOR_SUPPLY("v-intcore", "abx500-clk.0"),
+};
+
+static struct regulator_consumer_supply ab8505_usb_consumers[] = {
+        /* HS USB OTG physical interface */
+        REGULATOR_SUPPLY("v-ape", NULL),
 };
 
 static struct regulator_consumer_supply ab8500_vana_consumers[] = {
-        /* External displays, connector on board, 1v8 power supply */
-        REGULATOR_SUPPLY("vsmps2", "mcde.0"),
+        /* DB8500 DSI */
+        REGULATOR_SUPPLY("vdddsi1v2", "mcde"),
+        REGULATOR_SUPPLY("vdddsi1v2", "b2r2_core"),
+        REGULATOR_SUPPLY("vdddsi1v2", "b2r2_1_core"),
+        REGULATOR_SUPPLY("vdddsi1v2", "dsilink.0"),
+        REGULATOR_SUPPLY("vdddsi1v2", "dsilink.1"),
+        REGULATOR_SUPPLY("vdddsi1v2", "dsilink.2"),
+        /* DB8500 CSI */
+        REGULATOR_SUPPLY("vddcsi1v2", "mmio_camera"),
 };
 
 /* ab8500 regulator register initialization */
-struct ab8500_regulator_reg_init
-ab8500_regulator_reg_init[AB8500_NUM_REGULATOR_REGISTERS] = {
+static struct ab8500_regulator_reg_init ab8500_reg_init[] = {
         /*
          * VanaRequestCtrl          = HP/LP depending on VxRequest
          * VextSupply1RequestCtrl   = HP/LP depending on VxRequest
          */
-        INIT_REGULATOR_REGISTER(AB8500_REGUREQUESTCTRL2, 0x00),
+        INIT_REGULATOR_REGISTER(AB8500_REGUREQUESTCTRL2,       0xf0, 0x00),
         /*
          * VextSupply2RequestCtrl   = HP/LP depending on VxRequest
          * VextSupply3RequestCtrl   = HP/LP depending on VxRequest
          * Vaux1RequestCtrl         = HP/LP depending on VxRequest
          * Vaux2RequestCtrl         = HP/LP depending on VxRequest
          */
-        INIT_REGULATOR_REGISTER(AB8500_REGUREQUESTCTRL3, 0x00),
+        INIT_REGULATOR_REGISTER(AB8500_REGUREQUESTCTRL3,       0xff, 0x00),
         /*
          * Vaux3RequestCtrl         = HP/LP depending on VxRequest
          * SwHPReq                  = Control through SWValid disabled
          */
-        INIT_REGULATOR_REGISTER(AB8500_REGUREQUESTCTRL4, 0x00),
+        INIT_REGULATOR_REGISTER(AB8500_REGUREQUESTCTRL4,       0x07, 0x00),
         /*
          * VanaSysClkReq1HPValid    = disabled
          * Vaux1SysClkReq1HPValid   = disabled
          * Vaux2SysClkReq1HPValid   = disabled
          * Vaux3SysClkReq1HPValid   = disabled
          */
-        INIT_REGULATOR_REGISTER(AB8500_REGUSYSCLKREQ1HPVALID1, 0x00),
+        INIT_REGULATOR_REGISTER(AB8500_REGUSYSCLKREQ1HPVALID1, 0xe8, 0x00),
         /*
          * VextSupply1SysClkReq1HPValid = disabled
          * VextSupply2SysClkReq1HPValid = disabled
          * VextSupply3SysClkReq1HPValid = SysClkReq1 controlled
          */
-        INIT_REGULATOR_REGISTER(AB8500_REGUSYSCLKREQ1HPVALID2, 0x40),
+        INIT_REGULATOR_REGISTER(AB8500_REGUSYSCLKREQ1HPVALID2, 0x70, 0x40),
         /*
          * VanaHwHPReq1Valid        = disabled
          * Vaux1HwHPreq1Valid       = disabled
          * Vaux2HwHPReq1Valid       = disabled
          * Vaux3HwHPReqValid        = disabled
          */
-        INIT_REGULATOR_REGISTER(AB8500_REGUHWHPREQ1VALID1, 0x00),
+        INIT_REGULATOR_REGISTER(AB8500_REGUHWHPREQ1VALID1,     0xe8, 0x00),
         /*
          * VextSupply1HwHPReq1Valid = disabled
          * VextSupply2HwHPReq1Valid = disabled
          * VextSupply3HwHPReq1Valid = disabled
          */
-        INIT_REGULATOR_REGISTER(AB8500_REGUHWHPREQ1VALID2, 0x00),
+        INIT_REGULATOR_REGISTER(AB8500_REGUHWHPREQ1VALID2,     0x07, 0x00),
         /*
          * VanaHwHPReq2Valid        = disabled
          * Vaux1HwHPReq2Valid       = disabled
          * Vaux2HwHPReq2Valid       = disabled
          * Vaux3HwHPReq2Valid       = disabled
          */
-        INIT_REGULATOR_REGISTER(AB8500_REGUHWHPREQ2VALID1, 0x00),
+        INIT_REGULATOR_REGISTER(AB8500_REGUHWHPREQ2VALID1,     0xe8, 0x00),
         /*
          * VextSupply1HwHPReq2Valid = disabled
          * VextSupply2HwHPReq2Valid = disabled
          * VextSupply3HwHPReq2Valid = HWReq2 controlled
          */
-        INIT_REGULATOR_REGISTER(AB8500_REGUHWHPREQ2VALID2, 0x04),
+        INIT_REGULATOR_REGISTER(AB8500_REGUHWHPREQ2VALID2,     0x07, 0x04),
         /*
          * VanaSwHPReqValid         = disabled
          * Vaux1SwHPReqValid        = disabled
          */
-        INIT_REGULATOR_REGISTER(AB8500_REGUSWHPREQVALID1, 0x00),
+        INIT_REGULATOR_REGISTER(AB8500_REGUSWHPREQVALID1,      0xa0, 0x00),
         /*
          * Vaux2SwHPReqValid        = disabled
          * Vaux3SwHPReqValid        = disabled
@@ -192,7 +255,7 @@ ab8500_regulator_reg_init[AB8500_NUM_REGULATOR_REGISTERS] = {
          * VextSupply2SwHPReqValid  = disabled
          * VextSupply3SwHPReqValid  = disabled
          */
-        INIT_REGULATOR_REGISTER(AB8500_REGUSWHPREQVALID2, 0x00),
+        INIT_REGULATOR_REGISTER(AB8500_REGUSWHPREQVALID2,      0x1f, 0x00),
         /*
          * SysClkReq2Valid1         = SysClkReq2 controlled
          * SysClkReq3Valid1         = disabled
@@ -202,7 +265,7 @@ ab8500_regulator_reg_init[AB8500_NUM_REGULATOR_REGISTERS] = {
          * SysClkReq7Valid1         = disabled
          * SysClkReq8Valid1         = disabled
          */
-        INIT_REGULATOR_REGISTER(AB8500_REGUSYSCLKREQVALID1, 0x2a),
+        INIT_REGULATOR_REGISTER(AB8500_REGUSYSCLKREQVALID1,    0xfe, 0x2a),
         /*
          * SysClkReq2Valid2         = disabled
          * SysClkReq3Valid2         = disabled
@@ -212,7 +275,7 @@ ab8500_regulator_reg_init[AB8500_NUM_REGULATOR_REGISTERS] = {
          * SysClkReq7Valid2         = disabled
          * SysClkReq8Valid2         = disabled
          */
-        INIT_REGULATOR_REGISTER(AB8500_REGUSYSCLKREQVALID2, 0x20),
+        INIT_REGULATOR_REGISTER(AB8500_REGUSYSCLKREQVALID2,    0xfe, 0x20),
         /*
          * VTVoutEna                = disabled
          * Vintcore12Ena            = disabled
@@ -220,66 +283,62 @@ ab8500_regulator_reg_init[AB8500_NUM_REGULATOR_REGISTERS] = {
          * Vintcore12LP             = inactive (HP)
          * VTVoutLP                 = inactive (HP)
          */
-        INIT_REGULATOR_REGISTER(AB8500_REGUMISC1, 0x10),
+        INIT_REGULATOR_REGISTER(AB8500_REGUMISC1,              0xfe, 0x10),
         /*
          * VaudioEna                = disabled
          * VdmicEna                 = disabled
          * Vamic1Ena                = disabled
          * Vamic2Ena                = disabled
          */
-        INIT_REGULATOR_REGISTER(AB8500_VAUDIOSUPPLY, 0x00),
+        INIT_REGULATOR_REGISTER(AB8500_VAUDIOSUPPLY,           0x1e, 0x00),
         /*
          * Vamic1_dzout             = high-Z when Vamic1 is disabled
          * Vamic2_dzout             = high-Z when Vamic2 is disabled
          */
-        INIT_REGULATOR_REGISTER(AB8500_REGUCTRL1VAMIC, 0x00),
+        INIT_REGULATOR_REGISTER(AB8500_REGUCTRL1VAMIC,         0x03, 0x00),
         /*
-         * VPll                     = Hw controlled
+         * VPll                     = Hw controlled (NOTE! PRCMU bits)
          * VanaRegu                 = force off
          */
-        INIT_REGULATOR_REGISTER(AB8500_VPLLVANAREGU, 0x02),
+        INIT_REGULATOR_REGISTER(AB8500_VPLLVANAREGU,           0x0f, 0x02),
         /*
          * VrefDDREna               = disabled
          * VrefDDRSleepMode         = inactive (no pulldown)
          */
-        INIT_REGULATOR_REGISTER(AB8500_VREFDDR, 0x00),
+        INIT_REGULATOR_REGISTER(AB8500_VREFDDR,                0x03, 0x00),
         /*
-         * VextSupply1Regu          = HW control
-         * VextSupply2Regu          = HW control
-         * VextSupply3Regu          = HW control
+         * VextSupply1Regu          = force LP
+         * VextSupply2Regu          = force OFF
+         * VextSupply3Regu          = force HP (-> STBB2=LP and TPS=LP)
          * ExtSupply2Bypass         = ExtSupply12LPn ball is 0 when Ena is 0
          * ExtSupply3Bypass         = ExtSupply3LPn ball is 0 when Ena is 0
          */
-        INIT_REGULATOR_REGISTER(AB8500_EXTSUPPLYREGU, 0x2a),
+        INIT_REGULATOR_REGISTER(AB8500_EXTSUPPLYREGU,          0xff, 0x13),
         /*
          * Vaux1Regu                = force HP
          * Vaux2Regu                = force off
          */
-        INIT_REGULATOR_REGISTER(AB8500_VAUX12REGU, 0x01),
+        INIT_REGULATOR_REGISTER(AB8500_VAUX12REGU,             0x0f, 0x01),
         /*
-         * Vaux3regu                = force off
+         * Vaux3Regu                = force off
          */
-        INIT_REGULATOR_REGISTER(AB8500_VRF1VAUX3REGU, 0x00),
+        INIT_REGULATOR_REGISTER(AB8500_VRF1VAUX3REGU,          0x03, 0x00),
         /*
-         * Vsmps1                   = 1.15V
+         * Vaux1Sel                 = 2.8 V
          */
-        INIT_REGULATOR_REGISTER(AB8500_VSMPS1SEL1, 0x24),
-        /*
-         * Vaux1Sel                 = 2.5 V
-         */
-        INIT_REGULATOR_REGISTER(AB8500_VAUX1SEL, 0x08),
+        INIT_REGULATOR_REGISTER(AB8500_VAUX1SEL,               0x0f, 0x0C),
         /*
          * Vaux2Sel                 = 2.9 V
          */
-        INIT_REGULATOR_REGISTER(AB8500_VAUX2SEL, 0x0d),
+        INIT_REGULATOR_REGISTER(AB8500_VAUX2SEL,               0x0f, 0x0d),
         /*
          * Vaux3Sel                 = 2.91 V
          */
-        INIT_REGULATOR_REGISTER(AB8500_VRF1VAUX3SEL, 0x07),
+        INIT_REGULATOR_REGISTER(AB8500_VRF1VAUX3SEL,           0x07, 0x07),
         /*
          * VextSupply12LP           = disabled (no LP)
          */
-        INIT_REGULATOR_REGISTER(AB8500_REGUCTRL2SPARE, 0x00),
+        INIT_REGULATOR_REGISTER(AB8500_REGUCTRL2SPARE,         0x01, 0x00),
         /*
          * Vaux1Disch               = short discharge time
          * Vaux2Disch               = short discharge time
@@ -288,33 +347,26 @@ ab8500_regulator_reg_init[AB8500_NUM_REGULATOR_REGISTERS] = {
          * VTVoutDisch              = short discharge time
          * VaudioDisch              = short discharge time
          */
-        INIT_REGULATOR_REGISTER(AB8500_REGUCTRLDISCH, 0x00),
+        INIT_REGULATOR_REGISTER(AB8500_REGUCTRLDISCH,          0xfc, 0x00),
         /*
          * VanaDisch                = short discharge time
          * VdmicPullDownEna         = pulldown disabled when Vdmic is disabled
          * VdmicDisch               = short discharge time
          */
-        INIT_REGULATOR_REGISTER(AB8500_REGUCTRLDISCH2, 0x00),
+        INIT_REGULATOR_REGISTER(AB8500_REGUCTRLDISCH2,         0x16, 0x00),
 };
 
 /* AB8500 regulators */
-struct regulator_init_data ab8500_regulators[AB8500_NUM_REGULATORS] = {
+static struct regulator_init_data ab8500_regulators[AB8500_NUM_REGULATORS] = {
         /* supplies to the display/camera */
         [AB8500_LDO_AUX1] = {
                 .constraints = {
                         .name = "V-DISPLAY",
-                        .min_uV = 2500000,
-                        .max_uV = 2900000,
+                        .min_uV = 2800000,
+                        .max_uV = 3300000,
                         .valid_ops_mask = REGULATOR_CHANGE_VOLTAGE |
                                           REGULATOR_CHANGE_STATUS,
                         .boot_on = 1, /* display is on at boot */
-                        /*
-                         * This voltage cannot be disabled right now because
-                         * it is somehow affecting the external MMC
-                         * functionality, though that typically will use
-                         * AUX3.
-                         */
-                        .always_on = 1,
                 },
                 .num_consumer_supplies = ARRAY_SIZE(ab8500_vaux1_consumers),
                 .consumer_supplies = ab8500_vaux1_consumers,
@@ -326,7 +378,10 @@ struct regulator_init_data ab8500_regulators[AB8500_NUM_REGULATORS] = {
                         .min_uV = 1100000,
                         .max_uV = 3300000,
                         .valid_ops_mask = REGULATOR_CHANGE_VOLTAGE |
-                                          REGULATOR_CHANGE_STATUS,
+                                          REGULATOR_CHANGE_STATUS |
+                                          REGULATOR_CHANGE_MODE,
+                        .valid_modes_mask = REGULATOR_MODE_NORMAL |
+                                            REGULATOR_MODE_IDLE,
                 },
                 .num_consumer_supplies = ARRAY_SIZE(ab8500_vaux2_consumers),
                 .consumer_supplies = ab8500_vaux2_consumers,
@@ -338,7 +393,10 @@ struct regulator_init_data ab8500_regulators[AB8500_NUM_REGULATORS] = {
                         .min_uV = 1100000,
                         .max_uV = 3300000,
                         .valid_ops_mask = REGULATOR_CHANGE_VOLTAGE |
-                                          REGULATOR_CHANGE_STATUS,
+                                          REGULATOR_CHANGE_STATUS |
+                                          REGULATOR_CHANGE_MODE,
+                        .valid_modes_mask = REGULATOR_MODE_NORMAL |
+                                            REGULATOR_MODE_IDLE,
                 },
                 .num_consumer_supplies = ARRAY_SIZE(ab8500_vaux3_consumers),
                 .consumer_supplies = ab8500_vaux3_consumers,
@@ -392,18 +450,614 @@ struct regulator_init_data ab8500_regulators[AB8500_NUM_REGULATORS] = {
         [AB8500_LDO_INTCORE] = {
                 .constraints = {
                         .name = "V-INTCORE",
-                        .valid_ops_mask = REGULATOR_CHANGE_STATUS,
+                        .min_uV = 1250000,
+                        .max_uV = 1350000,
+                        .input_uV = 1800000,
+                        .valid_ops_mask = REGULATOR_CHANGE_VOLTAGE |
+                                          REGULATOR_CHANGE_STATUS |
+                                          REGULATOR_CHANGE_MODE |
+                                          REGULATOR_CHANGE_DRMS,
+                        .valid_modes_mask = REGULATOR_MODE_NORMAL |
+                                            REGULATOR_MODE_IDLE,
                 },
                 .num_consumer_supplies = ARRAY_SIZE(ab8500_vintcore_consumers),
                 .consumer_supplies = ab8500_vintcore_consumers,
         },
-        /* supply for U8500 CSI/DSI, VANA LDO */
+        /* supply for U8500 CSI-DSI, VANA LDO */
         [AB8500_LDO_ANA] = {
                 .constraints = {
-                        .name = "V-CSI/DSI",
+                        .name = "V-CSI-DSI",
                         .valid_ops_mask = REGULATOR_CHANGE_STATUS,
                 },
                 .num_consumer_supplies = ARRAY_SIZE(ab8500_vana_consumers),
                 .consumer_supplies = ab8500_vana_consumers,
         },
 };
+
+/* supply for VextSupply3 */
+static struct regulator_consumer_supply ab8500_ext_supply3_consumers[] = {
+        /* SIM supply for 3 V SIM cards */
+        REGULATOR_SUPPLY("vinvsim", "sim-detect.0"),
+};
+
+/* extended configuration for VextSupply2, only used for HREFP_V20 boards */
+static struct ab8500_ext_regulator_cfg ab8500_ext_supply2 = {
+        .hwreq = true,
+};
+
+/*
+ * AB8500 external regulators
+ */
+static struct regulator_init_data ab8500_ext_regulators[] = {
+        /* fixed Vbat supplies VSMPS1_EXT_1V8 */
+        [AB8500_EXT_SUPPLY1] = {
+                .constraints = {
+                        .name = "ab8500-ext-supply1",
+                        .min_uV = 1800000,
+                        .max_uV = 1800000,
+                        .initial_mode = REGULATOR_MODE_IDLE,
+                        .boot_on = 1,
+                        .always_on = 1,
+                },
+        },
+        /* fixed Vbat supplies VSMPS2_EXT_1V36 and VSMPS5_EXT_1V15 */
+        [AB8500_EXT_SUPPLY2] = {
+                .constraints = {
+                        .name = "ab8500-ext-supply2",
+                        .min_uV = 1360000,
+                        .max_uV = 1360000,
+                },
+        },
+        /* fixed Vbat supplies VSMPS3_EXT_3V4 and VSMPS4_EXT_3V4 */
+        [AB8500_EXT_SUPPLY3] = {
+                .constraints = {
+                        .name = "ab8500-ext-supply3",
+                        .min_uV = 3400000,
+                        .max_uV = 3400000,
+                        .valid_ops_mask = REGULATOR_CHANGE_STATUS,
+                        .boot_on = 1,
+                },
+                .num_consumer_supplies =
+                        ARRAY_SIZE(ab8500_ext_supply3_consumers),
+                .consumer_supplies = ab8500_ext_supply3_consumers,
+        },
+};
+
+/* ab8505 regulator register initialization */
+static struct ab8500_regulator_reg_init ab8505_reg_init[] = {
+        /*
+         * VarmRequestCtrl
+         * VsmpsCRequestCtrl
+         * VsmpsARequestCtrl
+         * VsmpsBRequestCtrl
+         */
+        INIT_REGULATOR_REGISTER(AB8505_REGUREQUESTCTRL1,       0x00, 0x00),
+        /*
+         * VsafeRequestCtrl
+         * VpllRequestCtrl
+         * VanaRequestCtrl          = HP/LP depending on VxRequest
+         */
+        INIT_REGULATOR_REGISTER(AB8505_REGUREQUESTCTRL2,       0x30, 0x00),
+        /*
+         * Vaux1RequestCtrl         = HP/LP depending on VxRequest
+         * Vaux2RequestCtrl         = HP/LP depending on VxRequest
+         */
+        INIT_REGULATOR_REGISTER(AB8505_REGUREQUESTCTRL3,       0xf0, 0x00),
+        /*
+         * Vaux3RequestCtrl         = HP/LP depending on VxRequest
+         * SwHPReq                  = Control through SWValid disabled
+         */
+        INIT_REGULATOR_REGISTER(AB8505_REGUREQUESTCTRL4,       0x07, 0x00),
+        /*
+         * VsmpsASysClkReq1HPValid
+         * VsmpsBSysClkReq1HPValid
+         * VsafeSysClkReq1HPValid
+         * VanaSysClkReq1HPValid    = disabled
+         * VpllSysClkReq1HPValid
+         * Vaux1SysClkReq1HPValid   = disabled
+         * Vaux2SysClkReq1HPValid   = disabled
+         * Vaux3SysClkReq1HPValid   = disabled
+         */
+        INIT_REGULATOR_REGISTER(AB8505_REGUSYSCLKREQ1HPVALID1, 0xe8, 0x00),
+        /*
+         * VsmpsCSysClkReq1HPValid
+         * VarmSysClkReq1HPValid
+         * VbbSysClkReq1HPValid
+         * VsmpsMSysClkReq1HPValid
+         */
+        INIT_REGULATOR_REGISTER(AB8505_REGUSYSCLKREQ1HPVALID2, 0x00, 0x00),
+        /*
+         * VsmpsAHwHPReq1Valid
+         * VsmpsBHwHPReq1Valid
+         * VsafeHwHPReq1Valid
+         * VanaHwHPReq1Valid        = disabled
+         * VpllHwHPReq1Valid
+         * Vaux1HwHPreq1Valid       = disabled
+         * Vaux2HwHPReq1Valid       = disabled
+         * Vaux3HwHPReqValid        = disabled
+         */
+        INIT_REGULATOR_REGISTER(AB8505_REGUHWHPREQ1VALID1,     0xe8, 0x00),
+        /*
+         * VsmpsMHwHPReq1Valid
+         */
+        INIT_REGULATOR_REGISTER(AB8505_REGUHWHPREQ1VALID2,     0x00, 0x00),
+        /*
+         * VsmpsAHwHPReq2Valid
+         * VsmpsBHwHPReq2Valid
+         * VsafeHwHPReq2Valid
+         * VanaHwHPReq2Valid        = disabled
+         * VpllHwHPReq2Valid
+         * Vaux1HwHPReq2Valid       = disabled
+         * Vaux2HwHPReq2Valid       = disabled
+         * Vaux3HwHPReq2Valid       = disabled
+         */
+        INIT_REGULATOR_REGISTER(AB8505_REGUHWHPREQ2VALID1,     0xe8, 0x00),
+        /*
+         * VsmpsMHwHPReq2Valid
+         */
+        INIT_REGULATOR_REGISTER(AB8505_REGUHWHPREQ2VALID2,     0x00, 0x00),
+        /**
+         * VsmpsCSwHPReqValid
+         * VarmSwHPReqValid
+         * VsmpsASwHPReqValid
+         * VsmpsBSwHPReqValid
+         * VsafeSwHPReqValid
+         * VanaSwHPReqValid
+         * VanaSwHPReqValid         = disabled
+         * VpllSwHPReqValid
+         * Vaux1SwHPReqValid        = disabled
+         */
+        INIT_REGULATOR_REGISTER(AB8505_REGUSWHPREQVALID1,      0xa0, 0x00),
+        /*
+         * Vaux2SwHPReqValid        = disabled
+         * Vaux3SwHPReqValid        = disabled
+         * VsmpsMSwHPReqValid
+         */
+        INIT_REGULATOR_REGISTER(AB8505_REGUSWHPREQVALID2,      0x03, 0x00),
+        /*
+         * SysClkReq2Valid1         = SysClkReq2 controlled
+         * SysClkReq3Valid1         = disabled
+         * SysClkReq4Valid1         = SysClkReq4 controlled
+         */
+        INIT_REGULATOR_REGISTER(AB8505_REGUSYSCLKREQVALID1,    0x0e, 0x0a),
+        /*
+         * SysClkReq2Valid2         = disabled
+         * SysClkReq3Valid2         = disabled
+         * SysClkReq4Valid2         = disabled
+         */
+        INIT_REGULATOR_REGISTER(AB8505_REGUSYSCLKREQVALID2,    0x0e, 0x00),
+        /*
+         * Vaux4SwHPReqValid
+         * Vaux4HwHPReq2Valid
+         * Vaux4HwHPReq1Valid
+         * Vaux4SysClkReq1HPValid
+         */
+        INIT_REGULATOR_REGISTER(AB8505_REGUVAUX4REQVALID,    0x00, 0x00),
+        /*
+         * VadcEna                  = disabled
+         * VintCore12Ena            = disabled
+         * VintCore12Sel            = 1.25 V
+         * VintCore12LP             = inactive (HP)
+         * VadcLP                   = inactive (HP)
+         */
+        INIT_REGULATOR_REGISTER(AB8505_REGUMISC1,              0xfe, 0x10),
+        /*
+         * VaudioEna                = disabled
+         * Vaux8Ena                 = disabled
+         * Vamic1Ena                = disabled
+         * Vamic2Ena                = disabled
+         */
+        INIT_REGULATOR_REGISTER(AB8505_VAUDIOSUPPLY,           0x1e, 0x00),
+        /*
+         * Vamic1_dzout             = high-Z when Vamic1 is disabled
+         * Vamic2_dzout             = high-Z when Vamic2 is disabled
+         */
+        INIT_REGULATOR_REGISTER(AB8505_REGUCTRL1VAMIC,         0x03, 0x00),
+        /*
+         * VsmpsARegu
+         * VsmpsASelCtrl
+         * VsmpsAAutoMode
+         * VsmpsAPWMMode
+         */
+        INIT_REGULATOR_REGISTER(AB8505_VSMPSAREGU,    0x00, 0x00),
+        /*
+         * VsmpsBRegu
+         * VsmpsBSelCtrl
+         * VsmpsBAutoMode
+         * VsmpsBPWMMode
+         */
+        INIT_REGULATOR_REGISTER(AB8505_VSMPSBREGU,    0x00, 0x00),
+        /*
+         * VsafeRegu
+         * VsafeSelCtrl
+         * VsafeAutoMode
+         * VsafePWMMode
+         */
+        INIT_REGULATOR_REGISTER(AB8505_VSAFEREGU,    0x00, 0x00),
+        /*
+         * VPll                     = Hw controlled (NOTE! PRCMU bits)
+         * VanaRegu                 = force off
+         */
+        INIT_REGULATOR_REGISTER(AB8505_VPLLVANAREGU,           0x0f, 0x02),
+        /*
+         * VextSupply1Regu          = force OFF (OTP_ExtSupply12LPnPolarity 1)
+         * VextSupply2Regu          = force OFF (OTP_ExtSupply12LPnPolarity 1)
+         * VextSupply3Regu          = force OFF (OTP_ExtSupply3LPnPolarity 0)
+         * ExtSupply2Bypass         = ExtSupply12LPn ball is 0 when Ena is 0
+         * ExtSupply3Bypass         = ExtSupply3LPn ball is 0 when Ena is 0
+         */
+        INIT_REGULATOR_REGISTER(AB8505_EXTSUPPLYREGU,          0xff, 0x30),
+        /*
+         * Vaux1Regu                = force HP
+         * Vaux2Regu                = force off
+         */
+        INIT_REGULATOR_REGISTER(AB8505_VAUX12REGU,             0x0f, 0x01),
+        /*
+         * Vaux3Regu                = force off
+         */
+        INIT_REGULATOR_REGISTER(AB8505_VRF1VAUX3REGU,          0x03, 0x00),
+        /*
+         * VsmpsASel1
+         */
+        INIT_REGULATOR_REGISTER(AB8505_VSMPSASEL1,    0x00, 0x00),
+        /*
+         * VsmpsASel2
+         */
+        INIT_REGULATOR_REGISTER(AB8505_VSMPSASEL2,    0x00, 0x00),
+        /*
+         * VsmpsASel3
+         */
+        INIT_REGULATOR_REGISTER(AB8505_VSMPSASEL3,    0x00, 0x00),
+        /*
+         * VsmpsBSel1
+         */
+        INIT_REGULATOR_REGISTER(AB8505_VSMPSBSEL1,    0x00, 0x00),
+        /*
+         * VsmpsBSel2
+         */
+        INIT_REGULATOR_REGISTER(AB8505_VSMPSBSEL2,    0x00, 0x00),
+        /*
+         * VsmpsBSel3
+         */
+        INIT_REGULATOR_REGISTER(AB8505_VSMPSBSEL3,    0x00, 0x00),
+        /*
+         * VsafeSel1
+         */
+        INIT_REGULATOR_REGISTER(AB8505_VSAFESEL1,    0x00, 0x00),
+        /*
+         * VsafeSel2
+         */
+        INIT_REGULATOR_REGISTER(AB8505_VSAFESEL2,    0x00, 0x00),
+        /*
+         * VsafeSel3
+         */
+        INIT_REGULATOR_REGISTER(AB8505_VSAFESEL3,    0x00, 0x00),
+        /*
+         * Vaux1Sel                 = 2.8 V
+         */
+        INIT_REGULATOR_REGISTER(AB8505_VAUX1SEL,               0x0f, 0x0C),
+        /*
+         * Vaux2Sel                 = 2.9 V
+         */
+        INIT_REGULATOR_REGISTER(AB8505_VAUX2SEL,               0x0f, 0x0d),
+        /*
+         * Vaux3Sel                 = 2.91 V
+         */
+        INIT_REGULATOR_REGISTER(AB8505_VRF1VAUX3SEL,           0x07, 0x07),
+        /*
+         * Vaux4RequestCtrl
+         */
+        INIT_REGULATOR_REGISTER(AB8505_VAUX4REQCTRL,    0x00, 0x00),
+        /*
+         * Vaux4Regu
+         */
+        INIT_REGULATOR_REGISTER(AB8505_VAUX4REGU,    0x00, 0x00),
+        /*
+         * Vaux4Sel
+         */
+        INIT_REGULATOR_REGISTER(AB8505_VAUX4SEL,    0x00, 0x00),
+        /*
+         * Vaux1Disch               = short discharge time
+         * Vaux2Disch               = short discharge time
+         * Vaux3Disch               = short discharge time
+         * Vintcore12Disch          = short discharge time
+         * VTVoutDisch              = short discharge time
+         * VaudioDisch              = short discharge time
+         */
+        INIT_REGULATOR_REGISTER(AB8505_REGUCTRLDISCH,          0xfc, 0x00),
+        /*
+         * VanaDisch                = short discharge time
+         * Vaux8PullDownEna         = pulldown disabled when Vaux8 is disabled
+         * Vaux8Disch               = short discharge time
+         */
+        INIT_REGULATOR_REGISTER(AB8505_REGUCTRLDISCH2,         0x16, 0x00),
+        /*
+         * Vaux4Disch               = short discharge time
+         */
+        INIT_REGULATOR_REGISTER(AB8505_REGUCTRLDISCH3,         0x01, 0x00),
+        /*
+         * Vaux5Sel
+         * Vaux5LP
+         * Vaux5Ena
+         * Vaux5Disch
+         * Vaux5DisSfst
+         * Vaux5DisPulld
+         */
+        INIT_REGULATOR_REGISTER(AB8505_CTRLVAUX5,              0x00, 0x00),
+        /*
+         * Vaux6Sel
+         * Vaux6LP
+         * Vaux6Ena
+         * Vaux6DisPulld
+         */
+        INIT_REGULATOR_REGISTER(AB8505_CTRLVAUX6,              0x00, 0x00),
+};
+
+struct regulator_init_data ab8505_regulators[AB8505_NUM_REGULATORS] = {
+        /* supplies to the display/camera */
+        [AB8505_LDO_AUX1] = {
+                .constraints = {
+                        .name = "V-DISPLAY",
+                        .min_uV = 2800000,
+                        .max_uV = 3300000,
+                        .valid_ops_mask = REGULATOR_CHANGE_VOLTAGE |
+                                          REGULATOR_CHANGE_STATUS,
+                        .boot_on = 1, /* display is on at boot */
+                },
+                .num_consumer_supplies = ARRAY_SIZE(ab8500_vaux1_consumers),
+                .consumer_supplies = ab8500_vaux1_consumers,
+        },
+        /* supplies to the on-board eMMC */
+        [AB8505_LDO_AUX2] = {
+                .constraints = {
+                        .name = "V-eMMC1",
+                        .min_uV = 1100000,
+                        .max_uV = 3300000,
+                        .valid_ops_mask = REGULATOR_CHANGE_VOLTAGE |
+                                          REGULATOR_CHANGE_STATUS |
+                                          REGULATOR_CHANGE_MODE,
+                        .valid_modes_mask = REGULATOR_MODE_NORMAL |
+                                            REGULATOR_MODE_IDLE,
+                },
+                .num_consumer_supplies = ARRAY_SIZE(ab8500_vaux2_consumers),
+                .consumer_supplies = ab8500_vaux2_consumers,
+        },
+        /* supply for VAUX3, supplies to SDcard slots */
+        [AB8505_LDO_AUX3] = {
+                .constraints = {
+                        .name = "V-MMC-SD",
+                        .min_uV = 1100000,
+                        .max_uV = 3300000,
+                        .valid_ops_mask = REGULATOR_CHANGE_VOLTAGE |
+                                          REGULATOR_CHANGE_STATUS |
+                                          REGULATOR_CHANGE_MODE,
+                        .valid_modes_mask = REGULATOR_MODE_NORMAL |
+                                            REGULATOR_MODE_IDLE,
+                },
+                .num_consumer_supplies = ARRAY_SIZE(ab8500_vaux3_consumers),
+                .consumer_supplies = ab8500_vaux3_consumers,
+        },
+        /* supply for VAUX4, supplies to NFC and standalone secure element */
+        [AB8505_LDO_AUX4] = {
+                .constraints = {
+                        .name = "V-NFC-SE",
+                        .min_uV = 1100000,
+                        .max_uV = 3300000,
+                        .valid_ops_mask = REGULATOR_CHANGE_VOLTAGE |
+                                          REGULATOR_CHANGE_STATUS |
+                                          REGULATOR_CHANGE_MODE,
+                        .valid_modes_mask = REGULATOR_MODE_NORMAL |
+                                            REGULATOR_MODE_IDLE,
+                },
+                .num_consumer_supplies = ARRAY_SIZE(ab8505_vaux4_consumers),
+                .consumer_supplies = ab8505_vaux4_consumers,
+        },
+        /* supply for VAUX5, supplies to TBD */
+        [AB8505_LDO_AUX5] = {
+                .constraints = {
+                        .name = "V-AUX5",
+                        .min_uV = 1050000,
+                        .max_uV = 2790000,
+                        .valid_ops_mask = REGULATOR_CHANGE_VOLTAGE |
+                                          REGULATOR_CHANGE_STATUS |
+                                          REGULATOR_CHANGE_MODE,
+                        .valid_modes_mask = REGULATOR_MODE_NORMAL |
+                                            REGULATOR_MODE_IDLE,
+                },
+                .num_consumer_supplies = ARRAY_SIZE(ab8505_vaux5_consumers),
+                .consumer_supplies = ab8505_vaux5_consumers,
+        },
+        /* supply for VAUX6, supplies to TBD */
+        [AB8505_LDO_AUX6] = {
+                .constraints = {
+                        .name = "V-AUX6",
+                        .min_uV = 1050000,
+                        .max_uV = 2790000,
+                        .valid_ops_mask = REGULATOR_CHANGE_VOLTAGE |
+                                          REGULATOR_CHANGE_STATUS |
+                                          REGULATOR_CHANGE_MODE,
+                        .valid_modes_mask = REGULATOR_MODE_NORMAL |
+                                            REGULATOR_MODE_IDLE,
+                },
+                .num_consumer_supplies = ARRAY_SIZE(ab8505_vaux6_consumers),
+                .consumer_supplies = ab8505_vaux6_consumers,
+        },
+        /* supply for gpadc, ADC LDO */
+        [AB8505_LDO_ADC] = {
+                .constraints = {
+                        .name = "V-ADC",
+                        .valid_ops_mask = REGULATOR_CHANGE_STATUS,
+                },
+                .num_consumer_supplies = ARRAY_SIZE(ab8505_vadc_consumers),
+                .consumer_supplies = ab8505_vadc_consumers,
+        },
+        /* supply for ab8500-vaudio, VAUDIO LDO */
+        [AB8505_LDO_AUDIO] = {
+                .constraints = {
+                        .name = "V-AUD",
+                        .valid_ops_mask = REGULATOR_CHANGE_STATUS,
+                },
+                .num_consumer_supplies = ARRAY_SIZE(ab8500_vaud_consumers),
+                .consumer_supplies = ab8500_vaud_consumers,
+        },
+        /* supply for v-anamic1 VAMic1-LDO */
+        [AB8505_LDO_ANAMIC1] = {
+                .constraints = {
+                        .name = "V-AMIC1",
+                        .valid_ops_mask = REGULATOR_CHANGE_STATUS |
+                                          REGULATOR_CHANGE_MODE,
+                        .valid_modes_mask = REGULATOR_MODE_NORMAL |
+                                            REGULATOR_MODE_IDLE,
+                },
+                .num_consumer_supplies = ARRAY_SIZE(ab8500_vamic1_consumers),
+                .consumer_supplies = ab8500_vamic1_consumers,
+        },
+        /* supply for v-amic2, VAMIC2 LDO, reuse constants for AMIC1 */
+        [AB8505_LDO_ANAMIC2] = {
+                .constraints = {
+                        .name = "V-AMIC2",
+                        .valid_ops_mask = REGULATOR_CHANGE_STATUS |
+                                          REGULATOR_CHANGE_MODE,
+                        .valid_modes_mask = REGULATOR_MODE_NORMAL |
+                                            REGULATOR_MODE_IDLE,
+                },
+                .num_consumer_supplies = ARRAY_SIZE(ab8500_vamic2_consumers),
+                .consumer_supplies = ab8500_vamic2_consumers,
+        },
+        /* supply for v-aux8, VAUX8 LDO */
+        [AB8505_LDO_AUX8] = {
+                .constraints = {
+                        .name = "V-AUX8",
+                        .valid_ops_mask = REGULATOR_CHANGE_STATUS,
+                },
+                .num_consumer_supplies = ARRAY_SIZE(ab8505_vaux8_consumers),
+                .consumer_supplies = ab8505_vaux8_consumers,
+        },
+        /* supply for v-intcore12, VINTCORE12 LDO */
+        [AB8505_LDO_INTCORE] = {
+                .constraints = {
+                        .name = "V-INTCORE",
+                        .min_uV = 1250000,
+                        .max_uV = 1350000,
+                        .input_uV = 1800000,
+                        .valid_ops_mask = REGULATOR_CHANGE_VOLTAGE |
+                                          REGULATOR_CHANGE_STATUS |
+                                          REGULATOR_CHANGE_MODE |
+                                          REGULATOR_CHANGE_DRMS,
+                        .valid_modes_mask = REGULATOR_MODE_NORMAL |
+                                            REGULATOR_MODE_IDLE,
+                },
+                .num_consumer_supplies = ARRAY_SIZE(ab8500_vintcore_consumers),
+                .consumer_supplies = ab8500_vintcore_consumers,
+        },
+        /* supply for LDO USB */
+        [AB8505_LDO_USB] = {
+                .constraints = {
+                        .name = "V-USB",
+                        .valid_ops_mask = REGULATOR_CHANGE_STATUS |
+                                          REGULATOR_CHANGE_MODE,
+                        .valid_modes_mask = REGULATOR_MODE_NORMAL |
+                                            REGULATOR_MODE_IDLE,
+                },
+                .num_consumer_supplies = ARRAY_SIZE(ab8505_usb_consumers),
+                .consumer_supplies = ab8505_usb_consumers,
+        },
+        /* supply for U8500 CSI-DSI, VANA LDO */
+        [AB8505_LDO_ANA] = {
+                .constraints = {
+                        .name = "V-CSI-DSI",
+                        .valid_ops_mask = REGULATOR_CHANGE_STATUS,
+                },
+                .num_consumer_supplies = ARRAY_SIZE(ab8500_vana_consumers),
+                .consumer_supplies = ab8500_vana_consumers,
+        },
+};
+
+struct ab8500_regulator_platform_data ab8500_regulator_plat_data = {
+        .reg_init               = ab8500_reg_init,
+        .num_reg_init           = ARRAY_SIZE(ab8500_reg_init),
+        .regulator              = ab8500_regulators,
+        .num_regulator          = ARRAY_SIZE(ab8500_regulators),
+        .ext_regulator          = ab8500_ext_regulators,
+        .num_ext_regulator      = ARRAY_SIZE(ab8500_ext_regulators),
+};
+
+/* Use the AB8500 init settings for AB8505 as they are the same right now */
+struct ab8500_regulator_platform_data ab8505_regulator_plat_data = {
+        .reg_init               = ab8505_reg_init,
+        .num_reg_init           = ARRAY_SIZE(ab8505_reg_init),
+        .regulator              = ab8505_regulators,
+        .num_regulator          = ARRAY_SIZE(ab8505_regulators),
+};
+
+static void ab8500_modify_reg_init(int id, u8 mask, u8 value)
+{
+        int i;
+
+        if (cpu_is_u8520()) {
+                for (i = ARRAY_SIZE(ab8505_reg_init) - 1; i >= 0; i--) {
+                        if (ab8505_reg_init[i].id == id) {
+                                u8 initval = ab8505_reg_init[i].value;
+                                initval = (initval & ~mask) | (value & mask);
+                                ab8505_reg_init[i].value = initval;
+
+                                BUG_ON(mask & ~ab8505_reg_init[i].mask);
+                                return;
+                        }
+                }
+        } else {
+                for (i = ARRAY_SIZE(ab8500_reg_init) - 1; i >= 0; i--) {
+                        if (ab8500_reg_init[i].id == id) {
+                                u8 initval = ab8500_reg_init[i].value;
+                                initval = (initval & ~mask) | (value & mask);
+                                ab8500_reg_init[i].value = initval;
+
+                                BUG_ON(mask & ~ab8500_reg_init[i].mask);
+                                return;
+                        }
+                }
+        }
+
+        BUG_ON(1);
+}
+
+void mop500_regulator_init(void)
+{
+        struct regulator_init_data *regulator;
+
+        /*
+         * Temporarily turn on Vaux2 on 8520 machine
+         */
+        if (cpu_is_u8520()) {
+                /* Vaux2 initialized to be on */
+                ab8500_modify_reg_init(AB8505_VAUX12REGU, 0x0f, 0x05);
+        }
+
+        /*
+         * Handle AB8500_EXT_SUPPLY2 on HREFP_V20_V50 boards (do it for
+         * all HREFP_V20 boards)
+         */
+        if (cpu_is_u8500v20()) {
+                /* VextSupply2RequestCtrl =  HP/OFF depending on VxRequest */
+                ab8500_modify_reg_init(AB8500_REGUREQUESTCTRL3, 0x01, 0x01);
+
+                /* VextSupply2SysClkReq1HPValid = SysClkReq1 controlled */
+                ab8500_modify_reg_init(AB8500_REGUSYSCLKREQ1HPVALID2,
+                        0x20, 0x20);
+
+                /* VextSupply2 = force HP at initialization */
+                ab8500_modify_reg_init(AB8500_EXTSUPPLYREGU, 0x0c, 0x04);
+
+                /* enable VextSupply2 during platform active */
+                regulator = &ab8500_ext_regulators[AB8500_EXT_SUPPLY2];
+                regulator->constraints.always_on = 1;
+
+                /* disable VextSupply2 in suspend */
+                regulator = &ab8500_ext_regulators[AB8500_EXT_SUPPLY2];
+                regulator->constraints.state_mem.disabled = 1;
+                regulator->constraints.state_standby.disabled = 1;
+
+                /* enable VextSupply2 HW control (used in suspend) */
+                regulator->driver_data = (void *)&ab8500_ext_supply2;
+        }
+}
diff --git a/arch/arm/mach-ux500/board-mop500-regulators.h b/arch/arm/mach-ux500/board-mop500-regulators.h
index 78a0642a2206..9bece38fe933 100644
--- a/arch/arm/mach-ux500/board-mop500-regulators.h
+++ b/arch/arm/mach-ux500/board-mop500-regulators.h
@@ -14,10 +14,11 @@
 #include <linux/regulator/machine.h>
 #include <linux/regulator/ab8500.h>
 
-extern struct ab8500_regulator_reg_init
-ab8500_regulator_reg_init[AB8500_NUM_REGULATOR_REGISTERS];
-extern struct regulator_init_data ab8500_regulators[AB8500_NUM_REGULATORS];
+extern struct ab8500_regulator_platform_data ab8500_regulator_plat_data;
+extern struct ab8500_regulator_platform_data ab8505_regulator_plat_data;
 extern struct regulator_init_data tps61052_regulator;
 extern struct regulator_init_data gpio_en_3v3_regulator;
 
+void mop500_regulator_init(void);
+
 #endif
diff --git a/arch/arm/mach-ux500/board-mop500.c b/arch/arm/mach-ux500/board-mop500.c
index 87d2d7b38ce9..ce672378a830 100644
--- a/arch/arm/mach-ux500/board-mop500.c
+++ b/arch/arm/mach-ux500/board-mop500.c
@@ -199,10 +199,7 @@ static struct platform_device snowball_sbnet_dev = {
 
 struct ab8500_platform_data ab8500_platdata = {
         .irq_base       = MOP500_AB8500_IRQ_BASE,
-        .regulator_reg_init = ab8500_regulator_reg_init,
-        .num_regulator_reg_init = ARRAY_SIZE(ab8500_regulator_reg_init),
-        .regulator      = ab8500_regulators,
-        .num_regulator  = ARRAY_SIZE(ab8500_regulators),
+        .regulator      = &ab8500_regulator_plat_data,
         .gpio           = &ab8500_gpio_pdata,
         .codec          = &ab8500_codec_pdata,
 };
diff --git a/arch/arm/mach-ux500/cpuidle.c b/arch/arm/mach-ux500/cpuidle.c
index ce9149302cc3..488e07472d98 100644
--- a/arch/arm/mach-ux500/cpuidle.c
+++ b/arch/arm/mach-ux500/cpuidle.c
@@ -11,7 +11,6 @@
 
 #include <linux/module.h>
 #include <linux/cpuidle.h>
-#include <linux/clockchips.h>
 #include <linux/spinlock.h>
 #include <linux/atomic.h>
 #include <linux/smp.h>
@@ -22,7 +21,6 @@
 
 static atomic_t master = ATOMIC_INIT(0);
 static DEFINE_SPINLOCK(master_lock);
-static DEFINE_PER_CPU(struct cpuidle_device, ux500_cpuidle_device);
 
 static inline int ux500_enter_idle(struct cpuidle_device *dev,
                                    struct cpuidle_driver *drv, int index)
@@ -30,8 +28,6 @@ static inline int ux500_enter_idle(struct cpuidle_device *dev,
         int this_cpu = smp_processor_id();
         bool recouple = false;
 
-        clockevents_notify(CLOCK_EVT_NOTIFY_BROADCAST_ENTER, &this_cpu);
-
         if (atomic_inc_return(&master) == num_online_cpus()) {
 
                 /* With this lock, we prevent the other cpu to exit and enter
@@ -91,22 +87,20 @@ out:
                 spin_unlock(&master_lock);
         }
 
-        clockevents_notify(CLOCK_EVT_NOTIFY_BROADCAST_EXIT, &this_cpu);
-
         return index;
 }
 
 static struct cpuidle_driver ux500_idle_driver = {
         .name = "ux500_idle",
         .owner = THIS_MODULE,
-        .en_core_tk_irqen = 1,
         .states = {
                 ARM_CPUIDLE_WFI_STATE,
                 {
                         .enter            = ux500_enter_idle,
                         .exit_latency     = 70,
                         .target_residency = 260,
-                        .flags            = CPUIDLE_FLAG_TIME_VALID,
+                        .flags            = CPUIDLE_FLAG_TIME_VALID |
+                                            CPUIDLE_FLAG_TIMER_STOP,
                         .name             = "ApIdle",
                         .desc             = "ARM Retention",
                 },
@@ -115,59 +109,13 @@ static struct cpuidle_driver ux500_idle_driver = {
         .state_count = 2,
 };
 
-/*
- * For each cpu, setup the broadcast timer because we will
- * need to migrate the timers for the states >= ApIdle.
- */
-static void ux500_setup_broadcast_timer(void *arg)
-{
-        int cpu = smp_processor_id();
-        clockevents_notify(CLOCK_EVT_NOTIFY_BROADCAST_ON, &cpu);
-}
-
 int __init ux500_idle_init(void)
 {
-        int ret, cpu;
-        struct cpuidle_device *device;
-
         /* Configure wake up reasons */
         prcmu_enable_wakeups(PRCMU_WAKEUP(ARM) | PRCMU_WAKEUP(RTC) |
                              PRCMU_WAKEUP(ABB));
 
-        /*
-         * Configure the timer broadcast for each cpu, that must
-         * be done from the cpu context, so we use a smp cross
-         * call with 'on_each_cpu'.
-         */
-        on_each_cpu(ux500_setup_broadcast_timer, NULL, 1);
-
-        ret = cpuidle_register_driver(&ux500_idle_driver);
-        if (ret) {
-                printk(KERN_ERR "failed to register ux500 idle driver\n");
-                return ret;
-        }
-
-        for_each_online_cpu(cpu) {
-                device = &per_cpu(ux500_cpuidle_device, cpu);
-                device->cpu = cpu;
-                ret = cpuidle_register_device(device);
-                if (ret) {
-                        printk(KERN_ERR "Failed to register cpuidle "
-                               "device for cpu%d\n", cpu);
-                        goto out_unregister;
-                }
-        }
-out:
-        return ret;
-
-out_unregister:
-        for_each_online_cpu(cpu) {
-                device = &per_cpu(ux500_cpuidle_device, cpu);
-                cpuidle_unregister_device(device);
-        }
-
-        cpuidle_unregister_driver(&ux500_idle_driver);
-        goto out;
+        return cpuidle_register(&ux500_idle_driver, NULL);
 }
 
 device_initcall(ux500_idle_init);
diff --git a/arch/arm/mach-vexpress/Kconfig b/arch/arm/mach-vexpress/Kconfig
index 52d315b792c8..0f1c5e53fb27 100644
--- a/arch/arm/mach-vexpress/Kconfig
+++ b/arch/arm/mach-vexpress/Kconfig
@@ -17,6 +17,9 @@ config ARCH_VEXPRESS
         select NO_IOPORT
         select PLAT_VERSATILE
         select PLAT_VERSATILE_CLCD
+        select POWER_RESET
+        select POWER_RESET_VEXPRESS
+        select POWER_SUPPLY
         select REGULATOR_FIXED_VOLTAGE if REGULATOR
         select VEXPRESS_CONFIG
         help
diff --git a/arch/arm/mach-vexpress/Makefile b/arch/arm/mach-vexpress/Makefile
index 80b64971fbdd..42703e8b4d3b 100644
--- a/arch/arm/mach-vexpress/Makefile
+++ b/arch/arm/mach-vexpress/Makefile
@@ -4,7 +4,7 @@
 ccflags-$(CONFIG_ARCH_MULTIPLATFORM) := -I$(srctree)/$(src)/include \
         -I$(srctree)/arch/arm/plat-versatile/include
 
-obj-y                                   := v2m.o reset.o
+obj-y                                   := v2m.o
 obj-$(CONFIG_ARCH_VEXPRESS_CA9X4)       += ct-ca9x4.o
 obj-$(CONFIG_SMP)                       += platsmp.o
 obj-$(CONFIG_HOTPLUG_CPU)               += hotplug.o
diff --git a/arch/arm/mach-vexpress/reset.c b/arch/arm/mach-vexpress/reset.c
deleted file mode 100644
index 465923aa3819..000000000000
--- a/arch/arm/mach-vexpress/reset.c
+++ /dev/null
@@ -1,141 +0,0 @@
-/*
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * Copyright (C) 2012 ARM Limited
- */
-
-#include <linux/jiffies.h>
-#include <linux/of.h>
-#include <linux/of_device.h>
-#include <linux/platform_device.h>
-#include <linux/stat.h>
-#include <linux/vexpress.h>
-
-static void vexpress_reset_do(struct device *dev, const char *what)
-{
-        int err = -ENOENT;
-        struct vexpress_config_func *func =
-                        vexpress_config_func_get_by_dev(dev);
-
-        if (func) {
-                unsigned long timeout;
-
-                err = vexpress_config_write(func, 0, 0);
-
-                timeout = jiffies + HZ;
-                while (time_before(jiffies, timeout))
-                        cpu_relax();
-        }
-
-        dev_emerg(dev, "Unable to %s (%d)\n", what, err);
-}
-
-static struct device *vexpress_power_off_device;
-
-void vexpress_power_off(void)
-{
-        vexpress_reset_do(vexpress_power_off_device, "power off");
-}
-
-static struct device *vexpress_restart_device;
-
-void vexpress_restart(char str, const char *cmd)
-{
-        vexpress_reset_do(vexpress_restart_device, "restart");
-}
-
-static ssize_t vexpress_reset_active_show(struct device *dev,
-                struct device_attribute *attr, char *buf)
-{
-        return sprintf(buf, "%d\n", vexpress_restart_device == dev);
-}
-
-static ssize_t vexpress_reset_active_store(struct device *dev,
-                struct device_attribute *attr, const char *buf, size_t count)
-{
-        long value;
-        int err = kstrtol(buf, 0, &value);
-
-        if (!err && value)
-                vexpress_restart_device = dev;
-
-        return err ? err : count;
-}
-
-DEVICE_ATTR(active, S_IRUGO | S_IWUSR, vexpress_reset_active_show,
-                vexpress_reset_active_store);
-
-
-enum vexpress_reset_func { FUNC_RESET, FUNC_SHUTDOWN, FUNC_REBOOT };
-
-static struct of_device_id vexpress_reset_of_match[] = {
-        {
-                .compatible = "arm,vexpress-reset",
-                .data = (void *)FUNC_RESET,
-        }, {
-                .compatible = "arm,vexpress-shutdown",
-                .data = (void *)FUNC_SHUTDOWN
-        }, {
-                .compatible = "arm,vexpress-reboot",
-                .data = (void *)FUNC_REBOOT
-        },
-        {}
-};
-
-static int vexpress_reset_probe(struct platform_device *pdev)
-{
-        enum vexpress_reset_func func;
-        const struct of_device_id *match =
-                        of_match_device(vexpress_reset_of_match, &pdev->dev);
-
-        if (match)
-                func = (enum vexpress_reset_func)match->data;
-        else
-                func = pdev->id_entry->driver_data;
-
-        switch (func) {
-        case FUNC_SHUTDOWN:
-                vexpress_power_off_device = &pdev->dev;
-                break;
-        case FUNC_RESET:
-                if (!vexpress_restart_device)
-                        vexpress_restart_device = &pdev->dev;
-                device_create_file(&pdev->dev, &dev_attr_active);
-                break;
-        case FUNC_REBOOT:
-                vexpress_restart_device = &pdev->dev;
-                device_create_file(&pdev->dev, &dev_attr_active);
-                break;
-        };
-
-        return 0;
-}
-
-static const struct platform_device_id vexpress_reset_id_table[] = {
-        { .name = "vexpress-reset", .driver_data = FUNC_RESET, },
-        { .name = "vexpress-shutdown", .driver_data = FUNC_SHUTDOWN, },
-        { .name = "vexpress-reboot", .driver_data = FUNC_REBOOT, },
-        {}
-};
-
-static struct platform_driver vexpress_reset_driver = {
-        .probe = vexpress_reset_probe,
-        .driver = {
-                .name = "vexpress-reset",
-                .of_match_table = vexpress_reset_of_match,
-        },
-        .id_table = vexpress_reset_id_table,
-};
-
-static int __init vexpress_reset_init(void)
-{
-        return platform_driver_register(&vexpress_reset_driver);
-}
-device_initcall(vexpress_reset_init);
diff --git a/arch/arm/mach-vexpress/v2m.c b/arch/arm/mach-vexpress/v2m.c
index 915683cb67d6..eb2b3a627f03 100644
--- a/arch/arm/mach-vexpress/v2m.c
+++ b/arch/arm/mach-vexpress/v2m.c
@@ -21,6 +21,8 @@
 #include <linux/regulator/fixed.h>
 #include <linux/regulator/machine.h>
 #include <linux/vexpress.h>
+#include <linux/clk-provider.h>
+#include <linux/clkdev.h>
 
 #include <asm/arch_timer.h>
 #include <asm/mach-types.h>
@@ -361,8 +363,6 @@ static void __init v2m_init(void)
         for (i = 0; i < ARRAY_SIZE(v2m_amba_devs); i++)
                 amba_device_register(v2m_amba_devs[i], &iomem_resource);
 
-        pm_power_off = vexpress_power_off;
-
         ct_desc->init_tile();
 }
 
@@ -374,7 +374,6 @@ MACHINE_START(VEXPRESS, "ARM-Versatile Express")
         .init_irq       = v2m_init_irq,
         .init_time      = v2m_timer_init,
         .init_machine   = v2m_init,
-        .restart        = vexpress_restart,
 MACHINE_END
 
 static struct map_desc v2m_rs1_io_desc __initdata = {
@@ -433,7 +432,7 @@ static void __init v2m_dt_timer_init(void)
 {
         struct device_node *node = NULL;
 
-        vexpress_clk_of_init();
+        of_clk_init(NULL);
 
         do {
                 node = of_find_compatible_node(node, NULL, "arm,sp804");
@@ -441,6 +440,10 @@ static void __init v2m_dt_timer_init(void)
         if (node) {
                 pr_info("Using SP804 '%s' as a clock & events source\n",
                                 node->full_name);
+                WARN_ON(clk_register_clkdev(of_clk_get_by_name(node,
+                                "timclken1"), "v2m-timer0", "sp804"));
+                WARN_ON(clk_register_clkdev(of_clk_get_by_name(node,
+                                "timclken2"), "v2m-timer1", "sp804"));
                 v2m_sp804_init(of_iomap(node, 0),
                                 irq_of_parse_and_map(node, 0));
         }
@@ -464,7 +467,6 @@ static void __init v2m_dt_init(void)
 {
         l2x0_of_init(0x00400000, 0xfe0fffff);
         of_platform_populate(NULL, v2m_dt_bus_match, NULL, NULL);
-        pm_power_off = vexpress_power_off;
 }
 
 static const char * const v2m_dt_match[] __initconst = {
@@ -481,5 +483,4 @@ DT_MACHINE_START(VEXPRESS_DT, "ARM-Versatile Express")
         .init_irq       = irqchip_init,
         .init_time      = v2m_dt_timer_init,
         .init_machine   = v2m_dt_init,
-        .restart        = vexpress_restart,
 MACHINE_END
diff --git a/arch/arm/mach-w90x900/dev.c b/arch/arm/mach-w90x900/dev.c
index 7abdb9645c5b..e65a80a1ac75 100644
--- a/arch/arm/mach-w90x900/dev.c
+++ b/arch/arm/mach-w90x900/dev.c
@@ -19,6 +19,7 @@
 #include <linux/init.h>
 #include <linux/platform_device.h>
 #include <linux/slab.h>
+#include <linux/cpu.h>
 
 #include <linux/mtd/physmap.h>
 #include <linux/mtd/mtd.h>
@@ -531,7 +532,7 @@ static struct platform_device *nuc900_public_dev[] __initdata = {
 
 void __init nuc900_board_init(struct platform_device **device, int size)
 {
-        disable_hlt();
+        cpu_idle_poll_ctrl(true);
         platform_add_devices(device, size);
         platform_add_devices(nuc900_public_dev, ARRAY_SIZE(nuc900_public_dev));
         spi_register_board_info(nuc900_spi_board_info,
diff --git a/arch/arm/mm/init.c b/arch/arm/mm/init.c
index ad722f1208a5..9a5cdc01fcdf 100644
--- a/arch/arm/mm/init.c
+++ b/arch/arm/mm/init.c
@@ -99,6 +99,9 @@ void show_mem(unsigned int filter)
         printk("Mem-info:\n");
         show_free_areas(filter);
 
+        if (filter & SHOW_MEM_FILTER_PAGE_COUNT)
+                return;
+
         for_each_bank (i, mi) {
                 struct membank *bank = &mi->bank[i];
                 unsigned int pfn1, pfn2;
@@ -424,24 +427,6 @@ void __init bootmem_init(void)
         max_pfn = max_high - PHYS_PFN_OFFSET;
 }
 
-static inline int free_area(unsigned long pfn, unsigned long end, char *s)
-{
-        unsigned int pages = 0, size = (end - pfn) << (PAGE_SHIFT - 10);
-
-        for (; pfn < end; pfn++) {
-                struct page *page = pfn_to_page(pfn);
-                ClearPageReserved(page);
-                init_page_count(page);
-                __free_page(page);
-                pages++;
-        }
-
-        if (size && s)
-                printk(KERN_INFO "Freeing %s memory: %dK\n", s, size);
-
-        return pages;
-}
-
 /*
  * Poison init memory with an undefined instruction (ARM) or a branch to an
  * undefined instruction (Thumb).
@@ -534,6 +519,14 @@ static void __init free_unused_memmap(struct meminfo *mi)
 #endif
 }
 
+#ifdef CONFIG_HIGHMEM
+static inline void free_area_high(unsigned long pfn, unsigned long end)
+{
+        for (; pfn < end; pfn++)
+                free_highmem_page(pfn_to_page(pfn));
+}
+#endif
+
 static void __init free_highpages(void)
 {
 #ifdef CONFIG_HIGHMEM
@@ -569,8 +562,7 @@ static void __init free_highpages(void)
                         if (res_end > end)
                                 res_end = end;
                         if (res_start != start)
-                                totalhigh_pages += free_area(start, res_start,
-                                                             NULL);
+                                free_area_high(start, res_start);
                         start = res_end;
                         if (start == end)
                                 break;
@@ -578,9 +570,8 @@ static void __init free_highpages(void)
 
                 /* And now free anything which remains */
                 if (start < end)
-                        totalhigh_pages += free_area(start, end, NULL);
+                        free_area_high(start, end);
         }
-        totalram_pages += totalhigh_pages;
 #endif
 }
 
@@ -609,8 +600,7 @@ void __init mem_init(void)
 
 #ifdef CONFIG_SA1111
         /* now that our DMA memory is actually so designated, we can free it */
-        totalram_pages += free_area(PHYS_PFN_OFFSET,
-                                    __phys_to_pfn(__pa(swapper_pg_dir)), NULL);
+        free_reserved_area(__va(PHYS_PFN_OFFSET), swapper_pg_dir, 0, NULL);
 #endif
 
         free_highpages();
@@ -738,16 +728,12 @@ void free_initmem(void)
         extern char __tcm_start, __tcm_end;
 
         poison_init_mem(&__tcm_start, &__tcm_end - &__tcm_start);
-        totalram_pages += free_area(__phys_to_pfn(__pa(&__tcm_start)),
-                                    __phys_to_pfn(__pa(&__tcm_end)),
-                                    "TCM link");
+        free_reserved_area(&__tcm_start, &__tcm_end, 0, "TCM link");
 #endif
 
         poison_init_mem(__init_begin, __init_end - __init_begin);
         if (!machine_is_integrator() && !machine_is_cintegrator())
-                totalram_pages += free_area(__phys_to_pfn(__pa(__init_begin)),
-                                            __phys_to_pfn(__pa(__init_end)),
-                                            "init");
+                free_initmem_default(0);
 }
 
 #ifdef CONFIG_BLK_DEV_INITRD
@@ -758,9 +744,7 @@ void free_initrd_mem(unsigned long start, unsigned long end)
 {
         if (!keep_initrd) {
                 poison_init_mem((void *)start, PAGE_ALIGN(end) - start);
-                totalram_pages += free_area(__phys_to_pfn(__pa(start)),
-                                            __phys_to_pfn(__pa(end)),
-                                            "initrd");
+                free_reserved_area(start, end, 0, "initrd");
         }
 }
 
diff --git a/arch/arm/plat-samsung/devs.c b/arch/arm/plat-samsung/devs.c
index 51afedda9ab6..03db14d8ace9 100644
--- a/arch/arm/plat-samsung/devs.c
+++ b/arch/arm/plat-samsung/devs.c
@@ -10,6 +10,7 @@
  * published by the Free Software Foundation.
 */
 
+#include <linux/amba/pl330.h>
 #include <linux/kernel.h>
 #include <linux/types.h>
 #include <linux/interrupt.h>
@@ -1552,6 +1553,9 @@ void __init s3c64xx_spi0_set_platdata(int (*cfg_gpio)(void), int src_clk_nr,
         pd.num_cs = num_cs;
         pd.src_clk_nr = src_clk_nr;
         pd.cfg_gpio = (cfg_gpio) ? cfg_gpio : s3c64xx_spi0_cfg_gpio;
+#ifdef CONFIG_PL330_DMA
+        pd.filter = pl330_filter;
+#endif
 
         s3c_set_platdata(&pd, sizeof(pd), &s3c64xx_device_spi0);
 }
@@ -1590,6 +1594,9 @@ void __init s3c64xx_spi1_set_platdata(int (*cfg_gpio)(void), int src_clk_nr,
         pd.num_cs = num_cs;
         pd.src_clk_nr = src_clk_nr;
         pd.cfg_gpio = (cfg_gpio) ? cfg_gpio : s3c64xx_spi1_cfg_gpio;
+#ifdef CONFIG_PL330_DMA
+        pd.filter = pl330_filter;
+#endif
 
         s3c_set_platdata(&pd, sizeof(pd), &s3c64xx_device_spi1);
 }
@@ -1628,6 +1635,9 @@ void __init s3c64xx_spi2_set_platdata(int (*cfg_gpio)(void), int src_clk_nr,
         pd.num_cs = num_cs;
         pd.src_clk_nr = src_clk_nr;
         pd.cfg_gpio = (cfg_gpio) ? cfg_gpio : s3c64xx_spi2_cfg_gpio;
+#ifdef CONFIG_PL330_DMA
+        pd.filter = pl330_filter;
+#endif
 
         s3c_set_platdata(&pd, sizeof(pd), &s3c64xx_device_spi2);
 }
diff --git a/arch/arm/plat-samsung/include/plat/fb.h b/arch/arm/plat-samsung/include/plat/fb.h
index b885322717a1..9ae507270785 100644
--- a/arch/arm/plat-samsung/include/plat/fb.h
+++ b/arch/arm/plat-samsung/include/plat/fb.h
@@ -15,55 +15,7 @@
 #ifndef __PLAT_S3C_FB_H
 #define __PLAT_S3C_FB_H __FILE__
 
-/* S3C_FB_MAX_WIN
- * Set to the maximum number of windows that any of the supported hardware
- * can use. Since the platform data uses this for an array size, having it
- * set to the maximum of any version of the hardware can do is safe.
- */
-#define S3C_FB_MAX_WIN  (5)
-
-/**
- * struct s3c_fb_pd_win - per window setup data
- * @xres     : The window X size.
- * @yres     : The window Y size.
- * @virtual_x: The virtual X size.
- * @virtual_y: The virtual Y size.
- */
-struct s3c_fb_pd_win {
-        unsigned short          default_bpp;
-        unsigned short          max_bpp;
-        unsigned short          xres;
-        unsigned short          yres;
-        unsigned short          virtual_x;
-        unsigned short          virtual_y;
-};
-
-/**
- * struct s3c_fb_platdata -  S3C driver platform specific information
- * @setup_gpio: Setup the external GPIO pins to the right state to transfer
- *              the data from the display system to the connected display
- *              device.
- * @vidcon0: The base vidcon0 values to control the panel data format.
- * @vidcon1: The base vidcon1 values to control the panel data output.
- * @vtiming: Video timing when connected to a RGB type panel.
- * @win: The setup data for each hardware window, or NULL for unused.
- * @display_mode: The LCD output display mode.
- *
- * The platform data supplies the video driver with all the information
- * it requires to work with the display(s) attached to the machine. It
- * controls the initial mode, the number of display windows (0 is always
- * the base framebuffer) that are initialised etc.
- *
- */
-struct s3c_fb_platdata {
-        void    (*setup_gpio)(void);
-
-        struct s3c_fb_pd_win    *win[S3C_FB_MAX_WIN];
-        struct fb_videomode     *vtiming;
-
-        u32                      vidcon0;
-        u32                      vidcon1;
-};
+#include <linux/platform_data/video_s3c.h>
 
 /**
  * s3c_fb_set_platdata() - Setup the FB device with platform data.
diff --git a/arch/arm/plat-samsung/include/plat/regs-serial.h b/arch/arm/plat-samsung/include/plat/regs-serial.h
index 29c26a818842..f05f2afa440d 100644
--- a/arch/arm/plat-samsung/include/plat/regs-serial.h
+++ b/arch/arm/plat-samsung/include/plat/regs-serial.h
@@ -1,281 +1 @@
-/* arch/arm/plat-samsung/include/plat/regs-serial.h
- *
- *  From linux/include/asm-arm/hardware/serial_s3c2410.h
- *
- *  Internal header file for Samsung S3C2410 serial ports (UART0-2)
- *
- *  Copyright (C) 2002 Shane Nay (shane@minirl.com)
- *
- *  Additional defines, Copyright 2003 Simtec Electronics (linux@simtec.co.uk)
- *
- *  Adapted from:
- *
- *  Internal header file for MX1ADS serial ports (UART1 & 2)
- *
- *  Copyright (C) 2002 Shane Nay (shane@minirl.com)
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-*/
-
-#ifndef __ASM_ARM_REGS_SERIAL_H
-#define __ASM_ARM_REGS_SERIAL_H
-
-#define S3C24XX_VA_UART0      (S3C_VA_UART)
-#define S3C24XX_VA_UART1      (S3C_VA_UART + 0x4000 )
-#define S3C24XX_VA_UART2      (S3C_VA_UART + 0x8000 )
-#define S3C24XX_VA_UART3      (S3C_VA_UART + 0xC000 )
-
-#define S3C2410_PA_UART0      (S3C24XX_PA_UART)
-#define S3C2410_PA_UART1      (S3C24XX_PA_UART + 0x4000 )
-#define S3C2410_PA_UART2      (S3C24XX_PA_UART + 0x8000 )
-#define S3C2443_PA_UART3      (S3C24XX_PA_UART + 0xC000 )
-
-#define S3C2410_URXH      (0x24)
-#define S3C2410_UTXH      (0x20)
-#define S3C2410_ULCON     (0x00)
-#define S3C2410_UCON      (0x04)
-#define S3C2410_UFCON     (0x08)
-#define S3C2410_UMCON     (0x0C)
-#define S3C2410_UBRDIV    (0x28)
-#define S3C2410_UTRSTAT   (0x10)
-#define S3C2410_UERSTAT   (0x14)
-#define S3C2410_UFSTAT    (0x18)
-#define S3C2410_UMSTAT    (0x1C)
-
-#define S3C2410_LCON_CFGMASK      ((0xF<<3)|(0x3))
-
-#define S3C2410_LCON_CS5          (0x0)
-#define S3C2410_LCON_CS6          (0x1)
-#define S3C2410_LCON_CS7          (0x2)
-#define S3C2410_LCON_CS8          (0x3)
-#define S3C2410_LCON_CSMASK       (0x3)
-
-#define S3C2410_LCON_PNONE        (0x0)
-#define S3C2410_LCON_PEVEN        (0x5 << 3)
-#define S3C2410_LCON_PODD         (0x4 << 3)
-#define S3C2410_LCON_PMASK        (0x7 << 3)
-
-#define S3C2410_LCON_STOPB        (1<<2)
-#define S3C2410_LCON_IRM          (1<<6)
-
-#define S3C2440_UCON_CLKMASK      (3<<10)
-#define S3C2440_UCON_CLKSHIFT     (10)
-#define S3C2440_UCON_PCLK         (0<<10)
-#define S3C2440_UCON_UCLK         (1<<10)
-#define S3C2440_UCON_PCLK2        (2<<10)
-#define S3C2440_UCON_FCLK         (3<<10)
-#define S3C2443_UCON_EPLL         (3<<10)
-
-#define S3C6400_UCON_CLKMASK    (3<<10)
-#define S3C6400_UCON_CLKSHIFT   (10)
-#define S3C6400_UCON_PCLK       (0<<10)
-#define S3C6400_UCON_PCLK2      (2<<10)
-#define S3C6400_UCON_UCLK0      (1<<10)
-#define S3C6400_UCON_UCLK1      (3<<10)
-
-#define S3C2440_UCON2_FCLK_EN     (1<<15)
-#define S3C2440_UCON0_DIVMASK     (15 << 12)
-#define S3C2440_UCON1_DIVMASK     (15 << 12)
-#define S3C2440_UCON2_DIVMASK     (7 << 12)
-#define S3C2440_UCON_DIVSHIFT     (12)
-
-#define S3C2412_UCON_CLKMASK    (3<<10)
-#define S3C2412_UCON_CLKSHIFT   (10)
-#define S3C2412_UCON_UCLK       (1<<10)
-#define S3C2412_UCON_USYSCLK    (3<<10)
-#define S3C2412_UCON_PCLK       (0<<10)
-#define S3C2412_UCON_PCLK2      (2<<10)
-
-#define S3C2410_UCON_CLKMASK    (1 << 10)
-#define S3C2410_UCON_CLKSHIFT   (10)
-#define S3C2410_UCON_UCLK         (1<<10)
-#define S3C2410_UCON_SBREAK       (1<<4)
-
-#define S3C2410_UCON_TXILEVEL     (1<<9)
-#define S3C2410_UCON_RXILEVEL     (1<<8)
-#define S3C2410_UCON_TXIRQMODE    (1<<2)
-#define S3C2410_UCON_RXIRQMODE    (1<<0)
-#define S3C2410_UCON_RXFIFO_TOI   (1<<7)
-#define S3C2443_UCON_RXERR_IRQEN  (1<<6)
-#define S3C2443_UCON_LOOPBACK     (1<<5)
-
-#define S3C2410_UCON_DEFAULT      (S3C2410_UCON_TXILEVEL  | \
-                                   S3C2410_UCON_RXILEVEL  | \
-                                   S3C2410_UCON_TXIRQMODE | \
-                                   S3C2410_UCON_RXIRQMODE | \
-                                   S3C2410_UCON_RXFIFO_TOI)
-
-#define S3C2410_UFCON_FIFOMODE    (1<<0)
-#define S3C2410_UFCON_TXTRIG0     (0<<6)
-#define S3C2410_UFCON_RXTRIG8     (1<<4)
-#define S3C2410_UFCON_RXTRIG12    (2<<4)
-
-/* S3C2440 FIFO trigger levels */
-#define S3C2440_UFCON_RXTRIG1     (0<<4)
-#define S3C2440_UFCON_RXTRIG8     (1<<4)
-#define S3C2440_UFCON_RXTRIG16    (2<<4)
-#define S3C2440_UFCON_RXTRIG32    (3<<4)
-
-#define S3C2440_UFCON_TXTRIG0     (0<<6)
-#define S3C2440_UFCON_TXTRIG16    (1<<6)
-#define S3C2440_UFCON_TXTRIG32    (2<<6)
-#define S3C2440_UFCON_TXTRIG48    (3<<6)
-
-#define S3C2410_UFCON_RESETBOTH   (3<<1)
-#define S3C2410_UFCON_RESETTX     (1<<2)
-#define S3C2410_UFCON_RESETRX     (1<<1)
-
-#define S3C2410_UFCON_DEFAULT     (S3C2410_UFCON_FIFOMODE | \
-                                   S3C2410_UFCON_TXTRIG0  | \
-                                   S3C2410_UFCON_RXTRIG8 )
-
-#define S3C2410_UMCOM_AFC         (1<<4)
-#define S3C2410_UMCOM_RTS_LOW     (1<<0)
-
-#define S3C2412_UMCON_AFC_63    (0<<5)          /* same as s3c2443 */
-#define S3C2412_UMCON_AFC_56    (1<<5)
-#define S3C2412_UMCON_AFC_48    (2<<5)
-#define S3C2412_UMCON_AFC_40    (3<<5)
-#define S3C2412_UMCON_AFC_32    (4<<5)
-#define S3C2412_UMCON_AFC_24    (5<<5)
-#define S3C2412_UMCON_AFC_16    (6<<5)
-#define S3C2412_UMCON_AFC_8     (7<<5)
-
-#define S3C2410_UFSTAT_TXFULL     (1<<9)
-#define S3C2410_UFSTAT_RXFULL     (1<<8)
-#define S3C2410_UFSTAT_TXMASK     (15<<4)
-#define S3C2410_UFSTAT_TXSHIFT    (4)
-#define S3C2410_UFSTAT_RXMASK     (15<<0)
-#define S3C2410_UFSTAT_RXSHIFT    (0)
-
-/* UFSTAT S3C2443 same as S3C2440 */
-#define S3C2440_UFSTAT_TXFULL     (1<<14)
-#define S3C2440_UFSTAT_RXFULL     (1<<6)
-#define S3C2440_UFSTAT_TXSHIFT    (8)
-#define S3C2440_UFSTAT_RXSHIFT    (0)
-#define S3C2440_UFSTAT_TXMASK     (63<<8)
-#define S3C2440_UFSTAT_RXMASK     (63)
-
-#define S3C2410_UTRSTAT_TXE       (1<<2)
-#define S3C2410_UTRSTAT_TXFE      (1<<1)
-#define S3C2410_UTRSTAT_RXDR      (1<<0)
-
-#define S3C2410_UERSTAT_OVERRUN   (1<<0)
-#define S3C2410_UERSTAT_FRAME     (1<<2)
-#define S3C2410_UERSTAT_BREAK     (1<<3)
-#define S3C2443_UERSTAT_PARITY    (1<<1)
-
-#define S3C2410_UERSTAT_ANY       (S3C2410_UERSTAT_OVERRUN | \
-                                   S3C2410_UERSTAT_FRAME | \
-                                   S3C2410_UERSTAT_BREAK)
-
-#define S3C2410_UMSTAT_CTS        (1<<0)
-#define S3C2410_UMSTAT_DeltaCTS   (1<<2)
-
-#define S3C2443_DIVSLOT           (0x2C)
-
-/* S3C64XX interrupt registers. */
-#define S3C64XX_UINTP           0x30
-#define S3C64XX_UINTSP          0x34
-#define S3C64XX_UINTM           0x38
-
-#define S3C64XX_UINTM_RXD       (0)
-#define S3C64XX_UINTM_TXD       (2)
-#define S3C64XX_UINTM_RXD_MSK   (1 << S3C64XX_UINTM_RXD)
-#define S3C64XX_UINTM_TXD_MSK   (1 << S3C64XX_UINTM_TXD)
-
-/* Following are specific to S5PV210 */
-#define S5PV210_UCON_CLKMASK    (1<<10)
-#define S5PV210_UCON_CLKSHIFT   (10)
-#define S5PV210_UCON_PCLK       (0<<10)
-#define S5PV210_UCON_UCLK       (1<<10)
-
-#define S5PV210_UFCON_TXTRIG0   (0<<8)
-#define S5PV210_UFCON_TXTRIG4   (1<<8)
-#define S5PV210_UFCON_TXTRIG8   (2<<8)
-#define S5PV210_UFCON_TXTRIG16  (3<<8)
-#define S5PV210_UFCON_TXTRIG32  (4<<8)
-#define S5PV210_UFCON_TXTRIG64  (5<<8)
-#define S5PV210_UFCON_TXTRIG128 (6<<8)
-#define S5PV210_UFCON_TXTRIG256 (7<<8)
-
-#define S5PV210_UFCON_RXTRIG1   (0<<4)
-#define S5PV210_UFCON_RXTRIG4   (1<<4)
-#define S5PV210_UFCON_RXTRIG8   (2<<4)
-#define S5PV210_UFCON_RXTRIG16  (3<<4)
-#define S5PV210_UFCON_RXTRIG32  (4<<4)
-#define S5PV210_UFCON_RXTRIG64  (5<<4)
-#define S5PV210_UFCON_RXTRIG128 (6<<4)
-#define S5PV210_UFCON_RXTRIG256 (7<<4)
-
-#define S5PV210_UFSTAT_TXFULL   (1<<24)
-#define S5PV210_UFSTAT_RXFULL   (1<<8)
-#define S5PV210_UFSTAT_TXMASK   (255<<16)
-#define S5PV210_UFSTAT_TXSHIFT  (16)
-#define S5PV210_UFSTAT_RXMASK   (255<<0)
-#define S5PV210_UFSTAT_RXSHIFT  (0)
-
-#define S3C2410_UCON_CLKSEL0    (1 << 0)
-#define S3C2410_UCON_CLKSEL1    (1 << 1)
-#define S3C2410_UCON_CLKSEL2    (1 << 2)
-#define S3C2410_UCON_CLKSEL3    (1 << 3)
-
-/* Default values for s5pv210 UCON and UFCON uart registers */
-#define S5PV210_UCON_DEFAULT    (S3C2410_UCON_TXILEVEL |        \
-                                 S3C2410_UCON_RXILEVEL |        \
-                                 S3C2410_UCON_TXIRQMODE |       \
-                                 S3C2410_UCON_RXIRQMODE |       \
-                                 S3C2410_UCON_RXFIFO_TOI |      \
-                                 S3C2443_UCON_RXERR_IRQEN)
-
-#define S5PV210_UFCON_DEFAULT   (S3C2410_UFCON_FIFOMODE |       \
-                                 S5PV210_UFCON_TXTRIG4 |        \
-                                 S5PV210_UFCON_RXTRIG4)
-
-#ifndef __ASSEMBLY__
-
-/* configuration structure for per-machine configurations for the
- * serial port
- *
- * the pointer is setup by the machine specific initialisation from the
- * arch/arm/mach-s3c2410/ directory.
-*/
-
-struct s3c2410_uartcfg {
-        unsigned char      hwport;       /* hardware port number */
-        unsigned char      unused;
-        unsigned short     flags;
-        upf_t              uart_flags;   /* default uart flags */
-        unsigned int       clk_sel;
-
-        unsigned int       has_fracval;
-
-        unsigned long      ucon;         /* value of ucon for port */
-        unsigned long      ulcon;        /* value of ulcon for port */
-        unsigned long      ufcon;        /* value of ufcon for port */
-};
-
-/* s3c24xx_uart_devs
- *
- * this is exported from the core as we cannot use driver_register(),
- * or platform_add_device() before the console_initcall()
-*/
-
-extern struct platform_device *s3c24xx_uart_devs[4];
-
-#endif /* __ASSEMBLY__ */
-
-#endif /* __ASM_ARM_REGS_SERIAL_H */
-
+#include <linux/serial_s3c.h>
diff --git a/arch/arm/plat-samsung/include/plat/usb-phy.h b/arch/arm/plat-samsung/include/plat/usb-phy.h
index 959bcdb03a25..ab34dfadb7f9 100644
--- a/arch/arm/plat-samsung/include/plat/usb-phy.h
+++ b/arch/arm/plat-samsung/include/plat/usb-phy.h
@@ -11,10 +11,7 @@
 #ifndef __PLAT_SAMSUNG_USB_PHY_H
 #define __PLAT_SAMSUNG_USB_PHY_H __FILE__
 
-enum s5p_usb_phy_type {
-        S5P_USB_PHY_DEVICE,
-        S5P_USB_PHY_HOST,
-};
+#include <linux/usb/samsung_usb_phy.h>
 
 extern int s5p_usb_phy_init(struct platform_device *pdev, int type);
 extern int s5p_usb_phy_exit(struct platform_device *pdev, int type);
diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig
index 9b6d19f74078..73b6e764034c 100644
--- a/arch/arm64/Kconfig
+++ b/arch/arm64/Kconfig
@@ -99,7 +99,16 @@ source "init/Kconfig"
 
 source "kernel/Kconfig.freezer"
 
-menu "System Type"
+menu "Platform selection"
+
+config ARCH_VEXPRESS
+        bool "ARMv8 software model (Versatile Express)"
+        select ARCH_REQUIRE_GPIOLIB
+        select COMMON_CLK_VERSATILE
+        select VEXPRESS_CONFIG
+        help
+          This enables support for the ARMv8 software model (Versatile
+          Express).
 
 endmenu
 
diff --git a/arch/arm64/boot/dts/Makefile b/arch/arm64/boot/dts/Makefile
index 32ac0aef0068..68457e9e0975 100644
--- a/arch/arm64/boot/dts/Makefile
+++ b/arch/arm64/boot/dts/Makefile
@@ -1,3 +1,5 @@
+dtb-$(CONFIG_ARCH_VEXPRESS) += rtsm_ve-aemv8a.dtb foundation-v8.dtb
+
 targets += dtbs
 targets += $(dtb-y)
 
diff --git a/arch/arm64/boot/dts/foundation-v8.dts b/arch/arm64/boot/dts/foundation-v8.dts
new file mode 100644
index 000000000000..198682b6de31
--- /dev/null
+++ b/arch/arm64/boot/dts/foundation-v8.dts
@@ -0,0 +1,230 @@
+/*
+ * ARM Ltd.
+ *
+ * ARMv8 Foundation model DTS
+ */
+
+/dts-v1/;
+
+/ {
+        model = "Foundation-v8A";
+        compatible = "arm,foundation-aarch64", "arm,vexpress";
+        interrupt-parent = <&gic>;
+        #address-cells = <2>;
+        #size-cells = <2>;
+
+        chosen { };
+
+        aliases {
+                serial0 = &v2m_serial0;
+                serial1 = &v2m_serial1;
+                serial2 = &v2m_serial2;
+                serial3 = &v2m_serial3;
+        };
+
+        cpus {
+                #address-cells = <1>;
+                #size-cells = <0>;
+
+                cpu@0 {
+                        device_type = "cpu";
+                        compatible = "arm,armv8";
+                        reg = <0x0 0x0>;
+                        enable-method = "spin-table";
+                        cpu-release-addr = <0x0 0x8000fff8>;
+                };
+                cpu@1 {
+                        device_type = "cpu";
+                        compatible = "arm,armv8";
+                        reg = <0x0 0x1>;
+                        enable-method = "spin-table";
+                        cpu-release-addr = <0x0 0x8000fff8>;
+                };
+                cpu@2 {
+                        device_type = "cpu";
+                        compatible = "arm,armv8";
+                        reg = <0x0 0x2>;
+                        enable-method = "spin-table";
+                        cpu-release-addr = <0x0 0x8000fff8>;
+                };
+                cpu@3 {
+                        device_type = "cpu";
+                        compatible = "arm,armv8";
+                        reg = <0x0 0x3>;
+                        enable-method = "spin-table";
+                        cpu-release-addr = <0x0 0x8000fff8>;
+                };
+        };
+
+        memory@80000000 {
+                device_type = "memory";
+                reg = <0x00000000 0x80000000 0 0x80000000>,
+                      <0x00000008 0x80000000 0 0x80000000>;
+        };
+
+        gic: interrupt-controller@2c001000 {
+                compatible = "arm,cortex-a15-gic", "arm,cortex-a9-gic";
+                #interrupt-cells = <3>;
+                #address-cells = <0>;
+                interrupt-controller;
+                reg = <0x0 0x2c001000 0 0x1000>,
+                      <0x0 0x2c002000 0 0x1000>,
+                      <0x0 0x2c004000 0 0x2000>,
+                      <0x0 0x2c006000 0 0x2000>;
+                interrupts = <1 9 0xf04>;
+        };
+
+        timer {
+                compatible = "arm,armv8-timer";
+                interrupts = <1 13 0xff01>,
+                             <1 14 0xff01>,
+                             <1 11 0xff01>,
+                             <1 10 0xff01>;
+                clock-frequency = <100000000>;
+        };
+
+        pmu {
+                compatible = "arm,armv8-pmuv3";
+                interrupts = <0 60 4>,
+                             <0 61 4>,
+                             <0 62 4>,
+                             <0 63 4>;
+        };
+
+        smb {
+                compatible = "arm,vexpress,v2m-p1", "simple-bus";
+                arm,v2m-memory-map = "rs1";
+                #address-cells = <2>; /* SMB chipselect number and offset */
+                #size-cells = <1>;
+
+                ranges = <0 0 0 0x08000000 0x04000000>,
+                         <1 0 0 0x14000000 0x04000000>,
+                         <2 0 0 0x18000000 0x04000000>,
+                         <3 0 0 0x1c000000 0x04000000>,
+                         <4 0 0 0x0c000000 0x04000000>,
+                         <5 0 0 0x10000000 0x04000000>;
+
+                #interrupt-cells = <1>;
+                interrupt-map-mask = <0 0 63>;
+                interrupt-map = <0 0  0 &gic 0  0 4>,
+                                <0 0  1 &gic 0  1 4>,
+                                <0 0  2 &gic 0  2 4>,
+                                <0 0  3 &gic 0  3 4>,
+                                <0 0  4 &gic 0  4 4>,
+                                <0 0  5 &gic 0  5 4>,
+                                <0 0  6 &gic 0  6 4>,
+                                <0 0  7 &gic 0  7 4>,
+                                <0 0  8 &gic 0  8 4>,
+                                <0 0  9 &gic 0  9 4>,
+                                <0 0 10 &gic 0 10 4>,
+                                <0 0 11 &gic 0 11 4>,
+                                <0 0 12 &gic 0 12 4>,
+                                <0 0 13 &gic 0 13 4>,
+                                <0 0 14 &gic 0 14 4>,
+                                <0 0 15 &gic 0 15 4>,
+                                <0 0 16 &gic 0 16 4>,
+                                <0 0 17 &gic 0 17 4>,
+                                <0 0 18 &gic 0 18 4>,
+                                <0 0 19 &gic 0 19 4>,
+                                <0 0 20 &gic 0 20 4>,
+                                <0 0 21 &gic 0 21 4>,
+                                <0 0 22 &gic 0 22 4>,
+                                <0 0 23 &gic 0 23 4>,
+                                <0 0 24 &gic 0 24 4>,
+                                <0 0 25 &gic 0 25 4>,
+                                <0 0 26 &gic 0 26 4>,
+                                <0 0 27 &gic 0 27 4>,
+                                <0 0 28 &gic 0 28 4>,
+                                <0 0 29 &gic 0 29 4>,
+                                <0 0 30 &gic 0 30 4>,
+                                <0 0 31 &gic 0 31 4>,
+                                <0 0 32 &gic 0 32 4>,
+                                <0 0 33 &gic 0 33 4>,
+                                <0 0 34 &gic 0 34 4>,
+                                <0 0 35 &gic 0 35 4>,
+                                <0 0 36 &gic 0 36 4>,
+                                <0 0 37 &gic 0 37 4>,
+                                <0 0 38 &gic 0 38 4>,
+                                <0 0 39 &gic 0 39 4>,
+                                <0 0 40 &gic 0 40 4>,
+                                <0 0 41 &gic 0 41 4>,
+                                <0 0 42 &gic 0 42 4>;
+
+                ethernet@2,02000000 {
+                        compatible = "smsc,lan91c111";
+                        reg = <2 0x02000000 0x10000>;
+                        interrupts = <15>;
+                };
+
+                v2m_clk24mhz: clk24mhz {
+                        compatible = "fixed-clock";
+                        #clock-cells = <0>;
+                        clock-frequency = <24000000>;
+                        clock-output-names = "v2m:clk24mhz";
+                };
+
+                v2m_refclk1mhz: refclk1mhz {
+                        compatible = "fixed-clock";
+                        #clock-cells = <0>;
+                        clock-frequency = <1000000>;
+                        clock-output-names = "v2m:refclk1mhz";
+                };
+
+                v2m_refclk32khz: refclk32khz {
+                        compatible = "fixed-clock";
+                        #clock-cells = <0>;
+                        clock-frequency = <32768>;
+                        clock-output-names = "v2m:refclk32khz";
+                };
+
+                iofpga@3,00000000 {
+                        compatible = "arm,amba-bus", "simple-bus";
+                        #address-cells = <1>;
+                        #size-cells = <1>;
+                        ranges = <0 3 0 0x200000>;
+
+                        v2m_sysreg: sysreg@010000 {
+                                compatible = "arm,vexpress-sysreg";
+                                reg = <0x010000 0x1000>;
+                        };
+
+                        v2m_serial0: uart@090000 {
+                                compatible = "arm,pl011", "arm,primecell";
+                                reg = <0x090000 0x1000>;
+                                interrupts = <5>;
+                                clocks = <&v2m_clk24mhz>, <&v2m_clk24mhz>;
+                                clock-names = "uartclk", "apb_pclk";
+                        };
+
+                        v2m_serial1: uart@0a0000 {
+                                compatible = "arm,pl011", "arm,primecell";
+                                reg = <0x0a0000 0x1000>;
+                                interrupts = <6>;
+                                clocks = <&v2m_clk24mhz>, <&v2m_clk24mhz>;
+                                clock-names = "uartclk", "apb_pclk";
+                        };
+
+                        v2m_serial2: uart@0b0000 {
+                                compatible = "arm,pl011", "arm,primecell";
+                                reg = <0x0b0000 0x1000>;
+                                interrupts = <7>;
+                                clocks = <&v2m_clk24mhz>, <&v2m_clk24mhz>;
+                                clock-names = "uartclk", "apb_pclk";
+                        };
+
+                        v2m_serial3: uart@0c0000 {
+                                compatible = "arm,pl011", "arm,primecell";
+                                reg = <0x0c0000 0x1000>;
+                                interrupts = <8>;
+                                clocks = <&v2m_clk24mhz>, <&v2m_clk24mhz>;
+                                clock-names = "uartclk", "apb_pclk";
+                        };
+
+                        virtio_block@0130000 {
+                                compatible = "virtio,mmio";
+                                reg = <0x130000 0x1000>;
+                                interrupts = <42>;
+                        };
+                };
+        };
+};
diff --git a/arch/arm64/boot/dts/rtsm_ve-aemv8a.dts b/arch/arm64/boot/dts/rtsm_ve-aemv8a.dts
new file mode 100644
index 000000000000..572005ea2217
--- /dev/null
+++ b/arch/arm64/boot/dts/rtsm_ve-aemv8a.dts
@@ -0,0 +1,159 @@
+/*
+ * ARM Ltd. Fast Models
+ *
+ * Architecture Envelope Model (AEM) ARMv8-A
+ * ARMAEMv8AMPCT
+ *
+ * RTSM_VE_AEMv8A.lisa
+ */
+
+/dts-v1/;
+
+/memreserve/ 0x80000000 0x00010000;
+
+/ {
+        model = "RTSM_VE_AEMv8A";
+        compatible = "arm,rtsm_ve,aemv8a", "arm,vexpress";
+        interrupt-parent = <&gic>;
+        #address-cells = <2>;
+        #size-cells = <2>;
+
+        chosen { };
+
+        aliases {
+                serial0 = &v2m_serial0;
+                serial1 = &v2m_serial1;
+                serial2 = &v2m_serial2;
+                serial3 = &v2m_serial3;
+        };
+
+        cpus {
+                #address-cells = <2>;
+                #size-cells = <0>;
+
+                cpu@0 {
+                        device_type = "cpu";
+                        compatible = "arm,armv8";
+                        reg = <0x0 0x0>;
+                        enable-method = "spin-table";
+                        cpu-release-addr = <0x0 0x8000fff8>;
+                };
+                cpu@1 {
+                        device_type = "cpu";
+                        compatible = "arm,armv8";
+                        reg = <0x0 0x1>;
+                        enable-method = "spin-table";
+                        cpu-release-addr = <0x0 0x8000fff8>;
+                };
+                cpu@2 {
+                        device_type = "cpu";
+                        compatible = "arm,armv8";
+                        reg = <0x0 0x2>;
+                        enable-method = "spin-table";
+                        cpu-release-addr = <0x0 0x8000fff8>;
+                };
+                cpu@3 {
+                        device_type = "cpu";
+                        compatible = "arm,armv8";
+                        reg = <0x0 0x3>;
+                        enable-method = "spin-table";
+                        cpu-release-addr = <0x0 0x8000fff8>;
+                };
+        };
+
+        memory@80000000 {
+                device_type = "memory";
+                reg = <0x00000000 0x80000000 0 0x80000000>,
+                      <0x00000008 0x80000000 0 0x80000000>;
+        };
+
+        gic: interrupt-controller@2c001000 {
+                compatible = "arm,cortex-a15-gic", "arm,cortex-a9-gic";
+                #interrupt-cells = <3>;
+                #address-cells = <0>;
+                interrupt-controller;
+                reg = <0x0 0x2c001000 0 0x1000>,
+                      <0x0 0x2c002000 0 0x1000>,
+                      <0x0 0x2c004000 0 0x2000>,
+                      <0x0 0x2c006000 0 0x2000>;
+                interrupts = <1 9 0xf04>;
+        };
+
+        timer {
+                compatible = "arm,armv8-timer";
+                interrupts = <1 13 0xff01>,
+                             <1 14 0xff01>,
+                             <1 11 0xff01>,
+                             <1 10 0xff01>;
+                clock-frequency = <100000000>;
+        };
+
+        pmu {
+                compatible = "arm,armv8-pmuv3";
+                interrupts = <0 60 4>,
+                             <0 61 4>,
+                             <0 62 4>,
+                             <0 63 4>;
+        };
+
+        smb {
+                compatible = "simple-bus";
+
+                #address-cells = <2>;
+                #size-cells = <1>;
+                ranges = <0 0 0 0x08000000 0x04000000>,
+                         <1 0 0 0x14000000 0x04000000>,
+                         <2 0 0 0x18000000 0x04000000>,
+                         <3 0 0 0x1c000000 0x04000000>,
+                         <4 0 0 0x0c000000 0x04000000>,
+                         <5 0 0 0x10000000 0x04000000>;
+
+                #interrupt-cells = <1>;
+                interrupt-map-mask = <0 0 63>;
+                interrupt-map = <0 0  0 &gic 0  0 4>,
+                                <0 0  1 &gic 0  1 4>,
+                                <0 0  2 &gic 0  2 4>,
+                                <0 0  3 &gic 0  3 4>,
+                                <0 0  4 &gic 0  4 4>,
+                                <0 0  5 &gic 0  5 4>,
+                                <0 0  6 &gic 0  6 4>,
+                                <0 0  7 &gic 0  7 4>,
+                                <0 0  8 &gic 0  8 4>,
+                                <0 0  9 &gic 0  9 4>,
+                                <0 0 10 &gic 0 10 4>,
+                                <0 0 11 &gic 0 11 4>,
+                                <0 0 12 &gic 0 12 4>,
+                                <0 0 13 &gic 0 13 4>,
+                                <0 0 14 &gic 0 14 4>,
+                                <0 0 15 &gic 0 15 4>,
+                                <0 0 16 &gic 0 16 4>,
+                                <0 0 17 &gic 0 17 4>,
+                                <0 0 18 &gic 0 18 4>,
+                                <0 0 19 &gic 0 19 4>,
+                                <0 0 20 &gic 0 20 4>,
+                                <0 0 21 &gic 0 21 4>,
+                                <0 0 22 &gic 0 22 4>,
+                                <0 0 23 &gic 0 23 4>,
+                                <0 0 24 &gic 0 24 4>,
+                                <0 0 25 &gic 0 25 4>,
+                                <0 0 26 &gic 0 26 4>,
+                                <0 0 27 &gic 0 27 4>,
+                                <0 0 28 &gic 0 28 4>,
+                                <0 0 29 &gic 0 29 4>,
+                                <0 0 30 &gic 0 30 4>,
+                                <0 0 31 &gic 0 31 4>,
+                                <0 0 32 &gic 0 32 4>,
+                                <0 0 33 &gic 0 33 4>,
+                                <0 0 34 &gic 0 34 4>,
+                                <0 0 35 &gic 0 35 4>,
+                                <0 0 36 &gic 0 36 4>,
+                                <0 0 37 &gic 0 37 4>,
+                                <0 0 38 &gic 0 38 4>,
+                                <0 0 39 &gic 0 39 4>,
+                                <0 0 40 &gic 0 40 4>,
+                                <0 0 41 &gic 0 41 4>,
+                                <0 0 42 &gic 0 42 4>;
+
+                /include/ "rtsm_ve-motherboard.dtsi"
+        };
+};
diff --git a/arch/arm64/boot/dts/rtsm_ve-motherboard.dtsi b/arch/arm64/boot/dts/rtsm_ve-motherboard.dtsi
new file mode 100644
index 000000000000..b45e5f39f577
--- /dev/null
+++ b/arch/arm64/boot/dts/rtsm_ve-motherboard.dtsi
@@ -0,0 +1,234 @@
+/*
+ * ARM Ltd. Fast Models
+ *
+ * Versatile Express (VE) system model
+ * Motherboard component
+ *
+ * VEMotherBoard.lisa
+ */
+
+        motherboard {
+                arm,v2m-memory-map = "rs1";
+                compatible = "arm,vexpress,v2m-p1", "simple-bus";
+                #address-cells = <2>; /* SMB chipselect number and offset */
+                #size-cells = <1>;
+                #interrupt-cells = <1>;
+                ranges;
+
+                flash@0,00000000 {
+                        compatible = "arm,vexpress-flash", "cfi-flash";
+                        reg = <0 0x00000000 0x04000000>,
+                              <4 0x00000000 0x04000000>;
+                        bank-width = <4>;
+                };
+
+                vram@2,00000000 {
+                        compatible = "arm,vexpress-vram";
+                        reg = <2 0x00000000 0x00800000>;
+                };
+
+                ethernet@2,02000000 {
+                        compatible = "smsc,lan91c111";
+                        reg = <2 0x02000000 0x10000>;
+                        interrupts = <15>;
+                };
+
+                v2m_clk24mhz: clk24mhz {
+                        compatible = "fixed-clock";
+                        #clock-cells = <0>;
+                        clock-frequency = <24000000>;
+                        clock-output-names = "v2m:clk24mhz";
+                };
+
+                v2m_refclk1mhz: refclk1mhz {
+                        compatible = "fixed-clock";
+                        #clock-cells = <0>;
+                        clock-frequency = <1000000>;
+                        clock-output-names = "v2m:refclk1mhz";
+                };
+
+                v2m_refclk32khz: refclk32khz {
+                        compatible = "fixed-clock";
+                        #clock-cells = <0>;
+                        clock-frequency = <32768>;
+                        clock-output-names = "v2m:refclk32khz";
+                };
+
+                iofpga@3,00000000 {
+                        compatible = "arm,amba-bus", "simple-bus";
+                        #address-cells = <1>;
+                        #size-cells = <1>;
+                        ranges = <0 3 0 0x200000>;
+
+                        v2m_sysreg: sysreg@010000 {
+                                compatible = "arm,vexpress-sysreg";
+                                reg = <0x010000 0x1000>;
+                                gpio-controller;
+                                #gpio-cells = <2>;
+                        };
+
+                        v2m_sysctl: sysctl@020000 {
+                                compatible = "arm,sp810", "arm,primecell";
+                                reg = <0x020000 0x1000>;
+                                clocks = <&v2m_refclk32khz>, <&v2m_refclk1mhz>, <&v2m_clk24mhz>;
+                                clock-names = "refclk", "timclk", "apb_pclk";
+                                #clock-cells = <1>;
+                                clock-output-names = "timerclken0", "timerclken1", "timerclken2", "timerclken3";
+                        };
+
+                        aaci@040000 {
+                                compatible = "arm,pl041", "arm,primecell";
+                                reg = <0x040000 0x1000>;
+                                interrupts = <11>;
+                                clocks = <&v2m_clk24mhz>;
+                                clock-names = "apb_pclk";
+                        };
+
+                        mmci@050000 {
+                                compatible = "arm,pl180", "arm,primecell";
+                                reg = <0x050000 0x1000>;
+                                interrupts = <9 10>;
+                                cd-gpios = <&v2m_sysreg 0 0>;
+                                wp-gpios = <&v2m_sysreg 1 0>;
+                                max-frequency = <12000000>;
+                                vmmc-supply = <&v2m_fixed_3v3>;
+                                clocks = <&v2m_clk24mhz>, <&v2m_clk24mhz>;
+                                clock-names = "mclk", "apb_pclk";
+                        };
+
+                        kmi@060000 {
+                                compatible = "arm,pl050", "arm,primecell";
+                                reg = <0x060000 0x1000>;
+                                interrupts = <12>;
+                                clocks = <&v2m_clk24mhz>, <&v2m_clk24mhz>;
+                                clock-names = "KMIREFCLK", "apb_pclk";
+                        };
+
+                        kmi@070000 {
+                                compatible = "arm,pl050", "arm,primecell";
+                                reg = <0x070000 0x1000>;
+                                interrupts = <13>;
+                                clocks = <&v2m_clk24mhz>, <&v2m_clk24mhz>;
+                                clock-names = "KMIREFCLK", "apb_pclk";
+                        };
+
+                        v2m_serial0: uart@090000 {
+                                compatible = "arm,pl011", "arm,primecell";
+                                reg = <0x090000 0x1000>;
+                                interrupts = <5>;
+                                clocks = <&v2m_clk24mhz>, <&v2m_clk24mhz>;
+                                clock-names = "uartclk", "apb_pclk";
+                        };
+
+                        v2m_serial1: uart@0a0000 {
+                                compatible = "arm,pl011", "arm,primecell";
+                                reg = <0x0a0000 0x1000>;
+                                interrupts = <6>;
+                                clocks = <&v2m_clk24mhz>, <&v2m_clk24mhz>;
+                                clock-names = "uartclk", "apb_pclk";
+                        };
+
+                        v2m_serial2: uart@0b0000 {
+                                compatible = "arm,pl011", "arm,primecell";
+                                reg = <0x0b0000 0x1000>;
+                                interrupts = <7>;
+                                clocks = <&v2m_clk24mhz>, <&v2m_clk24mhz>;
+                                clock-names = "uartclk", "apb_pclk";
+                        };
+
+                        v2m_serial3: uart@0c0000 {
+                                compatible = "arm,pl011", "arm,primecell";
+                                reg = <0x0c0000 0x1000>;
+                                interrupts = <8>;
+                                clocks = <&v2m_clk24mhz>, <&v2m_clk24mhz>;
+                                clock-names = "uartclk", "apb_pclk";
+                        };
+
+                        wdt@0f0000 {
+                                compatible = "arm,sp805", "arm,primecell";
+                                reg = <0x0f0000 0x1000>;
+                                interrupts = <0>;
+                                clocks = <&v2m_refclk32khz>, <&v2m_clk24mhz>;
+                                clock-names = "wdogclk", "apb_pclk";
+                        };
+
+                        v2m_timer01: timer@110000 {
+                                compatible = "arm,sp804", "arm,primecell";
+                                reg = <0x110000 0x1000>;
+                                interrupts = <2>;
+                                clocks = <&v2m_sysctl 0>, <&v2m_sysctl 1>, <&v2m_clk24mhz>;
+                                clock-names = "timclken1", "timclken2", "apb_pclk";
+                        };
+
+                        v2m_timer23: timer@120000 {
+                                compatible = "arm,sp804", "arm,primecell";
+                                reg = <0x120000 0x1000>;
+                                interrupts = <3>;
+                                clocks = <&v2m_sysctl 2>, <&v2m_sysctl 3>, <&v2m_clk24mhz>;
+                                clock-names = "timclken1", "timclken2", "apb_pclk";
+                        };
+
+                        rtc@170000 {
+                                compatible = "arm,pl031", "arm,primecell";
+                                reg = <0x170000 0x1000>;
+                                interrupts = <4>;
+                                clocks = <&v2m_clk24mhz>;
+                                clock-names = "apb_pclk";
+                        };
+
+                        clcd@1f0000 {
+                                compatible = "arm,pl111", "arm,primecell";
+                                reg = <0x1f0000 0x1000>;
+                                interrupts = <14>;
+                                clocks = <&v2m_oscclk1>, <&v2m_clk24mhz>;
+                                clock-names = "clcdclk", "apb_pclk";
+                        };
+                };
+
+                v2m_fixed_3v3: fixedregulator@0 {
+                        compatible = "regulator-fixed";
+                        regulator-name = "3V3";
+                        regulator-min-microvolt = <3300000>;
+                        regulator-max-microvolt = <3300000>;
+                        regulator-always-on;
+                };
+
+                mcc {
+                        compatible = "arm,vexpress,config-bus", "simple-bus";
+                        arm,vexpress,config-bridge = <&v2m_sysreg>;
+
+                        v2m_oscclk1: osc@1 {
+                                /* CLCD clock */
+                                compatible = "arm,vexpress-osc";
+                                arm,vexpress-sysreg,func = <1 1>;
+                                freq-range = <23750000 63500000>;
+                                #clock-cells = <0>;
+                                clock-output-names = "v2m:oscclk1";
+                        };
+
+                        reset@0 {
+                                compatible = "arm,vexpress-reset";
+                                arm,vexpress-sysreg,func = <5 0>;
+                        };
+
+                        muxfpga@0 {
+                                compatible = "arm,vexpress-muxfpga";
+                                arm,vexpress-sysreg,func = <7 0>;
+                        };
+
+                        shutdown@0 {
+                                compatible = "arm,vexpress-shutdown";
+                                arm,vexpress-sysreg,func = <8 0>;
+                        };
+
+                        reboot@0 {
+                                compatible = "arm,vexpress-reboot";
+                                arm,vexpress-sysreg,func = <9 0>;
+                        };
+
+                        dvimode@0 {
+                                compatible = "arm,vexpress-dvimode";
+                                arm,vexpress-sysreg,func = <11 0>;
+                        };
+                };
+        };
diff --git a/arch/arm64/boot/dts/skeleton.dtsi b/arch/arm64/boot/dts/skeleton.dtsi
new file mode 100644
index 000000000000..38ead821bb42
--- /dev/null
+++ b/arch/arm64/boot/dts/skeleton.dtsi
@@ -0,0 +1,13 @@
+/*
+ * Skeleton device tree; the bare minimum needed to boot; just include and
+ * add a compatible value.  The bootloader will typically populate the memory
+ * node.
+ */
+
+/ {
+        #address-cells = <2>;
+        #size-cells = <1>;
+        chosen { };
+        aliases { };
+        memory { device_type = "memory"; reg = <0 0 0>; };
+};
diff --git a/arch/arm64/configs/defconfig b/arch/arm64/configs/defconfig
index 09bef29f3a09..8d9696adb440 100644
--- a/arch/arm64/configs/defconfig
+++ b/arch/arm64/configs/defconfig
@@ -23,6 +23,7 @@ CONFIG_MODULES=y
 CONFIG_MODULE_UNLOAD=y
 # CONFIG_BLK_DEV_BSG is not set
 # CONFIG_IOSCHED_DEADLINE is not set
+CONFIG_ARCH_VEXPRESS=y
 CONFIG_SMP=y
 CONFIG_PREEMPT_VOLUNTARY=y
 CONFIG_CMDLINE="console=ttyAMA0"
@@ -47,11 +48,14 @@ CONFIG_BLK_DEV_SD=y
 # CONFIG_SCSI_LOWLEVEL is not set
 CONFIG_NETDEVICES=y
 CONFIG_MII=y
+CONFIG_SMC91X=y
 # CONFIG_WLAN is not set
 CONFIG_INPUT_EVDEV=y
 # CONFIG_SERIO_I8042 is not set
 # CONFIG_SERIO_SERPORT is not set
 CONFIG_LEGACY_PTY_COUNT=16
+CONFIG_SERIAL_AMBA_PL011=y
+CONFIG_SERIAL_AMBA_PL011_CONSOLE=y
 # CONFIG_HW_RANDOM is not set
 # CONFIG_HWMON is not set
 CONFIG_FB=y
diff --git a/arch/arm64/include/asm/Kbuild b/arch/arm64/include/asm/Kbuild
index e5fe4f99fe10..79a642d199f2 100644
--- a/arch/arm64/include/asm/Kbuild
+++ b/arch/arm64/include/asm/Kbuild
@@ -39,7 +39,6 @@ generic-y += shmbuf.h
 generic-y += sizes.h
 generic-y += socket.h
 generic-y += sockios.h
-generic-y += string.h
 generic-y += switch_to.h
 generic-y += swab.h
 generic-y += termbits.h
@@ -49,4 +48,5 @@ generic-y += trace_clock.h
 generic-y += types.h
 generic-y += unaligned.h
 generic-y += user.h
+generic-y += vga.h
 generic-y += xor.h
diff --git a/arch/arm64/include/asm/bitops.h b/arch/arm64/include/asm/bitops.h
index 5e693073b030..aa5b59d6ba43 100644
--- a/arch/arm64/include/asm/bitops.h
+++ b/arch/arm64/include/asm/bitops.h
@@ -32,6 +32,16 @@
 #error only <linux/bitops.h> can be included directly
 #endif
 
+/*
+ * Little endian assembly atomic bitops.
+ */
+extern void set_bit(int nr, volatile unsigned long *p);
+extern void clear_bit(int nr, volatile unsigned long *p);
+extern void change_bit(int nr, volatile unsigned long *p);
+extern int test_and_set_bit(int nr, volatile unsigned long *p);
+extern int test_and_clear_bit(int nr, volatile unsigned long *p);
+extern int test_and_change_bit(int nr, volatile unsigned long *p);
+
 #include <asm-generic/bitops/builtin-__ffs.h>
 #include <asm-generic/bitops/builtin-ffs.h>
 #include <asm-generic/bitops/builtin-__fls.h>
@@ -45,9 +55,13 @@
 #include <asm-generic/bitops/hweight.h>
 #include <asm-generic/bitops/lock.h>
 
-#include <asm-generic/bitops/atomic.h>
 #include <asm-generic/bitops/non-atomic.h>
 #include <asm-generic/bitops/le.h>
-#include <asm-generic/bitops/ext2-atomic.h>
+
+/*
+ * Ext2 is defined to use little-endian byte ordering.
+ */
+#define ext2_set_bit_atomic(lock, nr, p)        test_and_set_bit_le(nr, p)
+#define ext2_clear_bit_atomic(lock, nr, p)      test_and_clear_bit_le(nr, p)
 
 #endif /* __ASM_BITOPS_H */
diff --git a/arch/arm64/include/asm/cmpxchg.h b/arch/arm64/include/asm/cmpxchg.h
index 968b5cbfc260..8a8ce0e73a38 100644
--- a/arch/arm64/include/asm/cmpxchg.h
+++ b/arch/arm64/include/asm/cmpxchg.h
@@ -170,4 +170,7 @@ static inline unsigned long __cmpxchg_mb(volatile void *ptr, unsigned long old,
                                        (unsigned long)(n),              \
                                        sizeof(*(ptr))))
 
+#define cmpxchg64(ptr,o,n)              cmpxchg((ptr),(o),(n))
+#define cmpxchg64_local(ptr,o,n)        cmpxchg_local((ptr),(o),(n))
+
 #endif  /* __ASM_CMPXCHG_H */
diff --git a/arch/arm64/include/asm/compat.h b/arch/arm64/include/asm/compat.h
index 618b450e5a1d..899af807ef0f 100644
--- a/arch/arm64/include/asm/compat.h
+++ b/arch/arm64/include/asm/compat.h
@@ -35,14 +35,16 @@ typedef s32		compat_clock_t;
 typedef s32             compat_pid_t;
 typedef u32             __compat_uid_t;
 typedef u32             __compat_gid_t;
+typedef u16             __compat_uid16_t;
+typedef u16             __compat_gid16_t;
 typedef u32             __compat_uid32_t;
 typedef u32             __compat_gid32_t;
-typedef u32             compat_mode_t;
+typedef u16             compat_mode_t;
 typedef u32             compat_ino_t;
 typedef u32             compat_dev_t;
 typedef s32             compat_off_t;
 typedef s64             compat_loff_t;
-typedef s16             compat_nlink_t;
+typedef s32             compat_nlink_t;
 typedef u16             compat_ipc_pid_t;
 typedef s32             compat_daddr_t;
 typedef u32             compat_caddr_t;
@@ -50,9 +52,11 @@ typedef __kernel_fsid_t	compat_fsid_t;
 typedef s32             compat_key_t;
 typedef s32             compat_timer_t;
 
+typedef s16             compat_short_t;
 typedef s32             compat_int_t;
 typedef s32             compat_long_t;
 typedef s64             compat_s64;
+typedef u16             compat_ushort_t;
 typedef u32             compat_uint_t;
 typedef u32             compat_ulong_t;
 typedef u64             compat_u64;
@@ -72,20 +76,20 @@ struct compat_stat {
         compat_dev_t    st_dev;
         compat_ino_t    st_ino;
         compat_mode_t   st_mode;
-        compat_nlink_t  st_nlink;
-        __compat_uid32_t        st_uid;
-        __compat_gid32_t        st_gid;
+        compat_ushort_t st_nlink;
+        __compat_uid16_t        st_uid;
+        __compat_gid16_t        st_gid;
         compat_dev_t    st_rdev;
         compat_off_t    st_size;
         compat_off_t    st_blksize;
         compat_off_t    st_blocks;
         compat_time_t   st_atime;
-        u32             st_atime_nsec;
+        compat_ulong_t  st_atime_nsec;
         compat_time_t   st_mtime;
-        u32             st_mtime_nsec;
+        compat_ulong_t  st_mtime_nsec;
         compat_time_t   st_ctime;
-        u32             st_ctime_nsec;
-        u32             __unused4[2];
+        compat_ulong_t  st_ctime_nsec;
+        compat_ulong_t  __unused4[2];
 };
 
 struct compat_flock {
diff --git a/arch/arm64/include/asm/cputype.h b/arch/arm64/include/asm/cputype.h
index ef54125e6c1e..cf2749488cd4 100644
--- a/arch/arm64/include/asm/cputype.h
+++ b/arch/arm64/include/asm/cputype.h
@@ -17,6 +17,7 @@
 #define __ASM_CPUTYPE_H
 
 #define ID_MIDR_EL1             "midr_el1"
+#define ID_MPIDR_EL1            "mpidr_el1"
 #define ID_CTR_EL0              "ctr_el0"
 
 #define ID_AA64PFR0_EL1         "id_aa64pfr0_el1"
@@ -25,12 +26,24 @@
 #define ID_AA64ISAR0_EL1        "id_aa64isar0_el1"
 #define ID_AA64MMFR0_EL1        "id_aa64mmfr0_el1"
 
+#define INVALID_HWID            ULONG_MAX
+
+#define MPIDR_HWID_BITMASK      0xff00ffffff
+
 #define read_cpuid(reg) ({                                              \
         u64 __val;                                                      \
         asm("mrs        %0, " reg : "=r" (__val));                      \
         __val;                                                          \
 })
 
+#define ARM_CPU_IMP_ARM         0x41
+
+#define ARM_CPU_PART_AEM_V8     0xD0F0
+#define ARM_CPU_PART_FOUNDATION 0xD000
+#define ARM_CPU_PART_CORTEX_A57 0xD070
+
+#ifndef __ASSEMBLY__
+
 /*
  * The CPU ID never changes at run time, so we might as well tell the
  * compiler that it's constant.  Use this function to read the CPU ID
@@ -41,9 +54,26 @@ static inline u32 __attribute_const__ read_cpuid_id(void)
         return read_cpuid(ID_MIDR_EL1);
 }
 
+static inline u64 __attribute_const__ read_cpuid_mpidr(void)
+{
+        return read_cpuid(ID_MPIDR_EL1);
+}
+
+static inline unsigned int __attribute_const__ read_cpuid_implementor(void)
+{
+        return (read_cpuid_id() & 0xFF000000) >> 24;
+}
+
+static inline unsigned int __attribute_const__ read_cpuid_part_number(void)
+{
+        return (read_cpuid_id() & 0xFFF0);
+}
+
 static inline u32 __attribute_const__ read_cpuid_cachetype(void)
 {
         return read_cpuid(ID_CTR_EL0);
 }
 
+#endif /* __ASSEMBLY__ */
+
 #endif
diff --git a/arch/arm64/include/asm/esr.h b/arch/arm64/include/asm/esr.h
new file mode 100644
index 000000000000..78834123a32e
--- /dev/null
+++ b/arch/arm64/include/asm/esr.h
@@ -0,0 +1,55 @@
+/*
+ * Copyright (C) 2013 - ARM Ltd
+ * Author: Marc Zyngier <marc.zyngier@arm.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef __ASM_ESR_H
+#define __ASM_ESR_H
+
+#define ESR_EL1_EC_SHIFT        (26)
+#define ESR_EL1_IL              (1U << 25)
+
+#define ESR_EL1_EC_UNKNOWN      (0x00)
+#define ESR_EL1_EC_WFI          (0x01)
+#define ESR_EL1_EC_CP15_32      (0x03)
+#define ESR_EL1_EC_CP15_64      (0x04)
+#define ESR_EL1_EC_CP14_MR      (0x05)
+#define ESR_EL1_EC_CP14_LS      (0x06)
+#define ESR_EL1_EC_FP_ASIMD     (0x07)
+#define ESR_EL1_EC_CP10_ID      (0x08)
+#define ESR_EL1_EC_CP14_64      (0x0C)
+#define ESR_EL1_EC_ILL_ISS      (0x0E)
+#define ESR_EL1_EC_SVC32        (0x11)
+#define ESR_EL1_EC_SVC64        (0x15)
+#define ESR_EL1_EC_SYS64        (0x18)
+#define ESR_EL1_EC_IABT_EL0     (0x20)
+#define ESR_EL1_EC_IABT_EL1     (0x21)
+#define ESR_EL1_EC_PC_ALIGN     (0x22)
+#define ESR_EL1_EC_DABT_EL0     (0x24)
+#define ESR_EL1_EC_DABT_EL1     (0x25)
+#define ESR_EL1_EC_SP_ALIGN     (0x26)
+#define ESR_EL1_EC_FP_EXC32     (0x28)
+#define ESR_EL1_EC_FP_EXC64     (0x2C)
+#define ESR_EL1_EC_SERRROR      (0x2F)
+#define ESR_EL1_EC_BREAKPT_EL0  (0x30)
+#define ESR_EL1_EC_BREAKPT_EL1  (0x31)
+#define ESR_EL1_EC_SOFTSTP_EL0  (0x32)
+#define ESR_EL1_EC_SOFTSTP_EL1  (0x33)
+#define ESR_EL1_EC_WATCHPT_EL0  (0x34)
+#define ESR_EL1_EC_WATCHPT_EL1  (0x35)
+#define ESR_EL1_EC_BKPT32       (0x38)
+#define ESR_EL1_EC_BRK64        (0x3C)
+
+#endif /* __ASM_ESR_H */
diff --git a/arch/arm64/include/asm/exception.h b/arch/arm64/include/asm/exception.h
index ac63519b7b90..0303705fcad6 100644
--- a/arch/arm64/include/asm/exception.h
+++ b/arch/arm64/include/asm/exception.h
@@ -19,5 +19,6 @@
 #define __ASM_EXCEPTION_H
 
 #define __exception     __attribute__((section(".exception.text")))
+#define __exception_irq_entry   __exception
 
 #endif  /* __ASM_EXCEPTION_H */
diff --git a/arch/arm64/include/asm/hardirq.h b/arch/arm64/include/asm/hardirq.h
index 507546353d62..990c051e7829 100644
--- a/arch/arm64/include/asm/hardirq.h
+++ b/arch/arm64/include/asm/hardirq.h
@@ -49,4 +49,9 @@ static inline void ack_bad_irq(unsigned int irq)
 
 extern void handle_IRQ(unsigned int, struct pt_regs *);
 
+/*
+ * No arch-specific IRQ flags.
+ */
+#define set_irq_flags(irq, flags)
+
 #endif /* __ASM_HARDIRQ_H */
diff --git a/arch/arm64/include/asm/io.h b/arch/arm64/include/asm/io.h
index 57f12c991de2..2e12258aa7e4 100644
--- a/arch/arm64/include/asm/io.h
+++ b/arch/arm64/include/asm/io.h
@@ -92,10 +92,12 @@ static inline u64 __raw_readq(const volatile void __iomem *addr)
 #define readb_relaxed(c)        ({ u8  __v = __raw_readb(c); __v; })
 #define readw_relaxed(c)        ({ u16 __v = le16_to_cpu((__force __le16)__raw_readw(c)); __v; })
 #define readl_relaxed(c)        ({ u32 __v = le32_to_cpu((__force __le32)__raw_readl(c)); __v; })
+#define readq_relaxed(c)        ({ u64 __v = le64_to_cpu((__force __le64)__raw_readq(c)); __v; })
 
 #define writeb_relaxed(v,c)     ((void)__raw_writeb((v),(c)))
 #define writew_relaxed(v,c)     ((void)__raw_writew((__force u16)cpu_to_le16(v),(c)))
 #define writel_relaxed(v,c)     ((void)__raw_writel((__force u32)cpu_to_le32(v),(c)))
+#define writeq_relaxed(v,c)     ((void)__raw_writeq((__force u64)cpu_to_le64(v),(c)))
 
 /*
  * I/O memory access primitives. Reads are ordered relative to any
@@ -105,10 +107,12 @@ static inline u64 __raw_readq(const volatile void __iomem *addr)
 #define readb(c)                ({ u8  __v = readb_relaxed(c); __iormb(); __v; })
 #define readw(c)                ({ u16 __v = readw_relaxed(c); __iormb(); __v; })
 #define readl(c)                ({ u32 __v = readl_relaxed(c); __iormb(); __v; })
+#define readq(c)                ({ u64 __v = readq_relaxed(c); __iormb(); __v; })
 
 #define writeb(v,c)             ({ __iowmb(); writeb_relaxed((v),(c)); })
 #define writew(v,c)             ({ __iowmb(); writew_relaxed((v),(c)); })
 #define writel(v,c)             ({ __iowmb(); writel_relaxed((v),(c)); })
+#define writeq(v,c)             ({ __iowmb(); writeq_relaxed((v),(c)); })
 
 /*
  *  I/O port access primitives.
diff --git a/arch/arm64/include/asm/irq.h b/arch/arm64/include/asm/irq.h
index a4e1cad3202a..0332fc077f6e 100644
--- a/arch/arm64/include/asm/irq.h
+++ b/arch/arm64/include/asm/irq.h
@@ -4,5 +4,6 @@
 #include <asm-generic/irq.h>
 
 extern void (*handle_arch_irq)(struct pt_regs *);
+extern void set_handle_irq(void (*handle_irq)(struct pt_regs *));
 
 #endif
diff --git a/arch/arm64/lib/bitops.c b/arch/arm64/include/asm/smp_plat.h
index aa4965e60acc..ed43a0d2b1b2 100644
--- a/arch/arm64/lib/bitops.c
+++ b/arch/arm64/include/asm/smp_plat.h
@@ -1,7 +1,9 @@
 /*
- * Copyright (C) 2012 ARM Limited
+ * Definitions specific to SMP platforms.
  *
- * This program is free software; you can redistribute it and/or modify
+ * Copyright (C) 2013 ARM Ltd.
+ *
+ * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 as
  * published by the Free Software Foundation.
  *
@@ -14,12 +16,15 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <linux/kernel.h>
-#include <linux/spinlock.h>
-#include <linux/atomic.h>
+#ifndef __ASM_SMP_PLAT_H
+#define __ASM_SMP_PLAT_H
+
+#include <asm/types.h>
+
+/*
+ * Logical CPU mapping.
+ */
+extern u64 __cpu_logical_map[NR_CPUS];
+#define cpu_logical_map(cpu)    __cpu_logical_map[cpu]
 
-#ifdef CONFIG_SMP
-arch_spinlock_t __atomic_hash[ATOMIC_HASH_SIZE] __lock_aligned = {
-       [0 ... (ATOMIC_HASH_SIZE-1)]  = __ARCH_SPIN_LOCK_UNLOCKED
-};
-#endif
+#endif /* __ASM_SMP_PLAT_H */
diff --git a/arch/arm64/include/asm/string.h b/arch/arm64/include/asm/string.h
new file mode 100644
index 000000000000..3ee8b303d9a9
--- /dev/null
+++ b/arch/arm64/include/asm/string.h
@@ -0,0 +1,37 @@
+/*
+ * Copyright (C) 2013 ARM Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#ifndef __ASM_STRING_H
+#define __ASM_STRING_H
+
+#define __HAVE_ARCH_STRRCHR
+extern char *strrchr(const char *, int c);
+
+#define __HAVE_ARCH_STRCHR
+extern char *strchr(const char *, int c);
+
+#define __HAVE_ARCH_MEMCPY
+extern void *memcpy(void *, const void *, __kernel_size_t);
+
+#define __HAVE_ARCH_MEMMOVE
+extern void *memmove(void *, const void *, __kernel_size_t);
+
+#define __HAVE_ARCH_MEMCHR
+extern void *memchr(const void *, int, __kernel_size_t);
+
+#define __HAVE_ARCH_MEMSET
+extern void *memset(void *, int, __kernel_size_t);
+
+#endif
diff --git a/arch/arm64/kernel/arm64ksyms.c b/arch/arm64/kernel/arm64ksyms.c
index aa3e948f7885..7df1aad29b67 100644
--- a/arch/arm64/kernel/arm64ksyms.c
+++ b/arch/arm64/kernel/arm64ksyms.c
@@ -39,10 +39,21 @@ EXPORT_SYMBOL(__copy_from_user);
 EXPORT_SYMBOL(__copy_to_user);
 EXPORT_SYMBOL(__clear_user);
 
-        /* bitops */
-#ifdef CONFIG_SMP
-EXPORT_SYMBOL(__atomic_hash);
-#endif
-
         /* physical memory */
 EXPORT_SYMBOL(memstart_addr);
+
+        /* string / mem functions */
+EXPORT_SYMBOL(strchr);
+EXPORT_SYMBOL(strrchr);
+EXPORT_SYMBOL(memset);
+EXPORT_SYMBOL(memcpy);
+EXPORT_SYMBOL(memmove);
+EXPORT_SYMBOL(memchr);
+
+        /* atomic bitops */
+EXPORT_SYMBOL(set_bit);
+EXPORT_SYMBOL(test_and_set_bit);
+EXPORT_SYMBOL(clear_bit);
+EXPORT_SYMBOL(test_and_clear_bit);
+EXPORT_SYMBOL(change_bit);
+EXPORT_SYMBOL(test_and_change_bit);
diff --git a/arch/arm64/kernel/early_printk.c b/arch/arm64/kernel/early_printk.c
index 7e320a2edb9b..ac974f48a7a2 100644
--- a/arch/arm64/kernel/early_printk.c
+++ b/arch/arm64/kernel/early_printk.c
@@ -24,6 +24,7 @@
 #include <linux/io.h>
 
 #include <linux/amba/serial.h>
+#include <linux/serial_reg.h>
 
 static void __iomem *early_base;
 static void (*printch)(char ch);
@@ -40,6 +41,37 @@ static void pl011_printch(char ch)
                 ;
 }
 
+/*
+ * Semihosting-based debug console
+ */
+static void smh_printch(char ch)
+{
+        asm volatile("mov  x1, %0\n"
+                     "mov  x0, #3\n"
+                     "hlt  0xf000\n"
+                     : : "r" (&ch) : "x0", "x1", "memory");
+}
+
+/*
+ * 8250/16550 (8-bit aligned registers) single character TX.
+ */
+static void uart8250_8bit_printch(char ch)
+{
+        while (!(readb_relaxed(early_base + UART_LSR) & UART_LSR_THRE))
+                ;
+        writeb_relaxed(ch, early_base + UART_TX);
+}
+
+/*
+ * 8250/16550 (32-bit aligned registers) single character TX.
+ */
+static void uart8250_32bit_printch(char ch)
+{
+        while (!(readl_relaxed(early_base + (UART_LSR << 2)) & UART_LSR_THRE))
+                ;
+        writel_relaxed(ch, early_base + (UART_TX << 2));
+}
+
 struct earlycon_match {
         const char *name;
         void (*printch)(char ch);
@@ -47,6 +79,9 @@ struct earlycon_match {
 
 static const struct earlycon_match earlycon_match[] __initconst = {
         { .name = "pl011", .printch = pl011_printch, },
+        { .name = "smh", .printch = smh_printch, },
+        { .name = "uart8250-8bit", .printch = uart8250_8bit_printch, },
+        { .name = "uart8250-32bit", .printch = uart8250_32bit_printch, },
         {}
 };
 
diff --git a/arch/arm64/kernel/entry.S b/arch/arm64/kernel/entry.S
index 514d6098dbee..c7e047049f2c 100644
--- a/arch/arm64/kernel/entry.S
+++ b/arch/arm64/kernel/entry.S
@@ -24,6 +24,7 @@
 #include <asm/assembler.h>
 #include <asm/asm-offsets.h>
 #include <asm/errno.h>
+#include <asm/esr.h>
 #include <asm/thread_info.h>
 #include <asm/unistd.h>
 #include <asm/unistd32.h>
@@ -239,18 +240,18 @@ ENDPROC(el1_error_invalid)
 el1_sync:
         kernel_entry 1
         mrs     x1, esr_el1                     // read the syndrome register
-        lsr     x24, x1, #26                    // exception class
-        cmp     x24, #0x25                      // data abort in EL1
+        lsr     x24, x1, #ESR_EL1_EC_SHIFT      // exception class
+        cmp     x24, #ESR_EL1_EC_DABT_EL1       // data abort in EL1
         b.eq    el1_da
-        cmp     x24, #0x18                      // configurable trap
+        cmp     x24, #ESR_EL1_EC_SYS64          // configurable trap
         b.eq    el1_undef
-        cmp     x24, #0x26                      // stack alignment exception
+        cmp     x24, #ESR_EL1_EC_SP_ALIGN       // stack alignment exception
         b.eq    el1_sp_pc
-        cmp     x24, #0x22                      // pc alignment exception
+        cmp     x24, #ESR_EL1_EC_PC_ALIGN       // pc alignment exception
         b.eq    el1_sp_pc
-        cmp     x24, #0x00                      // unknown exception in EL1
+        cmp     x24, #ESR_EL1_EC_UNKNOWN        // unknown exception in EL1
         b.eq    el1_undef
-        cmp     x24, #0x30                      // debug exception in EL1
+        cmp     x24, #ESR_EL1_EC_BREAKPT_EL1    // debug exception in EL1
         b.ge    el1_dbg
         b       el1_inv
 el1_da:
@@ -346,27 +347,27 @@ el1_preempt:
 el0_sync:
         kernel_entry 0
         mrs     x25, esr_el1                    // read the syndrome register
-        lsr     x24, x25, #26                   // exception class
-        cmp     x24, #0x15                      // SVC in 64-bit state
+        lsr     x24, x25, #ESR_EL1_EC_SHIFT     // exception class
+        cmp     x24, #ESR_EL1_EC_SVC64          // SVC in 64-bit state
         b.eq    el0_svc
         adr     lr, ret_from_exception
-        cmp     x24, #0x24                      // data abort in EL0
+        cmp     x24, #ESR_EL1_EC_DABT_EL0       // data abort in EL0
         b.eq    el0_da
-        cmp     x24, #0x20                      // instruction abort in EL0
+        cmp     x24, #ESR_EL1_EC_IABT_EL0       // instruction abort in EL0
         b.eq    el0_ia
-        cmp     x24, #0x07                      // FP/ASIMD access
+        cmp     x24, #ESR_EL1_EC_FP_ASIMD       // FP/ASIMD access
         b.eq    el0_fpsimd_acc
-        cmp     x24, #0x2c                      // FP/ASIMD exception
+        cmp     x24, #ESR_EL1_EC_FP_EXC64       // FP/ASIMD exception
         b.eq    el0_fpsimd_exc
-        cmp     x24, #0x18                      // configurable trap
+        cmp     x24, #ESR_EL1_EC_SYS64          // configurable trap
         b.eq    el0_undef
-        cmp     x24, #0x26                      // stack alignment exception
+        cmp     x24, #ESR_EL1_EC_SP_ALIGN       // stack alignment exception
         b.eq    el0_sp_pc
-        cmp     x24, #0x22                      // pc alignment exception
+        cmp     x24, #ESR_EL1_EC_PC_ALIGN       // pc alignment exception
         b.eq    el0_sp_pc
-        cmp     x24, #0x00                      // unknown exception in EL0
+        cmp     x24, #ESR_EL1_EC_UNKNOWN        // unknown exception in EL0
         b.eq    el0_undef
-        cmp     x24, #0x30                      // debug exception in EL0
+        cmp     x24, #ESR_EL1_EC_BREAKPT_EL0    // debug exception in EL0
         b.ge    el0_dbg
         b       el0_inv
 
@@ -375,21 +376,21 @@ el0_sync:
 el0_sync_compat:
         kernel_entry 0, 32
         mrs     x25, esr_el1                    // read the syndrome register
-        lsr     x24, x25, #26                   // exception class
-        cmp     x24, #0x11                      // SVC in 32-bit state
+        lsr     x24, x25, #ESR_EL1_EC_SHIFT     // exception class
+        cmp     x24, #ESR_EL1_EC_SVC32          // SVC in 32-bit state
         b.eq    el0_svc_compat
         adr     lr, ret_from_exception
-        cmp     x24, #0x24                      // data abort in EL0
+        cmp     x24, #ESR_EL1_EC_DABT_EL0       // data abort in EL0
         b.eq    el0_da
-        cmp     x24, #0x20                      // instruction abort in EL0
+        cmp     x24, #ESR_EL1_EC_IABT_EL0       // instruction abort in EL0
         b.eq    el0_ia
-        cmp     x24, #0x07                      // FP/ASIMD access
+        cmp     x24, #ESR_EL1_EC_FP_ASIMD       // FP/ASIMD access
         b.eq    el0_fpsimd_acc
-        cmp     x24, #0x28                      // FP/ASIMD exception
+        cmp     x24, #ESR_EL1_EC_FP_EXC32       // FP/ASIMD exception
         b.eq    el0_fpsimd_exc
-        cmp     x24, #0x00                      // unknown exception in EL0
+        cmp     x24, #ESR_EL1_EC_UNKNOWN        // unknown exception in EL0
         b.eq    el0_undef
-        cmp     x24, #0x30                      // debug exception in EL0
+        cmp     x24, #ESR_EL1_EC_BREAKPT_EL0    // debug exception in EL0
         b.ge    el0_dbg
         b       el0_inv
 el0_svc_compat:
diff --git a/arch/arm64/kernel/head.S b/arch/arm64/kernel/head.S
index 0a0a49756826..53dcae49e729 100644
--- a/arch/arm64/kernel/head.S
+++ b/arch/arm64/kernel/head.S
@@ -26,6 +26,7 @@
 #include <asm/assembler.h>
 #include <asm/ptrace.h>
 #include <asm/asm-offsets.h>
+#include <asm/cputype.h>
 #include <asm/memory.h>
 #include <asm/thread_info.h>
 #include <asm/pgtable-hwdef.h>
@@ -229,7 +230,8 @@ ENTRY(secondary_holding_pen)
         bl      __calc_phys_offset              // x24=phys offset
         bl      el2_setup                       // Drop to EL1
         mrs     x0, mpidr_el1
-        and     x0, x0, #15                     // CPU number
+        ldr     x1, =MPIDR_HWID_BITMASK
+        and     x0, x0, x1
         adr     x1, 1b
         ldp     x2, x3, [x1]
         sub     x1, x1, x2
diff --git a/arch/arm64/kernel/irq.c b/arch/arm64/kernel/irq.c
index 0373c6609eaf..ecb3354292ed 100644
--- a/arch/arm64/kernel/irq.c
+++ b/arch/arm64/kernel/irq.c
@@ -25,7 +25,7 @@
 #include <linux/irq.h>
 #include <linux/smp.h>
 #include <linux/init.h>
-#include <linux/of_irq.h>
+#include <linux/irqchip.h>
 #include <linux/seq_file.h>
 #include <linux/ratelimit.h>
 
@@ -67,18 +67,17 @@ void handle_IRQ(unsigned int irq, struct pt_regs *regs)
         set_irq_regs(old_regs);
 }
 
-/*
- * Interrupt controllers supported by the kernel.
- */
-static const struct of_device_id intctrl_of_match[] __initconst = {
-        /* IRQ controllers { .compatible, .data } info to go here */
-        {}
-};
+void __init set_handle_irq(void (*handle_irq)(struct pt_regs *))
+{
+        if (handle_arch_irq)
+                return;
+
+        handle_arch_irq = handle_irq;
+}
 
 void __init init_IRQ(void)
 {
-        of_irq_init(intctrl_of_match);
-
+        irqchip_init();
         if (!handle_arch_irq)
                 panic("No interrupt controller found.");
 }
diff --git a/arch/arm64/kernel/process.c b/arch/arm64/kernel/process.c
index 0337cdb0667b..f4919721f7dd 100644
--- a/arch/arm64/kernel/process.c
+++ b/arch/arm64/kernel/process.c
@@ -84,11 +84,15 @@ EXPORT_SYMBOL_GPL(pm_power_off);
 void (*pm_restart)(const char *cmd);
 EXPORT_SYMBOL_GPL(pm_restart);
 
+void arch_cpu_idle_prepare(void)
+{
+        local_fiq_enable();
+}
 
 /*
  * This is our default idle handler.
  */
-static void default_idle(void)
+void arch_cpu_idle(void)
 {
         /*
          * This should do all the clock switching and wait for interrupt
@@ -98,43 +102,6 @@ static void default_idle(void)
         local_irq_enable();
 }
 
-/*
- * The idle thread.
- * We always respect 'hlt_counter' to prevent low power idle.
- */
-void cpu_idle(void)
-{
-        local_fiq_enable();
-
-        /* endless idle loop with no priority at all */
-        while (1) {
-                tick_nohz_idle_enter();
-                rcu_idle_enter();
-                while (!need_resched()) {
-                        /*
-                         * We need to disable interrupts here to ensure
-                         * we don't miss a wakeup call.
-                         */
-                        local_irq_disable();
-                        if (!need_resched()) {
-                                stop_critical_timings();
-                                default_idle();
-                                start_critical_timings();
-                                /*
-                                 * default_idle functions should always return
-                                 * with IRQs enabled.
-                                 */
-                                WARN_ON(irqs_disabled());
-                        } else {
-                                local_irq_enable();
-                        }
-                }
-                rcu_idle_exit();
-                tick_nohz_idle_exit();
-                schedule_preempt_disabled();
-        }
-}
-
 void machine_shutdown(void)
 {
 #ifdef CONFIG_SMP
@@ -178,11 +145,7 @@ void __show_regs(struct pt_regs *regs)
 {
         int i;
 
-        printk("CPU: %d    %s  (%s %.*s)\n",
-                raw_smp_processor_id(), print_tainted(),
-                init_utsname()->release,
-                (int)strcspn(init_utsname()->version, " "),
-                init_utsname()->version);
+        show_regs_print_info(KERN_DEFAULT);
         print_symbol("PC is at %s\n", instruction_pointer(regs));
         print_symbol("LR is at %s\n", regs->regs[30]);
         printk("pc : [<%016llx>] lr : [<%016llx>] pstate: %08llx\n",
@@ -199,7 +162,6 @@ void __show_regs(struct pt_regs *regs)
 void show_regs(struct pt_regs * regs)
 {
         printk("\n");
-        printk("Pid: %d, comm: %20s\n", task_pid_nr(current), current->comm);
         __show_regs(regs);
 }
 
@@ -311,11 +273,17 @@ struct task_struct *__switch_to(struct task_struct *prev,
         fpsimd_thread_switch(next);
         tls_thread_switch(next);
         hw_breakpoint_thread_switch(next);
+        contextidr_thread_switch(next);
+
+        /*
+         * Complete any pending TLB or cache maintenance on this CPU in case
+         * the thread migrates to a different CPU.
+         */
+        dsb();
 
         /* the actual thread switch */
         last = cpu_switch_to(prev, next);
 
-        contextidr_thread_switch(next);
         return last;
 }
 
diff --git a/arch/arm64/kernel/setup.c b/arch/arm64/kernel/setup.c
index 113db863f832..6a9a53292590 100644
--- a/arch/arm64/kernel/setup.c
+++ b/arch/arm64/kernel/setup.c
@@ -32,6 +32,7 @@
 #include <linux/kexec.h>
 #include <linux/crash_dump.h>
 #include <linux/root_dev.h>
+#include <linux/clk-provider.h>
 #include <linux/cpu.h>
 #include <linux/interrupt.h>
 #include <linux/smp.h>
@@ -46,6 +47,7 @@
 #include <asm/cputable.h>
 #include <asm/sections.h>
 #include <asm/setup.h>
+#include <asm/smp_plat.h>
 #include <asm/cacheflush.h>
 #include <asm/tlbflush.h>
 #include <asm/traps.h>
@@ -240,6 +242,8 @@ static void __init request_standard_resources(void)
         }
 }
 
+u64 __cpu_logical_map[NR_CPUS] = { [0 ... NR_CPUS-1] = INVALID_HWID };
+
 void __init setup_arch(char **cmdline_p)
 {
         setup_processor();
@@ -264,6 +268,7 @@ void __init setup_arch(char **cmdline_p)
 
         psci_init();
 
+        cpu_logical_map(0) = read_cpuid_mpidr() & MPIDR_HWID_BITMASK;
 #ifdef CONFIG_SMP
         smp_init_cpus();
 #endif
@@ -277,6 +282,13 @@ void __init setup_arch(char **cmdline_p)
 #endif
 }
 
+static int __init arm64_of_clk_init(void)
+{
+        of_clk_init(NULL);
+        return 0;
+}
+arch_initcall(arm64_of_clk_init);
+
 static DEFINE_PER_CPU(struct cpu, cpu_data);
 
 static int __init topology_init(void)
diff --git a/arch/arm64/kernel/smp.c b/arch/arm64/kernel/smp.c
index bdd34597254b..5d54e3717bf8 100644
--- a/arch/arm64/kernel/smp.c
+++ b/arch/arm64/kernel/smp.c
@@ -43,6 +43,7 @@
 #include <asm/pgtable.h>
 #include <asm/pgalloc.h>
 #include <asm/processor.h>
+#include <asm/smp_plat.h>
 #include <asm/sections.h>
 #include <asm/tlbflush.h>
 #include <asm/ptrace.h>
@@ -53,7 +54,7 @@
  * where to place its SVC stack
  */
 struct secondary_data secondary_data;
-volatile unsigned long secondary_holding_pen_release = -1;
+volatile unsigned long secondary_holding_pen_release = INVALID_HWID;
 
 enum ipi_msg_type {
         IPI_RESCHEDULE,
@@ -70,7 +71,7 @@ static DEFINE_RAW_SPINLOCK(boot_lock);
  * in coherency or not.  This is necessary for the hotplug code to work
  * reliably.
  */
-static void __cpuinit write_pen_release(int val)
+static void __cpuinit write_pen_release(u64 val)
 {
         void *start = (void *)&secondary_holding_pen_release;
         unsigned long size = sizeof(secondary_holding_pen_release);
@@ -96,7 +97,7 @@ static int __cpuinit boot_secondary(unsigned int cpu, struct task_struct *idle)
         /*
          * Update the pen release flag.
          */
-        write_pen_release(cpu);
+        write_pen_release(cpu_logical_map(cpu));
 
         /*
          * Send an event, causing the secondaries to read pen_release.
@@ -105,7 +106,7 @@ static int __cpuinit boot_secondary(unsigned int cpu, struct task_struct *idle)
 
         timeout = jiffies + (1 * HZ);
         while (time_before(jiffies, timeout)) {
-                if (secondary_holding_pen_release == -1UL)
+                if (secondary_holding_pen_release == INVALID_HWID)
                         break;
                 udelay(10);
         }
@@ -116,7 +117,7 @@ static int __cpuinit boot_secondary(unsigned int cpu, struct task_struct *idle)
          */
         raw_spin_unlock(&boot_lock);
 
-        return secondary_holding_pen_release != -1 ? -ENOSYS : 0;
+        return secondary_holding_pen_release != INVALID_HWID ? -ENOSYS : 0;
 }
 
 static DECLARE_COMPLETION(cpu_running);
@@ -190,7 +191,7 @@ asmlinkage void __cpuinit secondary_start_kernel(void)
          * Let the primary processor know we're out of the
          * pen, then head off into the C entry point
          */
-        write_pen_release(-1);
+        write_pen_release(INVALID_HWID);
 
         /*
          * Synchronise with the boot thread.
@@ -216,7 +217,7 @@ asmlinkage void __cpuinit secondary_start_kernel(void)
         /*
          * OK, it's off to the idle thread for us
          */
-        cpu_idle();
+        cpu_startup_entry(CPUHP_ONLINE);
 }
 
 void __init smp_cpus_done(unsigned int max_cpus)
@@ -244,11 +245,11 @@ static const struct smp_enable_ops *smp_enable_ops[NR_CPUS];
 
 static const struct smp_enable_ops * __init smp_get_enable_ops(const char *name)
 {
-        const struct smp_enable_ops *ops = enable_ops[0];
+        const struct smp_enable_ops **ops = enable_ops;
 
-        while (ops) {
-                if (!strcmp(name, ops->name))
-                        return ops;
+        while (*ops) {
+                if (!strcmp(name, (*ops)->name))
+                        return *ops;
 
                 ops++;
         }
@@ -257,15 +258,80 @@ static const struct smp_enable_ops * __init smp_get_enable_ops(const char *name)
 }
 
 /*
- * Enumerate the possible CPU set from the device tree.
+ * Enumerate the possible CPU set from the device tree and build the
+ * cpu logical map array containing MPIDR values related to logical
+ * cpus. Assumes that cpu_logical_map(0) has already been initialized.
  */
 void __init smp_init_cpus(void)
 {
         const char *enable_method;
         struct device_node *dn = NULL;
-        int cpu = 0;
+        int i, cpu = 1;
+        bool bootcpu_valid = false;
 
         while ((dn = of_find_node_by_type(dn, "cpu"))) {
+                const u32 *cell;
+                u64 hwid;
+
+                /*
+                 * A cpu node with missing "reg" property is
+                 * considered invalid to build a cpu_logical_map
+                 * entry.
+                 */
+                cell = of_get_property(dn, "reg", NULL);
+                if (!cell) {
+                        pr_err("%s: missing reg property\n", dn->full_name);
+                        goto next;
+                }
+                hwid = of_read_number(cell, of_n_addr_cells(dn));
+
+                /*
+                 * Non affinity bits must be set to 0 in the DT
+                 */
+                if (hwid & ~MPIDR_HWID_BITMASK) {
+                        pr_err("%s: invalid reg property\n", dn->full_name);
+                        goto next;
+                }
+
+                /*
+                 * Duplicate MPIDRs are a recipe for disaster. Scan
+                 * all initialized entries and check for
+                 * duplicates. If any is found just ignore the cpu.
+                 * cpu_logical_map was initialized to INVALID_HWID to
+                 * avoid matching valid MPIDR values.
+                 */
+                for (i = 1; (i < cpu) && (i < NR_CPUS); i++) {
+                        if (cpu_logical_map(i) == hwid) {
+                                pr_err("%s: duplicate cpu reg properties in the DT\n",
+                                        dn->full_name);
+                                goto next;
+                        }
+                }
+
+                /*
+                 * The numbering scheme requires that the boot CPU
+                 * must be assigned logical id 0. Record it so that
+                 * the logical map built from DT is validated and can
+                 * be used.
+                 */
+                if (hwid == cpu_logical_map(0)) {
+                        if (bootcpu_valid) {
+                                pr_err("%s: duplicate boot cpu reg property in DT\n",
+                                        dn->full_name);
+                                goto next;
+                        }
+
+                        bootcpu_valid = true;
+
+                        /*
+                         * cpu_logical_map has already been
+                         * initialized and the boot cpu doesn't need
+                         * the enable-method so continue without
+                         * incrementing cpu.
+                         */
+                        continue;
+                }
+
                 if (cpu >= NR_CPUS)
                         goto next;
 
@@ -274,22 +340,24 @@ void __init smp_init_cpus(void)
                  */
                 enable_method = of_get_property(dn, "enable-method", NULL);
                 if (!enable_method) {
-                        pr_err("CPU %d: missing enable-method property\n", cpu);
+                        pr_err("%s: missing enable-method property\n",
+                                dn->full_name);
                         goto next;
                 }
 
                 smp_enable_ops[cpu] = smp_get_enable_ops(enable_method);
 
                 if (!smp_enable_ops[cpu]) {
-                        pr_err("CPU %d: invalid enable-method property: %s\n",
-                               cpu, enable_method);
+                        pr_err("%s: invalid enable-method property: %s\n",
+                               dn->full_name, enable_method);
                         goto next;
                 }
 
                 if (smp_enable_ops[cpu]->init_cpu(dn, cpu))
                         goto next;
 
-                set_cpu_possible(cpu, true);
+                pr_debug("cpu logical map 0x%llx\n", hwid);
+                cpu_logical_map(cpu) = hwid;
 next:
                 cpu++;
         }
@@ -298,6 +366,19 @@ next:
         if (cpu > NR_CPUS)
                 pr_warning("no. of cores (%d) greater than configured maximum of %d - clipping\n",
                            cpu, NR_CPUS);
+
+        if (!bootcpu_valid) {
+                pr_err("DT missing boot CPU MPIDR, not enabling secondaries\n");
+                return;
+        }
+
+        /*
+         * All the cpus that made it to the cpu_logical_map have been
+         * validated so set them as possible cpus.
+         */
+        for (i = 0; i < NR_CPUS; i++)
+                if (cpu_logical_map(i) != INVALID_HWID)
+                        set_cpu_possible(i, true);
 }
 
 void __init smp_prepare_cpus(unsigned int max_cpus)
diff --git a/arch/arm64/kernel/smp_psci.c b/arch/arm64/kernel/smp_psci.c
index 112091684c22..0c533301be77 100644
--- a/arch/arm64/kernel/smp_psci.c
+++ b/arch/arm64/kernel/smp_psci.c
@@ -21,6 +21,7 @@
 #include <linux/smp.h>
 
 #include <asm/psci.h>
+#include <asm/smp_plat.h>
 
 static int __init smp_psci_init_cpu(struct device_node *dn, int cpu)
 {
@@ -36,7 +37,7 @@ static int __init smp_psci_prepare_cpu(int cpu)
                 return -ENODEV;
         }
 
-        err = psci_ops.cpu_on(cpu, __pa(secondary_holding_pen));
+        err = psci_ops.cpu_on(cpu_logical_map(cpu), __pa(secondary_holding_pen));
         if (err) {
                 pr_err("psci: failed to boot CPU%d (%d)\n", cpu, err);
                 return err;
@@ -47,6 +48,6 @@ static int __init smp_psci_prepare_cpu(int cpu)
 
 const struct smp_enable_ops smp_psci_ops __initconst = {
         .name           = "psci",
-        .init_cpu       = smp_psci_init_cpu,
+        .init_cpu       = smp_psci_init_cpu,
         .prepare_cpu    = smp_psci_prepare_cpu,
 };
diff --git a/arch/arm64/kernel/sys32.S b/arch/arm64/kernel/sys32.S
index 9416d045a687..db01aa978c41 100644
--- a/arch/arm64/kernel/sys32.S
+++ b/arch/arm64/kernel/sys32.S
@@ -84,13 +84,6 @@ compat_sys_readahead_wrapper:
         b       sys_readahead
 ENDPROC(compat_sys_readahead_wrapper)
 
-compat_sys_lookup_dcookie:
-        orr     x0, x0, x1, lsl #32
-        mov     w1, w2
-        mov     w2, w3
-        b       sys_lookup_dcookie
-ENDPROC(compat_sys_lookup_dcookie)
-
 compat_sys_fadvise64_64_wrapper:
         mov     w6, w1
         orr     x1, x2, x3, lsl #32
diff --git a/arch/arm64/kernel/traps.c b/arch/arm64/kernel/traps.c
index b3c5f628bdb4..61d7dd29f756 100644
--- a/arch/arm64/kernel/traps.c
+++ b/arch/arm64/kernel/traps.c
@@ -167,13 +167,6 @@ static void dump_backtrace(struct pt_regs *regs, struct task_struct *tsk)
         }
 }
 
-void dump_stack(void)
-{
-        dump_backtrace(NULL, NULL);
-}
-
-EXPORT_SYMBOL(dump_stack);
-
 void show_stack(struct task_struct *tsk, unsigned long *sp)
 {
         dump_backtrace(NULL, tsk);
diff --git a/arch/arm64/lib/Makefile b/arch/arm64/lib/Makefile
index 2fb7f6092aae..59acc0ef0462 100644
--- a/arch/arm64/lib/Makefile
+++ b/arch/arm64/lib/Makefile
@@ -1,4 +1,6 @@
 lib-y           := bitops.o delay.o                                     \
                    strncpy_from_user.o strnlen_user.o clear_user.o      \
                    copy_from_user.o copy_to_user.o copy_in_user.o       \
-                   copy_page.o clear_page.o
+                   copy_page.o clear_page.o                             \
+                   memchr.o memcpy.o memmove.o memset.o                 \
+                   strchr.o strrchr.o
diff --git a/arch/arm64/lib/bitops.S b/arch/arm64/lib/bitops.S
new file mode 100644
index 000000000000..36216d30cb9a
--- /dev/null
+++ b/arch/arm64/lib/bitops.S
@@ -0,0 +1,68 @@
+/*
+ * Based on arch/arm/lib/bitops.h
+ *
+ * Copyright (C) 2013 ARM Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include <linux/linkage.h>
+#include <asm/assembler.h>
+
+/*
+ * x0: bits 5:0  bit offset
+ *     bits 63:6 word offset
+ * x1: address
+ */
+        .macro  bitop, name, instr
+ENTRY(  \name   )
+        and     x3, x0, #63             // Get bit offset
+        eor     x0, x0, x3              // Clear low bits
+        mov     x2, #1
+        add     x1, x1, x0, lsr #3      // Get word offset
+        lsl     x3, x2, x3              // Create mask
+1:      ldxr    x2, [x1]
+        \instr  x2, x2, x3
+        stxr    w0, x2, [x1]
+        cbnz    w0, 1b
+        ret
+ENDPROC(\name   )
+        .endm
+
+        .macro  testop, name, instr
+ENTRY(  \name   )
+        and     x3, x0, #63             // Get bit offset
+        eor     x0, x0, x3              // Clear low bits
+        mov     x2, #1
+        add     x1, x1, x0, lsr #3      // Get word offset
+        lsl     x4, x2, x3              // Create mask
+1:      ldaxr   x2, [x1]
+        lsr     x0, x2, x3              // Save old value of bit
+        \instr  x2, x2, x4              // toggle bit
+        stlxr   w5, x2, [x1]
+        cbnz    w5, 1b
+        and     x0, x0, #1
+3:      ret
+ENDPROC(\name   )
+        .endm
+
+/*
+ * Atomic bit operations.
+ */
+        bitop   change_bit, eor
+        bitop   clear_bit, bic
+        bitop   set_bit, orr
+
+        testop  test_and_change_bit, eor
+        testop  test_and_clear_bit, bic
+        testop  test_and_set_bit, orr
diff --git a/arch/arm64/lib/memchr.S b/arch/arm64/lib/memchr.S
new file mode 100644
index 000000000000..8636b7549163
--- /dev/null
+++ b/arch/arm64/lib/memchr.S
@@ -0,0 +1,44 @@
+/*
+ * Based on arch/arm/lib/memchr.S
+ *
+ * Copyright (C) 1995-2000 Russell King
+ * Copyright (C) 2013 ARM Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include <linux/linkage.h>
+#include <asm/assembler.h>
+
+/*
+ * Find a character in an area of memory.
+ *
+ * Parameters:
+ *      x0 - buf
+ *      x1 - c
+ *      x2 - n
+ * Returns:
+ *      x0 - address of first occurrence of 'c' or 0
+ */
+ENTRY(memchr)
+        and     w1, w1, #0xff
+1:      subs    x2, x2, #1
+        b.mi    2f
+        ldrb    w3, [x0], #1
+        cmp     w3, w1
+        b.ne    1b
+        sub     x0, x0, #1
+        ret
+2:      mov     x0, #0
+        ret
+ENDPROC(memchr)
diff --git a/arch/arm64/lib/memcpy.S b/arch/arm64/lib/memcpy.S
new file mode 100644
index 000000000000..27b5003609b6
--- /dev/null
+++ b/arch/arm64/lib/memcpy.S
@@ -0,0 +1,53 @@
+/*
+ * Copyright (C) 2013 ARM Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include <linux/linkage.h>
+#include <asm/assembler.h>
+
+/*
+ * Copy a buffer from src to dest (alignment handled by the hardware)
+ *
+ * Parameters:
+ *      x0 - dest
+ *      x1 - src
+ *      x2 - n
+ * Returns:
+ *      x0 - dest
+ */
+ENTRY(memcpy)
+        mov     x4, x0
+        subs    x2, x2, #8
+        b.mi    2f
+1:      ldr     x3, [x1], #8
+        subs    x2, x2, #8
+        str     x3, [x4], #8
+        b.pl    1b
+2:      adds    x2, x2, #4
+        b.mi    3f
+        ldr     w3, [x1], #4
+        sub     x2, x2, #4
+        str     w3, [x4], #4
+3:      adds    x2, x2, #2
+        b.mi    4f
+        ldrh    w3, [x1], #2
+        sub     x2, x2, #2
+        strh    w3, [x4], #2
+4:      adds    x2, x2, #1
+        b.mi    5f
+        ldrb    w3, [x1]
+        strb    w3, [x4]
+5:      ret
+ENDPROC(memcpy)
diff --git a/arch/arm64/lib/memmove.S b/arch/arm64/lib/memmove.S
new file mode 100644
index 000000000000..b79fdfa42d39
--- /dev/null
+++ b/arch/arm64/lib/memmove.S
@@ -0,0 +1,57 @@
+/*
+ * Copyright (C) 2013 ARM Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include <linux/linkage.h>
+#include <asm/assembler.h>
+
+/*
+ * Move a buffer from src to test (alignment handled by the hardware).
+ * If dest <= src, call memcpy, otherwise copy in reverse order.
+ *
+ * Parameters:
+ *      x0 - dest
+ *      x1 - src
+ *      x2 - n
+ * Returns:
+ *      x0 - dest
+ */
+ENTRY(memmove)
+        cmp     x0, x1
+        b.ls    memcpy
+        add     x4, x0, x2
+        add     x1, x1, x2
+        subs    x2, x2, #8
+        b.mi    2f
+1:      ldr     x3, [x1, #-8]!
+        subs    x2, x2, #8
+        str     x3, [x4, #-8]!
+        b.pl    1b
+2:      adds    x2, x2, #4
+        b.mi    3f
+        ldr     w3, [x1, #-4]!
+        sub     x2, x2, #4
+        str     w3, [x4, #-4]!
+3:      adds    x2, x2, #2
+        b.mi    4f
+        ldrh    w3, [x1, #-2]!
+        sub     x2, x2, #2
+        strh    w3, [x4, #-2]!
+4:      adds    x2, x2, #1
+        b.mi    5f
+        ldrb    w3, [x1, #-1]
+        strb    w3, [x4, #-1]
+5:      ret
+ENDPROC(memmove)
diff --git a/arch/arm64/lib/memset.S b/arch/arm64/lib/memset.S
new file mode 100644
index 000000000000..87e4a68fbbbc
--- /dev/null
+++ b/arch/arm64/lib/memset.S
@@ -0,0 +1,53 @@
+/*
+ * Copyright (C) 2013 ARM Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include <linux/linkage.h>
+#include <asm/assembler.h>
+
+/*
+ * Fill in the buffer with character c (alignment handled by the hardware)
+ *
+ * Parameters:
+ *      x0 - buf
+ *      x1 - c
+ *      x2 - n
+ * Returns:
+ *      x0 - buf
+ */
+ENTRY(memset)
+        mov     x4, x0
+        and     w1, w1, #0xff
+        orr     w1, w1, w1, lsl #8
+        orr     w1, w1, w1, lsl #16
+        orr     x1, x1, x1, lsl #32
+        subs    x2, x2, #8
+        b.mi    2f
+1:      str     x1, [x4], #8
+        subs    x2, x2, #8
+        b.pl    1b
+2:      adds    x2, x2, #4
+        b.mi    3f
+        sub     x2, x2, #4
+        str     w1, [x4], #4
+3:      adds    x2, x2, #2
+        b.mi    4f
+        sub     x2, x2, #2
+        strh    w1, [x4], #2
+4:      adds    x2, x2, #1
+        b.mi    5f
+        strb    w1, [x4]
+5:      ret
+ENDPROC(memset)
diff --git a/arch/arm64/lib/strchr.S b/arch/arm64/lib/strchr.S
new file mode 100644
index 000000000000..dae0cf5591f9
--- /dev/null
+++ b/arch/arm64/lib/strchr.S
@@ -0,0 +1,42 @@
+/*
+ * Based on arch/arm/lib/strchr.S
+ *
+ * Copyright (C) 1995-2000 Russell King
+ * Copyright (C) 2013 ARM Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include <linux/linkage.h>
+#include <asm/assembler.h>
+
+/*
+ * Find the first occurrence of a character in a string.
+ *
+ * Parameters:
+ *      x0 - str
+ *      x1 - c
+ * Returns:
+ *      x0 - address of first occurrence of 'c' or 0
+ */
+ENTRY(strchr)
+        and     w1, w1, #0xff
+1:      ldrb    w2, [x0], #1
+        cmp     w2, w1
+        ccmp    w2, wzr, #4, ne
+        b.ne    1b
+        sub     x0, x0, #1
+        cmp     w2, w1
+        csel    x0, x0, xzr, eq
+        ret
+ENDPROC(strchr)
diff --git a/arch/arm64/lib/strrchr.S b/arch/arm64/lib/strrchr.S
new file mode 100644
index 000000000000..61eabd9a289a
--- /dev/null
+++ b/arch/arm64/lib/strrchr.S
@@ -0,0 +1,43 @@
+/*
+ * Based on arch/arm/lib/strrchr.S
+ *
+ * Copyright (C) 1995-2000 Russell King
+ * Copyright (C) 2013 ARM Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include <linux/linkage.h>
+#include <asm/assembler.h>
+
+/*
+ * Find the last occurrence of a character in a string.
+ *
+ * Parameters:
+ *      x0 - str
+ *      x1 - c
+ * Returns:
+ *      x0 - address of last occurrence of 'c' or 0
+ */
+ENTRY(strrchr)
+        mov     x3, #0
+        and     w1, w1, #0xff
+1:      ldrb    w2, [x0], #1
+        cbz     w2, 2f
+        cmp     w2, w1
+        b.ne    1b
+        sub     x3, x0, #1
+        b       1b
+2:      mov     x0, x3
+        ret
+ENDPROC(strrchr)
diff --git a/arch/arm64/mm/fault.c b/arch/arm64/mm/fault.c
index afadae6682ed..52638171d6fd 100644
--- a/arch/arm64/mm/fault.c
+++ b/arch/arm64/mm/fault.c
@@ -57,16 +57,16 @@ void show_pte(struct mm_struct *mm, unsigned long addr)
                 pmd_t *pmd;
                 pte_t *pte;
 
-                if (pgd_none_or_clear_bad(pgd))
+                if (pgd_none(*pgd) || pgd_bad(*pgd))
                         break;
 
                 pud = pud_offset(pgd, addr);
-                if (pud_none_or_clear_bad(pud))
+                if (pud_none(*pud) || pud_bad(*pud))
                         break;
 
                 pmd = pmd_offset(pud, addr);
                 printk(", *pmd=%016llx", pmd_val(*pmd));
-                if (pmd_none_or_clear_bad(pmd))
+                if (pmd_none(*pmd) || pmd_bad(*pmd))
                         break;
 
                 pte = pte_offset_map(pmd, addr);
diff --git a/arch/arm64/mm/init.c b/arch/arm64/mm/init.c
index 800aac306a08..f497ca77925a 100644
--- a/arch/arm64/mm/init.c
+++ b/arch/arm64/mm/init.c
@@ -197,24 +197,6 @@ void __init bootmem_init(void)
         max_pfn = max_low_pfn = max;
 }
 
-static inline int free_area(unsigned long pfn, unsigned long end, char *s)
-{
-        unsigned int pages = 0, size = (end - pfn) << (PAGE_SHIFT - 10);
-
-        for (; pfn < end; pfn++) {
-                struct page *page = pfn_to_page(pfn);
-                ClearPageReserved(page);
-                init_page_count(page);
-                __free_page(page);
-                pages++;
-        }
-
-        if (size && s)
-                pr_info("Freeing %s memory: %dK\n", s, size);
-
-        return pages;
-}
-
 /*
  * Poison init memory with an undefined instruction (0x0).
  */
@@ -405,9 +387,7 @@ void __init mem_init(void)
 void free_initmem(void)
 {
         poison_init_mem(__init_begin, __init_end - __init_begin);
-        totalram_pages += free_area(__phys_to_pfn(__pa(__init_begin)),
-                                    __phys_to_pfn(__pa(__init_end)),
-                                    "init");
+        free_initmem_default(0);
 }
 
 #ifdef CONFIG_BLK_DEV_INITRD
@@ -418,9 +398,7 @@ void free_initrd_mem(unsigned long start, unsigned long end)
 {
         if (!keep_initrd) {
                 poison_init_mem((void *)start, PAGE_ALIGN(end) - start);
-                totalram_pages += free_area(__phys_to_pfn(__pa(start)),
-                                            __phys_to_pfn(__pa(end)),
-                                            "initrd");
+                free_reserved_area(start, end, 0, "initrd");
         }
 }
 
diff --git a/arch/arm64/mm/mmu.c b/arch/arm64/mm/mmu.c
index 70b8cd4021c4..eeecc9c8ed68 100644
--- a/arch/arm64/mm/mmu.c
+++ b/arch/arm64/mm/mmu.c
@@ -391,17 +391,14 @@ int kern_addr_valid(unsigned long addr)
 }
 #ifdef CONFIG_SPARSEMEM_VMEMMAP
 #ifdef CONFIG_ARM64_64K_PAGES
-int __meminit vmemmap_populate(struct page *start_page,
-                               unsigned long size, int node)
+int __meminit vmemmap_populate(unsigned long start, unsigned long end, int node)
 {
-        return vmemmap_populate_basepages(start_page, size, node);
+        return vmemmap_populate_basepages(start, end, node);
 }
 #else   /* !CONFIG_ARM64_64K_PAGES */
-int __meminit vmemmap_populate(struct page *start_page,
-                               unsigned long size, int node)
+int __meminit vmemmap_populate(unsigned long start, unsigned long end, int node)
 {
-        unsigned long addr = (unsigned long)start_page;
-        unsigned long end = (unsigned long)(start_page + size);
+        unsigned long addr = start;
         unsigned long next;
         pgd_t *pgd;
         pud_t *pud;
@@ -434,7 +431,7 @@ int __meminit vmemmap_populate(struct page *start_page,
         return 0;
 }
 #endif  /* CONFIG_ARM64_64K_PAGES */
-void vmemmap_free(struct page *memmap, unsigned long nr_pages)
+void vmemmap_free(unsigned long start, unsigned long end)
 {
 }
 #endif  /* CONFIG_SPARSEMEM_VMEMMAP */
diff --git a/arch/avr32/Kconfig b/arch/avr32/Kconfig
index c1a868d398bd..22c40308360b 100644
--- a/arch/avr32/Kconfig
+++ b/arch/avr32/Kconfig
@@ -250,20 +250,7 @@ config ARCH_SUSPEND_POSSIBLE
         def_bool y
 
 menu "CPU Frequency scaling"
-
 source "drivers/cpufreq/Kconfig"
-
-config CPU_FREQ_AT32AP
-        bool "CPU frequency driver for AT32AP"
-        depends on CPU_FREQ && PLATFORM_AT32AP
-        default n
-        help
-          This enables the CPU frequency driver for AT32AP processors.
-
-          For details, take a look in <file:Documentation/cpu-freq>.
-
-          If in doubt, say N.
-
 endmenu
 
 endmenu
diff --git a/arch/avr32/configs/atngw100_defconfig b/arch/avr32/configs/atngw100_defconfig
index f4025db184ff..d5aff36ade92 100644
--- a/arch/avr32/configs/atngw100_defconfig
+++ b/arch/avr32/configs/atngw100_defconfig
@@ -26,7 +26,7 @@ CONFIG_CPU_FREQ=y
 # CONFIG_CPU_FREQ_STAT is not set
 CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y
 CONFIG_CPU_FREQ_GOV_USERSPACE=y
-CONFIG_CPU_FREQ_AT32AP=y
+CONFIG_AVR32_AT32AP_CPUFREQ=y
 CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS=y
 CONFIG_NET=y
 CONFIG_PACKET=y
diff --git a/arch/avr32/configs/atngw100_evklcd100_defconfig b/arch/avr32/configs/atngw100_evklcd100_defconfig
index c76a49b9e9d0..4abcf435d599 100644
--- a/arch/avr32/configs/atngw100_evklcd100_defconfig
+++ b/arch/avr32/configs/atngw100_evklcd100_defconfig
@@ -28,7 +28,7 @@ CONFIG_CPU_FREQ=y
 # CONFIG_CPU_FREQ_STAT is not set
 CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y
 CONFIG_CPU_FREQ_GOV_USERSPACE=y
-CONFIG_CPU_FREQ_AT32AP=y
+CONFIG_AVR32_AT32AP_CPUFREQ=y
 CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS=y
 CONFIG_NET=y
 CONFIG_PACKET=y
diff --git a/arch/avr32/configs/atngw100_evklcd101_defconfig b/arch/avr32/configs/atngw100_evklcd101_defconfig
index 2d8ab089a64e..18f3fa0470ff 100644
--- a/arch/avr32/configs/atngw100_evklcd101_defconfig
+++ b/arch/avr32/configs/atngw100_evklcd101_defconfig
@@ -27,7 +27,7 @@ CONFIG_CPU_FREQ=y
 # CONFIG_CPU_FREQ_STAT is not set
 CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y
 CONFIG_CPU_FREQ_GOV_USERSPACE=y
-CONFIG_CPU_FREQ_AT32AP=y
+CONFIG_AVR32_AT32AP_CPUFREQ=y
 CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS=y
 CONFIG_NET=y
 CONFIG_PACKET=y
diff --git a/arch/avr32/configs/atngw100_mrmt_defconfig b/arch/avr32/configs/atngw100_mrmt_defconfig
index b189e0cab04b..06e389cfcd12 100644
--- a/arch/avr32/configs/atngw100_mrmt_defconfig
+++ b/arch/avr32/configs/atngw100_mrmt_defconfig
@@ -23,7 +23,7 @@ CONFIG_CPU_FREQ=y
 CONFIG_CPU_FREQ_GOV_POWERSAVE=y
 CONFIG_CPU_FREQ_GOV_USERSPACE=y
 CONFIG_CPU_FREQ_GOV_ONDEMAND=y
-CONFIG_CPU_FREQ_AT32AP=y
+CONFIG_AVR32_AT32AP_CPUFREQ=y
 CONFIG_NET=y
 CONFIG_PACKET=y
 CONFIG_UNIX=y
diff --git a/arch/avr32/configs/atngw100mkii_defconfig b/arch/avr32/configs/atngw100mkii_defconfig
index 2e4de42a53c4..2518a1368d7c 100644
--- a/arch/avr32/configs/atngw100mkii_defconfig
+++ b/arch/avr32/configs/atngw100mkii_defconfig
@@ -26,7 +26,7 @@ CONFIG_CPU_FREQ=y
 # CONFIG_CPU_FREQ_STAT is not set
 CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y
 CONFIG_CPU_FREQ_GOV_USERSPACE=y
-CONFIG_CPU_FREQ_AT32AP=y
+CONFIG_AVR32_AT32AP_CPUFREQ=y
 CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS=y
 CONFIG_NET=y
 CONFIG_PACKET=y
diff --git a/arch/avr32/configs/atngw100mkii_evklcd100_defconfig b/arch/avr32/configs/atngw100mkii_evklcd100_defconfig
index fad3cd22dfd3..245ef6bd0fa6 100644
--- a/arch/avr32/configs/atngw100mkii_evklcd100_defconfig
+++ b/arch/avr32/configs/atngw100mkii_evklcd100_defconfig
@@ -29,7 +29,7 @@ CONFIG_CPU_FREQ=y
 # CONFIG_CPU_FREQ_STAT is not set
 CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y
 CONFIG_CPU_FREQ_GOV_USERSPACE=y
-CONFIG_CPU_FREQ_AT32AP=y
+CONFIG_AVR32_AT32AP_CPUFREQ=y
 CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS=y
 CONFIG_NET=y
 CONFIG_PACKET=y
diff --git a/arch/avr32/configs/atngw100mkii_evklcd101_defconfig b/arch/avr32/configs/atngw100mkii_evklcd101_defconfig
index 29986230aaa5..fa6cbac6e418 100644
--- a/arch/avr32/configs/atngw100mkii_evklcd101_defconfig
+++ b/arch/avr32/configs/atngw100mkii_evklcd101_defconfig
@@ -28,7 +28,7 @@ CONFIG_CPU_FREQ=y
 # CONFIG_CPU_FREQ_STAT is not set
 CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y
 CONFIG_CPU_FREQ_GOV_USERSPACE=y
-CONFIG_CPU_FREQ_AT32AP=y
+CONFIG_AVR32_AT32AP_CPUFREQ=y
 CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS=y
 CONFIG_NET=y
 CONFIG_PACKET=y
diff --git a/arch/avr32/configs/atstk1002_defconfig b/arch/avr32/configs/atstk1002_defconfig
index a582465e1cef..bbd5131021a5 100644
--- a/arch/avr32/configs/atstk1002_defconfig
+++ b/arch/avr32/configs/atstk1002_defconfig
@@ -25,7 +25,7 @@ CONFIG_CPU_FREQ=y
 # CONFIG_CPU_FREQ_STAT is not set
 CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y
 CONFIG_CPU_FREQ_GOV_USERSPACE=y
-CONFIG_CPU_FREQ_AT32AP=y
+CONFIG_AVR32_AT32AP_CPUFREQ=y
 CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS=y
 CONFIG_NET=y
 CONFIG_PACKET=y
diff --git a/arch/avr32/configs/atstk1003_defconfig b/arch/avr32/configs/atstk1003_defconfig
index 57a79df2ce5d..c1cd726f9012 100644
--- a/arch/avr32/configs/atstk1003_defconfig
+++ b/arch/avr32/configs/atstk1003_defconfig
@@ -26,7 +26,7 @@ CONFIG_CPU_FREQ=y
 # CONFIG_CPU_FREQ_STAT is not set
 CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y
 CONFIG_CPU_FREQ_GOV_USERSPACE=y
-CONFIG_CPU_FREQ_AT32AP=y
+CONFIG_AVR32_AT32AP_CPUFREQ=y
 CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS=y
 CONFIG_NET=y
 CONFIG_PACKET=y
diff --git a/arch/avr32/configs/atstk1004_defconfig b/arch/avr32/configs/atstk1004_defconfig
index 1a49bd8c6340..754ae56b2767 100644
--- a/arch/avr32/configs/atstk1004_defconfig
+++ b/arch/avr32/configs/atstk1004_defconfig
@@ -26,7 +26,7 @@ CONFIG_CPU_FREQ=y
 # CONFIG_CPU_FREQ_STAT is not set
 CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y
 CONFIG_CPU_FREQ_GOV_USERSPACE=y
-CONFIG_CPU_FREQ_AT32AP=y
+CONFIG_AVR32_AT32AP_CPUFREQ=y
 CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS=y
 CONFIG_NET=y
 CONFIG_PACKET=y
diff --git a/arch/avr32/configs/atstk1006_defconfig b/arch/avr32/configs/atstk1006_defconfig
index 206a1b67f763..58589d8cc0ac 100644
--- a/arch/avr32/configs/atstk1006_defconfig
+++ b/arch/avr32/configs/atstk1006_defconfig
@@ -26,7 +26,7 @@ CONFIG_CPU_FREQ=y
 # CONFIG_CPU_FREQ_STAT is not set
 CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y
 CONFIG_CPU_FREQ_GOV_USERSPACE=y
-CONFIG_CPU_FREQ_AT32AP=y
+CONFIG_AVR32_AT32AP_CPUFREQ=y
 CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS=y
 CONFIG_NET=y
 CONFIG_PACKET=y
diff --git a/arch/avr32/configs/favr-32_defconfig b/arch/avr32/configs/favr-32_defconfig
index 0421498d666b..57788a42ff83 100644
--- a/arch/avr32/configs/favr-32_defconfig
+++ b/arch/avr32/configs/favr-32_defconfig
@@ -27,7 +27,7 @@ CONFIG_CPU_FREQ=y
 # CONFIG_CPU_FREQ_STAT is not set
 CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y
 CONFIG_CPU_FREQ_GOV_USERSPACE=y
-CONFIG_CPU_FREQ_AT32AP=y
+CONFIG_AVR32_AT32AP_CPUFREQ=y
 CONFIG_NET=y
 CONFIG_PACKET=y
 CONFIG_UNIX=y
diff --git a/arch/avr32/configs/hammerhead_defconfig b/arch/avr32/configs/hammerhead_defconfig
index 82f24eb251bd..ba7c31e269cb 100644
--- a/arch/avr32/configs/hammerhead_defconfig
+++ b/arch/avr32/configs/hammerhead_defconfig
@@ -31,7 +31,7 @@ CONFIG_CPU_FREQ=y
 # CONFIG_CPU_FREQ_STAT is not set
 CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y
 CONFIG_CPU_FREQ_GOV_USERSPACE=y
-CONFIG_CPU_FREQ_AT32AP=y
+CONFIG_AVR32_AT32AP_CPUFREQ=y
 CONFIG_NET=y
 CONFIG_PACKET=y
 CONFIG_UNIX=y
diff --git a/arch/avr32/configs/mimc200_defconfig b/arch/avr32/configs/mimc200_defconfig
index 1bee51f22154..0a8bfdc420e0 100644
--- a/arch/avr32/configs/mimc200_defconfig
+++ b/arch/avr32/configs/mimc200_defconfig
@@ -24,7 +24,7 @@ CONFIG_CPU_FREQ=y
 # CONFIG_CPU_FREQ_STAT is not set
 CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y
 CONFIG_CPU_FREQ_GOV_USERSPACE=y
-CONFIG_CPU_FREQ_AT32AP=y
+CONFIG_AVR32_AT32AP_CPUFREQ=y
 CONFIG_NET=y
 CONFIG_PACKET=y
 CONFIG_UNIX=y
diff --git a/arch/avr32/include/asm/unistd.h b/arch/avr32/include/asm/unistd.h
index dc4d5a931112..c1eb080e45fe 100644
--- a/arch/avr32/include/asm/unistd.h
+++ b/arch/avr32/include/asm/unistd.h
@@ -41,12 +41,4 @@
 #define __ARCH_WANT_SYS_VFORK
 #define __ARCH_WANT_SYS_CLONE
 
-/*
- * "Conditional" syscalls
- *
- * What we want is __attribute__((weak,alias("sys_ni_syscall"))),
- * but it doesn't work on all toolchains, so we just do it by hand
- */
-#define cond_syscall(x) asm(".weak\t" #x "\n\t.set\t" #x ",sys_ni_syscall");
-
 #endif /* __ASM_AVR32_UNISTD_H */
diff --git a/arch/avr32/kernel/process.c b/arch/avr32/kernel/process.c
index fd78f58ea79a..e7b61494c312 100644
--- a/arch/avr32/kernel/process.c
+++ b/arch/avr32/kernel/process.c
@@ -30,18 +30,9 @@ EXPORT_SYMBOL(pm_power_off);
  * This file handles the architecture-dependent parts of process handling..
  */
 
-void cpu_idle(void)
+void arch_cpu_idle(void)
 {
-        /* endless idle loop with no priority at all */
-        while (1) {
-                tick_nohz_idle_enter();
-                rcu_idle_enter();
-                while (!need_resched())
-                        cpu_idle_sleep();
-                rcu_idle_exit();
-                tick_nohz_idle_exit();
-                schedule_preempt_disabled();
-        }
+        cpu_enter_idle();
 }
 
 void machine_halt(void)
@@ -213,14 +204,6 @@ void show_stack(struct task_struct *tsk, unsigned long *stack)
         show_stack_log_lvl(tsk, (unsigned long)stack, NULL, "");
 }
 
-void dump_stack(void)
-{
-        unsigned long stack;
-
-        show_trace_log_lvl(current, &stack, NULL, "");
-}
-EXPORT_SYMBOL(dump_stack);
-
 static const char *cpu_modes[] = {
         "Application", "Supervisor", "Interrupt level 0", "Interrupt level 1",
         "Interrupt level 2", "Interrupt level 3", "Exception", "NMI"
@@ -232,6 +215,8 @@ void show_regs_log_lvl(struct pt_regs *regs, const char *log_lvl)
         unsigned long lr = regs->lr;
         unsigned long mode = (regs->sr & MODE_MASK) >> MODE_SHIFT;
 
+        show_regs_print_info(log_lvl);
+
         if (!user_mode(regs)) {
                 sp = (unsigned long)regs + FRAME_SIZE_FULL;
 
@@ -269,9 +254,6 @@ void show_regs_log_lvl(struct pt_regs *regs, const char *log_lvl)
                regs->sr & SR_I0M ? '0' : '.',
                regs->sr & SR_GM ? 'G' : 'g');
         printk("%sCPU Mode: %s\n", log_lvl, cpu_modes[mode]);
-        printk("%sProcess: %s [%d] (task: %p thread: %p)\n",
-               log_lvl, current->comm, current->pid, current,
-               task_thread_info(current));
 }
 
 void show_regs(struct pt_regs *regs)
diff --git a/arch/avr32/kernel/time.c b/arch/avr32/kernel/time.c
index 05ad29112ff4..869a1c6ffeee 100644
--- a/arch/avr32/kernel/time.c
+++ b/arch/avr32/kernel/time.c
@@ -12,6 +12,7 @@
 #include <linux/irq.h>
 #include <linux/kernel.h>
 #include <linux/time.h>
+#include <linux/cpu.h>
 
 #include <asm/sysreg.h>
 
@@ -87,13 +88,17 @@ static void comparator_mode(enum clock_event_mode mode,
                 pr_debug("%s: start\n", evdev->name);
                 /* FALLTHROUGH */
         case CLOCK_EVT_MODE_RESUME:
-                cpu_disable_idle_sleep();
+                /*
+                 * If we're using the COUNT and COMPARE registers we
+                 * need to force idle poll.
+                 */
+                cpu_idle_poll_ctrl(true);
                 break;
         case CLOCK_EVT_MODE_UNUSED:
         case CLOCK_EVT_MODE_SHUTDOWN:
                 sysreg_write(COMPARE, 0);
                 pr_debug("%s: stop\n", evdev->name);
-                cpu_enable_idle_sleep();
+                cpu_idle_poll_ctrl(false);
                 break;
         default:
                 BUG();
diff --git a/arch/avr32/mach-at32ap/Makefile b/arch/avr32/mach-at32ap/Makefile
index 514c9a9b009a..fc09ec4bc725 100644
--- a/arch/avr32/mach-at32ap/Makefile
+++ b/arch/avr32/mach-at32ap/Makefile
@@ -1,7 +1,6 @@
 obj-y                           += pdc.o clock.o intc.o extint.o pio.o hsmc.o
 obj-y                           += hmatrix.o
 obj-$(CONFIG_CPU_AT32AP700X)    += at32ap700x.o pm-at32ap700x.o
-obj-$(CONFIG_CPU_FREQ_AT32AP)   += cpufreq.o
 obj-$(CONFIG_PM)                += pm.o
 
 ifeq ($(CONFIG_PM_DEBUG),y)
diff --git a/arch/avr32/mach-at32ap/cpufreq.c b/arch/avr32/mach-at32ap/cpufreq.c
deleted file mode 100644
index 18b765629a0c..000000000000
--- a/arch/avr32/mach-at32ap/cpufreq.c
+++ /dev/null
@@ -1,124 +0,0 @@
-/*
- * Copyright (C) 2004-2007 Atmel Corporation
- *
- * Based on MIPS implementation arch/mips/kernel/time.c
- *   Copyright 2001 MontaVista Software Inc.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
- */
-
-/*#define DEBUG*/
-
-#include <linux/kernel.h>
-#include <linux/types.h>
-#include <linux/init.h>
-#include <linux/cpufreq.h>
-#include <linux/io.h>
-#include <linux/clk.h>
-#include <linux/err.h>
-#include <linux/export.h>
-
-static struct clk *cpuclk;
-
-static int at32_verify_speed(struct cpufreq_policy *policy)
-{
-        if (policy->cpu != 0)
-                return -EINVAL;
-
-        cpufreq_verify_within_limits(policy, policy->cpuinfo.min_freq,
-                        policy->cpuinfo.max_freq);
-        return 0;
-}
-
-static unsigned int at32_get_speed(unsigned int cpu)
-{
-        /* No SMP support */
-        if (cpu)
-                return 0;
-        return (unsigned int)((clk_get_rate(cpuclk) + 500) / 1000);
-}
-
-static unsigned int     ref_freq;
-static unsigned long    loops_per_jiffy_ref;
-
-static int at32_set_target(struct cpufreq_policy *policy,
-                          unsigned int target_freq,
-                          unsigned int relation)
-{
-        struct cpufreq_freqs freqs;
-        long freq;
-
-        /* Convert target_freq from kHz to Hz */
-        freq = clk_round_rate(cpuclk, target_freq * 1000);
-
-        /* Check if policy->min <= new_freq <= policy->max */
-        if(freq < (policy->min * 1000) || freq > (policy->max * 1000))
-                return -EINVAL;
-
-        pr_debug("cpufreq: requested frequency %u Hz\n", target_freq * 1000);
-
-        freqs.old = at32_get_speed(0);
-        freqs.new = (freq + 500) / 1000;
-        freqs.cpu = 0;
-        freqs.flags = 0;
-
-        if (!ref_freq) {
-                ref_freq = freqs.old;
-                loops_per_jiffy_ref = boot_cpu_data.loops_per_jiffy;
-        }
-
-        cpufreq_notify_transition(&freqs, CPUFREQ_PRECHANGE);
-        if (freqs.old < freqs.new)
-                boot_cpu_data.loops_per_jiffy = cpufreq_scale(
-                                loops_per_jiffy_ref, ref_freq, freqs.new);
-        clk_set_rate(cpuclk, freq);
-        if (freqs.new < freqs.old)
-                boot_cpu_data.loops_per_jiffy = cpufreq_scale(
-                                loops_per_jiffy_ref, ref_freq, freqs.new);
-        cpufreq_notify_transition(&freqs, CPUFREQ_POSTCHANGE);
-
-        pr_debug("cpufreq: set frequency %lu Hz\n", freq);
-
-        return 0;
-}
-
-static int __init at32_cpufreq_driver_init(struct cpufreq_policy *policy)
-{
-        if (policy->cpu != 0)
-                return -EINVAL;
-
-        cpuclk = clk_get(NULL, "cpu");
-        if (IS_ERR(cpuclk)) {
-                pr_debug("cpufreq: could not get CPU clk\n");
-                return PTR_ERR(cpuclk);
-        }
-
-        policy->cpuinfo.min_freq = (clk_round_rate(cpuclk, 1) + 500) / 1000;
-        policy->cpuinfo.max_freq = (clk_round_rate(cpuclk, ~0UL) + 500) / 1000;
-        policy->cpuinfo.transition_latency = 0;
-        policy->cur = at32_get_speed(0);
-        policy->min = policy->cpuinfo.min_freq;
-        policy->max = policy->cpuinfo.max_freq;
-
-        printk("cpufreq: AT32AP CPU frequency driver\n");
-
-        return 0;
-}
-
-static struct cpufreq_driver at32_driver = {
-        .name           = "at32ap",
-        .owner          = THIS_MODULE,
-        .init           = at32_cpufreq_driver_init,
-        .verify         = at32_verify_speed,
-        .target         = at32_set_target,
-        .get            = at32_get_speed,
-        .flags          = CPUFREQ_STICKY,
-};
-
-static int __init at32_cpufreq_init(void)
-{
-        return cpufreq_register_driver(&at32_driver);
-}
-late_initcall(at32_cpufreq_init);
diff --git a/arch/avr32/mach-at32ap/include/mach/pm.h b/arch/avr32/mach-at32ap/include/mach/pm.h
index 979b355b77b6..f29ff2cd23d3 100644
--- a/arch/avr32/mach-at32ap/include/mach/pm.h
+++ b/arch/avr32/mach-at32ap/include/mach/pm.h
@@ -21,30 +21,6 @@
 extern void cpu_enter_idle(void);
 extern void cpu_enter_standby(unsigned long sdramc_base);
 
-extern bool disable_idle_sleep;
-
-static inline void cpu_disable_idle_sleep(void)
-{
-        disable_idle_sleep = true;
-}
-
-static inline void cpu_enable_idle_sleep(void)
-{
-        disable_idle_sleep = false;
-}
-
-static inline void cpu_idle_sleep(void)
-{
-        /*
-         * If we're using the COUNT and COMPARE registers for
-         * timekeeping, we can't use the IDLE state.
-         */
-        if (disable_idle_sleep)
-                cpu_relax();
-        else
-                cpu_enter_idle();
-}
-
 void intc_set_suspend_handler(unsigned long offset);
 #endif
 
diff --git a/arch/avr32/mach-at32ap/pm-at32ap700x.S b/arch/avr32/mach-at32ap/pm-at32ap700x.S
index f868f4ce761b..1c8e4e6bff03 100644
--- a/arch/avr32/mach-at32ap/pm-at32ap700x.S
+++ b/arch/avr32/mach-at32ap/pm-at32ap700x.S
@@ -18,13 +18,6 @@
 /* Same as 0xfff00000 but fits in a 21 bit signed immediate */
 #define PM_BASE -0x100000
 
-        .section .bss, "wa", @nobits
-        .global disable_idle_sleep
-        .type   disable_idle_sleep, @object
-disable_idle_sleep:
-        .int    4
-        .size   disable_idle_sleep, . - disable_idle_sleep
-
         /* Keep this close to the irq handlers */
         .section .irq.text, "ax", @progbits
 
diff --git a/arch/avr32/mm/init.c b/arch/avr32/mm/init.c
index 2798c2d4a1cf..e66e8406f992 100644
--- a/arch/avr32/mm/init.c
+++ b/arch/avr32/mm/init.c
@@ -146,34 +146,14 @@ void __init mem_init(void)
                 initsize >> 10);
 }
 
-static inline void free_area(unsigned long addr, unsigned long end, char *s)
-{
-        unsigned int size = (end - addr) >> 10;
-
-        for (; addr < end; addr += PAGE_SIZE) {
-                struct page *page = virt_to_page(addr);
-                ClearPageReserved(page);
-                init_page_count(page);
-                free_page(addr);
-                totalram_pages++;
-        }
-
-        if (size && s)
-                printk(KERN_INFO "Freeing %s memory: %dK (%lx - %lx)\n",
-                       s, size, end - (size << 10), end);
-}
-
 void free_initmem(void)
 {
-        free_area((unsigned long)__init_begin, (unsigned long)__init_end,
-                  "init");
+        free_initmem_default(0);
 }
 
 #ifdef CONFIG_BLK_DEV_INITRD
-
 void free_initrd_mem(unsigned long start, unsigned long end)
 {
-        free_area(start, end, "initrd");
+        free_reserved_area(start, end, 0, "initrd");
 }
-
 #endif
diff --git a/arch/blackfin/include/asm/bfin_sport3.h b/arch/blackfin/include/asm/bfin_sport3.h
index 03c00220d69b..d82f5fa0ad9f 100644
--- a/arch/blackfin/include/asm/bfin_sport3.h
+++ b/arch/blackfin/include/asm/bfin_sport3.h
@@ -41,7 +41,7 @@
 #define SPORT_CTL_LAFS                0x00020000    /* Late Transmit frame select */
 #define SPORT_CTL_RJUST               0x00040000    /* Right Justified mode select */
 #define SPORT_CTL_FSED                0x00080000    /* External frame sync edge select */
-#define SPORT_CTL_TFIEN               0x00100000    /* Transmit finish interrrupt enable select */
+#define SPORT_CTL_TFIEN               0x00100000    /* Transmit finish interrupt enable select */
 #define SPORT_CTL_GCLKEN              0x00200000    /* Gated clock mode select */
 #define SPORT_CTL_SPENSEC             0x01000000    /* Enable secondary channel */
 #define SPORT_CTL_SPTRAN              0x02000000    /* Data direction control */
diff --git a/arch/blackfin/include/asm/unistd.h b/arch/blackfin/include/asm/unistd.h
index 04e83ea8d5cc..c35414bdf7bd 100644
--- a/arch/blackfin/include/asm/unistd.h
+++ b/arch/blackfin/include/asm/unistd.h
@@ -20,12 +20,4 @@
 #define __ARCH_WANT_SYS_NICE
 #define __ARCH_WANT_SYS_VFORK
 
-/*
- * "Conditional" syscalls
- *
- * What we want is __attribute__((weak,alias("sys_ni_syscall"))),
- * but it doesn't work on all toolchains, so we just do it by hand
- */
-#define cond_syscall(x) asm(".weak\t_" #x "\n\t.set\t_" #x ",_sys_ni_syscall");
-
 #endif                          /* __ASM_BFIN_UNISTD_H */
diff --git a/arch/blackfin/kernel/dumpstack.c b/arch/blackfin/kernel/dumpstack.c
index 5cfbaa298211..95ba6d9e9a3d 100644
--- a/arch/blackfin/kernel/dumpstack.c
+++ b/arch/blackfin/kernel/dumpstack.c
@@ -168,6 +168,7 @@ void dump_stack(void)
 #endif
         trace_buffer_save(tflags);
         dump_bfin_trace_buffer();
+        dump_stack_print_info(KERN_DEFAULT);
         show_stack(current, &stack);
         trace_buffer_restore(tflags);
 }
diff --git a/arch/blackfin/kernel/early_printk.c b/arch/blackfin/kernel/early_printk.c
index 84ed8375113c..61fbd2de993d 100644
--- a/arch/blackfin/kernel/early_printk.c
+++ b/arch/blackfin/kernel/early_printk.c
@@ -25,8 +25,6 @@ extern struct console *bfin_earlyserial_init(unsigned int port,
 extern struct console *bfin_jc_early_init(void);
 #endif
 
-static struct console *early_console;
-
 /* Default console */
 #define DEFAULT_PORT 0
 #define DEFAULT_CFLAG CS8|B57600
diff --git a/arch/blackfin/kernel/process.c b/arch/blackfin/kernel/process.c
index 9782c0329c14..4aa5545c4fde 100644
--- a/arch/blackfin/kernel/process.c
+++ b/arch/blackfin/kernel/process.c
@@ -46,15 +46,14 @@ EXPORT_SYMBOL(pm_power_off);
  * The idle loop on BFIN
  */
 #ifdef CONFIG_IDLE_L1
-static void default_idle(void)__attribute__((l1_text));
-void cpu_idle(void)__attribute__((l1_text));
+void arch_cpu_idle(void)__attribute__((l1_text));
 #endif
 
 /*
  * This is our default idle handler.  We need to disable
  * interrupts here to ensure we don't miss a wakeup call.
  */
-static void default_idle(void)
+void arch_cpu_idle(void)
 {
 #ifdef CONFIG_IPIPE
         ipipe_suspend_domain();
@@ -66,31 +65,12 @@ static void default_idle(void)
         hard_local_irq_enable();
 }
 
-/*
- * The idle thread.  We try to conserve power, while trying to keep
- * overall latency low.  The architecture specific idle is passed
- * a value to indicate the level of "idleness" of the system.
- */
-void cpu_idle(void)
-{
-        /* endless idle loop with no priority at all */
-        while (1) {
-
 #ifdef CONFIG_HOTPLUG_CPU
-                if (cpu_is_offline(smp_processor_id()))
-                        cpu_die();
-#endif
-                tick_nohz_idle_enter();
-                rcu_idle_enter();
-                while (!need_resched())
-                        default_idle();
-                rcu_idle_exit();
-                tick_nohz_idle_exit();
-                preempt_enable_no_resched();
-                schedule();
-                preempt_disable();
-        }
+void arch_cpu_idle_dead(void)
+{
+        cpu_die();
 }
+#endif
 
 /*
  * Do necessary setup to start up a newly executed thread.
diff --git a/arch/blackfin/kernel/trace.c b/arch/blackfin/kernel/trace.c
index f7f7a18abca9..c36efa0c7163 100644
--- a/arch/blackfin/kernel/trace.c
+++ b/arch/blackfin/kernel/trace.c
@@ -853,6 +853,8 @@ void show_regs(struct pt_regs *fp)
         unsigned char in_atomic = (bfin_read_IPEND() & 0x10) || in_atomic();
 
         pr_notice("\n");
+        show_regs_print_info(KERN_NOTICE);
+
         if (CPUID != bfin_cpuid())
                 pr_notice("Compiled for cpu family 0x%04x (Rev %d), "
                         "but running on:0x%04x (Rev %d)\n",
diff --git a/arch/blackfin/mach-bf609/boards/ezkit.c b/arch/blackfin/mach-bf609/boards/ezkit.c
index 61c1f47a4bf2..97d701639585 100644
--- a/arch/blackfin/mach-bf609/boards/ezkit.c
+++ b/arch/blackfin/mach-bf609/boards/ezkit.c
@@ -936,19 +936,19 @@ static struct v4l2_input adv7842_inputs[] = {
                 .index = 2,
                 .name = "Component",
                 .type = V4L2_INPUT_TYPE_CAMERA,
-                .capabilities = V4L2_IN_CAP_CUSTOM_TIMINGS,
+                .capabilities = V4L2_IN_CAP_DV_TIMINGS,
         },
         {
                 .index = 3,
                 .name = "VGA",
                 .type = V4L2_INPUT_TYPE_CAMERA,
-                .capabilities = V4L2_IN_CAP_CUSTOM_TIMINGS,
+                .capabilities = V4L2_IN_CAP_DV_TIMINGS,
         },
         {
                 .index = 4,
                 .name = "HDMI",
                 .type = V4L2_INPUT_TYPE_CAMERA,
-                .capabilities = V4L2_IN_CAP_CUSTOM_TIMINGS,
+                .capabilities = V4L2_IN_CAP_DV_TIMINGS,
         },
 };
 
@@ -1074,7 +1074,7 @@ static struct v4l2_output adv7511_outputs[] = {
                 .index = 0,
                 .name = "HDMI",
                 .type = V4L2_INPUT_TYPE_CAMERA,
-                .capabilities = V4L2_OUT_CAP_CUSTOM_TIMINGS,
+                .capabilities = V4L2_OUT_CAP_DV_TIMINGS,
         },
 };
 
diff --git a/arch/blackfin/mach-common/Makefile b/arch/blackfin/mach-common/Makefile
index 75f0ba29ebb9..675466d490d4 100644
--- a/arch/blackfin/mach-common/Makefile
+++ b/arch/blackfin/mach-common/Makefile
@@ -10,7 +10,6 @@ obj-$(CONFIG_PM)          += pm.o
 ifneq ($(CONFIG_BF60x),y)
 obj-$(CONFIG_PM)          += dpmc_modes.o
 endif
-obj-$(CONFIG_CPU_FREQ)    += cpufreq.o
 obj-$(CONFIG_CPU_VOLTAGE) += dpmc.o
 obj-$(CONFIG_SMP)         += smp.o
 obj-$(CONFIG_BFIN_KERNEL_CLOCK) += clocks-init.o
diff --git a/arch/blackfin/mach-common/cpufreq.c b/arch/blackfin/mach-common/cpufreq.c
deleted file mode 100644
index d88bd31319e6..000000000000
--- a/arch/blackfin/mach-common/cpufreq.c
+++ /dev/null
@@ -1,258 +0,0 @@
-/*
- * Blackfin core clock scaling
- *
- * Copyright 2008-2011 Analog Devices Inc.
- *
- * Licensed under the GPL-2 or later.
- */
-
-#include <linux/kernel.h>
-#include <linux/module.h>
-#include <linux/types.h>
-#include <linux/init.h>
-#include <linux/clk.h>
-#include <linux/cpufreq.h>
-#include <linux/fs.h>
-#include <linux/delay.h>
-#include <asm/blackfin.h>
-#include <asm/time.h>
-#include <asm/dpmc.h>
-
-
-/* this is the table of CCLK frequencies, in Hz */
-/* .index is the entry in the auxiliary dpm_state_table[] */
-static struct cpufreq_frequency_table bfin_freq_table[] = {
-        {
-                .frequency = CPUFREQ_TABLE_END,
-                .index = 0,
-        },
-        {
-                .frequency = CPUFREQ_TABLE_END,
-                .index = 1,
-        },
-        {
-                .frequency = CPUFREQ_TABLE_END,
-                .index = 2,
-        },
-        {
-                .frequency = CPUFREQ_TABLE_END,
-                .index = 0,
-        },
-};
-
-static struct bfin_dpm_state {
-        unsigned int csel; /* system clock divider */
-        unsigned int tscale; /* change the divider on the core timer interrupt */
-} dpm_state_table[3];
-
-#if defined(CONFIG_CYCLES_CLOCKSOURCE)
-/*
- * normalized to maximum frequency offset for CYCLES,
- * used in time-ts cycles clock source, but could be used
- * somewhere also.
- */
-unsigned long long __bfin_cycles_off;
-unsigned int __bfin_cycles_mod;
-#endif
-
-/**************************************************************************/
-static void __init bfin_init_tables(unsigned long cclk, unsigned long sclk)
-{
-
-        unsigned long csel, min_cclk;
-        int index;
-
-        /* Anomaly 273 seems to still exist on non-BF54x w/dcache turned on */
-#if ANOMALY_05000273 || ANOMALY_05000274 || \
-        (!(defined(CONFIG_BF54x) || defined(CONFIG_BF60x)) \
-        && defined(CONFIG_BFIN_EXTMEM_DCACHEABLE))
-        min_cclk = sclk * 2;
-#else
-        min_cclk = sclk;
-#endif
-
-#ifndef CONFIG_BF60x
-        csel = ((bfin_read_PLL_DIV() & CSEL) >> 4);
-#else
-        csel = bfin_read32(CGU0_DIV) & 0x1F;
-#endif
-
-        for (index = 0;  (cclk >> index) >= min_cclk && csel <= 3 && index < 3; index++, csel++) {
-                bfin_freq_table[index].frequency = cclk >> index;
-#ifndef CONFIG_BF60x
-                dpm_state_table[index].csel = csel << 4; /* Shift now into PLL_DIV bitpos */
-#else
-                dpm_state_table[index].csel = csel;
-#endif
-                dpm_state_table[index].tscale =  (TIME_SCALE >> index) - 1;
-
-                pr_debug("cpufreq: freq:%d csel:0x%x tscale:%d\n",
-                                                 bfin_freq_table[index].frequency,
-                                                 dpm_state_table[index].csel,
-                                                 dpm_state_table[index].tscale);
-        }
-        return;
-}
-
-static void bfin_adjust_core_timer(void *info)
-{
-        unsigned int tscale;
-        unsigned int index = *(unsigned int *)info;
-
-        /* we have to adjust the core timer, because it is using cclk */
-        tscale = dpm_state_table[index].tscale;
-        bfin_write_TSCALE(tscale);
-        return;
-}
-
-static unsigned int bfin_getfreq_khz(unsigned int cpu)
-{
-        /* Both CoreA/B have the same core clock */
-        return get_cclk() / 1000;
-}
-
-#ifdef CONFIG_BF60x
-unsigned long cpu_set_cclk(int cpu, unsigned long new)
-{
-        struct clk *clk;
-        int ret;
-
-        clk = clk_get(NULL, "CCLK");
-        if (IS_ERR(clk))
-                return -ENODEV;
-
-        ret = clk_set_rate(clk, new);
-        clk_put(clk);
-        return ret;
-}
-#endif
-
-static int bfin_target(struct cpufreq_policy *poli,
-                        unsigned int target_freq, unsigned int relation)
-{
-#ifndef CONFIG_BF60x
-        unsigned int plldiv;
-#endif
-        unsigned int index, cpu;
-        unsigned long cclk_hz;
-        struct cpufreq_freqs freqs;
-        static unsigned long lpj_ref;
-        static unsigned int  lpj_ref_freq;
-        int ret = 0;
-
-#if defined(CONFIG_CYCLES_CLOCKSOURCE)
-        cycles_t cycles;
-#endif
-
-        for_each_online_cpu(cpu) {
-                struct cpufreq_policy *policy = cpufreq_cpu_get(cpu);
-
-                if (!policy)
-                        continue;
-
-                if (cpufreq_frequency_table_target(policy, bfin_freq_table,
-                                 target_freq, relation, &index))
-                        return -EINVAL;
-
-                cclk_hz = bfin_freq_table[index].frequency;
-
-                freqs.old = bfin_getfreq_khz(0);
-                freqs.new = cclk_hz;
-                freqs.cpu = cpu;
-
-                pr_debug("cpufreq: changing cclk to %lu; target = %u, oldfreq = %u\n",
-                         cclk_hz, target_freq, freqs.old);
-
-                cpufreq_notify_transition(&freqs, CPUFREQ_PRECHANGE);
-                if (cpu == CPUFREQ_CPU) {
-#ifndef CONFIG_BF60x
-                        plldiv = (bfin_read_PLL_DIV() & SSEL) |
-                                                dpm_state_table[index].csel;
-                        bfin_write_PLL_DIV(plldiv);
-#else
-                        ret = cpu_set_cclk(cpu, freqs.new * 1000);
-                        if (ret != 0) {
-                                WARN_ONCE(ret, "cpufreq set freq failed %d\n", ret);
-                                break;
-                        }
-#endif
-                        on_each_cpu(bfin_adjust_core_timer, &index, 1);
-#if defined(CONFIG_CYCLES_CLOCKSOURCE)
-                        cycles = get_cycles();
-                        SSYNC();
-                        cycles += 10; /* ~10 cycles we lose after get_cycles() */
-                        __bfin_cycles_off +=
-                            (cycles << __bfin_cycles_mod) - (cycles << index);
-                        __bfin_cycles_mod = index;
-#endif
-                        if (!lpj_ref_freq) {
-                                lpj_ref = loops_per_jiffy;
-                                lpj_ref_freq = freqs.old;
-                        }
-                        if (freqs.new != freqs.old) {
-                                loops_per_jiffy = cpufreq_scale(lpj_ref,
-                                                lpj_ref_freq, freqs.new);
-                        }
-                }
-                /* TODO: just test case for cycles clock source, remove later */
-                cpufreq_notify_transition(&freqs, CPUFREQ_POSTCHANGE);
-        }
-
-        pr_debug("cpufreq: done\n");
-        return ret;
-}
-
-static int bfin_verify_speed(struct cpufreq_policy *policy)
-{
-        return cpufreq_frequency_table_verify(policy, bfin_freq_table);
-}
-
-static int __bfin_cpu_init(struct cpufreq_policy *policy)
-{
-
-        unsigned long cclk, sclk;
-
-        cclk = get_cclk() / 1000;
-        sclk = get_sclk() / 1000;
-
-        if (policy->cpu == CPUFREQ_CPU)
-                bfin_init_tables(cclk, sclk);
-
-        policy->cpuinfo.transition_latency = 50000; /* 50us assumed */
-
-        policy->cur = cclk;
-        cpufreq_frequency_table_get_attr(bfin_freq_table, policy->cpu);
-        return cpufreq_frequency_table_cpuinfo(policy, bfin_freq_table);
-}
-
-static struct freq_attr *bfin_freq_attr[] = {
-        &cpufreq_freq_attr_scaling_available_freqs,
-        NULL,
-};
-
-static struct cpufreq_driver bfin_driver = {
-        .verify = bfin_verify_speed,
-        .target = bfin_target,
-        .get = bfin_getfreq_khz,
-        .init = __bfin_cpu_init,
-        .name = "bfin cpufreq",
-        .owner = THIS_MODULE,
-        .attr = bfin_freq_attr,
-};
-
-static int __init bfin_cpu_init(void)
-{
-        return cpufreq_register_driver(&bfin_driver);
-}
-
-static void __exit bfin_cpu_exit(void)
-{
-        cpufreq_unregister_driver(&bfin_driver);
-}
-
-MODULE_AUTHOR("Michael Hennerich <hennerich@blackfin.uclinux.org>");
-MODULE_DESCRIPTION("cpufreq driver for Blackfin");
-MODULE_LICENSE("GPL");
-
-module_init(bfin_cpu_init);
-module_exit(bfin_cpu_exit);
diff --git a/arch/blackfin/mach-common/smp.c b/arch/blackfin/mach-common/smp.c
index bb61ae4986e4..1bc2ce6f3c94 100644
--- a/arch/blackfin/mach-common/smp.c
+++ b/arch/blackfin/mach-common/smp.c
@@ -335,7 +335,7 @@ void __cpuinit secondary_start_kernel(void)
          */
         calibrate_delay();
 
-        cpu_idle();
+        cpu_startup_entry(CPUHP_ONLINE);
 }
 
 void __init smp_prepare_boot_cpu(void)
diff --git a/arch/blackfin/mm/init.c b/arch/blackfin/mm/init.c
index 9cb85537bd2b..82d01a71207f 100644
--- a/arch/blackfin/mm/init.c
+++ b/arch/blackfin/mm/init.c
@@ -103,7 +103,7 @@ void __init mem_init(void)
         max_mapnr = num_physpages = MAP_NR(high_memory);
         printk(KERN_DEBUG "Kernel managed physical pages: %lu\n", num_physpages);
 
-        /* This will put all memory onto the freelists. */
+        /* This will put all low memory onto the freelists. */
         totalram_pages = free_all_bootmem();
 
         reservedpages = 0;
@@ -129,24 +129,11 @@ void __init mem_init(void)
                 initk, codek, datak, DMA_UNCACHED_REGION >> 10, (reservedpages << (PAGE_SHIFT-10)));
 }
 
-static void __init free_init_pages(const char *what, unsigned long begin, unsigned long end)
-{
-        unsigned long addr;
-        /* next to check that the page we free is not a partial page */
-        for (addr = begin; addr + PAGE_SIZE <= end; addr += PAGE_SIZE) {
-                ClearPageReserved(virt_to_page(addr));
-                init_page_count(virt_to_page(addr));
-                free_page(addr);
-                totalram_pages++;
-        }
-        printk(KERN_INFO "Freeing %s: %ldk freed\n", what, (end - begin) >> 10);
-}
-
 #ifdef CONFIG_BLK_DEV_INITRD
 void __init free_initrd_mem(unsigned long start, unsigned long end)
 {
 #ifndef CONFIG_MPU
-        free_init_pages("initrd memory", start, end);
+        free_reserved_area(start, end, 0, "initrd");
 #endif
 }
 #endif
@@ -154,10 +141,7 @@ void __init free_initrd_mem(unsigned long start, unsigned long end)
 void __init_refok free_initmem(void)
 {
 #if defined CONFIG_RAMKERNEL && !defined CONFIG_MPU
-        free_init_pages("unused kernel memory",
-                        (unsigned long)(&__init_begin),
-                        (unsigned long)(&__init_end));
-
+        free_initmem_default(0);
         if (memory_start == (unsigned long)(&__init_end))
                 memory_start = (unsigned long)(&__init_begin);
 #endif
diff --git a/arch/c6x/kernel/process.c b/arch/c6x/kernel/process.c
index 6434df476f77..57d2ea8d1977 100644
--- a/arch/c6x/kernel/process.c
+++ b/arch/c6x/kernel/process.c
@@ -33,7 +33,7 @@ extern asmlinkage void ret_from_kernel_thread(void);
 void (*pm_power_off)(void);
 EXPORT_SYMBOL(pm_power_off);
 
-static void c6x_idle(void)
+void arch_cpu_idle(void)
 {
         unsigned long tmp;
 
@@ -49,32 +49,6 @@ static void c6x_idle(void)
                       : "=b"(tmp));
 }
 
-/*
- * The idle loop for C64x
- */
-void cpu_idle(void)
-{
-        /* endless idle loop with no priority at all */
-        while (1) {
-                tick_nohz_idle_enter();
-                rcu_idle_enter();
-                while (1) {
-                        local_irq_disable();
-                        if (need_resched()) {
-                                local_irq_enable();
-                                break;
-                        }
-                        c6x_idle(); /* enables local irqs */
-                }
-                rcu_idle_exit();
-                tick_nohz_idle_exit();
-
-                preempt_enable_no_resched();
-                schedule();
-                preempt_disable();
-        }
-}
-
 static void halt_loop(void)
 {
         printk(KERN_EMERG "System Halted, OK to turn off power\n");
diff --git a/arch/c6x/kernel/traps.c b/arch/c6x/kernel/traps.c
index 1be74e5b4788..dcc2c2f6d67c 100644
--- a/arch/c6x/kernel/traps.c
+++ b/arch/c6x/kernel/traps.c
@@ -31,6 +31,7 @@ void __init trap_init(void)
 void show_regs(struct pt_regs *regs)
 {
         pr_err("\n");
+        show_regs_print_info(KERN_ERR);
         pr_err("PC: %08lx SP: %08lx\n", regs->pc, regs->sp);
         pr_err("Status: %08lx ORIG_A4: %08lx\n", regs->csr, regs->orig_a4);
         pr_err("A0: %08lx  B0: %08lx\n", regs->a0, regs->b0);
@@ -67,15 +68,6 @@ void show_regs(struct pt_regs *regs)
         pr_err("A31: %08lx  B31: %08lx\n", regs->a31, regs->b31);
 }
 
-void dump_stack(void)
-{
-        unsigned long stack;
-
-        show_stack(current, &stack);
-}
-EXPORT_SYMBOL(dump_stack);
-
-
 void die(char *str, struct pt_regs *fp, int nr)
 {
         console_verbose();
diff --git a/arch/c6x/mm/init.c b/arch/c6x/mm/init.c
index 89395f09648a..a9fcd89b251b 100644
--- a/arch/c6x/mm/init.c
+++ b/arch/c6x/mm/init.c
@@ -77,37 +77,11 @@ void __init mem_init(void)
 #ifdef CONFIG_BLK_DEV_INITRD
 void __init free_initrd_mem(unsigned long start, unsigned long end)
 {
-        int pages = 0;
-        for (; start < end; start += PAGE_SIZE) {
-                ClearPageReserved(virt_to_page(start));
-                init_page_count(virt_to_page(start));
-                free_page(start);
-                totalram_pages++;
-                pages++;
-        }
-        printk(KERN_INFO "Freeing initrd memory: %luk freed\n",
-               (pages * PAGE_SIZE) >> 10);
+        free_reserved_area(start, end, 0, "initrd");
 }
 #endif
 
 void __init free_initmem(void)
 {
-        unsigned long addr;
-
-        /*
-         * The following code should be cool even if these sections
-         * are not page aligned.
-         */
-        addr = PAGE_ALIGN((unsigned long)(__init_begin));
-
-        /* next to check that the page we free is not a partial page */
-        for (; addr + PAGE_SIZE < (unsigned long)(__init_end);
-             addr += PAGE_SIZE) {
-                ClearPageReserved(virt_to_page(addr));
-                init_page_count(virt_to_page(addr));
-                free_page(addr);
-                totalram_pages++;
-        }
-        printk(KERN_INFO "Freeing unused kernel memory: %dK freed\n",
-               (int) ((addr - PAGE_ALIGN((long) &__init_begin)) >> 10));
+        free_initmem_default(0);
 }
diff --git a/arch/cris/arch-v10/kernel/process.c b/arch/cris/arch-v10/kernel/process.c
index b1018750cffb..753e9a03cf87 100644
--- a/arch/cris/arch-v10/kernel/process.c
+++ b/arch/cris/arch-v10/kernel/process.c
@@ -30,8 +30,9 @@ void etrax_gpio_wake_up_check(void); /* drivers/gpio.c */
 void default_idle(void)
 {
 #ifdef CONFIG_ETRAX_GPIO
-  etrax_gpio_wake_up_check();
+        etrax_gpio_wake_up_check();
 #endif
+        local_irq_enable();
 }
 
 /*
@@ -175,6 +176,9 @@ unsigned long get_wchan(struct task_struct *p)
 void show_regs(struct pt_regs * regs)
 {
         unsigned long usp = rdusp();
+
+        show_regs_print_info(KERN_DEFAULT);
+
         printk("IRP: %08lx SRP: %08lx DCCR: %08lx USP: %08lx MOF: %08lx\n",
                regs->irp, regs->srp, regs->dccr, usp, regs->mof );
         printk(" r0: %08lx  r1: %08lx   r2: %08lx  r3: %08lx\n",
diff --git a/arch/cris/arch-v32/kernel/process.c b/arch/cris/arch-v32/kernel/process.c
index 2b23ef0e4452..cebd32e2a8fb 100644
--- a/arch/cris/arch-v32/kernel/process.c
+++ b/arch/cris/arch-v32/kernel/process.c
@@ -20,18 +20,12 @@
 
 extern void stop_watchdog(void);
 
-extern int cris_hlt_counter;
-
 /* We use this if we don't have any better idle routine. */
 void default_idle(void)
 {
-        local_irq_disable();
-        if (!need_resched() && !cris_hlt_counter) {
-                /* Halt until exception. */
-                __asm__ volatile("ei    \n\t"
-                                 "halt      ");
-        }
-        local_irq_enable();
+        /* Halt until exception. */
+        __asm__ volatile("ei    \n\t"
+                         "halt      ");
 }
 
 /*
@@ -170,6 +164,9 @@ get_wchan(struct task_struct *p)
 void show_regs(struct pt_regs * regs)
 {
         unsigned long usp = rdusp();
+
+        show_regs_print_info(KERN_DEFAULT);
+
         printk("ERP: %08lx SRP: %08lx  CCS: %08lx USP: %08lx MOF: %08lx\n",
                 regs->erp, regs->srp, regs->ccs, usp, regs->mof);
 
diff --git a/arch/cris/arch-v32/kernel/smp.c b/arch/cris/arch-v32/kernel/smp.c
index 04a16edd5401..cdd12028de0c 100644
--- a/arch/cris/arch-v32/kernel/smp.c
+++ b/arch/cris/arch-v32/kernel/smp.c
@@ -145,8 +145,6 @@ smp_boot_one_cpu(int cpuid, struct task_struct idle)
  * specific stuff such as the local timer and the MMU. */
 void __init smp_callin(void)
 {
-        extern void cpu_idle(void);
-
         int cpu = cpu_now_booting;
         reg_intr_vect_rw_mask vect_mask = {0};
 
@@ -170,7 +168,7 @@ void __init smp_callin(void)
         local_irq_enable();
 
         set_cpu_online(cpu, true);
-        cpu_idle();
+        cpu_startup_entry(CPUHP_ONLINE);
 }
 
 /* Stop execution on this CPU.*/
diff --git a/arch/cris/arch-v32/mach-a3/Makefile b/arch/cris/arch-v32/mach-a3/Makefile
index d366e0891988..18a227196a41 100644
--- a/arch/cris/arch-v32/mach-a3/Makefile
+++ b/arch/cris/arch-v32/mach-a3/Makefile
@@ -3,7 +3,6 @@
 #
 
 obj-y   := dma.o pinmux.o io.o arbiter.o
-obj-$(CONFIG_CPU_FREQ)   += cpufreq.o
 
 clean:
 
diff --git a/arch/cris/arch-v32/mach-a3/cpufreq.c b/arch/cris/arch-v32/mach-a3/cpufreq.c
deleted file mode 100644
index ee391ecb5bc9..000000000000
--- a/arch/cris/arch-v32/mach-a3/cpufreq.c
+++ /dev/null
@@ -1,152 +0,0 @@
-#include <linux/init.h>
-#include <linux/module.h>
-#include <linux/cpufreq.h>
-#include <hwregs/reg_map.h>
-#include <hwregs/reg_rdwr.h>
-#include <hwregs/clkgen_defs.h>
-#include <hwregs/ddr2_defs.h>
-
-static int
-cris_sdram_freq_notifier(struct notifier_block *nb, unsigned long val,
-        void *data);
-
-static struct notifier_block cris_sdram_freq_notifier_block = {
-        .notifier_call = cris_sdram_freq_notifier
-};
-
-static struct cpufreq_frequency_table cris_freq_table[] = {
-        {0x01,  6000},
-        {0x02,  200000},
-        {0,     CPUFREQ_TABLE_END},
-};
-
-static unsigned int cris_freq_get_cpu_frequency(unsigned int cpu)
-{
-        reg_clkgen_rw_clk_ctrl clk_ctrl;
-        clk_ctrl = REG_RD(clkgen, regi_clkgen, rw_clk_ctrl);
-        return clk_ctrl.pll ? 200000 : 6000;
-}
-
-static void cris_freq_set_cpu_state(unsigned int state)
-{
-        int i = 0;
-        struct cpufreq_freqs freqs;
-        reg_clkgen_rw_clk_ctrl clk_ctrl;
-        clk_ctrl = REG_RD(clkgen, regi_clkgen, rw_clk_ctrl);
-
-#ifdef CONFIG_SMP
-        for_each_present_cpu(i)
-#endif
-        {
-                freqs.old = cris_freq_get_cpu_frequency(i);
-                freqs.new = cris_freq_table[state].frequency;
-                freqs.cpu = i;
-        }
-
-        cpufreq_notify_transition(&freqs, CPUFREQ_PRECHANGE);
-
-        local_irq_disable();
-
-        /* Even though we may be SMP they will share the same clock
-         * so all settings are made on CPU0. */
-        if (cris_freq_table[state].frequency == 200000)
-                clk_ctrl.pll = 1;
-        else
-                clk_ctrl.pll = 0;
-        REG_WR(clkgen, regi_clkgen, rw_clk_ctrl, clk_ctrl);
-
-        local_irq_enable();
-
-        cpufreq_notify_transition(&freqs, CPUFREQ_POSTCHANGE);
-};
-
-static int cris_freq_verify(struct cpufreq_policy *policy)
-{
-        return cpufreq_frequency_table_verify(policy, &cris_freq_table[0]);
-}
-
-static int cris_freq_target(struct cpufreq_policy *policy,
-                            unsigned int target_freq,
-                            unsigned int relation)
-{
-        unsigned int newstate = 0;
-
-        if (cpufreq_frequency_table_target(policy, cris_freq_table,
-                        target_freq, relation, &newstate))
-                return -EINVAL;
-
-        cris_freq_set_cpu_state(newstate);
-
-        return 0;
-}
-
-static int cris_freq_cpu_init(struct cpufreq_policy *policy)
-{
-        int result;
-
-        /* cpuinfo and default policy values */
-        policy->cpuinfo.transition_latency = 1000000; /* 1ms */
-        policy->cur = cris_freq_get_cpu_frequency(0);
-
-        result = cpufreq_frequency_table_cpuinfo(policy, cris_freq_table);
-        if (result)
-                return (result);
-
-        cpufreq_frequency_table_get_attr(cris_freq_table, policy->cpu);
-
-        return 0;
-}
-
-
-static int cris_freq_cpu_exit(struct cpufreq_policy *policy)
-{
-        cpufreq_frequency_table_put_attr(policy->cpu);
-        return 0;
-}
-
-
-static struct freq_attr *cris_freq_attr[] = {
-        &cpufreq_freq_attr_scaling_available_freqs,
-        NULL,
-};
-
-static struct cpufreq_driver cris_freq_driver = {
-        .get    = cris_freq_get_cpu_frequency,
-        .verify = cris_freq_verify,
-        .target = cris_freq_target,
-        .init   = cris_freq_cpu_init,
-        .exit   = cris_freq_cpu_exit,
-        .name   = "cris_freq",
-        .owner  = THIS_MODULE,
-        .attr   = cris_freq_attr,
-};
-
-static int __init cris_freq_init(void)
-{
-        int ret;
-        ret = cpufreq_register_driver(&cris_freq_driver);
-        cpufreq_register_notifier(&cris_sdram_freq_notifier_block,
-                CPUFREQ_TRANSITION_NOTIFIER);
-        return ret;
-}
-
-static int
-cris_sdram_freq_notifier(struct notifier_block *nb, unsigned long val,
-        void *data)
-{
-        int i;
-        struct cpufreq_freqs *freqs = data;
-        if (val == CPUFREQ_PRECHANGE) {
-                reg_ddr2_rw_cfg cfg =
-                  REG_RD(ddr2, regi_ddr2_ctrl, rw_cfg);
-                cfg.ref_interval = (freqs->new == 200000 ? 1560 : 46);
-
-                if (freqs->new == 200000)
-                        for (i = 0; i < 50000; i++);
-                REG_WR(bif_core, regi_bif_core, rw_sdram_timing, timing);
-        }
-        return 0;
-}
-
-
-module_init(cris_freq_init);
diff --git a/arch/cris/arch-v32/mach-fs/Makefile b/arch/cris/arch-v32/mach-fs/Makefile
index d366e0891988..18a227196a41 100644
--- a/arch/cris/arch-v32/mach-fs/Makefile
+++ b/arch/cris/arch-v32/mach-fs/Makefile
@@ -3,7 +3,6 @@
 #
 
 obj-y   := dma.o pinmux.o io.o arbiter.o
-obj-$(CONFIG_CPU_FREQ)   += cpufreq.o
 
 clean:
 
diff --git a/arch/cris/arch-v32/mach-fs/cpufreq.c b/arch/cris/arch-v32/mach-fs/cpufreq.c
deleted file mode 100644
index d92cf70d1cbe..000000000000
--- a/arch/cris/arch-v32/mach-fs/cpufreq.c
+++ /dev/null
@@ -1,145 +0,0 @@
-#include <linux/init.h>
-#include <linux/module.h>
-#include <linux/cpufreq.h>
-#include <hwregs/reg_map.h>
-#include <arch/hwregs/reg_rdwr.h>
-#include <arch/hwregs/config_defs.h>
-#include <arch/hwregs/bif_core_defs.h>
-
-static int
-cris_sdram_freq_notifier(struct notifier_block *nb, unsigned long val,
-                         void *data);
-
-static struct notifier_block cris_sdram_freq_notifier_block = {
-        .notifier_call = cris_sdram_freq_notifier
-};
-
-static struct cpufreq_frequency_table cris_freq_table[] = {
-        {0x01, 6000},
-        {0x02, 200000},
-        {0, CPUFREQ_TABLE_END},
-};
-
-static unsigned int cris_freq_get_cpu_frequency(unsigned int cpu)
-{
-        reg_config_rw_clk_ctrl clk_ctrl;
-        clk_ctrl = REG_RD(config, regi_config, rw_clk_ctrl);
-        return clk_ctrl.pll ? 200000 : 6000;
-}
-
-static void cris_freq_set_cpu_state(unsigned int state)
-{
-        int i;
-        struct cpufreq_freqs freqs;
-        reg_config_rw_clk_ctrl clk_ctrl;
-        clk_ctrl = REG_RD(config, regi_config, rw_clk_ctrl);
-
-        for_each_possible_cpu(i) {
-                freqs.old = cris_freq_get_cpu_frequency(i);
-                freqs.new = cris_freq_table[state].frequency;
-                freqs.cpu = i;
-        }
-
-        cpufreq_notify_transition(&freqs, CPUFREQ_PRECHANGE);
-
-        local_irq_disable();
-
-        /* Even though we may be SMP they will share the same clock
-         * so all settings are made on CPU0. */
-        if (cris_freq_table[state].frequency == 200000)
-                clk_ctrl.pll = 1;
-        else
-                clk_ctrl.pll = 0;
-        REG_WR(config, regi_config, rw_clk_ctrl, clk_ctrl);
-
-        local_irq_enable();
-
-        cpufreq_notify_transition(&freqs, CPUFREQ_POSTCHANGE);
-};
-
-static int cris_freq_verify(struct cpufreq_policy *policy)
-{
-        return cpufreq_frequency_table_verify(policy, &cris_freq_table[0]);
-}
-
-static int cris_freq_target(struct cpufreq_policy *policy,
-                            unsigned int target_freq, unsigned int relation)
-{
-        unsigned int newstate = 0;
-
-        if (cpufreq_frequency_table_target
-            (policy, cris_freq_table, target_freq, relation, &newstate))
-                return -EINVAL;
-
-        cris_freq_set_cpu_state(newstate);
-
-        return 0;
-}
-
-static int cris_freq_cpu_init(struct cpufreq_policy *policy)
-{
-        int result;
-
-        /* cpuinfo and default policy values */
-        policy->cpuinfo.transition_latency = 1000000;   /* 1ms */
-        policy->cur = cris_freq_get_cpu_frequency(0);
-
-        result = cpufreq_frequency_table_cpuinfo(policy, cris_freq_table);
-        if (result)
-                return (result);
-
-        cpufreq_frequency_table_get_attr(cris_freq_table, policy->cpu);
-
-        return 0;
-}
-
-static int cris_freq_cpu_exit(struct cpufreq_policy *policy)
-{
-        cpufreq_frequency_table_put_attr(policy->cpu);
-        return 0;
-}
-
-static struct freq_attr *cris_freq_attr[] = {
-        &cpufreq_freq_attr_scaling_available_freqs,
-        NULL,
-};
-
-static struct cpufreq_driver cris_freq_driver = {
-        .get = cris_freq_get_cpu_frequency,
-        .verify = cris_freq_verify,
-        .target = cris_freq_target,
-        .init = cris_freq_cpu_init,
-        .exit = cris_freq_cpu_exit,
-        .name = "cris_freq",
-        .owner = THIS_MODULE,
-        .attr = cris_freq_attr,
-};
-
-static int __init cris_freq_init(void)
-{
-        int ret;
-        ret = cpufreq_register_driver(&cris_freq_driver);
-        cpufreq_register_notifier(&cris_sdram_freq_notifier_block,
-                                  CPUFREQ_TRANSITION_NOTIFIER);
-        return ret;
-}
-
-static int
-cris_sdram_freq_notifier(struct notifier_block *nb, unsigned long val,
-                         void *data)
-{
-        int i;
-        struct cpufreq_freqs *freqs = data;
-        if (val == CPUFREQ_PRECHANGE) {
-                reg_bif_core_rw_sdram_timing timing =
-                    REG_RD(bif_core, regi_bif_core, rw_sdram_timing);
-                timing.cpd = (freqs->new == 200000 ? 0 : 1);
-
-                if (freqs->new == 200000)
-                        for (i = 0; i < 50000; i++) ;
-                REG_WR(bif_core, regi_bif_core, rw_sdram_timing, timing);
-        }
-        return 0;
-}
-
-module_init(cris_freq_init);
diff --git a/arch/cris/include/asm/processor.h b/arch/cris/include/asm/processor.h
index 675823f70c0f..c0a29b96b92b 100644
--- a/arch/cris/include/asm/processor.h
+++ b/arch/cris/include/asm/processor.h
@@ -65,13 +65,6 @@ static inline void release_thread(struct task_struct *dead_task)
 
 #define cpu_relax()     barrier()
 
-/*
- * disable hlt during certain critical i/o operations
- */
-#define HAVE_DISABLE_HLT
-void disable_hlt(void);
-void enable_hlt(void);
-
 void default_idle(void);
 
 #endif /* __ASM_CRIS_PROCESSOR_H */
diff --git a/arch/cris/include/asm/unistd.h b/arch/cris/include/asm/unistd.h
index be57a988bfb9..0ff3f6889842 100644
--- a/arch/cris/include/asm/unistd.h
+++ b/arch/cris/include/asm/unistd.h
@@ -34,12 +34,4 @@
 #define __ARCH_WANT_SYS_VFORK
 #define __ARCH_WANT_SYS_CLONE
 
-/*
- * "Conditional" syscalls
- *
- * What we want is __attribute__((weak,alias("sys_ni_syscall"))),
- * but it doesn't work on all toolchains, so we just do it by hand
- */
-#define cond_syscall(x) asm(".weak\t" #x "\n\t.set\t" #x ",sys_ni_syscall")
-
 #endif /* _ASM_CRIS_UNISTD_H_ */
diff --git a/arch/cris/kernel/process.c b/arch/cris/kernel/process.c
index 104ff4dd9b98..b78498eb079b 100644
--- a/arch/cris/kernel/process.c
+++ b/arch/cris/kernel/process.c
@@ -29,59 +29,14 @@
 
 //#define DEBUG
 
-/*
- * The hlt_counter, disable_hlt and enable_hlt is just here as a hook if
- * there would ever be a halt sequence (for power save when idle) with
- * some largish delay when halting or resuming *and* a driver that can't
- * afford that delay.  The hlt_counter would then be checked before
- * executing the halt sequence, and the driver marks the unhaltable
- * region by enable_hlt/disable_hlt.
- */
-
-int cris_hlt_counter=0;
-
-void disable_hlt(void)
-{
-        cris_hlt_counter++;
-}
-
-EXPORT_SYMBOL(disable_hlt);
-
-void enable_hlt(void)
-{
-        cris_hlt_counter--;
-}
-
-EXPORT_SYMBOL(enable_hlt);
- 
 extern void default_idle(void);
 
 void (*pm_power_off)(void);
 EXPORT_SYMBOL(pm_power_off);
 
-/*
- * The idle thread. There's no useful work to be
- * done, so just try to conserve power and have a
- * low exit latency (ie sit in a loop waiting for
- * somebody to say that they'd like to reschedule)
- */
-
-void cpu_idle (void)
+void arch_cpu_idle(void)
 {
-        /* endless idle loop with no priority at all */
-        while (1) {
-                rcu_idle_enter();
-                while (!need_resched()) {
-                        /*
-                         * Mark this as an RCU critical section so that
-                         * synchronize_kernel() in the unload path waits
-                         * for our completion.
-                         */
-                        default_idle();
-                }
-                rcu_idle_exit();
-                schedule_preempt_disabled();
-        }
+        default_idle();
 }
 
 void hard_reset_now (void);
diff --git a/arch/cris/kernel/traps.c b/arch/cris/kernel/traps.c
index a11ad3229f8c..0ffda73734f5 100644
--- a/arch/cris/kernel/traps.c
+++ b/arch/cris/kernel/traps.c
@@ -147,13 +147,6 @@ show_stack(void)
 #endif
 
 void
-dump_stack(void)
-{
-        show_stack(NULL, NULL);
-}
-EXPORT_SYMBOL(dump_stack);
-
-void
 set_nmi_handler(void (*handler)(struct pt_regs *))
 {
         nmi_handler = handler;
diff --git a/arch/cris/mm/init.c b/arch/cris/mm/init.c
index d72ab58fd83e..9ac80946dada 100644
--- a/arch/cris/mm/init.c
+++ b/arch/cris/mm/init.c
@@ -12,12 +12,10 @@
 #include <linux/init.h>
 #include <linux/bootmem.h>
 #include <asm/tlb.h>
+#include <asm/sections.h>
 
 unsigned long empty_zero_page;
 
-extern char _stext, _edata, _etext; /* From linkerscript */
-extern char __init_begin, __init_end;
-
 void __init
 mem_init(void)
 {
@@ -67,15 +65,5 @@ mem_init(void)
 void 
 free_initmem(void)
 {
-        unsigned long addr;
-
-        addr = (unsigned long)(&__init_begin);
-        for (; addr < (unsigned long)(&__init_end); addr += PAGE_SIZE) {
-                ClearPageReserved(virt_to_page(addr));
-                init_page_count(virt_to_page(addr));
-                free_page(addr);
-                totalram_pages++;
-        }
-        printk (KERN_INFO "Freeing unused kernel memory: %luk freed\n",
-                (unsigned long)((&__init_end - &__init_begin) >> 10));
+        free_initmem_default(0);
 }
diff --git a/arch/frv/include/asm/unistd.h b/arch/frv/include/asm/unistd.h
index 4cfcc7bba25a..70ec7293dce7 100644
--- a/arch/frv/include/asm/unistd.h
+++ b/arch/frv/include/asm/unistd.h
@@ -31,14 +31,4 @@
 #define __ARCH_WANT_SYS_VFORK
 #define __ARCH_WANT_SYS_CLONE
 
-/*
- * "Conditional" syscalls
- *
- * What we want is __attribute__((weak,alias("sys_ni_syscall"))),
- * but it doesn't work on all toolchains, so we just do it by hand
- */
-#ifndef cond_syscall
-#define cond_syscall(x) asm(".weak\t" #x "\n\t.set\t" #x ",sys_ni_syscall")
-#endif
-
 #endif /* _ASM_UNISTD_H_ */
diff --git a/arch/frv/kernel/process.c b/arch/frv/kernel/process.c
index 23916b2a12a2..5d40aeb7712e 100644
--- a/arch/frv/kernel/process.c
+++ b/arch/frv/kernel/process.c
@@ -59,29 +59,12 @@ static void core_sleep_idle(void)
         mb();
 }
 
-void (*idle)(void) = core_sleep_idle;
-
-/*
- * The idle thread. There's no useful work to be
- * done, so just try to conserve power and have a
- * low exit latency (ie sit in a loop waiting for
- * somebody to say that they'd like to reschedule)
- */
-void cpu_idle(void)
+void arch_cpu_idle(void)
 {
-        /* endless idle loop with no priority at all */
-        while (1) {
-                rcu_idle_enter();
-                while (!need_resched()) {
-                        check_pgt_cache();
-
-                        if (!frv_dma_inprogress && idle)
-                                idle();
-                }
-                rcu_idle_exit();
-
-                schedule_preempt_disabled();
-        }
+        if (!frv_dma_inprogress)
+                core_sleep_idle();
+        else
+                local_irq_enable();
 }
 
 void machine_restart(char * __unused)
diff --git a/arch/frv/kernel/traps.c b/arch/frv/kernel/traps.c
index 5cfd1420b091..4bff48c19d29 100644
--- a/arch/frv/kernel/traps.c
+++ b/arch/frv/kernel/traps.c
@@ -466,17 +466,6 @@ asmlinkage void compound_exception(unsigned long esfr1,
         BUG();
 } /* end compound_exception() */
 
-/*****************************************************************************/
-/*
- * The architecture-independent backtrace generator
- */
-void dump_stack(void)
-{
-        show_stack(NULL, NULL);
-}
-
-EXPORT_SYMBOL(dump_stack);
-
 void show_stack(struct task_struct *task, unsigned long *sp)
 {
 }
@@ -508,6 +497,7 @@ void show_regs(struct pt_regs *regs)
         int loop;
 
         printk("\n");
+        show_regs_print_info(KERN_DEFAULT);
 
         printk("Frame: @%08lx [%s]\n",
                (unsigned long) regs,
@@ -522,8 +512,6 @@ void show_regs(struct pt_regs *regs)
                 else
                         printk(" | ");
         }
-
-        printk("Process %s (pid: %d)\n", current->comm, current->pid);
 }
 
 void die_if_kernel(const char *str, ...)
diff --git a/arch/frv/mm/init.c b/arch/frv/mm/init.c
index 92e97b0894a6..dee354fa6b64 100644
--- a/arch/frv/mm/init.c
+++ b/arch/frv/mm/init.c
@@ -122,7 +122,7 @@ void __init mem_init(void)
 #endif
         int codek = 0, datak = 0;
 
-        /* this will put all memory onto the freelists */
+        /* this will put all low memory onto the freelists */
         totalram_pages = free_all_bootmem();
 
 #ifdef CONFIG_MMU
@@ -131,14 +131,8 @@ void __init mem_init(void)
                         datapages++;
 
 #ifdef CONFIG_HIGHMEM
-        for (pfn = num_physpages - 1; pfn >= num_mappedpages; pfn--) {
-                struct page *page = &mem_map[pfn];
-
-                ClearPageReserved(page);
-                init_page_count(page);
-                __free_page(page);
-                totalram_pages++;
-        }
+        for (pfn = num_physpages - 1; pfn >= num_mappedpages; pfn--)
+                free_highmem_page(&mem_map[pfn]);
 #endif
 
         codek = ((unsigned long) &_etext - (unsigned long) &_stext) >> 10;
@@ -168,21 +162,7 @@ void __init mem_init(void)
 void free_initmem(void)
 {
 #if defined(CONFIG_RAMKERNEL) && !defined(CONFIG_PROTECT_KERNEL)
-        unsigned long start, end, addr;
-
-        start = PAGE_ALIGN((unsigned long) &__init_begin);      /* round up */
-        end   = ((unsigned long) &__init_end) & PAGE_MASK;      /* round down */
-
-        /* next to check that the page we free is not a partial page */
-        for (addr = start; addr < end; addr += PAGE_SIZE) {
-                ClearPageReserved(virt_to_page(addr));
-                init_page_count(virt_to_page(addr));
-                free_page(addr);
-                totalram_pages++;
-        }
-
-        printk("Freeing unused kernel memory: %ldKiB freed (0x%lx - 0x%lx)\n",
-               (end - start) >> 10, start, end);
+        free_initmem_default(0);
 #endif
 } /* end free_initmem() */
 
@@ -193,14 +173,6 @@ void free_initmem(void)
 #ifdef CONFIG_BLK_DEV_INITRD
 void __init free_initrd_mem(unsigned long start, unsigned long end)
 {
-        int pages = 0;
-        for (; start < end; start += PAGE_SIZE) {
-                ClearPageReserved(virt_to_page(start));
-                init_page_count(virt_to_page(start));
-                free_page(start);
-                totalram_pages++;
-                pages++;
-        }
-        printk("Freeing initrd memory: %dKiB freed\n", (pages * PAGE_SIZE) >> 10);
+        free_reserved_area(start, end, 0, "initrd");
 } /* end free_initrd_mem() */
 #endif
diff --git a/arch/h8300/include/asm/linkage.h b/arch/h8300/include/asm/linkage.h
index 6f4df7d46180..1d81604fb0ad 100644
--- a/arch/h8300/include/asm/linkage.h
+++ b/arch/h8300/include/asm/linkage.h
@@ -2,7 +2,5 @@
 #define _H8300_LINKAGE_H
 
 #undef SYMBOL_NAME_LABEL
-#undef SYMBOL_NAME
 #define SYMBOL_NAME_LABEL(_name_) _##_name_##:
-#define SYMBOL_NAME(_name_) _##_name_
 #endif
diff --git a/arch/h8300/include/asm/unistd.h b/arch/h8300/include/asm/unistd.h
index 6721856d841b..ab671ecf5196 100644
--- a/arch/h8300/include/asm/unistd.h
+++ b/arch/h8300/include/asm/unistd.h
@@ -33,11 +33,4 @@
 #define __ARCH_WANT_SYS_VFORK
 #define __ARCH_WANT_SYS_CLONE
 
-/*
- * "Conditional" syscalls
- */
-#define cond_syscall(name)                                              \
-  asm (".weak\t_" #name "\n"                            \
-       ".set\t_" #name ",_sys_ni_syscall");
-
 #endif /* _ASM_H8300_UNISTD_H_ */
diff --git a/arch/h8300/kernel/process.c b/arch/h8300/kernel/process.c
index b609f63f1590..1a744ab7e7e5 100644
--- a/arch/h8300/kernel/process.c
+++ b/arch/h8300/kernel/process.c
@@ -53,40 +53,13 @@ asmlinkage void ret_from_kernel_thread(void);
  * The idle loop on an H8/300..
  */
 #if !defined(CONFIG_H8300H_SIM) && !defined(CONFIG_H8S_SIM)
-static void default_idle(void)
+void arch_cpu_idle(void)
 {
-        local_irq_disable();
-        if (!need_resched()) {
-                local_irq_enable();
-                /* XXX: race here! What if need_resched() gets set now? */
-                __asm__("sleep");
-        } else
-                local_irq_enable();
-}
-#else
-static void default_idle(void)
-{
-        cpu_relax();
+        local_irq_enable();
+        /* XXX: race here! What if need_resched() gets set now? */
+        __asm__("sleep");
 }
 #endif
-void (*idle)(void) = default_idle;
-
-/*
- * The idle thread. There's no useful work to be
- * done, so just try to conserve power and have a
- * low exit latency (ie sit in a loop waiting for
- * somebody to say that they'd like to reschedule)
- */
-void cpu_idle(void)
-{
-        while (1) {
-                rcu_idle_enter();
-                while (!need_resched())
-                        idle();
-                rcu_idle_exit();
-                schedule_preempt_disabled();
-        }
-}
 
 void machine_restart(char * __unused)
 {
@@ -110,6 +83,8 @@ void machine_power_off(void)
 
 void show_regs(struct pt_regs * regs)
 {
+        show_regs_print_info(KERN_DEFAULT);
+
         printk("\nPC: %08lx  Status: %02x",
                regs->pc, regs->ccr);
         printk("\nORIG_ER0: %08lx ER0: %08lx ER1: %08lx",
diff --git a/arch/h8300/kernel/traps.c b/arch/h8300/kernel/traps.c
index 7833aa3e7c7d..cfe494dbe3da 100644
--- a/arch/h8300/kernel/traps.c
+++ b/arch/h8300/kernel/traps.c
@@ -164,10 +164,3 @@ void show_trace_task(struct task_struct *tsk)
 {
         show_stack(tsk,(unsigned long *)tsk->thread.esp0);
 }
-
-void dump_stack(void)
-{
-        show_stack(NULL,NULL);
-}
-
-EXPORT_SYMBOL(dump_stack);
diff --git a/arch/h8300/mm/init.c b/arch/h8300/mm/init.c
index 981e25094b1a..ff349d70a29b 100644
--- a/arch/h8300/mm/init.c
+++ b/arch/h8300/mm/init.c
@@ -139,7 +139,7 @@ void __init mem_init(void)
         start_mem = PAGE_ALIGN(start_mem);
         max_mapnr = num_physpages = MAP_NR(high_memory);
 
-        /* this will put all memory onto the freelists */
+        /* this will put all low memory onto the freelists */
         totalram_pages = free_all_bootmem();
 
         codek = (_etext - _stext) >> 10;
@@ -161,15 +161,7 @@ void __init mem_init(void)
 #ifdef CONFIG_BLK_DEV_INITRD
 void free_initrd_mem(unsigned long start, unsigned long end)
 {
-        int pages = 0;
-        for (; start < end; start += PAGE_SIZE) {
-                ClearPageReserved(virt_to_page(start));
-                init_page_count(virt_to_page(start));
-                free_page(start);
-                totalram_pages++;
-                pages++;
-        }
-        printk ("Freeing initrd memory: %dk freed\n", pages);
+        free_reserved_area(start, end, 0, "initrd");
 }
 #endif
 
@@ -177,23 +169,7 @@ void
 free_initmem(void)
 {
 #ifdef CONFIG_RAMKERNEL
-        unsigned long addr;
-/*
- *      the following code should be cool even if these sections
- *      are not page aligned.
- */
-        addr = PAGE_ALIGN((unsigned long)(__init_begin));
-        /* next to check that the page we free is not a partial page */
-        for (; addr + PAGE_SIZE < (unsigned long)__init_end; addr +=PAGE_SIZE) {
-                ClearPageReserved(virt_to_page(addr));
-                init_page_count(virt_to_page(addr));
-                free_page(addr);
-                totalram_pages++;
-        }
-        printk(KERN_INFO "Freeing unused kernel memory: %ldk freed (0x%x - 0x%x)\n",
-                        (addr - PAGE_ALIGN((long) __init_begin)) >> 10,
-                        (int)(PAGE_ALIGN((unsigned long)__init_begin)),
-                        (int)(addr - PAGE_SIZE));
+        free_initmem_default(0);
 #endif
 }
 
diff --git a/arch/hexagon/kernel/process.c b/arch/hexagon/kernel/process.c
index 7fcc636b6238..0a0dd5c05b46 100644
--- a/arch/hexagon/kernel/process.c
+++ b/arch/hexagon/kernel/process.c
@@ -52,28 +52,11 @@ void start_thread(struct pt_regs *regs, unsigned long pc, unsigned long sp)
  *  If hardware or VM offer wait termination even though interrupts
  *  are disabled.
  */
-static void default_idle(void)
+void arch_cpu_idle(void)
 {
         __vmwait();
-}
-
-void (*idle_sleep)(void) = default_idle;
-
-void cpu_idle(void)
-{
-        while (1) {
-                tick_nohz_idle_enter();
-                local_irq_disable();
-                while (!need_resched()) {
-                        idle_sleep();
-                        /*  interrupts wake us up, but aren't serviced  */
-                        local_irq_enable();     /* service interrupt   */
-                        local_irq_disable();
-                }
-                local_irq_enable();
-                tick_nohz_idle_exit();
-                schedule();
-        }
+        /*  interrupts wake us up, but irqs are still disabled */
+        local_irq_enable();
 }
 
 /*
diff --git a/arch/hexagon/kernel/smp.c b/arch/hexagon/kernel/smp.c
index 8e095dffd070..0e364ca43198 100644
--- a/arch/hexagon/kernel/smp.c
+++ b/arch/hexagon/kernel/smp.c
@@ -184,7 +184,7 @@ void __cpuinit start_secondary(void)
 
         local_irq_enable();
 
-        cpu_idle();
+        cpu_startup_entry(CPUHP_ONLINE);
 }
 
 
diff --git a/arch/hexagon/kernel/traps.c b/arch/hexagon/kernel/traps.c
index aaf53f883710..7858663352b9 100644
--- a/arch/hexagon/kernel/traps.c
+++ b/arch/hexagon/kernel/traps.c
@@ -195,14 +195,6 @@ void show_stack(struct task_struct *task, unsigned long *fp)
         do_show_stack(task, fp, 0);
 }
 
-void dump_stack(void)
-{
-        unsigned long *fp;
-        asm("%0 = r30" : "=r" (fp));
-        show_stack(current, fp);
-}
-EXPORT_SYMBOL(dump_stack);
-
 int die(const char *str, struct pt_regs *regs, long err)
 {
         static struct {
diff --git a/arch/hexagon/kernel/vm_events.c b/arch/hexagon/kernel/vm_events.c
index 3e4453091889..741aaa917cda 100644
--- a/arch/hexagon/kernel/vm_events.c
+++ b/arch/hexagon/kernel/vm_events.c
@@ -33,6 +33,8 @@
  */
 void show_regs(struct pt_regs *regs)
 {
+        show_regs_print_info(KERN_EMERG);
+
         printk(KERN_EMERG "restart_r0: \t0x%08lx   syscall_nr: %ld\n",
                regs->restart_r0, regs->syscall_nr);
         printk(KERN_EMERG "preds: \t\t0x%08lx\n", regs->preds);
diff --git a/arch/ia64/Kconfig b/arch/ia64/Kconfig
index 9a02f71c6b1f..e725ea01569e 100644
--- a/arch/ia64/Kconfig
+++ b/arch/ia64/Kconfig
@@ -187,7 +187,7 @@ config IA64_DIG
 
 config IA64_DIG_VTD
         bool "DIG+Intel+IOMMU"
-        select DMAR
+        select INTEL_IOMMU
         select PCI_MSI
 
 config IA64_HP_ZX1
@@ -591,9 +591,9 @@ source "kernel/power/Kconfig"
 source "drivers/acpi/Kconfig"
 
 if PM
-
-source "arch/ia64/kernel/cpufreq/Kconfig"
-
+menu "CPU Frequency scaling"
+source "drivers/cpufreq/Kconfig"
+endmenu
 endif
 
 endmenu
diff --git a/arch/ia64/hp/sim/simserial.c b/arch/ia64/hp/sim/simserial.c
index da2f319fb71d..e70cadec7ce6 100644
--- a/arch/ia64/hp/sim/simserial.c
+++ b/arch/ia64/hp/sim/simserial.c
@@ -142,8 +142,7 @@ static void transmit_chars(struct tty_struct *tty, struct serial_state *info,
                 goto out;
         }
 
-        if (info->xmit.head == info->xmit.tail || tty->stopped ||
-                        tty->hw_stopped) {
+        if (info->xmit.head == info->xmit.tail || tty->stopped) {
 #ifdef SIMSERIAL_DEBUG
                 printk("transmit_chars: head=%d, tail=%d, stopped=%d\n",
                        info->xmit.head, info->xmit.tail, tty->stopped);
@@ -181,7 +180,7 @@ static void rs_flush_chars(struct tty_struct *tty)
         struct serial_state *info = tty->driver_data;
 
         if (info->xmit.head == info->xmit.tail || tty->stopped ||
-                        tty->hw_stopped || !info->xmit.buf)
+                        !info->xmit.buf)
                 return;
 
         transmit_chars(tty, info, NULL);
@@ -217,7 +216,7 @@ static int rs_write(struct tty_struct * tty,
          * Hey, we transmit directly from here in our case
          */
         if (CIRC_CNT(info->xmit.head, info->xmit.tail, SERIAL_XMIT_SIZE) &&
-                        !tty->stopped && !tty->hw_stopped)
+                        !tty->stopped)
                 transmit_chars(tty, info, NULL);
 
         return ret;
@@ -325,14 +324,6 @@ static int rs_ioctl(struct tty_struct *tty, unsigned int cmd, unsigned long arg)
 
 #define RELEVANT_IFLAG(iflag) (iflag & (IGNBRK|BRKINT|IGNPAR|PARMRK|INPCK))
 
-static void rs_set_termios(struct tty_struct *tty, struct ktermios *old_termios)
-{
-        /* Handle turning off CRTSCTS */
-        if ((old_termios->c_cflag & CRTSCTS) &&
-            !(tty->termios.c_cflag & CRTSCTS)) {
-                tty->hw_stopped = 0;
-        }
-}
 /*
  * This routine will shutdown a serial port; interrupts are disabled, and
  * DTR is dropped if the hangup on close termio flag is on.
@@ -481,7 +472,6 @@ static const struct tty_operations hp_ops = {
         .throttle = rs_throttle,
         .unthrottle = rs_unthrottle,
         .send_xchar = rs_send_xchar,
-        .set_termios = rs_set_termios,
         .hangup = rs_hangup,
         .proc_fops = &rs_proc_fops,
 };
diff --git a/arch/ia64/include/asm/futex.h b/arch/ia64/include/asm/futex.h
index d2bf1fd5e44f..76acbcd5c060 100644
--- a/arch/ia64/include/asm/futex.h
+++ b/arch/ia64/include/asm/futex.h
@@ -106,16 +106,15 @@ futex_atomic_cmpxchg_inatomic(u32 *uval, u32 __user *uaddr,
                 return -EFAULT;
 
         {
-                register unsigned long r8 __asm ("r8");
+                register unsigned long r8 __asm ("r8") = 0;
                 unsigned long prev;
                 __asm__ __volatile__(
                         "       mf;;                                    \n"
-                        "       mov %0=r0                               \n"
                         "       mov ar.ccv=%4;;                         \n"
                         "[1:]   cmpxchg4.acq %1=[%2],%3,ar.ccv          \n"
                         "       .xdata4 \"__ex_table\", 1b-., 2f-.      \n"
                         "[2:]"
-                        : "=r" (r8), "=r" (prev)
+                        : "+r" (r8), "=&r" (prev)
                         : "r" (uaddr), "r" (newval),
                           "rO" ((long) (unsigned) oldval)
                         : "memory");
diff --git a/arch/ia64/include/asm/hugetlb.h b/arch/ia64/include/asm/hugetlb.h
index 94eaa5bd5d0c..aa910054b8e7 100644
--- a/arch/ia64/include/asm/hugetlb.h
+++ b/arch/ia64/include/asm/hugetlb.h
@@ -2,6 +2,7 @@
 #define _ASM_IA64_HUGETLB_H
 
 #include <asm/page.h>
+#include <asm-generic/hugetlb.h>
 
 
 void hugetlb_free_pgd_range(struct mmu_gather *tlb, unsigned long addr,
diff --git a/arch/ia64/include/asm/irqflags.h b/arch/ia64/include/asm/irqflags.h
index 2b68d856dc78..1bf2cf2f4ab4 100644
--- a/arch/ia64/include/asm/irqflags.h
+++ b/arch/ia64/include/asm/irqflags.h
@@ -89,6 +89,7 @@ static inline bool arch_irqs_disabled(void)
 
 static inline void arch_safe_halt(void)
 {
+        arch_local_irq_enable();
         ia64_pal_halt_light();  /* PAL_HALT_LIGHT */
 }
 
diff --git a/arch/ia64/include/asm/linkage.h b/arch/ia64/include/asm/linkage.h
index ef22a45c1890..787575701f1c 100644
--- a/arch/ia64/include/asm/linkage.h
+++ b/arch/ia64/include/asm/linkage.h
@@ -11,4 +11,8 @@
 
 #endif
 
+#define cond_syscall(x) asm(".weak\t" #x "#\n" #x "#\t=\tsys_ni_syscall#")
+#define SYSCALL_ALIAS(alias, name)                                      \
+        asm ( #alias "# = " #name "#\n\t.globl " #alias "#")
+
 #endif
diff --git a/arch/ia64/include/asm/mca.h b/arch/ia64/include/asm/mca.h
index 43f96ab18fa0..8c7096168716 100644
--- a/arch/ia64/include/asm/mca.h
+++ b/arch/ia64/include/asm/mca.h
@@ -143,6 +143,7 @@ extern unsigned long __per_cpu_mca[NR_CPUS];
 extern int cpe_vector;
 extern int ia64_cpe_irq;
 extern void ia64_mca_init(void);
+extern void ia64_mca_irq_init(void);
 extern void ia64_mca_cpu_init(void *);
 extern void ia64_os_mca_dispatch(void);
 extern void ia64_os_mca_dispatch_end(void);
diff --git a/arch/ia64/include/asm/numa.h b/arch/ia64/include/asm/numa.h
index 2e27ef175652..2db0a6c6daa5 100644
--- a/arch/ia64/include/asm/numa.h
+++ b/arch/ia64/include/asm/numa.h
@@ -67,14 +67,13 @@ extern int paddr_to_nid(unsigned long paddr);
 
 extern void map_cpu_to_node(int cpu, int nid);
 extern void unmap_cpu_from_node(int cpu, int nid);
-
+extern void numa_clear_node(int cpu);
 
 #else /* !CONFIG_NUMA */
 #define map_cpu_to_node(cpu, nid)       do{}while(0)
 #define unmap_cpu_from_node(cpu, nid)   do{}while(0)
-
 #define paddr_to_nid(addr)      0
-
+#define numa_clear_node(cpu)    do { } while (0)
 #endif /* CONFIG_NUMA */
 
 #endif /* _ASM_IA64_NUMA_H */
diff --git a/arch/ia64/include/asm/thread_info.h b/arch/ia64/include/asm/thread_info.h
index 020d655ed082..cade13dd0299 100644
--- a/arch/ia64/include/asm/thread_info.h
+++ b/arch/ia64/include/asm/thread_info.h
@@ -131,8 +131,6 @@ struct thread_info {
 #define TS_POLLING              1       /* true if in idle loop and not sleeping */
 #define TS_RESTORE_SIGMASK      2       /* restore signal mask in do_signal() */
 
-#define tsk_is_polling(t) (task_thread_info(t)->status & TS_POLLING)
-
 #ifndef __ASSEMBLY__
 #define HAVE_SET_RESTORE_SIGMASK        1
 static inline void set_restore_sigmask(void)
diff --git a/arch/ia64/include/asm/unistd.h b/arch/ia64/include/asm/unistd.h
index 096373800f73..afd45e0d552e 100644
--- a/arch/ia64/include/asm/unistd.h
+++ b/arch/ia64/include/asm/unistd.h
@@ -46,15 +46,5 @@ asmlinkage unsigned long sys_mmap2(
 struct pt_regs;
 asmlinkage long sys_ia64_pipe(void);
 
-/*
- * "Conditional" syscalls
- *
- * Note, this macro can only be used in the file which defines sys_ni_syscall, i.e., in
- * kernel/sys_ni.c.  This version causes warnings because the declaration isn't a
- * proper prototype, but we can't use __typeof__ either, because not all cond_syscall()
- * declarations have prototypes at the moment.
- */
-#define cond_syscall(x) asmlinkage long x (void) __attribute__((weak,alias("sys_ni_syscall")))
-
 #endif /* !__ASSEMBLY__ */
 #endif /* _ASM_IA64_UNISTD_H */
diff --git a/arch/ia64/kernel/Makefile b/arch/ia64/kernel/Makefile
index d959c84904be..20678a9ed11a 100644
--- a/arch/ia64/kernel/Makefile
+++ b/arch/ia64/kernel/Makefile
@@ -23,7 +23,6 @@ obj-$(CONFIG_SMP)		+= smp.o smpboot.o
 obj-$(CONFIG_NUMA)              += numa.o
 obj-$(CONFIG_PERFMON)           += perfmon_default_smpl.o
 obj-$(CONFIG_IA64_CYCLONE)      += cyclone.o
-obj-$(CONFIG_CPU_FREQ)          += cpufreq/
 obj-$(CONFIG_IA64_MCA_RECOVERY) += mca_recovery.o
 obj-$(CONFIG_KPROBES)           += kprobes.o jprobes.o
 obj-$(CONFIG_DYNAMIC_FTRACE)    += ftrace.o
diff --git a/arch/ia64/kernel/cpufreq/Kconfig b/arch/ia64/kernel/cpufreq/Kconfig
deleted file mode 100644
index 2d9d5279b981..000000000000
--- a/arch/ia64/kernel/cpufreq/Kconfig
+++ /dev/null
@@ -1,29 +0,0 @@
-
-#
-# CPU Frequency scaling
-#
-
-menu "CPU Frequency scaling"
-
-source "drivers/cpufreq/Kconfig"
-
-if CPU_FREQ
-
-comment "CPUFreq processor drivers"
-
-config IA64_ACPI_CPUFREQ
-        tristate "ACPI Processor P-States driver"
-        select CPU_FREQ_TABLE
-        depends on ACPI_PROCESSOR
-        help
-        This driver adds a CPUFreq driver which utilizes the ACPI
-        Processor Performance States.
-
-        For details, take a look at <file:Documentation/cpu-freq/>.
-
-        If in doubt, say N.
-
-endif   # CPU_FREQ
-
-endmenu
-
diff --git a/arch/ia64/kernel/cpufreq/Makefile b/arch/ia64/kernel/cpufreq/Makefile
deleted file mode 100644
index 4838f2a57c7a..000000000000
--- a/arch/ia64/kernel/cpufreq/Makefile
+++ /dev/null
@@ -1,2 +0,0 @@
-obj-$(CONFIG_IA64_ACPI_CPUFREQ)         += acpi-cpufreq.o
-
diff --git a/arch/ia64/kernel/cpufreq/acpi-cpufreq.c b/arch/ia64/kernel/cpufreq/acpi-cpufreq.c
deleted file mode 100644
index f09b174244d5..000000000000
--- a/arch/ia64/kernel/cpufreq/acpi-cpufreq.c
+++ /dev/null
@@ -1,437 +0,0 @@
-/*
- * arch/ia64/kernel/cpufreq/acpi-cpufreq.c
- * This file provides the ACPI based P-state support. This
- * module works with generic cpufreq infrastructure. Most of
- * the code is based on i386 version
- * (arch/i386/kernel/cpu/cpufreq/acpi-cpufreq.c)
- *
- * Copyright (C) 2005 Intel Corp
- *      Venkatesh Pallipadi <venkatesh.pallipadi@intel.com>
- */
-
-#include <linux/kernel.h>
-#include <linux/slab.h>
-#include <linux/module.h>
-#include <linux/init.h>
-#include <linux/cpufreq.h>
-#include <linux/proc_fs.h>
-#include <linux/seq_file.h>
-#include <asm/io.h>
-#include <asm/uaccess.h>
-#include <asm/pal.h>
-
-#include <linux/acpi.h>
-#include <acpi/processor.h>
-
-MODULE_AUTHOR("Venkatesh Pallipadi");
-MODULE_DESCRIPTION("ACPI Processor P-States Driver");
-MODULE_LICENSE("GPL");
-
-
-struct cpufreq_acpi_io {
-        struct acpi_processor_performance       acpi_data;
-        struct cpufreq_frequency_table          *freq_table;
-        unsigned int                            resume;
-};
-
-static struct cpufreq_acpi_io   *acpi_io_data[NR_CPUS];
-
-static struct cpufreq_driver acpi_cpufreq_driver;
-
-
-static int
-processor_set_pstate (
-        u32     value)
-{
-        s64 retval;
-
-        pr_debug("processor_set_pstate\n");
-
-        retval = ia64_pal_set_pstate((u64)value);
-
-        if (retval) {
-                pr_debug("Failed to set freq to 0x%x, with error 0x%lx\n",
-                        value, retval);
-                return -ENODEV;
-        }
-        return (int)retval;
-}
-
-
-static int
-processor_get_pstate (
-        u32     *value)
-{
-        u64     pstate_index = 0;
-        s64     retval;
-
-        pr_debug("processor_get_pstate\n");
-
-        retval = ia64_pal_get_pstate(&pstate_index,
-                                     PAL_GET_PSTATE_TYPE_INSTANT);
-        *value = (u32) pstate_index;
-
-        if (retval)
-                pr_debug("Failed to get current freq with "
-                        "error 0x%lx, idx 0x%x\n", retval, *value);
-
-        return (int)retval;
-}
-
-
-/* To be used only after data->acpi_data is initialized */
-static unsigned
-extract_clock (
-        struct cpufreq_acpi_io *data,
-        unsigned value,
-        unsigned int cpu)
-{
-        unsigned long i;
-
-        pr_debug("extract_clock\n");
-
-        for (i = 0; i < data->acpi_data.state_count; i++) {
-                if (value == data->acpi_data.states[i].status)
-                        return data->acpi_data.states[i].core_frequency;
-        }
-        return data->acpi_data.states[i-1].core_frequency;
-}
-
-
-static unsigned int
-processor_get_freq (
-        struct cpufreq_acpi_io  *data,
-        unsigned int            cpu)
-{
-        int                     ret = 0;
-        u32                     value = 0;
-        cpumask_t               saved_mask;
-        unsigned long           clock_freq;
-
-        pr_debug("processor_get_freq\n");
-
-        saved_mask = current->cpus_allowed;
-        set_cpus_allowed_ptr(current, cpumask_of(cpu));
-        if (smp_processor_id() != cpu)
-                goto migrate_end;
-
-        /* processor_get_pstate gets the instantaneous frequency */
-        ret = processor_get_pstate(&value);
-
-        if (ret) {
-                set_cpus_allowed_ptr(current, &saved_mask);
-                printk(KERN_WARNING "get performance failed with error %d\n",
-                       ret);
-                ret = 0;
-                goto migrate_end;
-        }
-        clock_freq = extract_clock(data, value, cpu);
-        ret = (clock_freq*1000);
-
-migrate_end:
-        set_cpus_allowed_ptr(current, &saved_mask);
-        return ret;
-}
-
-
-static int
-processor_set_freq (
-        struct cpufreq_acpi_io  *data,
-        unsigned int            cpu,
-        int                     state)
-{
-        int                     ret = 0;
-        u32                     value = 0;
-        struct cpufreq_freqs    cpufreq_freqs;
-        cpumask_t               saved_mask;
-        int                     retval;
-
-        pr_debug("processor_set_freq\n");
-
-        saved_mask = current->cpus_allowed;
-        set_cpus_allowed_ptr(current, cpumask_of(cpu));
-        if (smp_processor_id() != cpu) {
-                retval = -EAGAIN;
-                goto migrate_end;
-        }
-
-        if (state == data->acpi_data.state) {
-                if (unlikely(data->resume)) {
-                        pr_debug("Called after resume, resetting to P%d\n", state);
-                        data->resume = 0;
-                } else {
-                        pr_debug("Already at target state (P%d)\n", state);
-                        retval = 0;
-                        goto migrate_end;
-                }
-        }
-
-        pr_debug("Transitioning from P%d to P%d\n",
-                data->acpi_data.state, state);
-
-        /* cpufreq frequency struct */
-        cpufreq_freqs.cpu = cpu;
-        cpufreq_freqs.old = data->freq_table[data->acpi_data.state].frequency;
-        cpufreq_freqs.new = data->freq_table[state].frequency;
-
-        /* notify cpufreq */
-        cpufreq_notify_transition(&cpufreq_freqs, CPUFREQ_PRECHANGE);
-
-        /*
-         * First we write the target state's 'control' value to the
-         * control_register.
-         */
-
-        value = (u32) data->acpi_data.states[state].control;
-
-        pr_debug("Transitioning to state: 0x%08x\n", value);
-
-        ret = processor_set_pstate(value);
-        if (ret) {
-                unsigned int tmp = cpufreq_freqs.new;
-                cpufreq_notify_transition(&cpufreq_freqs, CPUFREQ_POSTCHANGE);
-                cpufreq_freqs.new = cpufreq_freqs.old;
-                cpufreq_freqs.old = tmp;
-                cpufreq_notify_transition(&cpufreq_freqs, CPUFREQ_PRECHANGE);
-                cpufreq_notify_transition(&cpufreq_freqs, CPUFREQ_POSTCHANGE);
-                printk(KERN_WARNING "Transition failed with error %d\n", ret);
-                retval = -ENODEV;
-                goto migrate_end;
-        }
-
-        cpufreq_notify_transition(&cpufreq_freqs, CPUFREQ_POSTCHANGE);
-
-        data->acpi_data.state = state;
-
-        retval = 0;
-
-migrate_end:
-        set_cpus_allowed_ptr(current, &saved_mask);
-        return (retval);
-}
-
-
-static unsigned int
-acpi_cpufreq_get (
-        unsigned int            cpu)
-{
-        struct cpufreq_acpi_io *data = acpi_io_data[cpu];
-
-        pr_debug("acpi_cpufreq_get\n");
-
-        return processor_get_freq(data, cpu);
-}
-
-
-static int
-acpi_cpufreq_target (
-        struct cpufreq_policy   *policy,
-        unsigned int target_freq,
-        unsigned int relation)
-{
-        struct cpufreq_acpi_io *data = acpi_io_data[policy->cpu];
-        unsigned int next_state = 0;
-        unsigned int result = 0;
-
-        pr_debug("acpi_cpufreq_setpolicy\n");
-
-        result = cpufreq_frequency_table_target(policy,
-                        data->freq_table, target_freq, relation, &next_state);
-        if (result)
-                return (result);
-
-        result = processor_set_freq(data, policy->cpu, next_state);
-
-        return (result);
-}
-
-
-static int
-acpi_cpufreq_verify (
-        struct cpufreq_policy   *policy)
-{
-        unsigned int result = 0;
-        struct cpufreq_acpi_io *data = acpi_io_data[policy->cpu];
-
-        pr_debug("acpi_cpufreq_verify\n");
-
-        result = cpufreq_frequency_table_verify(policy,
-                        data->freq_table);
-
-        return (result);
-}
-
-
-static int
-acpi_cpufreq_cpu_init (
-        struct cpufreq_policy   *policy)
-{
-        unsigned int            i;
-        unsigned int            cpu = policy->cpu;
-        struct cpufreq_acpi_io  *data;
-        unsigned int            result = 0;
-
-        pr_debug("acpi_cpufreq_cpu_init\n");
-
-        data = kzalloc(sizeof(struct cpufreq_acpi_io), GFP_KERNEL);
-        if (!data)
-                return (-ENOMEM);
-
-        acpi_io_data[cpu] = data;
-
-        result = acpi_processor_register_performance(&data->acpi_data, cpu);
-
-        if (result)
-                goto err_free;
-
-        /* capability check */
-        if (data->acpi_data.state_count <= 1) {
-                pr_debug("No P-States\n");
-                result = -ENODEV;
-                goto err_unreg;
-        }
-
-        if ((data->acpi_data.control_register.space_id !=
-                                        ACPI_ADR_SPACE_FIXED_HARDWARE) ||
-            (data->acpi_data.status_register.space_id !=
-                                        ACPI_ADR_SPACE_FIXED_HARDWARE)) {
-                pr_debug("Unsupported address space [%d, %d]\n",
-                        (u32) (data->acpi_data.control_register.space_id),
-                        (u32) (data->acpi_data.status_register.space_id));
-                result = -ENODEV;
-                goto err_unreg;
-        }
-
-        /* alloc freq_table */
-        data->freq_table = kmalloc(sizeof(struct cpufreq_frequency_table) *
-                                   (data->acpi_data.state_count + 1),
-                                   GFP_KERNEL);
-        if (!data->freq_table) {
-                result = -ENOMEM;
-                goto err_unreg;
-        }
-
-        /* detect transition latency */
-        policy->cpuinfo.transition_latency = 0;
-        for (i=0; i<data->acpi_data.state_count; i++) {
-                if ((data->acpi_data.states[i].transition_latency * 1000) >
-                    policy->cpuinfo.transition_latency) {
-                        policy->cpuinfo.transition_latency =
-                            data->acpi_data.states[i].transition_latency * 1000;
-                }
-        }
-        policy->cur = processor_get_freq(data, policy->cpu);
-
-        /* table init */
-        for (i = 0; i <= data->acpi_data.state_count; i++)
-        {
-                data->freq_table[i].index = i;
-                if (i < data->acpi_data.state_count) {
-                        data->freq_table[i].frequency =
-                              data->acpi_data.states[i].core_frequency * 1000;
-                } else {
-                        data->freq_table[i].frequency = CPUFREQ_TABLE_END;
-                }
-        }
-
-        result = cpufreq_frequency_table_cpuinfo(policy, data->freq_table);
-        if (result) {
-                goto err_freqfree;
-        }
-
-        /* notify BIOS that we exist */
-        acpi_processor_notify_smm(THIS_MODULE);
-
-        printk(KERN_INFO "acpi-cpufreq: CPU%u - ACPI performance management "
-               "activated.\n", cpu);
-
-        for (i = 0; i < data->acpi_data.state_count; i++)
-                pr_debug("     %cP%d: %d MHz, %d mW, %d uS, %d uS, 0x%x 0x%x\n",
-                        (i == data->acpi_data.state?'*':' '), i,
-                        (u32) data->acpi_data.states[i].core_frequency,
-                        (u32) data->acpi_data.states[i].power,
-                        (u32) data->acpi_data.states[i].transition_latency,
-                        (u32) data->acpi_data.states[i].bus_master_latency,
-                        (u32) data->acpi_data.states[i].status,
-                        (u32) data->acpi_data.states[i].control);
-
-        cpufreq_frequency_table_get_attr(data->freq_table, policy->cpu);
-
-        /* the first call to ->target() should result in us actually
-         * writing something to the appropriate registers. */
-        data->resume = 1;
-
-        return (result);
-
- err_freqfree:
-        kfree(data->freq_table);
- err_unreg:
-        acpi_processor_unregister_performance(&data->acpi_data, cpu);
- err_free:
-        kfree(data);
-        acpi_io_data[cpu] = NULL;
-
-        return (result);
-}
-
-
-static int
-acpi_cpufreq_cpu_exit (
-        struct cpufreq_policy   *policy)
-{
-        struct cpufreq_acpi_io *data = acpi_io_data[policy->cpu];
-
-        pr_debug("acpi_cpufreq_cpu_exit\n");
-
-        if (data) {
-                cpufreq_frequency_table_put_attr(policy->cpu);
-                acpi_io_data[policy->cpu] = NULL;
-                acpi_processor_unregister_performance(&data->acpi_data,
-                                                      policy->cpu);
-                kfree(data);
-        }
-
-        return (0);
-}
-
-
-static struct freq_attr* acpi_cpufreq_attr[] = {
-        &cpufreq_freq_attr_scaling_available_freqs,
-        NULL,
-};
-
-
-static struct cpufreq_driver acpi_cpufreq_driver = {
-        .verify         = acpi_cpufreq_verify,
-        .target         = acpi_cpufreq_target,
-        .get            = acpi_cpufreq_get,
-        .init           = acpi_cpufreq_cpu_init,
-        .exit           = acpi_cpufreq_cpu_exit,
-        .name           = "acpi-cpufreq",
-        .owner          = THIS_MODULE,
-        .attr           = acpi_cpufreq_attr,
-};
-
-
-static int __init
-acpi_cpufreq_init (void)
-{
-        pr_debug("acpi_cpufreq_init\n");
-
-        return cpufreq_register_driver(&acpi_cpufreq_driver);
-}
-
-
-static void __exit
-acpi_cpufreq_exit (void)
-{
-        pr_debug("acpi_cpufreq_exit\n");
-
-        cpufreq_unregister_driver(&acpi_cpufreq_driver);
-        return;
-}
-
-
-late_initcall(acpi_cpufreq_init);
-module_exit(acpi_cpufreq_exit);
-
diff --git a/arch/ia64/kernel/fsys.S b/arch/ia64/kernel/fsys.S
index c4cd45d97749..abc6dee3799c 100644
--- a/arch/ia64/kernel/fsys.S
+++ b/arch/ia64/kernel/fsys.S
@@ -90,53 +90,6 @@ ENTRY(fsys_getpid)
         FSYS_RETURN
 END(fsys_getpid)
 
-ENTRY(fsys_getppid)
-        .prologue
-        .altrp b6
-        .body
-        add r17=IA64_TASK_GROUP_LEADER_OFFSET,r16
-        ;;
-        ld8 r17=[r17]                           // r17 = current->group_leader
-        add r9=TI_FLAGS+IA64_TASK_SIZE,r16
-        ;;
-
-        ld4 r9=[r9]
-        add r17=IA64_TASK_REAL_PARENT_OFFSET,r17 // r17 = &current->group_leader->real_parent
-        ;;
-        and r9=TIF_ALLWORK_MASK,r9
-
-1:      ld8 r18=[r17]                           // r18 = current->group_leader->real_parent
-        ;;
-        cmp.ne p8,p0=0,r9
-        add r8=IA64_TASK_TGID_OFFSET,r18        // r8 = &current->group_leader->real_parent->tgid
-        ;;
-
-        /*
-         * The .acq is needed to ensure that the read of tgid has returned its data before
-         * we re-check "real_parent".
-         */
-        ld4.acq r8=[r8]                         // r8 = current->group_leader->real_parent->tgid
-#ifdef CONFIG_SMP
-        /*
-         * Re-read current->group_leader->real_parent.
-         */
-        ld8 r19=[r17]                           // r19 = current->group_leader->real_parent
-(p8)    br.spnt.many fsys_fallback_syscall
-        ;;
-        cmp.ne p6,p0=r18,r19                    // did real_parent change?
-        mov r19=0                       // i must not leak kernel bits...
-(p6)    br.cond.spnt.few 1b                     // yes -> redo the read of tgid and the check
-        ;;
-        mov r17=0                       // i must not leak kernel bits...
-        mov r18=0                       // i must not leak kernel bits...
-#else
-        mov r17=0                       // i must not leak kernel bits...
-        mov r18=0                       // i must not leak kernel bits...
-        mov r19=0                       // i must not leak kernel bits...
-#endif
-        FSYS_RETURN
-END(fsys_getppid)
-
 ENTRY(fsys_set_tid_address)
         .prologue
         .altrp b6
@@ -614,7 +567,7 @@ paravirt_fsyscall_table:
         data8 0                         // chown
         data8 0                         // lseek                // 1040
         data8 fsys_getpid               // getpid
-        data8 fsys_getppid              // getppid
+        data8 0                         // getppid
         data8 0                         // mount
         data8 0                         // umount
         data8 0                         // setuid               // 1045
diff --git a/arch/ia64/kernel/iosapic.c b/arch/ia64/kernel/iosapic.c
index ee33c3aaa2fc..19f107be734e 100644
--- a/arch/ia64/kernel/iosapic.c
+++ b/arch/ia64/kernel/iosapic.c
@@ -76,7 +76,7 @@
  *      PCI pin -> global system interrupt (GSI) -> IA-64 vector <-> IRQ
  *
  * Note: The term "IRQ" is loosely used everywhere in Linux kernel to
- * describeinterrupts.  Now we use "IRQ" only for Linux IRQ's.  ISA IRQ
+ * describe interrupts.  Now we use "IRQ" only for Linux IRQ's.  ISA IRQ
  * (isa_irq) is the only exception in this source code.
  */
 
@@ -1010,6 +1010,26 @@ iosapic_check_gsi_range (unsigned int gsi_base, unsigned int ver)
         return 0;
 }
 
+static int
+iosapic_delete_rte(unsigned int irq, unsigned int gsi)
+{
+        struct iosapic_rte_info *rte, *temp;
+
+        list_for_each_entry_safe(rte, temp, &iosapic_intr_info[irq].rtes,
+                                                                rte_list) {
+                if (rte->iosapic->gsi_base + rte->rte_index == gsi) {
+                        if (rte->refcnt)
+                                return -EBUSY;
+
+                        list_del(&rte->rte_list);
+                        kfree(rte);
+                        return 0;
+                }
+        }
+
+        return -EINVAL;
+}
+
 int iosapic_init(unsigned long phys_addr, unsigned int gsi_base)
 {
         int num_rte, err, index;
@@ -1069,7 +1089,7 @@ int iosapic_init(unsigned long phys_addr, unsigned int gsi_base)
 
 int iosapic_remove(unsigned int gsi_base)
 {
-        int index, err = 0;
+        int i, irq, index, err = 0;
         unsigned long flags;
 
         spin_lock_irqsave(&iosapic_lock, flags);
@@ -1087,6 +1107,16 @@ int iosapic_remove(unsigned int gsi_base)
                 goto out;
         }
 
+        for (i = gsi_base; i < gsi_base + iosapic_lists[index].num_rte; i++) {
+                irq = __gsi_to_irq(i);
+                if (irq < 0)
+                        continue;
+
+                err = iosapic_delete_rte(irq, i);
+                if (err)
+                        goto out;
+        }
+
         iounmap(iosapic_lists[index].addr);
         iosapic_free(index);
  out:
diff --git a/arch/ia64/kernel/irq.c b/arch/ia64/kernel/irq.c
index ad69606613eb..f2c418281130 100644
--- a/arch/ia64/kernel/irq.c
+++ b/arch/ia64/kernel/irq.c
@@ -23,6 +23,8 @@
 #include <linux/interrupt.h>
 #include <linux/kernel_stat.h>
 
+#include <asm/mca.h>
+
 /*
  * 'what should we do if we get a hw irq event on an illegal vector'.
  * each architecture has to answer this themselves.
@@ -83,6 +85,12 @@ bool is_affinity_mask_valid(const struct cpumask *cpumask)
 
 #endif /* CONFIG_SMP */
 
+int __init arch_early_irq_init(void)
+{
+        ia64_mca_irq_init();
+        return 0;
+}
+
 #ifdef CONFIG_HOTPLUG_CPU
 unsigned int vectors_in_migration[NR_IRQS];
 
diff --git a/arch/ia64/kernel/mca.c b/arch/ia64/kernel/mca.c
index 65bf9cd39044..d7396dbb07bb 100644
--- a/arch/ia64/kernel/mca.c
+++ b/arch/ia64/kernel/mca.c
@@ -2074,22 +2074,16 @@ ia64_mca_init(void)
         printk(KERN_INFO "MCA related initialization done\n");
 }
 
+
 /*
- * ia64_mca_late_init
- *
- *      Opportunity to setup things that require initialization later
- *      than ia64_mca_init.  Setup a timer to poll for CPEs if the
- *      platform doesn't support an interrupt driven mechanism.
- *
- *  Inputs  :   None
- *  Outputs :   Status
+ * These pieces cannot be done in ia64_mca_init() because it is called before
+ * early_irq_init() which would wipe out our percpu irq registrations. But we
+ * cannot leave them until ia64_mca_late_init() because by then all the other
+ * processors have been brought online and have set their own CMC vectors to
+ * point at a non-existant action. Called from arch_early_irq_init().
  */
-static int __init
-ia64_mca_late_init(void)
+void __init ia64_mca_irq_init(void)
 {
-        if (!mca_init)
-                return 0;
-
         /*
          *  Configure the CMCI/P vector and handler. Interrupts for CMC are
          *  per-processor, so AP CMC interrupts are setup in smp_callin() (smpboot.c).
@@ -2108,6 +2102,23 @@ ia64_mca_late_init(void)
         /* Setup the CPEI/P handler */
         register_percpu_irq(IA64_CPEP_VECTOR, &mca_cpep_irqaction);
 #endif
+}
+
+/*
+ * ia64_mca_late_init
+ *
+ *      Opportunity to setup things that require initialization later
+ *      than ia64_mca_init.  Setup a timer to poll for CPEs if the
+ *      platform doesn't support an interrupt driven mechanism.
+ *
+ *  Inputs  :   None
+ *  Outputs :   Status
+ */
+static int __init
+ia64_mca_late_init(void)
+{
+        if (!mca_init)
+                return 0;
 
         register_hotcpu_notifier(&mca_cpu_notifier);
 
diff --git a/arch/ia64/kernel/mca_drv.c b/arch/ia64/kernel/mca_drv.c
index 9392e021c93b..94f8bf777afa 100644
--- a/arch/ia64/kernel/mca_drv.c
+++ b/arch/ia64/kernel/mca_drv.c
@@ -349,7 +349,7 @@ init_record_index_pools(void)
 
         /* - 3 - */
         slidx_pool.max_idx = (rec_max_size/sect_min_size) * 2 + 1;
-        slidx_pool.buffer = (slidx_list_t *)
+        slidx_pool.buffer =
                 kmalloc(slidx_pool.max_idx * sizeof(slidx_list_t), GFP_KERNEL);
 
         return slidx_pool.buffer ? 0 : -ENOMEM;
diff --git a/arch/ia64/kernel/perfmon.c b/arch/ia64/kernel/perfmon.c
index 2eda28414abb..9ea25fce06d5 100644
--- a/arch/ia64/kernel/perfmon.c
+++ b/arch/ia64/kernel/perfmon.c
@@ -42,6 +42,7 @@
 #include <linux/completion.h>
 #include <linux/tracehook.h>
 #include <linux/slab.h>
+#include <linux/cpu.h>
 
 #include <asm/errno.h>
 #include <asm/intrinsics.h>
@@ -1322,8 +1323,6 @@ out:
 }
 EXPORT_SYMBOL(pfm_unregister_buffer_fmt);
 
-extern void update_pal_halt_status(int);
-
 static int
 pfm_reserve_session(struct task_struct *task, int is_syswide, unsigned int cpu)
 {
@@ -1371,9 +1370,9 @@ pfm_reserve_session(struct task_struct *task, int is_syswide, unsigned int cpu)
                 cpu));
 
         /*
-         * disable default_idle() to go to PAL_HALT
+         * Force idle() into poll mode
          */
-        update_pal_halt_status(0);
+        cpu_idle_poll_ctrl(true);
 
         UNLOCK_PFS(flags);
 
@@ -1430,11 +1429,8 @@ pfm_unreserve_session(pfm_context_t *ctx, int is_syswide, unsigned int cpu)
                 is_syswide,
                 cpu));
 
-        /*
-         * if possible, enable default_idle() to go into PAL_HALT
-         */
-        if (pfm_sessions.pfs_task_sessions == 0 && pfm_sessions.pfs_sys_sessions == 0)
-                update_pal_halt_status(1);
+        /* Undo forced polling. Last session reenables pal_halt */
+        cpu_idle_poll_ctrl(false);
 
         UNLOCK_PFS(flags);
 
diff --git a/arch/ia64/kernel/process.c b/arch/ia64/kernel/process.c
index 6f7dc8b7b35c..55d4ba47a907 100644
--- a/arch/ia64/kernel/process.c
+++ b/arch/ia64/kernel/process.c
@@ -96,21 +96,13 @@ show_stack (struct task_struct *task, unsigned long *sp)
 }
 
 void
-dump_stack (void)
-{
-        show_stack(NULL, NULL);
-}
-
-EXPORT_SYMBOL(dump_stack);
-
-void
 show_regs (struct pt_regs *regs)
 {
         unsigned long ip = regs->cr_iip + ia64_psr(regs)->ri;
 
         print_modules();
-        printk("\nPid: %d, CPU %d, comm: %20s\n", task_pid_nr(current),
-                        smp_processor_id(), current->comm);
+        printk("\n");
+        show_regs_print_info(KERN_DEFAULT);
         printk("psr : %016lx ifs : %016lx ip  : [<%016lx>]    %s (%s)\n",
                regs->cr_ipsr, regs->cr_ifs, ip, print_tainted(),
                init_utsname()->release);
@@ -209,41 +201,13 @@ do_notify_resume_user(sigset_t *unused, struct sigscratch *scr, long in_syscall)
         local_irq_disable();    /* force interrupt disable */
 }
 
-static int pal_halt        = 1;
-static int can_do_pal_halt = 1;
-
 static int __init nohalt_setup(char * str)
 {
-        pal_halt = can_do_pal_halt = 0;
+        cpu_idle_poll_ctrl(true);
         return 1;
 }
 __setup("nohalt", nohalt_setup);
 
-void
-update_pal_halt_status(int status)
-{
-        can_do_pal_halt = pal_halt && status;
-}
-
-/*
- * We use this if we don't have any better idle routine..
- */
-void
-default_idle (void)
-{
-        local_irq_enable();
-        while (!need_resched()) {
-                if (can_do_pal_halt) {
-                        local_irq_disable();
-                        if (!need_resched()) {
-                                safe_halt();
-                        }
-                        local_irq_enable();
-                } else
-                        cpu_relax();
-        }
-}
-
 #ifdef CONFIG_HOTPLUG_CPU
 /* We don't actually take CPU down, just spin without interrupts. */
 static inline void play_dead(void)
@@ -270,47 +234,29 @@ static inline void play_dead(void)
 }
 #endif /* CONFIG_HOTPLUG_CPU */
 
-void __attribute__((noreturn))
-cpu_idle (void)
+void arch_cpu_idle_dead(void)
+{
+        play_dead();
+}
+
+void arch_cpu_idle(void)
 {
         void (*mark_idle)(int) = ia64_mark_idle;
-        int cpu = smp_processor_id();
-
-        /* endless idle loop with no priority at all */
-        while (1) {
-                rcu_idle_enter();
-                if (can_do_pal_halt) {
-                        current_thread_info()->status &= ~TS_POLLING;
-                        /*
-                         * TS_POLLING-cleared state must be visible before we
-                         * test NEED_RESCHED:
-                         */
-                        smp_mb();
-                } else {
-                        current_thread_info()->status |= TS_POLLING;
-                }
 
-                if (!need_resched()) {
 #ifdef CONFIG_SMP
-                        min_xtp();
+        min_xtp();
 #endif
-                        rmb();
-                        if (mark_idle)
-                                (*mark_idle)(1);
+        rmb();
+        if (mark_idle)
+                (*mark_idle)(1);
 
-                        default_idle();
-                        if (mark_idle)
-                                (*mark_idle)(0);
+        safe_halt();
+
+        if (mark_idle)
+                (*mark_idle)(0);
 #ifdef CONFIG_SMP
-                        normal_xtp();
+        normal_xtp();
 #endif
-                }
-                rcu_idle_exit();
-                schedule_preempt_disabled();
-                check_pgt_cache();
-                if (cpu_is_offline(cpu))
-                        play_dead();
-        }
 }
 
 void
diff --git a/arch/ia64/kernel/setup.c b/arch/ia64/kernel/setup.c
index 2029cc0d2fc6..13bfdd22afc8 100644
--- a/arch/ia64/kernel/setup.c
+++ b/arch/ia64/kernel/setup.c
@@ -1063,6 +1063,7 @@ check_bugs (void)
 static int __init run_dmi_scan(void)
 {
         dmi_scan_machine();
+        dmi_set_dump_stack_arch_desc();
         return 0;
 }
 core_initcall(run_dmi_scan);
diff --git a/arch/ia64/kernel/smpboot.c b/arch/ia64/kernel/smpboot.c
index 500f1e4d9f9d..8d87168d218d 100644
--- a/arch/ia64/kernel/smpboot.c
+++ b/arch/ia64/kernel/smpboot.c
@@ -455,7 +455,7 @@ start_secondary (void *unused)
         preempt_disable();
         smp_callin();
 
-        cpu_idle();
+        cpu_startup_entry(CPUHP_ONLINE);
         return 0;
 }
 
diff --git a/arch/ia64/kvm/vtlb.c b/arch/ia64/kvm/vtlb.c
index 4332f7ee5203..a7869f8f49a6 100644
--- a/arch/ia64/kvm/vtlb.c
+++ b/arch/ia64/kvm/vtlb.c
@@ -256,7 +256,7 @@ u64 guest_vhpt_lookup(u64 iha, u64 *pte)
                         "srlz.d;;"
                         "ssm psr.i;;"
                         "srlz.d;;"
-                        : "=r"(ret) : "r"(iha), "r"(pte):"memory");
+                        : "=&r"(ret) : "r"(iha), "r"(pte) : "memory");
 
         return ret;
 }
diff --git a/arch/ia64/mm/contig.c b/arch/ia64/mm/contig.c
index 80dab509dfb0..67c59ebec899 100644
--- a/arch/ia64/mm/contig.c
+++ b/arch/ia64/mm/contig.c
@@ -47,6 +47,8 @@ void show_mem(unsigned int filter)
         printk(KERN_INFO "Mem-info:\n");
         show_free_areas(filter);
         printk(KERN_INFO "Node memory in pages:\n");
+        if (filter & SHOW_MEM_FILTER_PAGE_COUNT)
+                return;
         for_each_online_pgdat(pgdat) {
                 unsigned long present;
                 unsigned long flags;
diff --git a/arch/ia64/mm/discontig.c b/arch/ia64/mm/discontig.c
index c2e955ee79a8..ae4db4bd6d97 100644
--- a/arch/ia64/mm/discontig.c
+++ b/arch/ia64/mm/discontig.c
@@ -623,6 +623,8 @@ void show_mem(unsigned int filter)
 
         printk(KERN_INFO "Mem-info:\n");
         show_free_areas(filter);
+        if (filter & SHOW_MEM_FILTER_PAGE_COUNT)
+                return;
         printk(KERN_INFO "Node memory in pages:\n");
         for_each_online_pgdat(pgdat) {
                 unsigned long present;
@@ -817,13 +819,12 @@ void arch_refresh_nodedata(int update_node, pg_data_t *update_pgdat)
 #endif
 
 #ifdef CONFIG_SPARSEMEM_VMEMMAP
-int __meminit vmemmap_populate(struct page *start_page,
-                                                unsigned long size, int node)
+int __meminit vmemmap_populate(unsigned long start, unsigned long end, int node)
 {
-        return vmemmap_populate_basepages(start_page, size, node);
+        return vmemmap_populate_basepages(start, end, node);
 }
 
-void vmemmap_free(struct page *memmap, unsigned long nr_pages)
+void vmemmap_free(unsigned long start, unsigned long end)
 {
 }
 #endif
diff --git a/arch/ia64/mm/init.c b/arch/ia64/mm/init.c
index 20bc967c7209..d1fe4b402601 100644
--- a/arch/ia64/mm/init.c
+++ b/arch/ia64/mm/init.c
@@ -154,25 +154,14 @@ ia64_init_addr_space (void)
 void
 free_initmem (void)
 {
-        unsigned long addr, eaddr;
-
-        addr = (unsigned long) ia64_imva(__init_begin);
-        eaddr = (unsigned long) ia64_imva(__init_end);
-        while (addr < eaddr) {
-                ClearPageReserved(virt_to_page(addr));
-                init_page_count(virt_to_page(addr));
-                free_page(addr);
-                ++totalram_pages;
-                addr += PAGE_SIZE;
-        }
-        printk(KERN_INFO "Freeing unused kernel memory: %ldkB freed\n",
-               (__init_end - __init_begin) >> 10);
+        free_reserved_area((unsigned long)ia64_imva(__init_begin),
+                           (unsigned long)ia64_imva(__init_end),
+                           0, "unused kernel");
 }
 
 void __init
 free_initrd_mem (unsigned long start, unsigned long end)
 {
-        struct page *page;
         /*
          * EFI uses 4KB pages while the kernel can use 4KB or bigger.
          * Thus EFI and the kernel may have different page sizes. It is
@@ -213,11 +202,7 @@ free_initrd_mem (unsigned long start, unsigned long end)
         for (; start < end; start += PAGE_SIZE) {
                 if (!virt_addr_valid(start))
                         continue;
-                page = virt_to_page(start);
-                ClearPageReserved(page);
-                init_page_count(page);
-                free_page(start);
-                ++totalram_pages;
+                free_reserved_page(virt_to_page(start));
         }
 }
 
diff --git a/arch/ia64/mm/ioremap.c b/arch/ia64/mm/ioremap.c
index 3dccdd8eb275..43964cde6214 100644
--- a/arch/ia64/mm/ioremap.c
+++ b/arch/ia64/mm/ioremap.c
@@ -16,7 +16,7 @@
 #include <asm/meminit.h>
 
 static inline void __iomem *
-__ioremap (unsigned long phys_addr)
+__ioremap_uc(unsigned long phys_addr)
 {
         return (void __iomem *) (__IA64_UNCACHED_OFFSET | phys_addr);
 }
@@ -24,7 +24,11 @@ __ioremap (unsigned long phys_addr)
 void __iomem *
 early_ioremap (unsigned long phys_addr, unsigned long size)
 {
-        return __ioremap(phys_addr);
+        u64 attr;
+        attr = kern_mem_attribute(phys_addr, size);
+        if (attr & EFI_MEMORY_WB)
+                return (void __iomem *) phys_to_virt(phys_addr);
+        return __ioremap_uc(phys_addr);
 }
 
 void __iomem *
@@ -47,7 +51,7 @@ ioremap (unsigned long phys_addr, unsigned long size)
         if (attr & EFI_MEMORY_WB)
                 return (void __iomem *) phys_to_virt(phys_addr);
         else if (attr & EFI_MEMORY_UC)
-                return __ioremap(phys_addr);
+                return __ioremap_uc(phys_addr);
 
         /*
          * Some chipsets don't support UC access to memory.  If
@@ -93,7 +97,7 @@ ioremap (unsigned long phys_addr, unsigned long size)
                 return (void __iomem *) (offset + (char __iomem *)addr);
         }
 
-        return __ioremap(phys_addr);
+        return __ioremap_uc(phys_addr);
 }
 EXPORT_SYMBOL(ioremap);
 
@@ -103,7 +107,7 @@ ioremap_nocache (unsigned long phys_addr, unsigned long size)
         if (kern_mem_attribute(phys_addr, size) & EFI_MEMORY_WB)
                 return NULL;
 
-        return __ioremap(phys_addr);
+        return __ioremap_uc(phys_addr);
 }
 EXPORT_SYMBOL(ioremap_nocache);
 
diff --git a/arch/ia64/mm/numa.c b/arch/ia64/mm/numa.c
index 3efea7d0a351..4248492b9321 100644
--- a/arch/ia64/mm/numa.c
+++ b/arch/ia64/mm/numa.c
@@ -61,18 +61,36 @@ paddr_to_nid(unsigned long paddr)
 int __meminit __early_pfn_to_nid(unsigned long pfn)
 {
         int i, section = pfn >> PFN_SECTION_SHIFT, ssec, esec;
+        /*
+         * NOTE: The following SMP-unsafe globals are only used early in boot
+         * when the kernel is running single-threaded.
+         */
+        static int __meminitdata last_ssec, last_esec;
+        static int __meminitdata last_nid;
+
+        if (section >= last_ssec && section < last_esec)
+                return last_nid;
 
         for (i = 0; i < num_node_memblks; i++) {
                 ssec = node_memblk[i].start_paddr >> PA_SECTION_SHIFT;
                 esec = (node_memblk[i].start_paddr + node_memblk[i].size +
                         ((1L << PA_SECTION_SHIFT) - 1)) >> PA_SECTION_SHIFT;
-                if (section >= ssec && section < esec)
+                if (section >= ssec && section < esec) {
+                        last_ssec = ssec;
+                        last_esec = esec;
+                        last_nid = node_memblk[i].nid;
                         return node_memblk[i].nid;
+                }
         }
 
         return -1;
 }
 
+void __cpuinit numa_clear_node(int cpu)
+{
+        unmap_cpu_from_node(cpu, NUMA_NO_NODE);
+}
+
 #ifdef CONFIG_MEMORY_HOTPLUG
 /*
  *  SRAT information is stored in node_memblk[], then we can use SRAT
diff --git a/arch/ia64/pci/pci.c b/arch/ia64/pci/pci.c
index 60532ab27346..de1474ff0bc5 100644
--- a/arch/ia64/pci/pci.c
+++ b/arch/ia64/pci/pci.c
@@ -15,6 +15,7 @@
 #include <linux/types.h>
 #include <linux/kernel.h>
 #include <linux/pci.h>
+#include <linux/pci-acpi.h>
 #include <linux/init.h>
 #include <linux/ioport.h>
 #include <linux/slab.h>
@@ -458,6 +459,16 @@ void pcibios_fixup_bus(struct pci_bus *b)
         platform_pci_fixup_bus(b);
 }
 
+void pcibios_add_bus(struct pci_bus *bus)
+{
+        acpi_pci_add_bus(bus);
+}
+
+void pcibios_remove_bus(struct pci_bus *bus)
+{
+        acpi_pci_remove_bus(bus);
+}
+
 void pcibios_set_master (struct pci_dev *dev)
 {
         /* No special bus mastering setup handling */
diff --git a/arch/ia64/sn/kernel/tiocx.c b/arch/ia64/sn/kernel/tiocx.c
index 14c1711238c0..e35f6485c1fd 100644
--- a/arch/ia64/sn/kernel/tiocx.c
+++ b/arch/ia64/sn/kernel/tiocx.c
@@ -490,11 +490,14 @@ static int __init tiocx_init(void)
 {
         cnodeid_t cnodeid;
         int found_tiocx_device = 0;
+        int err;
 
         if (!ia64_platform_is("sn2"))
                 return 0;
 
-        bus_register(&tiocx_bus_type);
+        err = bus_register(&tiocx_bus_type);
+        if (err)
+                return err;
 
         for (cnodeid = 0; cnodeid < num_cnodes; cnodeid++) {
                 nasid_t nasid;
diff --git a/arch/m32r/include/asm/unistd.h b/arch/m32r/include/asm/unistd.h
index 555629b05267..59db80193454 100644
--- a/arch/m32r/include/asm/unistd.h
+++ b/arch/m32r/include/asm/unistd.h
@@ -48,14 +48,4 @@
 #define __IGNORE_getresgid
 #define __IGNORE_chown
 
-/*
- * "Conditional" syscalls
- *
- * What we want is __attribute__((weak,alias("sys_ni_syscall"))),
- * but it doesn't work on all toolchains, so we just do it by hand
- */
-#ifndef cond_syscall
-#define cond_syscall(x) asm(".weak\t" #x "\n\t.set\t" #x ",sys_ni_syscall")
-#endif
-
 #endif /* _ASM_M32R_UNISTD_H */
diff --git a/arch/m32r/kernel/process.c b/arch/m32r/kernel/process.c
index bde899e155d3..e69221d581d5 100644
--- a/arch/m32r/kernel/process.c
+++ b/arch/m32r/kernel/process.c
@@ -47,24 +47,6 @@ unsigned long thread_saved_pc(struct task_struct *tsk)
 void (*pm_power_off)(void) = NULL;
 EXPORT_SYMBOL(pm_power_off);
 
-/*
- * The idle thread. There's no useful work to be
- * done, so just try to conserve power and have a
- * low exit latency (ie sit in a loop waiting for
- * somebody to say that they'd like to reschedule)
- */
-void cpu_idle (void)
-{
-        /* endless idle loop with no priority at all */
-        while (1) {
-                rcu_idle_enter();
-                while (!need_resched())
-                        cpu_relax();
-                rcu_idle_exit();
-                schedule_preempt_disabled();
-        }
-}
-
 void machine_restart(char *__unused)
 {
 #if defined(CONFIG_PLAT_MAPPI3)
@@ -91,6 +73,8 @@ void machine_power_off(void)
 void show_regs(struct pt_regs * regs)
 {
         printk("\n");
+        show_regs_print_info(KERN_DEFAULT);
+
         printk("BPC[%08lx]:PSW[%08lx]:LR [%08lx]:FP [%08lx]\n", \
           regs->bpc, regs->psw, regs->lr, regs->fp);
         printk("BBPC[%08lx]:BBPSW[%08lx]:SPU[%08lx]:SPI[%08lx]\n", \
diff --git a/arch/m32r/kernel/smpboot.c b/arch/m32r/kernel/smpboot.c
index 13168a769f8f..0ac558adc605 100644
--- a/arch/m32r/kernel/smpboot.c
+++ b/arch/m32r/kernel/smpboot.c
@@ -432,7 +432,7 @@ int __init start_secondary(void *unused)
          */
         local_flush_tlb_all();
 
-        cpu_idle();
+        cpu_startup_entry(CPUHP_ONLINE);
         return 0;
 }
 
diff --git a/arch/m32r/kernel/traps.c b/arch/m32r/kernel/traps.c
index 3bcb207e5b6d..a7a424f852e4 100644
--- a/arch/m32r/kernel/traps.c
+++ b/arch/m32r/kernel/traps.c
@@ -132,10 +132,8 @@ static void show_trace(struct task_struct *task, unsigned long *stack)
         printk("Call Trace: ");
         while (!kstack_end(stack)) {
                 addr = *stack++;
-                if (__kernel_text_address(addr)) {
-                        printk("[<%08lx>] ", addr);
-                        print_symbol("%s\n", addr);
-                }
+                if (__kernel_text_address(addr))
+                        printk("[<%08lx>] %pSR\n", addr, (void *)addr);
         }
         printk("\n");
 }
@@ -169,15 +167,6 @@ void show_stack(struct task_struct *task, unsigned long *sp)
         show_trace(task, sp);
 }
 
-void dump_stack(void)
-{
-        unsigned long stack;
-
-        show_trace(current, &stack);
-}
-
-EXPORT_SYMBOL(dump_stack);
-
 static void show_registers(struct pt_regs *regs)
 {
         int i = 0;
diff --git a/arch/m32r/mm/init.c b/arch/m32r/mm/init.c
index 78b660e903da..ab4cbce91a9b 100644
--- a/arch/m32r/mm/init.c
+++ b/arch/m32r/mm/init.c
@@ -28,10 +28,7 @@
 #include <asm/mmu_context.h>
 #include <asm/setup.h>
 #include <asm/tlb.h>
-
-/* References to section boundaries */
-extern char _text, _etext, _edata;
-extern char __init_begin, __init_end;
+#include <asm/sections.h>
 
 pgd_t swapper_pg_dir[1024];
 
@@ -184,17 +181,7 @@ void __init mem_init(void)
  *======================================================================*/
 void free_initmem(void)
 {
-        unsigned long addr;
-
-        addr = (unsigned long)(&__init_begin);
-        for (; addr < (unsigned long)(&__init_end); addr += PAGE_SIZE) {
-                ClearPageReserved(virt_to_page(addr));
-                init_page_count(virt_to_page(addr));
-                free_page(addr);
-                totalram_pages++;
-        }
-        printk (KERN_INFO "Freeing unused kernel memory: %dk freed\n", \
-          (int)(&__init_end - &__init_begin) >> 10);
+        free_initmem_default(0);
 }
 
 #ifdef CONFIG_BLK_DEV_INITRD
@@ -204,13 +191,6 @@ void free_initmem(void)
  *======================================================================*/
 void free_initrd_mem(unsigned long start, unsigned long end)
 {
-        unsigned long p;
-        for (p = start; p < end; p += PAGE_SIZE) {
-                ClearPageReserved(virt_to_page(p));
-                init_page_count(virt_to_page(p));
-                free_page(p);
-                totalram_pages++;
-        }
-        printk (KERN_INFO "Freeing initrd memory: %ldk freed\n", (end - start) >> 10);
+        free_reserved_area(start, end, 0, "initrd");
 }
 #endif
diff --git a/arch/m68k/Kconfig.bus b/arch/m68k/Kconfig.bus
index 93ef0346b209..675b087198f6 100644
--- a/arch/m68k/Kconfig.bus
+++ b/arch/m68k/Kconfig.bus
@@ -45,6 +45,16 @@ config ISA
           (MCA) or VESA.  ISA is an older system, now being displaced by PCI;
           newer boards don't support it.  If you have ISA, say Y, otherwise N.
 
+config ATARI_ROM_ISA
+        bool "Atari ROM port ISA adapter support"
+        depends on ATARI
+        help
+          This option enables support for the ROM port ISA adapter used to
+          operate ISA cards on Atari. Only 8  bit cards are supported, and
+          no interrupt lines are connected.
+          The only driver currently using this adapter is the EtherNEC
+          driver for RTL8019AS based NE2000 compatible network cards.
+
 config GENERIC_ISA_DMA
         def_bool ISA
 
diff --git a/arch/m68k/Kconfig.devices b/arch/m68k/Kconfig.devices
index 4bc945dfe467..d163991c5717 100644
--- a/arch/m68k/Kconfig.devices
+++ b/arch/m68k/Kconfig.devices
@@ -55,6 +55,30 @@ config NFETH
           which will emulate a regular ethernet device while presenting an
           ethertap device to the host system.
 
+config ATARI_ETHERNAT
+        bool "Atari EtherNAT Ethernet support"
+        depends on ATARI
+        ---help---
+          Say Y to include support for the EtherNAT network adapter for the
+          CT/60 extension port.
+
+          To compile the actual ethernet driver, choose Y or M for the SMC91X
+          option in the network device section; the module will be called smc91x.
+
+config ATARI_ETHERNEC
+        bool "Atari EtherNEC Ethernet support"
+        depends on ATARI_ROM_ISA
+        ---help---
+          Say Y to include support for the EtherNEC network adapter for the
+          ROM port. The driver works by polling instead of interrupts, so it
+          is quite slow.
+
+          This driver also suppports the ethernet part of the NetUSBee ROM
+          port combined Ethernet/USB adapter.
+
+          To compile the actual ethernet driver, choose Y or M in for the NE2000
+          option in the network device section; the module will be called ne.
+
 endmenu
 
 menu "Character devices"
diff --git a/arch/m68k/atari/ataints.c b/arch/m68k/atari/ataints.c
index 3f41092d1b70..20cde4e9fc77 100644
--- a/arch/m68k/atari/ataints.c
+++ b/arch/m68k/atari/ataints.c
@@ -49,6 +49,7 @@
 #include <asm/atari_stdma.h>
 #include <asm/irq.h>
 #include <asm/entry.h>
+#include <asm/io.h>
 
 
 /*
@@ -122,6 +123,136 @@ static struct irq_chip atari_irq_chip = {
 };
 
 /*
+ * ST-MFP timer D chained interrupts - each driver gets its own timer
+ * interrupt instance.
+ */
+
+struct mfptimerbase {
+        volatile struct MFP *mfp;
+        unsigned char mfp_mask, mfp_data;
+        unsigned short int_mask;
+        int handler_irq, mfptimer_irq, server_irq;
+        char *name;
+} stmfp_base = {
+        .mfp            = &st_mfp,
+        .int_mask       = 0x0,
+        .handler_irq    = IRQ_MFP_TIMD,
+        .mfptimer_irq   = IRQ_MFP_TIMER1,
+        .name           = "MFP Timer D"
+};
+
+static irqreturn_t mfptimer_handler(int irq, void *dev_id)
+{
+        struct mfptimerbase *base = dev_id;
+        int mach_irq;
+        unsigned char ints;
+
+        mach_irq = base->mfptimer_irq;
+        ints = base->int_mask;
+        for (; ints; mach_irq++, ints >>= 1) {
+                if (ints & 1)
+                        generic_handle_irq(mach_irq);
+        }
+        return IRQ_HANDLED;
+}
+
+
+static void atari_mfptimer_enable(struct irq_data *data)
+{
+        int mfp_num = data->irq - IRQ_MFP_TIMER1;
+        stmfp_base.int_mask |= 1 << mfp_num;
+        atari_enable_irq(IRQ_MFP_TIMD);
+}
+
+static void atari_mfptimer_disable(struct irq_data *data)
+{
+        int mfp_num = data->irq - IRQ_MFP_TIMER1;
+        stmfp_base.int_mask &= ~(1 << mfp_num);
+        if (!stmfp_base.int_mask)
+                atari_disable_irq(IRQ_MFP_TIMD);
+}
+
+static struct irq_chip atari_mfptimer_chip = {
+        .name           = "timer_d",
+        .irq_enable     = atari_mfptimer_enable,
+        .irq_disable    = atari_mfptimer_disable,
+};
+
+
+/*
+ * EtherNAT CPLD interrupt handling
+ * CPLD interrupt register is at phys. 0x80000023
+ * Need this mapped in at interrupt startup time
+ * Possibly need this mapped on demand anyway -
+ * EtherNAT USB driver needs to disable IRQ before
+ * startup!
+ */
+
+static unsigned char *enat_cpld;
+
+static unsigned int atari_ethernat_startup(struct irq_data *data)
+{
+        int enat_num = 140 - data->irq + 1;
+
+        m68k_irq_startup(data);
+        /*
+        * map CPLD interrupt register
+        */
+        if (!enat_cpld)
+                enat_cpld = (unsigned char *)ioremap((ATARI_ETHERNAT_PHYS_ADDR+0x23), 0x2);
+        /*
+         * do _not_ enable the USB chip interrupt here - causes interrupt storm
+         * and triggers dead interrupt watchdog
+         * Need to reset the USB chip to a sane state in early startup before
+         * removing this hack
+         */
+        if (enat_num == 1)
+                *enat_cpld |= 1 << enat_num;
+
+        return 0;
+}
+
+static void atari_ethernat_enable(struct irq_data *data)
+{
+        int enat_num = 140 - data->irq + 1;
+        /*
+        * map CPLD interrupt register
+        */
+        if (!enat_cpld)
+                enat_cpld = (unsigned char *)ioremap((ATARI_ETHERNAT_PHYS_ADDR+0x23), 0x2);
+        *enat_cpld |= 1 << enat_num;
+}
+
+static void atari_ethernat_disable(struct irq_data *data)
+{
+        int enat_num = 140 - data->irq + 1;
+        /*
+        * map CPLD interrupt register
+        */
+        if (!enat_cpld)
+                enat_cpld = (unsigned char *)ioremap((ATARI_ETHERNAT_PHYS_ADDR+0x23), 0x2);
+        *enat_cpld &= ~(1 << enat_num);
+}
+
+static void atari_ethernat_shutdown(struct irq_data *data)
+{
+        int enat_num = 140 - data->irq + 1;
+        if (enat_cpld) {
+                *enat_cpld &= ~(1 << enat_num);
+                iounmap(enat_cpld);
+                enat_cpld = NULL;
+        }
+}
+
+static struct irq_chip atari_ethernat_chip = {
+        .name           = "ethernat",
+        .irq_startup    = atari_ethernat_startup,
+        .irq_shutdown   = atari_ethernat_shutdown,
+        .irq_enable     = atari_ethernat_enable,
+        .irq_disable    = atari_ethernat_disable,
+};
+
+/*
  * void atari_init_IRQ (void)
  *
  * Parameters:  None
@@ -198,6 +329,27 @@ void __init atari_init_IRQ(void)
         /* Initialize the PSG: all sounds off, both ports output */
         sound_ym.rd_data_reg_sel = 7;
         sound_ym.wd_data = 0xff;
+
+        m68k_setup_irq_controller(&atari_mfptimer_chip, handle_simple_irq,
+                                  IRQ_MFP_TIMER1, 8);
+
+        /* prepare timer D data for use as poll interrupt */
+        /* set Timer D data Register - needs to be > 0 */
+        st_mfp.tim_dt_d = 254;  /* < 100 Hz */
+        /* start timer D, div = 1:100 */
+        st_mfp.tim_ct_cd = (st_mfp.tim_ct_cd & 0xf0) | 0x6;
+
+        /* request timer D dispatch handler */
+        if (request_irq(IRQ_MFP_TIMD, mfptimer_handler, IRQF_SHARED,
+                        stmfp_base.name, &stmfp_base))
+                pr_err("Couldn't register %s interrupt\n", stmfp_base.name);
+
+        /*
+         * EtherNAT ethernet / USB interrupt handlers
+         */
+
+        m68k_setup_irq_controller(&atari_ethernat_chip, handle_simple_irq,
+                                  139, 2);
 }
 
 
diff --git a/arch/m68k/atari/config.c b/arch/m68k/atari/config.c
index 037c11c99331..fb2d0bd9b3ad 100644
--- a/arch/m68k/atari/config.c
+++ b/arch/m68k/atari/config.c
@@ -31,6 +31,8 @@
 #include <linux/init.h>
 #include <linux/delay.h>
 #include <linux/ioport.h>
+#include <linux/platform_device.h>
+#include <linux/usb/isp116x.h>
 #include <linux/vt_kern.h>
 #include <linux/module.h>
 
@@ -655,3 +657,240 @@ static void atari_get_hardware_list(struct seq_file *m)
         ATARIHW_ANNOUNCE(VME, "VME Bus");
         ATARIHW_ANNOUNCE(DSP56K, "DSP56001 processor");
 }
+
+/*
+ * MSch: initial platform device support for Atari,
+ * required for EtherNAT/EtherNEC/NetUSBee drivers
+ */
+
+#if defined(CONFIG_ATARI_ETHERNAT) || defined(CONFIG_ATARI_ETHERNEC)
+static void isp1160_delay(struct device *dev, int delay)
+{
+        ndelay(delay);
+}
+#endif
+
+#ifdef CONFIG_ATARI_ETHERNAT
+/*
+ * EtherNAT: SMC91C111 Ethernet chipset, handled by smc91x driver
+ */
+
+#define ATARI_ETHERNAT_IRQ              140
+
+static struct resource smc91x_resources[] = {
+        [0] = {
+                .name   = "smc91x-regs",
+                .start  = ATARI_ETHERNAT_PHYS_ADDR,
+                .end    = ATARI_ETHERNAT_PHYS_ADDR + 0xfffff,
+                .flags  = IORESOURCE_MEM,
+        },
+        [1] = {
+                .name   = "smc91x-irq",
+                .start  = ATARI_ETHERNAT_IRQ,
+                .end    = ATARI_ETHERNAT_IRQ,
+                .flags  = IORESOURCE_IRQ,
+        },
+};
+
+static struct platform_device smc91x_device = {
+        .name           = "smc91x",
+        .id             = -1,
+        .num_resources  = ARRAY_SIZE(smc91x_resources),
+        .resource       = smc91x_resources,
+};
+
+/*
+ * ISP 1160 - using the isp116x-hcd module
+ */
+
+#define ATARI_USB_PHYS_ADDR     0x80000012
+#define ATARI_USB_IRQ           139
+
+static struct resource isp1160_resources[] = {
+        [0] = {
+                .name   = "isp1160-data",
+                .start  = ATARI_USB_PHYS_ADDR,
+                .end    = ATARI_USB_PHYS_ADDR + 0x1,
+                .flags  = IORESOURCE_MEM,
+        },
+        [1] = {
+                .name   = "isp1160-regs",
+                .start  = ATARI_USB_PHYS_ADDR + 0x4,
+                .end    = ATARI_USB_PHYS_ADDR + 0x5,
+                .flags  = IORESOURCE_MEM,
+        },
+        [2] = {
+                .name   = "isp1160-irq",
+                .start  = ATARI_USB_IRQ,
+                .end    = ATARI_USB_IRQ,
+                .flags  = IORESOURCE_IRQ,
+        },
+};
+
+/* (DataBusWidth16|AnalogOCEnable|DREQOutputPolarity|DownstreamPort15KRSel ) */
+static struct isp116x_platform_data isp1160_platform_data = {
+        /* Enable internal resistors on downstream ports */
+        .sel15Kres              = 1,
+        /* On-chip overcurrent protection */
+        .oc_enable              = 1,
+        /* INT output polarity */
+        .int_act_high           = 1,
+        /* INT edge or level triggered */
+        .int_edge_triggered     = 0,
+
+        /* WAKEUP pin connected - NOT SUPPORTED  */
+        /* .remote_wakeup_connected = 0, */
+        /* Wakeup by devices on usb bus enabled */
+        .remote_wakeup_enable   = 0,
+        .delay                  = isp1160_delay,
+};
+
+static struct platform_device isp1160_device = {
+        .name           = "isp116x-hcd",
+        .id             = 0,
+        .num_resources  = ARRAY_SIZE(isp1160_resources),
+        .resource       = isp1160_resources,
+        .dev                    = {
+                .platform_data  = &isp1160_platform_data,
+        },
+};
+
+static struct platform_device *atari_ethernat_devices[] __initdata = {
+        &smc91x_device,
+        &isp1160_device
+};
+#endif /* CONFIG_ATARI_ETHERNAT */
+
+#ifdef CONFIG_ATARI_ETHERNEC
+/*
+ * EtherNEC: RTL8019 (NE2000 compatible) Ethernet chipset,
+ * handled by ne.c driver
+ */
+
+#define ATARI_ETHERNEC_PHYS_ADDR        0xfffa0000
+#define ATARI_ETHERNEC_BASE             0x300
+#define ATARI_ETHERNEC_IRQ              IRQ_MFP_TIMER1
+
+static struct resource rtl8019_resources[] = {
+        [0] = {
+                .name   = "rtl8019-regs",
+                .start  = ATARI_ETHERNEC_BASE,
+                .end    = ATARI_ETHERNEC_BASE + 0x20 - 1,
+                .flags  = IORESOURCE_IO,
+        },
+        [1] = {
+                .name   = "rtl8019-irq",
+                .start  = ATARI_ETHERNEC_IRQ,
+                .end    = ATARI_ETHERNEC_IRQ,
+                .flags  = IORESOURCE_IRQ,
+        },
+};
+
+static struct platform_device rtl8019_device = {
+        .name           = "ne",
+        .id             = -1,
+        .num_resources  = ARRAY_SIZE(rtl8019_resources),
+        .resource       = rtl8019_resources,
+};
+
+/*
+ * NetUSBee: ISP1160 USB host adapter via ROM-port adapter
+ */
+
+#define ATARI_NETUSBEE_PHYS_ADDR        0xfffa8000
+#define ATARI_NETUSBEE_BASE             0x340
+#define ATARI_NETUSBEE_IRQ              IRQ_MFP_TIMER2
+
+static struct resource netusbee_resources[] = {
+        [0] = {
+                .name   = "isp1160-data",
+                .start  = ATARI_NETUSBEE_BASE,
+                .end    = ATARI_NETUSBEE_BASE + 0x1,
+                .flags  = IORESOURCE_MEM,
+        },
+        [1] = {
+                .name   = "isp1160-regs",
+                .start  = ATARI_NETUSBEE_BASE + 0x20,
+                .end    = ATARI_NETUSBEE_BASE + 0x21,
+                .flags  = IORESOURCE_MEM,
+        },
+        [2] = {
+                .name   = "isp1160-irq",
+                .start  = ATARI_NETUSBEE_IRQ,
+                .end    = ATARI_NETUSBEE_IRQ,
+                .flags  = IORESOURCE_IRQ,
+        },
+};
+
+/* (DataBusWidth16|AnalogOCEnable|DREQOutputPolarity|DownstreamPort15KRSel ) */
+static struct isp116x_platform_data netusbee_platform_data = {
+        /* Enable internal resistors on downstream ports */
+        .sel15Kres              = 1,
+        /* On-chip overcurrent protection */
+        .oc_enable              = 1,
+        /* INT output polarity */
+        .int_act_high           = 1,
+        /* INT edge or level triggered */
+        .int_edge_triggered     = 0,
+
+        /* WAKEUP pin connected - NOT SUPPORTED  */
+        /* .remote_wakeup_connected = 0, */
+        /* Wakeup by devices on usb bus enabled */
+        .remote_wakeup_enable   = 0,
+        .delay                  = isp1160_delay,
+};
+
+static struct platform_device netusbee_device = {
+        .name           = "isp116x-hcd",
+        .id             = 1,
+        .num_resources  = ARRAY_SIZE(netusbee_resources),
+        .resource       = netusbee_resources,
+        .dev                    = {
+                .platform_data  = &netusbee_platform_data,
+        },
+};
+
+static struct platform_device *atari_netusbee_devices[] __initdata = {
+        &rtl8019_device,
+        &netusbee_device
+};
+#endif /* CONFIG_ATARI_ETHERNEC */
+
+int __init atari_platform_init(void)
+{
+        int rv = 0;
+
+        if (!MACH_IS_ATARI)
+                return -ENODEV;
+
+#ifdef CONFIG_ATARI_ETHERNAT
+        {
+                unsigned char *enatc_virt;
+                enatc_virt = (unsigned char *)ioremap((ATARI_ETHERNAT_PHYS_ADDR+0x23), 0xf);
+                if (hwreg_present(enatc_virt)) {
+                        rv = platform_add_devices(atari_ethernat_devices,
+                                                ARRAY_SIZE(atari_ethernat_devices));
+                }
+                iounmap(enatc_virt);
+        }
+#endif
+
+#ifdef CONFIG_ATARI_ETHERNEC
+        {
+                int error;
+                unsigned char *enec_virt;
+                enec_virt = (unsigned char *)ioremap((ATARI_ETHERNEC_PHYS_ADDR), 0xf);
+                if (hwreg_present(enec_virt)) {
+                        error = platform_add_devices(atari_netusbee_devices,
+                                                ARRAY_SIZE(atari_netusbee_devices));
+                        if (error && !rv)
+                                rv = error;
+                }
+                iounmap(enec_virt);
+        }
+#endif
+
+        return rv;
+}
+
+arch_initcall(atari_platform_init);
diff --git a/arch/m68k/include/asm/atarihw.h b/arch/m68k/include/asm/atarihw.h
index c0cb36350775..d887050e6da6 100644
--- a/arch/m68k/include/asm/atarihw.h
+++ b/arch/m68k/include/asm/atarihw.h
@@ -805,5 +805,11 @@ struct MSTE_RTC {
 
 #define mste_rtc ((*(volatile struct MSTE_RTC *)MSTE_RTC_BAS))
 
+/*
+** EtherNAT add-on card for Falcon - combined ethernet and USB adapter
+*/
+
+#define ATARI_ETHERNAT_PHYS_ADDR        0x80000000
+
 #endif /* linux/atarihw.h */
 
diff --git a/arch/m68k/include/asm/atariints.h b/arch/m68k/include/asm/atariints.h
index 5fc13bdf9044..953e0ac6855e 100644
--- a/arch/m68k/include/asm/atariints.h
+++ b/arch/m68k/include/asm/atariints.h
@@ -32,7 +32,7 @@
 #define VME_SOURCE_BASE    56
 #define VME_MAX_SOURCES    16
 
-#define NUM_ATARI_SOURCES   (VME_SOURCE_BASE+VME_MAX_SOURCES-STMFP_SOURCE_BASE)
+#define NUM_ATARI_SOURCES  141
 
 /* convert vector number to int source number */
 #define IRQ_VECTOR_TO_SOURCE(v) ((v) - ((v) < 0x20 ? 0x18 : (0x40-8)))
@@ -94,6 +94,15 @@
 #define IRQ_SCCA_RX          (52)
 #define IRQ_SCCA_SPCOND      (54)
 
+/* shared MFP timer D interrupts - hires timer for EtherNEC et al. */
+#define IRQ_MFP_TIMER1       (64)
+#define IRQ_MFP_TIMER2       (65)
+#define IRQ_MFP_TIMER3       (66)
+#define IRQ_MFP_TIMER4       (67)
+#define IRQ_MFP_TIMER5       (68)
+#define IRQ_MFP_TIMER6       (69)
+#define IRQ_MFP_TIMER7       (70)
+#define IRQ_MFP_TIMER8       (71)
 
 #define INT_CLK   24576     /* CLK while int_clk =2.456MHz and divide = 100 */
 #define INT_TICKS 246       /* to make sched_time = 99.902... HZ */
diff --git a/arch/m68k/include/asm/cmpxchg.h b/arch/m68k/include/asm/cmpxchg.h
index 5c81d0eae5cf..bc755bc620ad 100644
--- a/arch/m68k/include/asm/cmpxchg.h
+++ b/arch/m68k/include/asm/cmpxchg.h
@@ -124,6 +124,9 @@ static inline unsigned long __cmpxchg(volatile void *p, unsigned long old,
 #define cmpxchg_local(ptr, o, n)                                            \
         ((__typeof__(*(ptr)))__cmpxchg((ptr), (unsigned long)(o),           \
                         (unsigned long)(n), sizeof(*(ptr))))
+
+#define cmpxchg64(ptr, o, n)    cmpxchg64_local((ptr), (o), (n))
+
 #else
 
 /*
diff --git a/arch/m68k/include/asm/delay.h b/arch/m68k/include/asm/delay.h
index 12d8fe4f1d30..d28fa8fe26fe 100644
--- a/arch/m68k/include/asm/delay.h
+++ b/arch/m68k/include/asm/delay.h
@@ -92,5 +92,28 @@ static inline void __udelay(unsigned long usecs)
 #define udelay(n) (__builtin_constant_p(n) ? \
         ((n) > 20000 ? __bad_udelay() : __const_udelay(n)) : __udelay(n))
 
+/*
+ * nanosecond delay:
+ *
+ * ((((HZSCALE) >> 11) * (loops_per_jiffy >> 11)) >> 6) is the number of loops
+ * per microsecond
+ *
+ * 1000 / ((((HZSCALE) >> 11) * (loops_per_jiffy >> 11)) >> 6) is the number of
+ * nanoseconds per loop
+ *
+ * So n / ( 1000 / ((((HZSCALE) >> 11) * (loops_per_jiffy >> 11)) >> 6) ) would
+ * be the number of loops for n nanoseconds
+ */
+
+/*
+ * The simpler m68k and ColdFire processors do not have a 32*32->64
+ * multiply instruction. So we need to handle them a little differently.
+ * We use a bit of shifting and a single 32*32->32 multiply to get close.
+ * This is a macro so that the const version can factor out the first
+ * multiply and shift.
+ */
+#define HZSCALE         (268435456 / (1000000 / HZ))
+
+#define ndelay(n) __delay(DIV_ROUND_UP((n) * ((((HZSCALE) >> 11) * (loops_per_jiffy >> 11)) >> 6), 1000));
 
 #endif /* defined(_M68K_DELAY_H) */
diff --git a/arch/m68k/include/asm/io_mm.h b/arch/m68k/include/asm/io_mm.h
index a6686d26fe17..ffdf54f44bc6 100644
--- a/arch/m68k/include/asm/io_mm.h
+++ b/arch/m68k/include/asm/io_mm.h
@@ -63,6 +63,23 @@
 #endif
 #endif /* AMIGA_PCMCIA */
 
+#ifdef CONFIG_ATARI_ROM_ISA
+
+#define enec_isa_read_base  0xfffa0000
+#define enec_isa_write_base 0xfffb0000
+
+#define ENEC_ISA_IO_B(ioaddr)   (enec_isa_read_base+((((unsigned long)(ioaddr))&0x7F)<<9))
+#define ENEC_ISA_IO_W(ioaddr)   (enec_isa_read_base+((((unsigned long)(ioaddr))&0x7F)<<9))
+#define ENEC_ISA_MEM_B(madr)    (enec_isa_read_base+((((unsigned long)(madr))&0x7F)<<9))
+#define ENEC_ISA_MEM_W(madr)    (enec_isa_read_base+((((unsigned long)(madr))&0x7F)<<9))
+
+#ifndef MULTI_ISA
+#define MULTI_ISA 0
+#else
+#undef MULTI_ISA
+#define MULTI_ISA 1
+#endif
+#endif /* ATARI_ROM_ISA */
 
 
 #if defined(CONFIG_PCI) && defined(CONFIG_COLDFIRE)
@@ -111,14 +128,15 @@ void mcf_pci_outsl(u32 addr, const u32 *buf, u32 len);
 #define readw(addr)     in_le16(addr)
 #define writew(v, addr) out_le16((addr), (v))
 
-#elif defined(CONFIG_ISA)
+#elif defined(CONFIG_ISA) || defined(CONFIG_ATARI_ROM_ISA)
 
 #if MULTI_ISA == 0
 #undef MULTI_ISA
 #endif
 
-#define ISA_TYPE_Q40 (1)
-#define ISA_TYPE_AG  (2)
+#define ISA_TYPE_Q40  (1)
+#define ISA_TYPE_AG   (2)
+#define ISA_TYPE_ENEC (3)
 
 #if defined(CONFIG_Q40) && !defined(MULTI_ISA)
 #define ISA_TYPE ISA_TYPE_Q40
@@ -128,6 +146,10 @@ void mcf_pci_outsl(u32 addr, const u32 *buf, u32 len);
 #define ISA_TYPE ISA_TYPE_AG
 #define ISA_SEX  1
 #endif
+#if defined(CONFIG_ATARI_ROM_ISA) && !defined(MULTI_ISA)
+#define ISA_TYPE ISA_TYPE_ENEC
+#define ISA_SEX  0
+#endif
 
 #ifdef MULTI_ISA
 extern int isa_type;
@@ -152,6 +174,9 @@ static inline u8 __iomem *isa_itb(unsigned long addr)
 #ifdef CONFIG_AMIGA_PCMCIA
     case ISA_TYPE_AG: return (u8 __iomem *)AG_ISA_IO_B(addr);
 #endif
+#ifdef CONFIG_ATARI_ROM_ISA
+    case ISA_TYPE_ENEC: return (u8 __iomem *)ENEC_ISA_IO_B(addr);
+#endif
     default: return NULL; /* avoid warnings, just in case */
     }
 }
@@ -165,6 +190,9 @@ static inline u16 __iomem *isa_itw(unsigned long addr)
 #ifdef CONFIG_AMIGA_PCMCIA
     case ISA_TYPE_AG: return (u16 __iomem *)AG_ISA_IO_W(addr);
 #endif
+#ifdef CONFIG_ATARI_ROM_ISA
+    case ISA_TYPE_ENEC: return (u16 __iomem *)ENEC_ISA_IO_W(addr);
+#endif
     default: return NULL; /* avoid warnings, just in case */
     }
 }
@@ -188,6 +216,9 @@ static inline u8 __iomem *isa_mtb(unsigned long addr)
 #ifdef CONFIG_AMIGA_PCMCIA
     case ISA_TYPE_AG: return (u8 __iomem *)addr;
 #endif
+#ifdef CONFIG_ATARI_ROM_ISA
+    case ISA_TYPE_ENEC: return (u8 __iomem *)ENEC_ISA_MEM_B(addr);
+#endif
     default: return NULL; /* avoid warnings, just in case */
     }
 }
@@ -201,6 +232,9 @@ static inline u16 __iomem *isa_mtw(unsigned long addr)
 #ifdef CONFIG_AMIGA_PCMCIA
     case ISA_TYPE_AG: return (u16 __iomem *)addr;
 #endif
+#ifdef CONFIG_ATARI_ROM_ISA
+    case ISA_TYPE_ENEC: return (u16 __iomem *)ENEC_ISA_MEM_W(addr);
+#endif
     default: return NULL; /* avoid warnings, just in case */
     }
 }
@@ -222,6 +256,36 @@ static inline u16 __iomem *isa_mtw(unsigned long addr)
         (ISA_SEX ? out_be16(isa_mtw((unsigned long)(p)),(val))  \
                  : out_le16(isa_mtw((unsigned long)(p)),(val)))
 
+#ifdef CONFIG_ATARI_ROM_ISA
+#define isa_rom_inb(port)      rom_in_8(isa_itb(port))
+#define isa_rom_inw(port)       \
+        (ISA_SEX ? rom_in_be16(isa_itw(port))   \
+                 : rom_in_le16(isa_itw(port)))
+
+#define isa_rom_outb(val, port) rom_out_8(isa_itb(port), (val))
+#define isa_rom_outw(val, port) \
+        (ISA_SEX ? rom_out_be16(isa_itw(port), (val))   \
+                 : rom_out_le16(isa_itw(port), (val)))
+
+#define isa_rom_readb(p)       rom_in_8(isa_mtb((unsigned long)(p)))
+#define isa_rom_readw(p)       \
+        (ISA_SEX ? rom_in_be16(isa_mtw((unsigned long)(p)))     \
+                 : rom_in_le16(isa_mtw((unsigned long)(p))))
+#define isa_rom_readw_swap(p)       \
+        (ISA_SEX ? rom_in_le16(isa_mtw((unsigned long)(p)))     \
+                 : rom_in_be16(isa_mtw((unsigned long)(p))))
+#define isa_rom_readw_raw(p)   rom_in_be16(isa_mtw((unsigned long)(p)))
+
+#define isa_rom_writeb(val, p)  rom_out_8(isa_mtb((unsigned long)(p)), (val))
+#define isa_rom_writew(val, p)  \
+        (ISA_SEX ? rom_out_be16(isa_mtw((unsigned long)(p)), (val))     \
+                 : rom_out_le16(isa_mtw((unsigned long)(p)), (val)))
+#define isa_rom_writew_swap(val, p)  \
+        (ISA_SEX ? rom_out_le16(isa_mtw((unsigned long)(p)), (val))     \
+                 : rom_out_be16(isa_mtw((unsigned long)(p)), (val)))
+#define isa_rom_writew_raw(val, p)  rom_out_be16(isa_mtw((unsigned long)(p)), (val))
+#endif /* CONFIG_ATARI_ROM_ISA */
+
 static inline void isa_delay(void)
 {
   switch(ISA_TYPE)
@@ -232,6 +296,9 @@ static inline void isa_delay(void)
 #ifdef CONFIG_AMIGA_PCMCIA
     case ISA_TYPE_AG: break;
 #endif
+#ifdef CONFIG_ATARI_ROM_ISA
+    case ISA_TYPE_ENEC: break;
+#endif
     default: break; /* avoid warnings */
     }
 }
@@ -263,6 +330,29 @@ static inline void isa_delay(void)
                   raw_outsw_swapw(isa_itw(port), (u16 *)(buf), (nr)<<1))
 
 
+#ifdef CONFIG_ATARI_ROM_ISA
+#define isa_rom_inb_p(p)        ({ u8 _v = isa_rom_inb(p); isa_delay(); _v; })
+#define isa_rom_inw_p(p)        ({ u16 _v = isa_rom_inw(p); isa_delay(); _v; })
+#define isa_rom_outb_p(v, p)    ({ isa_rom_outb((v), (p)); isa_delay(); })
+#define isa_rom_outw_p(v, p)    ({ isa_rom_outw((v), (p)); isa_delay(); })
+
+#define isa_rom_insb(port, buf, nr) raw_rom_insb(isa_itb(port), (u8 *)(buf), (nr))
+
+#define isa_rom_insw(port, buf, nr)     \
+       (ISA_SEX ? raw_rom_insw(isa_itw(port), (u16 *)(buf), (nr)) :    \
+                  raw_rom_insw_swapw(isa_itw(port), (u16 *)(buf), (nr)))
+
+#define isa_rom_outsb(port, buf, nr) raw_rom_outsb(isa_itb(port), (u8 *)(buf), (nr))
+
+#define isa_rom_outsw(port, buf, nr)    \
+       (ISA_SEX ? raw_rom_outsw(isa_itw(port), (u16 *)(buf), (nr)) :  \
+                  raw_rom_outsw_swapw(isa_itw(port), (u16 *)(buf), (nr)))
+#endif /* CONFIG_ATARI_ROM_ISA */
+
+#endif  /* CONFIG_ISA || CONFIG_ATARI_ROM_ISA */
+
+
+#if defined(CONFIG_ISA) && !defined(CONFIG_ATARI_ROM_ISA)
 #define inb     isa_inb
 #define inb_p   isa_inb_p
 #define outb    isa_outb
@@ -285,9 +375,43 @@ static inline void isa_delay(void)
 #define readw   isa_readw
 #define writeb  isa_writeb
 #define writew  isa_writew
+#endif  /* CONFIG_ISA && !CONFIG_ATARI_ROM_ISA */
 
-#else  /* CONFIG_ISA */
-
+#ifdef CONFIG_ATARI_ROM_ISA
+/*
+ * kernel with both ROM port ISA and IDE compiled in, those have
+ * conflicting defs for in/out. Simply consider port < 1024
+ * ROM port ISA and everything else regular ISA for IDE. read,write defined
+ * below.
+ */
+#define inb(port)       ((port) < 1024 ? isa_rom_inb(port) : in_8(port))
+#define inb_p(port)     ((port) < 1024 ? isa_rom_inb_p(port) : in_8(port))
+#define inw(port)       ((port) < 1024 ? isa_rom_inw(port) : in_le16(port))
+#define inw_p(port)     ((port) < 1024 ? isa_rom_inw_p(port) : in_le16(port))
+#define inl             isa_inl
+#define inl_p           isa_inl_p
+
+#define outb(val, port) ((port) < 1024 ? isa_rom_outb((val), (port)) : out_8((port), (val)))
+#define outb_p(val, port) ((port) < 1024 ? isa_rom_outb_p((val), (port)) : out_8((port), (val)))
+#define outw(val, port) ((port) < 1024 ? isa_rom_outw((val), (port)) : out_le16((port), (val)))
+#define outw_p(val, port) ((port) < 1024 ? isa_rom_outw_p((val), (port)) : out_le16((port), (val)))
+#define outl            isa_outl
+#define outl_p          isa_outl_p
+
+#define insb(port, buf, nr)     ((port) < 1024 ? isa_rom_insb((port), (buf), (nr)) : isa_insb((port), (buf), (nr)))
+#define insw(port, buf, nr)     ((port) < 1024 ? isa_rom_insw((port), (buf), (nr)) : isa_insw((port), (buf), (nr)))
+#define insl                    isa_insl
+#define outsb(port, buf, nr)    ((port) < 1024 ? isa_rom_outsb((port), (buf), (nr)) : isa_outsb((port), (buf), (nr)))
+#define outsw(port, buf, nr)    ((port) < 1024 ? isa_rom_outsw((port), (buf), (nr)) : isa_outsw((port), (buf), (nr)))
+#define outsl                   isa_outsl
+
+#define readb(addr)             in_8(addr)
+#define writeb(val, addr)       out_8((addr), (val))
+#define readw(addr)             in_le16(addr)
+#define writew(val, addr)       out_le16((addr), (val))
+#endif /* CONFIG_ATARI_ROM_ISA */
+
+#if !defined(CONFIG_ISA) && !defined(CONFIG_ATARI_ROM_ISA)
 /*
  * We need to define dummy functions for GENERIC_IOMAP support.
  */
@@ -319,7 +443,7 @@ static inline void isa_delay(void)
 #define readw(addr)      in_le16(addr)
 #define writew(val,addr) out_le16((addr),(val))
 
-#endif /* CONFIG_ISA */
+#endif /* !CONFIG_ISA && !CONFIG_ATARI_ROM_ISA */
 
 #define readl(addr)      in_le32(addr)
 #define writel(val,addr) out_le32((addr),(val))
diff --git a/arch/m68k/include/asm/irq.h b/arch/m68k/include/asm/irq.h
index c1155f0e22cc..81ca118d58af 100644
--- a/arch/m68k/include/asm/irq.h
+++ b/arch/m68k/include/asm/irq.h
@@ -6,12 +6,16 @@
  * different m68k hosts compiled into the kernel.
  * Currently the Atari has 72 and the Amiga 24, but if both are
  * supported in the kernel it is better to make room for 72.
+ * With EtherNAT add-on card on Atari, the highest interrupt
+ * number is 140 so NR_IRQS needs to be 141.
  */
 #if defined(CONFIG_COLDFIRE)
 #define NR_IRQS 256
 #elif defined(CONFIG_VME) || defined(CONFIG_SUN3) || defined(CONFIG_SUN3X)
 #define NR_IRQS 200
-#elif defined(CONFIG_ATARI) || defined(CONFIG_MAC)
+#elif defined(CONFIG_ATARI)
+#define NR_IRQS 141
+#elif defined(CONFIG_MAC)
 #define NR_IRQS 72
 #elif defined(CONFIG_Q40)
 #define NR_IRQS 43
diff --git a/arch/m68k/include/asm/raw_io.h b/arch/m68k/include/asm/raw_io.h
index d9eb9834ccc8..932faa35655b 100644
--- a/arch/m68k/include/asm/raw_io.h
+++ b/arch/m68k/include/asm/raw_io.h
@@ -10,7 +10,7 @@
 
 #ifdef __KERNEL__
 
-#include <asm/types.h>
+#include <asm/byteorder.h>
 
 
 /* Values for nocacheflag and cmode */
@@ -60,6 +60,57 @@ extern void __iounmap(void *addr, unsigned long size);
 #define __raw_writew(val,addr) out_be16((addr),(val))
 #define __raw_writel(val,addr) out_be32((addr),(val))
 
+/*
+ * Atari ROM port (cartridge port) ISA adapter, used for the EtherNEC NE2000
+ * network card driver.
+ * The ISA adapter connects address lines A9-A13 to ISA address lines A0-A4,
+ * and hardwires the rest of the ISA addresses for a base address of 0x300.
+ *
+ * Data lines D8-D15 are connected to ISA data lines D0-D7 for reading.
+ * For writes, address lines A1-A8 are latched to ISA data lines D0-D7
+ * (meaning the bit pattern on A1-A8 can be read back as byte).
+ *
+ * Read and write operations are distinguished by the base address used:
+ * reads are from the ROM A side range, writes are through the B side range
+ * addresses (A side base + 0x10000).
+ *
+ * Reads and writes are byte only.
+ *
+ * 16 bit reads and writes are necessary for the NetUSBee adapter's USB
+ * chipset - 16 bit words are read straight off the ROM port while 16 bit
+ * reads are split into two byte writes. The low byte is latched to the
+ * NetUSBee buffer by a read from the _read_ window (with the data pattern
+ * asserted as A1-A8 address pattern). The high byte is then written to the
+ * write range as usual, completing the write cycle.
+ */
+
+#if defined(CONFIG_ATARI_ROM_ISA)
+#define rom_in_8(addr) \
+        ({ u16 __v = (*(__force volatile u16 *) (addr)); __v >>= 8; __v; })
+#define rom_in_be16(addr) \
+        ({ u16 __v = (*(__force volatile u16 *) (addr)); __v; })
+#define rom_in_le16(addr) \
+        ({ u16 __v = le16_to_cpu(*(__force volatile u16 *) (addr)); __v; })
+
+#define rom_out_8(addr, b)      \
+        ({u8 __w, __v = (b);  u32 _addr = ((u32) (addr)); \
+        __w = ((*(__force volatile u8 *)  ((_addr | 0x10000) + (__v<<1)))); })
+#define rom_out_be16(addr, w)   \
+        ({u16 __w, __v = (w); u32 _addr = ((u32) (addr)); \
+        __w = ((*(__force volatile u16 *) ((_addr & 0xFFFF0000UL) + ((__v & 0xFF)<<1)))); \
+        __w = ((*(__force volatile u16 *) ((_addr | 0x10000) + ((__v >> 8)<<1)))); })
+#define rom_out_le16(addr, w)   \
+        ({u16 __w, __v = (w); u32 _addr = ((u32) (addr)); \
+        __w = ((*(__force volatile u16 *) ((_addr & 0xFFFF0000UL) + ((__v >> 8)<<1)))); \
+        __w = ((*(__force volatile u16 *) ((_addr | 0x10000) + ((__v & 0xFF)<<1)))); })
+
+#define raw_rom_inb rom_in_8
+#define raw_rom_inw rom_in_be16
+
+#define raw_rom_outb(val, port) rom_out_8((port), (val))
+#define raw_rom_outw(val, port) rom_out_be16((port), (val))
+#endif /* CONFIG_ATARI_ROM_ISA */
+
 static inline void raw_insb(volatile u8 __iomem *port, u8 *buf, unsigned int len)
 {
         unsigned int i;
@@ -342,6 +393,62 @@ static inline void raw_outsw_swapw(volatile u16 __iomem *port, const u16 *buf,
                 : "d0", "a0", "a1", "d6");
 }
 
+
+#if defined(CONFIG_ATARI_ROM_ISA)
+static inline void raw_rom_insb(volatile u8 __iomem *port, u8 *buf, unsigned int len)
+{
+        unsigned int i;
+
+        for (i = 0; i < len; i++)
+                *buf++ = rom_in_8(port);
+}
+
+static inline void raw_rom_outsb(volatile u8 __iomem *port, const u8 *buf,
+                             unsigned int len)
+{
+        unsigned int i;
+
+        for (i = 0; i < len; i++)
+                rom_out_8(port, *buf++);
+}
+
+static inline void raw_rom_insw(volatile u16 __iomem *port, u16 *buf,
+                                   unsigned int nr)
+{
+        unsigned int i;
+
+        for (i = 0; i < nr; i++)
+                *buf++ = rom_in_be16(port);
+}
+
+static inline void raw_rom_outsw(volatile u16 __iomem *port, const u16 *buf,
+                                   unsigned int nr)
+{
+        unsigned int i;
+
+        for (i = 0; i < nr; i++)
+                rom_out_be16(port, *buf++);
+}
+
+static inline void raw_rom_insw_swapw(volatile u16 __iomem *port, u16 *buf,
+                                   unsigned int nr)
+{
+        unsigned int i;
+
+        for (i = 0; i < nr; i++)
+                *buf++ = rom_in_le16(port);
+}
+
+static inline void raw_rom_outsw_swapw(volatile u16 __iomem *port, const u16 *buf,
+                                   unsigned int nr)
+{
+        unsigned int i;
+
+        for (i = 0; i < nr; i++)
+                rom_out_le16(port, *buf++);
+}
+#endif /* CONFIG_ATARI_ROM_ISA */
+
 #endif /* __KERNEL__ */
 
 #endif /* _RAW_IO_H */
diff --git a/arch/m68k/include/asm/string.h b/arch/m68k/include/asm/string.h
index 32198454da70..9aea9f11fa25 100644
--- a/arch/m68k/include/asm/string.h
+++ b/arch/m68k/include/asm/string.h
@@ -4,15 +4,6 @@
 #include <linux/types.h>
 #include <linux/compiler.h>
 
-static inline size_t __kernel_strlen(const char *s)
-{
-        const char *sc;
-
-        for (sc = s; *sc++; )
-                ;
-        return sc - s - 1;
-}
-
 static inline char *__kernel_strcpy(char *dest, const char *src)
 {
         char *xdest = dest;
@@ -27,11 +18,6 @@ static inline char *__kernel_strcpy(char *dest, const char *src)
 
 #ifndef __IN_STRING_C
 
-#define __HAVE_ARCH_STRLEN
-#define strlen(s)       (__builtin_constant_p(s) ?      \
-                         __builtin_strlen(s) :          \
-                         __kernel_strlen(s))
-
 #define __HAVE_ARCH_STRNLEN
 static inline size_t strnlen(const char *s, size_t count)
 {
diff --git a/arch/m68k/include/asm/unistd.h b/arch/m68k/include/asm/unistd.h
index 6cd92671ca5e..014f288fc813 100644
--- a/arch/m68k/include/asm/unistd.h
+++ b/arch/m68k/include/asm/unistd.h
@@ -32,12 +32,4 @@
 #define __ARCH_WANT_SYS_FORK
 #define __ARCH_WANT_SYS_VFORK
 
-/*
- * "Conditional" syscalls
- *
- * What we want is __attribute__((weak,alias("sys_ni_syscall"))),
- * but it doesn't work on all toolchains, so we just do it by hand
- */
-#define cond_syscall(x) asm(".weak\t" #x "\n\t.set\t" #x ",sys_ni_syscall")
-
 #endif /* _ASM_M68K_UNISTD_H_ */
diff --git a/arch/m68k/kernel/process.c b/arch/m68k/kernel/process.c
index d538694ad208..c55ff719fa72 100644
--- a/arch/m68k/kernel/process.c
+++ b/arch/m68k/kernel/process.c
@@ -51,40 +51,16 @@ unsigned long thread_saved_pc(struct task_struct *tsk)
                 return sw->retpc;
 }
 
-/*
- * The idle loop on an m68k..
- */
-static void default_idle(void)
+void arch_cpu_idle(void)
 {
-        if (!need_resched())
 #if defined(MACH_ATARI_ONLY)
-                /* block out HSYNC on the atari (falcon) */
-                __asm__("stop #0x2200" : : : "cc");
+        /* block out HSYNC on the atari (falcon) */
+        __asm__("stop #0x2200" : : : "cc");
 #else
-                __asm__("stop #0x2000" : : : "cc");
+        __asm__("stop #0x2000" : : : "cc");
 #endif
 }
 
-void (*idle)(void) = default_idle;
-
-/*
- * The idle thread. There's no useful work to be
- * done, so just try to conserve power and have a
- * low exit latency (ie sit in a loop waiting for
- * somebody to say that they'd like to reschedule)
- */
-void cpu_idle(void)
-{
-        /* endless idle loop with no priority at all */
-        while (1) {
-                rcu_idle_enter();
-                while (!need_resched())
-                        idle();
-                rcu_idle_exit();
-                schedule_preempt_disabled();
-        }
-}
-
 void machine_restart(char * __unused)
 {
         if (mach_reset)
diff --git a/arch/m68k/kernel/setup_mm.c b/arch/m68k/kernel/setup_mm.c
index 80cfbe56ea32..e67e53159573 100644
--- a/arch/m68k/kernel/setup_mm.c
+++ b/arch/m68k/kernel/setup_mm.c
@@ -381,6 +381,12 @@ void __init setup_arch(char **cmdline_p)
                 isa_sex = 1;
         }
 #endif
+#ifdef CONFIG_ATARI_ROM_ISA
+        if (MACH_IS_ATARI) {
+                isa_type = ISA_TYPE_ENEC;
+                isa_sex = 0;
+        }
+#endif
 #endif
 }
 
diff --git a/arch/m68k/kernel/traps.c b/arch/m68k/kernel/traps.c
index f32ab22e7ed3..88fcd8c70e7b 100644
--- a/arch/m68k/kernel/traps.c
+++ b/arch/m68k/kernel/traps.c
@@ -992,18 +992,6 @@ void show_stack(struct task_struct *task, unsigned long *stack)
 }
 
 /*
- * The architecture-independent backtrace generator
- */
-void dump_stack(void)
-{
-        unsigned long stack;
-
-        show_trace(&stack);
-}
-
-EXPORT_SYMBOL(dump_stack);
-
-/*
  * The vector number returned in the frame pointer may also contain
  * the "fs" (Fault Status) bits on ColdFire. These are in the bottom
  * 2 bits, and upper 2 bits. So we need to mask out the real vector
diff --git a/arch/m68k/lib/string.c b/arch/m68k/lib/string.c
index b9a57abfad08..4d61fa8a112c 100644
--- a/arch/m68k/lib/string.c
+++ b/arch/m68k/lib/string.c
@@ -17,6 +17,6 @@ EXPORT_SYMBOL(strcpy);
 
 char *strcat(char *dest, const char *src)
 {
-        return __kernel_strcpy(dest + __kernel_strlen(dest), src);
+        return __kernel_strcpy(dest + strlen(dest), src);
 }
 EXPORT_SYMBOL(strcat);
diff --git a/arch/m68k/mm/init.c b/arch/m68k/mm/init.c
index 519aad8fa812..1af2ca3411f6 100644
--- a/arch/m68k/mm/init.c
+++ b/arch/m68k/mm/init.c
@@ -110,18 +110,7 @@ void __init paging_init(void)
 void free_initmem(void)
 {
 #ifndef CONFIG_MMU_SUN3
-        unsigned long addr;
-
-        addr = (unsigned long) __init_begin;
-        for (; addr < ((unsigned long) __init_end); addr += PAGE_SIZE) {
-                ClearPageReserved(virt_to_page(addr));
-                init_page_count(virt_to_page(addr));
-                free_page(addr);
-                totalram_pages++;
-        }
-        pr_notice("Freeing unused kernel memory: %luk freed (0x%x - 0x%x)\n",
-                (addr - (unsigned long) __init_begin) >> 10,
-                (unsigned int) __init_begin, (unsigned int) __init_end);
+        free_initmem_default(0);
 #endif /* CONFIG_MMU_SUN3 */
 }
 
@@ -213,15 +202,6 @@ void __init mem_init(void)
 #ifdef CONFIG_BLK_DEV_INITRD
 void free_initrd_mem(unsigned long start, unsigned long end)
 {
-        int pages = 0;
-        for (; start < end; start += PAGE_SIZE) {
-                ClearPageReserved(virt_to_page(start));
-                init_page_count(virt_to_page(start));
-                free_page(start);
-                totalram_pages++;
-                pages++;
-        }
-        pr_notice("Freeing initrd memory: %dk freed\n",
-                pages << (PAGE_SHIFT - 10));
+        free_reserved_area(start, end, 0, "initrd");
 }
 #endif
diff --git a/arch/metag/Kconfig b/arch/metag/Kconfig
index afc8973d1488..b06b41861aac 100644
--- a/arch/metag/Kconfig
+++ b/arch/metag/Kconfig
@@ -25,6 +25,7 @@ config METAG
         select HAVE_MEMBLOCK
         select HAVE_MEMBLOCK_NODE_MAP
         select HAVE_MOD_ARCH_SPECIFIC
+        select HAVE_OPROFILE
         select HAVE_PERF_EVENTS
         select HAVE_SYSCALL_TRACEPOINTS
         select IRQ_DOMAIN
@@ -209,6 +210,9 @@ config METAG_PERFCOUNTER_IRQS
           When disabled, Performance Counters information will be collected
           based on Timer Interrupt.
 
+config HW_PERF_EVENTS
+        def_bool METAG_PERFCOUNTER_IRQS && PERF_EVENTS
+
 config METAG_DA
         bool "DA support"
         help
diff --git a/arch/metag/Makefile b/arch/metag/Makefile
index 81bd6a1c7483..b566116b171b 100644
--- a/arch/metag/Makefile
+++ b/arch/metag/Makefile
@@ -49,6 +49,8 @@ core-y					+= arch/metag/mm/
 libs-y                                  += arch/metag/lib/
 libs-y                                  += arch/metag/tbx/
 
+drivers-$(CONFIG_OPROFILE)              += arch/metag/oprofile/
+
 boot                                    := arch/metag/boot
 
 boot_targets                            += uImage
diff --git a/arch/metag/boot/dts/Makefile b/arch/metag/boot/dts/Makefile
index e0b5afd8bde8..dbd95217733a 100644
--- a/arch/metag/boot/dts/Makefile
+++ b/arch/metag/boot/dts/Makefile
@@ -4,13 +4,17 @@ dtb-y	+= skeleton.dtb
 builtindtb-y                            := skeleton
 
 ifneq ($(CONFIG_METAG_BUILTIN_DTB_NAME),"")
-        builtindtb-y                    := $(CONFIG_METAG_BUILTIN_DTB_NAME)
+        builtindtb-y                    := $(patsubst "%",%,$(CONFIG_METAG_BUILTIN_DTB_NAME))
 endif
-obj-$(CONFIG_METAG_BUILTIN_DTB) += $(patsubst "%",%,$(builtindtb-y)).dtb.o
+
+dtb-$(CONFIG_METAG_BUILTIN_DTB) += $(builtindtb-y).dtb
+obj-$(CONFIG_METAG_BUILTIN_DTB) += $(builtindtb-y).dtb.o
 
 targets += dtbs
 targets += $(dtb-y)
 
+.SECONDARY: $(obj)/$(builtindtb-y).dtb.S
+
 dtbs: $(addprefix $(obj)/, $(dtb-y))
 
-clean-files += *.dtb
+clean-files += *.dtb *.dtb.S
diff --git a/arch/metag/configs/meta1_defconfig b/arch/metag/configs/meta1_defconfig
index c35a75e8ecfe..01cd67e4403d 100644
--- a/arch/metag/configs/meta1_defconfig
+++ b/arch/metag/configs/meta1_defconfig
@@ -1,6 +1,5 @@
 # CONFIG_LOCALVERSION_AUTO is not set
 # CONFIG_SWAP is not set
-CONFIG_LOG_BUF_SHIFT=13
 CONFIG_SYSFS_DEPRECATED=y
 CONFIG_SYSFS_DEPRECATED_V2=y
 CONFIG_KALLSYMS_ALL=y
diff --git a/arch/metag/configs/meta2_defconfig b/arch/metag/configs/meta2_defconfig
index fb3148410183..643392ba7ed5 100644
--- a/arch/metag/configs/meta2_defconfig
+++ b/arch/metag/configs/meta2_defconfig
@@ -1,7 +1,6 @@
 # CONFIG_LOCALVERSION_AUTO is not set
 # CONFIG_SWAP is not set
 CONFIG_SYSVIPC=y
-CONFIG_LOG_BUF_SHIFT=13
 CONFIG_SYSFS_DEPRECATED=y
 CONFIG_SYSFS_DEPRECATED_V2=y
 CONFIG_KALLSYMS_ALL=y
diff --git a/arch/metag/configs/meta2_smp_defconfig b/arch/metag/configs/meta2_smp_defconfig
index 6c7b777ac276..f3306737da20 100644
--- a/arch/metag/configs/meta2_smp_defconfig
+++ b/arch/metag/configs/meta2_smp_defconfig
@@ -1,7 +1,6 @@
 # CONFIG_LOCALVERSION_AUTO is not set
 # CONFIG_SWAP is not set
 CONFIG_SYSVIPC=y
-CONFIG_LOG_BUF_SHIFT=13
 CONFIG_SYSFS_DEPRECATED=y
 CONFIG_SYSFS_DEPRECATED_V2=y
 CONFIG_KALLSYMS_ALL=y
diff --git a/arch/metag/include/asm/metag_mem.h b/arch/metag/include/asm/metag_mem.h
index 3f7b54d8ccac..aa5a076df439 100644
--- a/arch/metag/include/asm/metag_mem.h
+++ b/arch/metag/include/asm/metag_mem.h
@@ -700,6 +700,9 @@
 #define     SYSC_xCPARTG_AND_S    8
 #define     SYSC_xCPARTL_OR_BITS  0x000F0000 /* Ors into top 4 bits */
 #define     SYSC_xCPARTL_OR_S     16
+#ifdef METAC_2_1
+#define     SYSC_DCPART_GCON_BIT  0x00100000 /* Coherent shared local */
+#endif /* METAC_2_1 */
 #define     SYSC_xCPARTG_OR_BITS  0x0F000000 /* Ors into top 4 bits */
 #define     SYSC_xCPARTG_OR_S     24
 #define     SYSC_CWRMODE_BIT      0x80000000 /* Write cache mode bit */
diff --git a/arch/metag/include/asm/thread_info.h b/arch/metag/include/asm/thread_info.h
index 0ecd34d8b5f6..7c4a33006142 100644
--- a/arch/metag/include/asm/thread_info.h
+++ b/arch/metag/include/asm/thread_info.h
@@ -150,6 +150,4 @@ static inline int kstack_end(void *addr)
 #define _TIF_WORK_MASK          (_TIF_ALLWORK_MASK & ~(_TIF_SYSCALL_TRACE | \
                                  _TIF_SYSCALL_AUDIT | _TIF_SINGLESTEP))
 
-#define tsk_is_polling(t) test_tsk_thread_flag(t, TIF_POLLING_NRFLAG)
-
 #endif /* _ASM_THREAD_INFO_H */
diff --git a/arch/metag/include/uapi/asm/Kbuild b/arch/metag/include/uapi/asm/Kbuild
index 876c71f866de..84e09feb4d54 100644
--- a/arch/metag/include/uapi/asm/Kbuild
+++ b/arch/metag/include/uapi/asm/Kbuild
@@ -2,6 +2,7 @@
 include include/uapi/asm-generic/Kbuild.asm
 
 header-y += byteorder.h
+header-y += ech.h
 header-y += ptrace.h
 header-y += resource.h
 header-y += sigcontext.h
diff --git a/arch/metag/include/uapi/asm/ech.h b/arch/metag/include/uapi/asm/ech.h
new file mode 100644
index 000000000000..ac94d1cf9be4
--- /dev/null
+++ b/arch/metag/include/uapi/asm/ech.h
@@ -0,0 +1,15 @@
+#ifndef _UAPI_METAG_ECH_H
+#define _UAPI_METAG_ECH_H
+
+/*
+ * These bits can be set in the top half of the D0.8 register when DSP context
+ * switching is enabled, in order to support partial DSP context save/restore.
+ */
+
+#define TBICTX_XEXT_BIT 0x1000  /* Enable extended context save */
+#define TBICTX_XTDP_BIT 0x0800  /* DSP accumulators/RAM/templates */
+#define TBICTX_XHL2_BIT 0x0400  /* Hardware loops */
+#define TBICTX_XAXX_BIT 0x0200  /* Extended AX registers (A*.4-7) */
+#define TBICTX_XDX8_BIT 0x0100  /* Extended DX registers (D*.8-15) */
+
+#endif /* _UAPI_METAG_ECH_H */
diff --git a/arch/metag/kernel/cachepart.c b/arch/metag/kernel/cachepart.c
index 3a589dfb966b..954548b1bea8 100644
--- a/arch/metag/kernel/cachepart.c
+++ b/arch/metag/kernel/cachepart.c
@@ -24,15 +24,21 @@
 unsigned int get_dcache_size(void)
 {
         unsigned int config2 = metag_in32(METAC_CORE_CONFIG2);
-        return 0x1000 << ((config2 & METAC_CORECFG2_DCSZ_BITS)
-                                >> METAC_CORECFG2_DCSZ_S);
+        unsigned int sz = 0x1000 << ((config2 & METAC_CORECFG2_DCSZ_BITS)
+                                     >> METAC_CORECFG2_DCSZ_S);
+        if (config2 & METAC_CORECFG2_DCSMALL_BIT)
+                sz >>= 6;
+        return sz;
 }
 
 unsigned int get_icache_size(void)
 {
         unsigned int config2 = metag_in32(METAC_CORE_CONFIG2);
-        return 0x1000 << ((config2 & METAC_CORE_C2ICSZ_BITS)
-                                >> METAC_CORE_C2ICSZ_S);
+        unsigned int sz = 0x1000 << ((config2 & METAC_CORE_C2ICSZ_BITS)
+                                     >> METAC_CORE_C2ICSZ_S);
+        if (config2 & METAC_CORECFG2_ICSMALL_BIT)
+                sz >>= 6;
+        return sz;
 }
 
 unsigned int get_global_dcache_size(void)
@@ -61,7 +67,7 @@ static unsigned int get_thread_cache_size(unsigned int cache, int thread_id)
                 return 0;
 #if PAGE_OFFSET >= LINGLOBAL_BASE
         /* Checking for global cache */
-        cache_size = (cache == DCACHE ? get_global_dache_size() :
+        cache_size = (cache == DCACHE ? get_global_dcache_size() :
                 get_global_icache_size());
         offset = 8;
 #else
diff --git a/arch/metag/kernel/da.c b/arch/metag/kernel/da.c
index 52aabb658fde..a35dbed6fffa 100644
--- a/arch/metag/kernel/da.c
+++ b/arch/metag/kernel/da.c
@@ -5,12 +5,14 @@
  */
 
 
+#include <linux/export.h>
 #include <linux/io.h>
 #include <linux/kernel.h>
 #include <asm/da.h>
 #include <asm/metag_mem.h>
 
 bool _metag_da_present;
+EXPORT_SYMBOL_GPL(_metag_da_present);
 
 int __init metag_da_probe(void)
 {
diff --git a/arch/metag/kernel/head.S b/arch/metag/kernel/head.S
index 969dffabc03a..713f71d1bdfe 100644
--- a/arch/metag/kernel/head.S
+++ b/arch/metag/kernel/head.S
@@ -1,6 +1,7 @@
         ! Copyright 2005,2006,2007,2009 Imagination Technologies
 
 #include <linux/init.h>
+#include <asm/metag_mem.h>
 #include <generated/asm-offsets.h>
 #undef __exit
 
@@ -48,6 +49,13 @@ __exit:
         .global _secondary_startup
         .type _secondary_startup,function
 _secondary_startup:
+#if CONFIG_PAGE_OFFSET < LINGLOBAL_BASE
+        ! In case GCOn has just been turned on we need to fence any writes that
+        ! the boot thread might have performed prior to coherency taking effect.
+        MOVT    D0Re0,#HI(LINSYSEVENT_WR_ATOMIC_UNLOCK)
+        MOV     D1Re0,#0
+        SETD    [D0Re0], D1Re0
+#endif
         MOVT    A0StP,#HI(_secondary_data_stack)
         ADD     A0StP,A0StP,#LO(_secondary_data_stack)
         GETD    A0StP,[A0StP]
diff --git a/arch/metag/kernel/perf/perf_event.c b/arch/metag/kernel/perf/perf_event.c
index a876d5ff3897..366569425c52 100644
--- a/arch/metag/kernel/perf/perf_event.c
+++ b/arch/metag/kernel/perf/perf_event.c
@@ -22,9 +22,9 @@
 #include <linux/slab.h>
 
 #include <asm/core_reg.h>
-#include <asm/hwthread.h>
 #include <asm/io.h>
 #include <asm/irq.h>
+#include <asm/processor.h>
 
 #include "perf_event.h"
 
@@ -40,10 +40,10 @@ static DEFINE_PER_CPU(struct cpu_hw_events, cpu_hw_events);
 /* PMU admin */
 const char *perf_pmu_name(void)
 {
-        if (metag_pmu)
-                return metag_pmu->pmu.name;
+        if (!metag_pmu)
+                return NULL;
 
-        return NULL;
+        return metag_pmu->name;
 }
 EXPORT_SYMBOL_GPL(perf_pmu_name);
 
@@ -171,6 +171,7 @@ static int metag_pmu_event_init(struct perf_event *event)
         switch (event->attr.type) {
         case PERF_TYPE_HARDWARE:
         case PERF_TYPE_HW_CACHE:
+        case PERF_TYPE_RAW:
                 err = _hw_perf_event_init(event);
                 break;
 
@@ -211,9 +212,10 @@ again:
         /*
          * Calculate the delta and add it to the counter.
          */
-        delta = new_raw_count - prev_raw_count;
+        delta = (new_raw_count - prev_raw_count) & MAX_PERIOD;
 
         local64_add(delta, &event->count);
+        local64_sub(delta, &hwc->period_left);
 }
 
 int metag_pmu_event_set_period(struct perf_event *event,
@@ -223,6 +225,10 @@ int metag_pmu_event_set_period(struct perf_event *event,
         s64 period = hwc->sample_period;
         int ret = 0;
 
+        /* The period may have been changed */
+        if (unlikely(period != hwc->last_period))
+                left += period - hwc->last_period;
+
         if (unlikely(left <= -period)) {
                 left = period;
                 local64_set(&hwc->period_left, left);
@@ -240,8 +246,10 @@ int metag_pmu_event_set_period(struct perf_event *event,
         if (left > (s64)metag_pmu->max_period)
                 left = metag_pmu->max_period;
 
-        if (metag_pmu->write)
-                metag_pmu->write(idx, (u64)(-left) & MAX_PERIOD);
+        if (metag_pmu->write) {
+                local64_set(&hwc->prev_count, -(s32)left);
+                metag_pmu->write(idx, -left & MAX_PERIOD);
+        }
 
         perf_event_update_userpage(event);
 
@@ -549,6 +557,10 @@ static int _hw_perf_event_init(struct perf_event *event)
                 if (err)
                         return err;
                 break;
+
+        case PERF_TYPE_RAW:
+                mapping = attr->config;
+                break;
         }
 
         /* Return early if the event is unsupported */
@@ -610,15 +622,13 @@ static void metag_pmu_enable_counter(struct hw_perf_event *event, int idx)
                 WARN_ONCE((config != 0x100),
                         "invalid configuration (%d) for counter (%d)\n",
                         config, idx);
-
-                /* Reset the cycle count */
-                __core_reg_set(TXTACTCYC, 0);
+                local64_set(&event->prev_count, __core_reg_get(TXTACTCYC));
                 goto unlock;
         }
 
         /* Check for a core internal or performance channel event. */
         if (tmp) {
-                void *perf_addr = (void *)PERF_COUNT(idx);
+                void *perf_addr;
 
                 /*
                  * Anything other than a cycle count will write the low-
@@ -632,9 +642,14 @@ static void metag_pmu_enable_counter(struct hw_perf_event *event, int idx)
                 case 0xf0:
                         perf_addr = (void *)PERF_CHAN(idx);
                         break;
+
+                default:
+                        perf_addr = NULL;
+                        break;
                 }
 
-                metag_out32((tmp & 0x0f), perf_addr);
+                if (perf_addr)
+                        metag_out32((config & 0x0f), perf_addr);
 
                 /*
                  * Now we use the high nibble as the performance event to
@@ -643,13 +658,21 @@ static void metag_pmu_enable_counter(struct hw_perf_event *event, int idx)
                 config = tmp >> 4;
         }
 
-        /*
-         * Enabled counters start from 0. Early cores clear the count on
-         * write but newer cores don't, so we make sure that the count is
-         * set to 0.
-         */
         tmp = ((config & 0xf) << 28) |
-                        ((1 << 24) << cpu_2_hwthread_id[get_cpu()]);
+                        ((1 << 24) << hard_processor_id());
+        if (metag_pmu->max_period)
+                /*
+                 * Cores supporting overflow interrupts may have had the counter
+                 * set to a specific value that needs preserving.
+                 */
+                tmp |= metag_in32(PERF_COUNT(idx)) & 0x00ffffff;
+        else
+                /*
+                 * Older cores reset the counter on write, so prev_count needs
+                 * resetting too so we can calculate a correct delta.
+                 */
+                local64_set(&event->prev_count, 0);
+
         metag_out32(tmp, PERF_COUNT(idx));
 unlock:
         raw_spin_unlock_irqrestore(&events->pmu_lock, flags);
@@ -693,9 +716,8 @@ static u64 metag_pmu_read_counter(int idx)
 {
         u32 tmp = 0;
 
-        /* The act of reading the cycle counter also clears it */
         if (METAG_INST_COUNTER == idx) {
-                __core_reg_swap(TXTACTCYC, tmp);
+                tmp = __core_reg_get(TXTACTCYC);
                 goto out;
         }
 
@@ -764,10 +786,16 @@ static irqreturn_t metag_pmu_counter_overflow(int irq, void *dev)
 
         /*
          * Enable the counter again once core overflow processing has
-         * completed.
+         * completed. Note the counter value may have been modified while it was
+         * inactive to set it up ready for the next interrupt.
          */
-        if (!perf_event_overflow(event, &sampledata, regs))
+        if (!perf_event_overflow(event, &sampledata, regs)) {
+                __global_lock2(flags);
+                counter = (counter & 0xff000000) |
+                          (metag_in32(PERF_COUNT(idx)) & 0x00ffffff);
                 metag_out32(counter, PERF_COUNT(idx));
+                __global_unlock2(flags);
+        }
 
         return IRQ_HANDLED;
 }
@@ -830,7 +858,7 @@ static int __init init_hw_perf_events(void)
                         metag_pmu->max_period = 0;
                 }
 
-                metag_pmu->name = "Meta 2";
+                metag_pmu->name = "meta2";
                 metag_pmu->version = version;
                 metag_pmu->pmu = pmu;
         }
diff --git a/arch/metag/kernel/process.c b/arch/metag/kernel/process.c
index c6efe62e5b76..483dff986a23 100644
--- a/arch/metag/kernel/process.c
+++ b/arch/metag/kernel/process.c
@@ -22,6 +22,7 @@
 #include <linux/pm.h>
 #include <linux/syscalls.h>
 #include <linux/uaccess.h>
+#include <linux/smp.h>
 #include <asm/core_reg.h>
 #include <asm/user_gateway.h>
 #include <asm/tcm.h>
@@ -31,7 +32,7 @@
 /*
  * Wait for the next interrupt and enable local interrupts
  */
-static inline void arch_idle(void)
+void arch_cpu_idle(void)
 {
         int tmp;
 
@@ -59,36 +60,12 @@ static inline void arch_idle(void)
                       : "r" (get_trigger_mask()));
 }
 
-void cpu_idle(void)
-{
-        set_thread_flag(TIF_POLLING_NRFLAG);
-
-        while (1) {
-                tick_nohz_idle_enter();
-                rcu_idle_enter();
-
-                while (!need_resched()) {
-                        /*
-                         * We need to disable interrupts here to ensure we don't
-                         * miss a wakeup call.
-                         */
-                        local_irq_disable();
-                        if (!need_resched()) {
 #ifdef CONFIG_HOTPLUG_CPU
-                                if (cpu_is_offline(smp_processor_id()))
-                                        cpu_die();
-#endif
-                                arch_idle();
-                        } else {
-                                local_irq_enable();
-                        }
-                }
-
-                rcu_idle_exit();
-                tick_nohz_idle_exit();
-                schedule_preempt_disabled();
-         }
+void arch_cpu_idle_dead(void)
+{
+        cpu_die();
 }
+#endif
 
 void (*pm_power_off)(void);
 EXPORT_SYMBOL(pm_power_off);
@@ -152,6 +129,8 @@ void show_regs(struct pt_regs *regs)
                 "D1.7 "
         };
 
+        show_regs_print_info(KERN_INFO);
+
         pr_info(" pt_regs @ %p\n", regs);
         pr_info(" SaveMask = 0x%04hx\n", regs->ctx.SaveMask);
         pr_info(" Flags = 0x%04hx (%c%c%c%c)\n", regs->ctx.Flags,
diff --git a/arch/metag/kernel/ptrace.c b/arch/metag/kernel/ptrace.c
index 47a8828615a5..7563628822bd 100644
--- a/arch/metag/kernel/ptrace.c
+++ b/arch/metag/kernel/ptrace.c
@@ -288,10 +288,36 @@ static int metag_rp_state_set(struct task_struct *target,
         return metag_rp_state_copyin(regs, pos, count, kbuf, ubuf);
 }
 
+static int metag_tls_get(struct task_struct *target,
+                        const struct user_regset *regset,
+                        unsigned int pos, unsigned int count,
+                        void *kbuf, void __user *ubuf)
+{
+        void __user *tls = target->thread.tls_ptr;
+        return user_regset_copyout(&pos, &count, &kbuf, &ubuf, &tls, 0, -1);
+}
+
+static int metag_tls_set(struct task_struct *target,
+                        const struct user_regset *regset,
+                        unsigned int pos, unsigned int count,
+                        const void *kbuf, const void __user *ubuf)
+{
+        int ret;
+        void __user *tls;
+
+        ret = user_regset_copyin(&pos, &count, &kbuf, &ubuf, &tls, 0, -1);
+        if (ret)
+                return ret;
+
+        target->thread.tls_ptr = tls;
+        return ret;
+}
+
 enum metag_regset {
         REGSET_GENERAL,
         REGSET_CBUF,
         REGSET_READPIPE,
+        REGSET_TLS,
 };
 
 static const struct user_regset metag_regsets[] = {
@@ -319,6 +345,14 @@ static const struct user_regset metag_regsets[] = {
                 .get = metag_rp_state_get,
                 .set = metag_rp_state_set,
         },
+        [REGSET_TLS] = {
+                .core_note_type = NT_METAG_TLS,
+                .n = 1,
+                .size = sizeof(void *),
+                .align = sizeof(void *),
+                .get = metag_tls_get,
+                .set = metag_tls_set,
+        },
 };
 
 static const struct user_regset_view user_metag_view = {
diff --git a/arch/metag/kernel/setup.c b/arch/metag/kernel/setup.c
index 879246170aec..4f5726f1a55b 100644
--- a/arch/metag/kernel/setup.c
+++ b/arch/metag/kernel/setup.c
@@ -124,6 +124,7 @@ struct machine_desc *machine_desc __initdata;
 u8 cpu_2_hwthread_id[NR_CPUS] __read_mostly = {
         [0 ... NR_CPUS-1] = BAD_HWTHREAD_ID
 };
+EXPORT_SYMBOL_GPL(cpu_2_hwthread_id);
 
 /*
  * Map a hardware thread ID to a Linux CPU number
diff --git a/arch/metag/kernel/smp.c b/arch/metag/kernel/smp.c
index 4b6d1f14df32..f443ec9a7cbe 100644
--- a/arch/metag/kernel/smp.c
+++ b/arch/metag/kernel/smp.c
@@ -28,6 +28,8 @@
 #include <asm/cachepart.h>
 #include <asm/core_reg.h>
 #include <asm/cpu.h>
+#include <asm/global_lock.h>
+#include <asm/metag_mem.h>
 #include <asm/mmu_context.h>
 #include <asm/pgtable.h>
 #include <asm/pgalloc.h>
@@ -37,6 +39,9 @@
 #include <asm/hwthread.h>
 #include <asm/traps.h>
 
+#define SYSC_DCPART(n)  (SYSC_DCPART0 + SYSC_xCPARTn_STRIDE * (n))
+#define SYSC_ICPART(n)  (SYSC_ICPART0 + SYSC_xCPARTn_STRIDE * (n))
+
 DECLARE_PER_CPU(PTBI, pTBI);
 
 void *secondary_data_stack;
@@ -99,6 +104,114 @@ int __cpuinit boot_secondary(unsigned int thread, struct task_struct *idle)
         return 0;
 }
 
+/**
+ * describe_cachepart_change: describe a change to cache partitions.
+ * @thread:     Hardware thread number.
+ * @label:      Label of cache type, e.g. "dcache" or "icache".
+ * @sz:         Total size of the cache.
+ * @old:        Old cache partition configuration (*CPART* register).
+ * @new:        New cache partition configuration (*CPART* register).
+ *
+ * If the cache partition has changed, prints a message to the log describing
+ * those changes.
+ */
+static __cpuinit void describe_cachepart_change(unsigned int thread,
+                                                const char *label,
+                                                unsigned int sz,
+                                                unsigned int old,
+                                                unsigned int new)
+{
+        unsigned int lor1, land1, gor1, gand1;
+        unsigned int lor2, land2, gor2, gand2;
+        unsigned int diff = old ^ new;
+
+        if (!diff)
+                return;
+
+        pr_info("Thread %d: %s partition changed:", thread, label);
+        if (diff & (SYSC_xCPARTL_OR_BITS | SYSC_xCPARTL_AND_BITS)) {
+                lor1   = (old & SYSC_xCPARTL_OR_BITS)  >> SYSC_xCPARTL_OR_S;
+                lor2   = (new & SYSC_xCPARTL_OR_BITS)  >> SYSC_xCPARTL_OR_S;
+                land1  = (old & SYSC_xCPARTL_AND_BITS) >> SYSC_xCPARTL_AND_S;
+                land2  = (new & SYSC_xCPARTL_AND_BITS) >> SYSC_xCPARTL_AND_S;
+                pr_cont(" L:%#x+%#x->%#x+%#x",
+                        (lor1 * sz) >> 4,
+                        ((land1 + 1) * sz) >> 4,
+                        (lor2 * sz) >> 4,
+                        ((land2 + 1) * sz) >> 4);
+        }
+        if (diff & (SYSC_xCPARTG_OR_BITS | SYSC_xCPARTG_AND_BITS)) {
+                gor1   = (old & SYSC_xCPARTG_OR_BITS)  >> SYSC_xCPARTG_OR_S;
+                gor2   = (new & SYSC_xCPARTG_OR_BITS)  >> SYSC_xCPARTG_OR_S;
+                gand1  = (old & SYSC_xCPARTG_AND_BITS) >> SYSC_xCPARTG_AND_S;
+                gand2  = (new & SYSC_xCPARTG_AND_BITS) >> SYSC_xCPARTG_AND_S;
+                pr_cont(" G:%#x+%#x->%#x+%#x",
+                        (gor1 * sz) >> 4,
+                        ((gand1 + 1) * sz) >> 4,
+                        (gor2 * sz) >> 4,
+                        ((gand2 + 1) * sz) >> 4);
+        }
+        if (diff & SYSC_CWRMODE_BIT)
+                pr_cont(" %sWR",
+                        (new & SYSC_CWRMODE_BIT) ? "+" : "-");
+        if (diff & SYSC_DCPART_GCON_BIT)
+                pr_cont(" %sGCOn",
+                        (new & SYSC_DCPART_GCON_BIT) ? "+" : "-");
+        pr_cont("\n");
+}
+
+/**
+ * setup_smp_cache: ensure cache coherency for new SMP thread.
+ * @thread:     New hardware thread number.
+ *
+ * Ensures that coherency is enabled and that the threads share the same cache
+ * partitions.
+ */
+static __cpuinit void setup_smp_cache(unsigned int thread)
+{
+        unsigned int this_thread, lflags;
+        unsigned int dcsz, dcpart_this, dcpart_old, dcpart_new;
+        unsigned int icsz, icpart_old, icpart_new;
+
+        /*
+         * Copy over the current thread's cache partition configuration to the
+         * new thread so that they share cache partitions.
+         */
+        __global_lock2(lflags);
+        this_thread = hard_processor_id();
+        /* Share dcache partition */
+        dcpart_this = metag_in32(SYSC_DCPART(this_thread));
+        dcpart_old = metag_in32(SYSC_DCPART(thread));
+        dcpart_new = dcpart_this;
+#if PAGE_OFFSET < LINGLOBAL_BASE
+        /*
+         * For the local data cache to be coherent the threads must also have
+         * GCOn enabled.
+         */
+        dcpart_new |= SYSC_DCPART_GCON_BIT;
+        metag_out32(dcpart_new, SYSC_DCPART(this_thread));
+#endif
+        metag_out32(dcpart_new, SYSC_DCPART(thread));
+        /* Share icache partition too */
+        icpart_new = metag_in32(SYSC_ICPART(this_thread));
+        icpart_old = metag_in32(SYSC_ICPART(thread));
+        metag_out32(icpart_new, SYSC_ICPART(thread));
+        __global_unlock2(lflags);
+
+        /*
+         * Log if the cache partitions were altered so the user is aware of any
+         * potential unintentional cache wastage.
+         */
+        dcsz = get_dcache_size();
+        icsz = get_dcache_size();
+        describe_cachepart_change(this_thread, "dcache", dcsz,
+                                  dcpart_this, dcpart_new);
+        describe_cachepart_change(thread, "dcache", dcsz,
+                                  dcpart_old, dcpart_new);
+        describe_cachepart_change(thread, "icache", icsz,
+                                  icpart_old, icpart_new);
+}
+
 int __cpuinit __cpu_up(unsigned int cpu, struct task_struct *idle)
 {
         unsigned int thread = cpu_2_hwthread_id[cpu];
@@ -108,6 +221,8 @@ int __cpuinit __cpu_up(unsigned int cpu, struct task_struct *idle)
 
         flush_tlb_all();
 
+        setup_smp_cache(thread);
+
         /*
          * Tell the secondary CPU where to find its idle thread's stack.
          */
@@ -297,7 +412,7 @@ asmlinkage void secondary_start_kernel(void)
         /*
          * OK, it's off to the idle thread for us
          */
-        cpu_idle();
+        cpu_startup_entry(CPUHP_ONLINE);
 }
 
 void __init smp_cpus_done(unsigned int max_cpus)
diff --git a/arch/metag/kernel/traps.c b/arch/metag/kernel/traps.c
index 8961f247b500..2ceeaae5b199 100644
--- a/arch/metag/kernel/traps.c
+++ b/arch/metag/kernel/traps.c
@@ -987,9 +987,3 @@ void show_stack(struct task_struct *tsk, unsigned long *sp)
 
         show_trace(tsk, sp, NULL);
 }
-
-void dump_stack(void)
-{
-        show_stack(NULL, NULL);
-}
-EXPORT_SYMBOL(dump_stack);
diff --git a/arch/metag/mm/Kconfig b/arch/metag/mm/Kconfig
index 975f2f4e3ecf..794f26a187f9 100644
--- a/arch/metag/mm/Kconfig
+++ b/arch/metag/mm/Kconfig
@@ -98,9 +98,6 @@ config MAX_ACTIVE_REGIONS
         default "2" if SPARSEMEM
         default "1"
 
-config ARCH_POPULATES_NODE_MAP
-        def_bool y
-
 config ARCH_SELECT_MEMORY_MODEL
         def_bool y
 
diff --git a/arch/metag/mm/init.c b/arch/metag/mm/init.c
index 504a398d5f8b..d05b8455c44c 100644
--- a/arch/metag/mm/init.c
+++ b/arch/metag/mm/init.c
@@ -380,14 +380,8 @@ void __init mem_init(void)
 
 #ifdef CONFIG_HIGHMEM
         unsigned long tmp;
-        for (tmp = highstart_pfn; tmp < highend_pfn; tmp++) {
-                struct page *page = pfn_to_page(tmp);
-                ClearPageReserved(page);
-                init_page_count(page);
-                __free_page(page);
-                totalhigh_pages++;
-        }
-        totalram_pages += totalhigh_pages;
+        for (tmp = highstart_pfn; tmp < highend_pfn; tmp++)
+                free_highmem_page(pfn_to_page(tmp));
         num_physpages += totalhigh_pages;
 #endif /* CONFIG_HIGHMEM */
 
@@ -412,32 +406,15 @@ void __init mem_init(void)
         return;
 }
 
-static void free_init_pages(char *what, unsigned long begin, unsigned long end)
-{
-        unsigned long addr;
-
-        for (addr = begin; addr < end; addr += PAGE_SIZE) {
-                ClearPageReserved(virt_to_page(addr));
-                init_page_count(virt_to_page(addr));
-                memset((void *)addr, POISON_FREE_INITMEM, PAGE_SIZE);
-                free_page(addr);
-                totalram_pages++;
-        }
-        pr_info("Freeing %s: %luk freed\n", what, (end - begin) >> 10);
-}
-
 void free_initmem(void)
 {
-        free_init_pages("unused kernel memory",
-                        (unsigned long)(&__init_begin),
-                        (unsigned long)(&__init_end));
+        free_initmem_default(POISON_FREE_INITMEM);
 }
 
 #ifdef CONFIG_BLK_DEV_INITRD
 void free_initrd_mem(unsigned long start, unsigned long end)
 {
-        end = end & PAGE_MASK;
-        free_init_pages("initrd memory", start, end);
+        free_reserved_area(start, end, POISON_FREE_INITMEM, "initrd");
 }
 #endif
 
diff --git a/arch/metag/oprofile/Makefile b/arch/metag/oprofile/Makefile
new file mode 100644
index 000000000000..c9639d4734d6
--- /dev/null
+++ b/arch/metag/oprofile/Makefile
@@ -0,0 +1,17 @@
+obj-$(CONFIG_OPROFILE)  += oprofile.o
+
+oprofile-core-y += buffer_sync.o
+oprofile-core-y += cpu_buffer.o
+oprofile-core-y += event_buffer.o
+oprofile-core-y += oprof.o
+oprofile-core-y += oprofile_files.o
+oprofile-core-y += oprofile_stats.o
+oprofile-core-y += oprofilefs.o
+oprofile-core-y += timer_int.o
+oprofile-core-$(CONFIG_HW_PERF_EVENTS)  += oprofile_perf.o
+
+oprofile-y      += backtrace.o
+oprofile-y      += common.o
+oprofile-y      += $(addprefix ../../../drivers/oprofile/,$(oprofile-core-y))
+
+ccflags-y       += -Werror
diff --git a/arch/metag/oprofile/backtrace.c b/arch/metag/oprofile/backtrace.c
new file mode 100644
index 000000000000..7cc3f37cb40e
--- /dev/null
+++ b/arch/metag/oprofile/backtrace.c
@@ -0,0 +1,63 @@
+/*
+ * Copyright (C) 2010-2013 Imagination Technologies Ltd.
+ *
+ * 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.
+ */
+
+#include <linux/oprofile.h>
+#include <linux/uaccess.h>
+#include <asm/processor.h>
+#include <asm/stacktrace.h>
+
+#include "backtrace.h"
+
+static void user_backtrace_fp(unsigned long __user *fp, unsigned int depth)
+{
+        while (depth-- && access_ok(VERIFY_READ, fp, 8)) {
+                unsigned long addr;
+                unsigned long __user *fpnew;
+                if (__copy_from_user_inatomic(&addr, fp + 1, sizeof(addr)))
+                        break;
+                addr -= 4;
+
+                oprofile_add_trace(addr);
+
+                /* stack grows up, so frame pointers must decrease */
+                if (__copy_from_user_inatomic(&fpnew, fp + 0, sizeof(fpnew)))
+                        break;
+                if (fpnew >= fp)
+                        break;
+                fp = fpnew;
+        }
+}
+
+static int kernel_backtrace_frame(struct stackframe *frame, void *data)
+{
+        unsigned int *depth = data;
+
+        oprofile_add_trace(frame->pc);
+
+        /* decrement depth and stop if we reach 0 */
+        if ((*depth)-- == 0)
+                return 1;
+
+        /* otherwise onto the next frame */
+        return 0;
+}
+
+void metag_backtrace(struct pt_regs * const regs, unsigned int depth)
+{
+        if (user_mode(regs)) {
+                unsigned long *fp = (unsigned long *)regs->ctx.AX[1].U0;
+                user_backtrace_fp((unsigned long __user __force *)fp, depth);
+        } else {
+                struct stackframe frame;
+                frame.fp = regs->ctx.AX[1].U0;          /* A0FrP */
+                frame.sp = user_stack_pointer(regs);    /* A0StP */
+                frame.lr = 0;                           /* from stack */
+                frame.pc = regs->ctx.CurrPC;            /* PC */
+                walk_stackframe(&frame, &kernel_backtrace_frame, &depth);
+        }
+}
diff --git a/arch/metag/oprofile/backtrace.h b/arch/metag/oprofile/backtrace.h
new file mode 100644
index 000000000000..c0fcc4265abb
--- /dev/null
+++ b/arch/metag/oprofile/backtrace.h
@@ -0,0 +1,6 @@
+#ifndef _METAG_OPROFILE_BACKTRACE_H
+#define _METAG_OPROFILE_BACKTRACE_H
+
+void metag_backtrace(struct pt_regs * const regs, unsigned int depth);
+
+#endif
diff --git a/arch/metag/oprofile/common.c b/arch/metag/oprofile/common.c
new file mode 100644
index 000000000000..ba26152b3c00
--- /dev/null
+++ b/arch/metag/oprofile/common.c
@@ -0,0 +1,66 @@
+/*
+ * arch/metag/oprofile/common.c
+ *
+ * Copyright (C) 2013 Imagination Technologies Ltd.
+ *
+ * Based on arch/sh/oprofile/common.c:
+ *
+ * Copyright (C) 2003 - 2010  Paul Mundt
+ *
+ * Based on arch/mips/oprofile/common.c:
+ *
+ *      Copyright (C) 2004, 2005 Ralf Baechle
+ *      Copyright (C) 2005 MIPS Technologies, Inc.
+ *
+ * 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.
+ */
+#include <linux/errno.h>
+#include <linux/init.h>
+#include <linux/oprofile.h>
+#include <linux/perf_event.h>
+#include <linux/slab.h>
+
+#include "backtrace.h"
+
+#ifdef CONFIG_HW_PERF_EVENTS
+/*
+ * This will need to be reworked when multiple PMUs are supported.
+ */
+static char *metag_pmu_op_name;
+
+char *op_name_from_perf_id(void)
+{
+        return metag_pmu_op_name;
+}
+
+int __init oprofile_arch_init(struct oprofile_operations *ops)
+{
+        ops->backtrace = metag_backtrace;
+
+        if (perf_num_counters() == 0)
+                return -ENODEV;
+
+        metag_pmu_op_name = kasprintf(GFP_KERNEL, "metag/%s",
+                                      perf_pmu_name());
+        if (unlikely(!metag_pmu_op_name))
+                return -ENOMEM;
+
+        return oprofile_perf_init(ops);
+}
+
+void oprofile_arch_exit(void)
+{
+        oprofile_perf_exit();
+        kfree(metag_pmu_op_name);
+}
+#else
+int __init oprofile_arch_init(struct oprofile_operations *ops)
+{
+        ops->backtrace = metag_backtrace;
+        /* fall back to timer interrupt PC sampling */
+        return -ENODEV;
+}
+void oprofile_arch_exit(void) {}
+#endif /* CONFIG_HW_PERF_EVENTS */
diff --git a/arch/microblaze/Kconfig b/arch/microblaze/Kconfig
index 1323fa2530eb..54237af0b07c 100644
--- a/arch/microblaze/Kconfig
+++ b/arch/microblaze/Kconfig
@@ -26,6 +26,7 @@ config MICROBLAZE
         select GENERIC_CPU_DEVICES
         select GENERIC_ATOMIC64
         select GENERIC_CLOCKEVENTS
+        select GENERIC_IDLE_POLL_SETUP
         select MODULES_USE_ELF_RELA
         select CLONE_BACKWARDS
 
@@ -38,9 +39,6 @@ config RWSEM_GENERIC_SPINLOCK
 config ZONE_DMA
         def_bool y
 
-config ARCH_POPULATES_NODE_MAP
-        def_bool y
-
 config RWSEM_XCHGADD_ALGORITHM
         bool
 
diff --git a/arch/microblaze/include/asm/processor.h b/arch/microblaze/include/asm/processor.h
index 0759153e8117..d6e0ffea28b6 100644
--- a/arch/microblaze/include/asm/processor.h
+++ b/arch/microblaze/include/asm/processor.h
@@ -22,7 +22,6 @@
 extern const struct seq_operations cpuinfo_op;
 
 # define cpu_relax()            barrier()
-# define cpu_sleep()            do {} while (0)
 
 #define task_pt_regs(tsk) \
                 (((struct pt_regs *)(THREAD_SIZE + task_stack_page(tsk))) - 1)
@@ -160,10 +159,6 @@ unsigned long get_wchan(struct task_struct *p);
 #  define STACK_TOP     TASK_SIZE
 #  define STACK_TOP_MAX STACK_TOP
 
-void disable_hlt(void);
-void enable_hlt(void);
-void default_idle(void);
-
 #ifdef CONFIG_DEBUG_FS
 extern struct dentry *of_debugfs_root;
 #endif
diff --git a/arch/microblaze/include/asm/setup.h b/arch/microblaze/include/asm/setup.h
index 0e0b0a5ec756..f05df5630c84 100644
--- a/arch/microblaze/include/asm/setup.h
+++ b/arch/microblaze/include/asm/setup.h
@@ -46,7 +46,6 @@ void machine_shutdown(void);
 void machine_halt(void);
 void machine_power_off(void);
 
-void free_init_pages(char *what, unsigned long begin, unsigned long end);
 extern void *alloc_maybe_bootmem(size_t size, gfp_t mask);
 extern void *zalloc_maybe_bootmem(size_t size, gfp_t mask);
 
diff --git a/arch/microblaze/include/asm/thread_info.h b/arch/microblaze/include/asm/thread_info.h
index 008f30433d22..de26ea6373de 100644
--- a/arch/microblaze/include/asm/thread_info.h
+++ b/arch/microblaze/include/asm/thread_info.h
@@ -182,7 +182,6 @@ static inline bool test_and_clear_restore_sigmask(void)
         ti->status &= ~TS_RESTORE_SIGMASK;
         return true;
 }
-#define tsk_is_polling(t) test_tsk_thread_flag(t, TIF_POLLING_NRFLAG)
 #endif
 
 #endif /* __KERNEL__ */
diff --git a/arch/microblaze/include/asm/unistd.h b/arch/microblaze/include/asm/unistd.h
index b3778391d9cc..6dece2d002dc 100644
--- a/arch/microblaze/include/asm/unistd.h
+++ b/arch/microblaze/include/asm/unistd.h
@@ -37,13 +37,5 @@
 #define __ARCH_WANT_SYS_VFORK
 #define __ARCH_WANT_SYS_FORK
 
-/*
- * "Conditional" syscalls
- *
- * What we want is __attribute__((weak,alias("sys_ni_syscall"))),
- * but it doesn't work on all toolchains, so we just do it by hand
- */
-#define cond_syscall(x) asm(".weak\t" #x "\n\t.set\t" #x ",sys_ni_syscall");
-
 #endif /* __ASSEMBLY__ */
 #endif /* _ASM_MICROBLAZE_UNISTD_H */
diff --git a/arch/microblaze/kernel/early_printk.c b/arch/microblaze/kernel/early_printk.c
index 60dcacc68038..365f2d53f1b2 100644
--- a/arch/microblaze/kernel/early_printk.c
+++ b/arch/microblaze/kernel/early_printk.c
@@ -21,7 +21,6 @@
 #include <asm/setup.h>
 #include <asm/prom.h>
 
-static u32 early_console_initialized;
 static u32 base_addr;
 
 #ifdef CONFIG_SERIAL_UARTLITE_CONSOLE
@@ -109,27 +108,11 @@ static struct console early_serial_uart16550_console = {
 };
 #endif /* CONFIG_SERIAL_8250_CONSOLE */
 
-static struct console *early_console;
-
-void early_printk(const char *fmt, ...)
-{
-        char buf[512];
-        int n;
-        va_list ap;
-
-        if (early_console_initialized) {
-                va_start(ap, fmt);
-                n = vscnprintf(buf, 512, fmt, ap);
-                early_console->write(early_console, buf, n);
-                va_end(ap);
-        }
-}
-
 int __init setup_early_printk(char *opt)
 {
         int version = 0;
 
-        if (early_console_initialized)
+        if (early_console)
                 return 1;
 
         base_addr = of_early_console(&version);
@@ -159,7 +142,6 @@ int __init setup_early_printk(char *opt)
                 }
 
                 register_console(early_console);
-                early_console_initialized = 1;
                 return 0;
         }
         return 1;
@@ -169,7 +151,7 @@ int __init setup_early_printk(char *opt)
  * only for early console because of performance degression */
 void __init remap_early_printk(void)
 {
-        if (!early_console_initialized || !early_console)
+        if (!early_console)
                 return;
         pr_info("early_printk_console remapping from 0x%x to ", base_addr);
         base_addr = (u32) ioremap(base_addr, PAGE_SIZE);
@@ -194,9 +176,9 @@ void __init remap_early_printk(void)
 
 void __init disable_early_printk(void)
 {
-        if (!early_console_initialized || !early_console)
+        if (!early_console)
                 return;
         pr_warn("disabling early console\n");
         unregister_console(early_console);
-        early_console_initialized = 0;
+        early_console = NULL;
 }
diff --git a/arch/microblaze/kernel/process.c b/arch/microblaze/kernel/process.c
index fa0ea609137c..a55893807274 100644
--- a/arch/microblaze/kernel/process.c
+++ b/arch/microblaze/kernel/process.c
@@ -20,6 +20,8 @@
 
 void show_regs(struct pt_regs *regs)
 {
+        show_regs_print_info(KERN_INFO);
+
         pr_info(" Registers dump: mode=%X\r\n", regs->pt_mode);
         pr_info(" r1=%08lX, r2=%08lX, r3=%08lX, r4=%08lX\n",
                                 regs->r1, regs->r2, regs->r3, regs->r4);
@@ -44,71 +46,6 @@ void show_regs(struct pt_regs *regs)
 void (*pm_power_off)(void) = NULL;
 EXPORT_SYMBOL(pm_power_off);
 
-static int hlt_counter = 1;
-
-void disable_hlt(void)
-{
-        hlt_counter++;
-}
-EXPORT_SYMBOL(disable_hlt);
-
-void enable_hlt(void)
-{
-        hlt_counter--;
-}
-EXPORT_SYMBOL(enable_hlt);
-
-static int __init nohlt_setup(char *__unused)
-{
-        hlt_counter = 1;
-        return 1;
-}
-__setup("nohlt", nohlt_setup);
-
-static int __init hlt_setup(char *__unused)
-{
-        hlt_counter = 0;
-        return 1;
-}
-__setup("hlt", hlt_setup);
-
-void default_idle(void)
-{
-        if (likely(hlt_counter)) {
-                local_irq_disable();
-                stop_critical_timings();
-                cpu_relax();
-                start_critical_timings();
-                local_irq_enable();
-        } else {
-                clear_thread_flag(TIF_POLLING_NRFLAG);
-                smp_mb__after_clear_bit();
-                local_irq_disable();
-                while (!need_resched())
-                        cpu_sleep();
-                local_irq_enable();
-                set_thread_flag(TIF_POLLING_NRFLAG);
-        }
-}
-
-void cpu_idle(void)
-{
-        set_thread_flag(TIF_POLLING_NRFLAG);
-
-        /* endless idle loop with no priority at all */
-        while (1) {
-                tick_nohz_idle_enter();
-                rcu_idle_enter();
-                while (!need_resched())
-                        default_idle();
-                rcu_idle_exit();
-                tick_nohz_idle_exit();
-
-                schedule_preempt_disabled();
-                check_pgt_cache();
-        }
-}
-
 void flush_thread(void)
 {
 }
diff --git a/arch/microblaze/kernel/traps.c b/arch/microblaze/kernel/traps.c
index 30e6b5004a6a..cb619533a192 100644
--- a/arch/microblaze/kernel/traps.c
+++ b/arch/microblaze/kernel/traps.c
@@ -75,9 +75,3 @@ void show_stack(struct task_struct *task, unsigned long *sp)
 
         debug_show_held_locks(task);
 }
-
-void dump_stack(void)
-{
-        show_stack(NULL, NULL);
-}
-EXPORT_SYMBOL(dump_stack);
diff --git a/arch/microblaze/mm/init.c b/arch/microblaze/mm/init.c
index 8f8b367c079e..4ec137d13ad7 100644
--- a/arch/microblaze/mm/init.c
+++ b/arch/microblaze/mm/init.c
@@ -82,13 +82,9 @@ static unsigned long highmem_setup(void)
                 /* FIXME not sure about */
                 if (memblock_is_reserved(pfn << PAGE_SHIFT))
                         continue;
-                ClearPageReserved(page);
-                init_page_count(page);
-                __free_page(page);
-                totalhigh_pages++;
+                free_highmem_page(page);
                 reservedpages++;
         }
-        totalram_pages += totalhigh_pages;
         pr_info("High memory: %luk\n",
                                         totalhigh_pages << (PAGE_SHIFT-10));
 
@@ -236,40 +232,16 @@ void __init setup_memory(void)
         paging_init();
 }
 
-void free_init_pages(char *what, unsigned long begin, unsigned long end)
-{
-        unsigned long addr;
-
-        for (addr = begin; addr < end; addr += PAGE_SIZE) {
-                ClearPageReserved(virt_to_page(addr));
-                init_page_count(virt_to_page(addr));
-                free_page(addr);
-                totalram_pages++;
-        }
-        pr_info("Freeing %s: %ldk freed\n", what, (end - begin) >> 10);
-}
-
 #ifdef CONFIG_BLK_DEV_INITRD
 void free_initrd_mem(unsigned long start, unsigned long end)
 {
-        int pages = 0;
-        for (; start < end; start += PAGE_SIZE) {
-                ClearPageReserved(virt_to_page(start));
-                init_page_count(virt_to_page(start));
-                free_page(start);
-                totalram_pages++;
-                pages++;
-        }
-        pr_notice("Freeing initrd memory: %dk freed\n",
-                                        (int)(pages * (PAGE_SIZE / 1024)));
+        free_reserved_area(start, end, 0, "initrd");
 }
 #endif
 
 void free_initmem(void)
 {
-        free_init_pages("unused kernel memory",
-                        (unsigned long)(&__init_begin),
-                        (unsigned long)(&__init_end));
+        free_initmem_default(0);
 }
 
 void __init mem_init(void)
diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig
index 51244bf97271..e5f3794744f1 100644
--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
@@ -404,6 +404,8 @@ config PMC_MSP
         select IRQ_CPU
         select SERIAL_8250
         select SERIAL_8250_CONSOLE
+        select USB_EHCI_BIG_ENDIAN_MMIO
+        select USB_EHCI_BIG_ENDIAN_DESC
         help
           This adds support for the PMC-Sierra family of Multi-Service
           Processor System-On-A-Chips.  These parts include a number
@@ -1433,6 +1435,7 @@ config CPU_CAVIUM_OCTEON
         select CPU_SUPPORTS_HUGEPAGES
         select LIBFDT
         select USE_OF
+        select USB_EHCI_BIG_ENDIAN_MMIO
         help
           The Cavium Octeon processor is a highly integrated chip containing
           many ethernet hardware widgets for networking tasks. The processor
@@ -1736,7 +1739,6 @@ config 32BIT
 config 64BIT
         bool "64-bit kernel"
         depends on CPU_SUPPORTS_64BIT_KERNEL && SYS_SUPPORTS_64BIT_KERNEL
-        select HAVE_SYSCALL_WRAPPERS
         help
           Select this option if you want to build a 64-bit kernel.
 
@@ -2538,7 +2540,14 @@ source "kernel/power/Kconfig"
 
 endmenu
 
-source "arch/mips/kernel/cpufreq/Kconfig"
+config MIPS_EXTERNAL_TIMER
+        bool
+
+if CPU_SUPPORTS_CPUFREQ && MIPS_EXTERNAL_TIMER
+menu "CPU Power Management"
+source "drivers/cpufreq/Kconfig"
+endmenu
+endif
 
 source "net/Kconfig"
 
diff --git a/arch/mips/bcm63xx/dev-spi.c b/arch/mips/bcm63xx/dev-spi.c
index f1c9c3e2f678..e97fd60e92ef 100644
--- a/arch/mips/bcm63xx/dev-spi.c
+++ b/arch/mips/bcm63xx/dev-spi.c
@@ -85,20 +85,9 @@ static struct platform_device bcm63xx_spi_device = {
 
 int __init bcm63xx_spi_register(void)
 {
-        struct clk *periph_clk;
-
         if (BCMCPU_IS_6328() || BCMCPU_IS_6345())
                 return -ENODEV;
 
-        periph_clk = clk_get(NULL, "periph");
-        if (IS_ERR(periph_clk)) {
-                pr_err("unable to get periph clock\n");
-                return -ENODEV;
-        }
-
-        /* Set bus frequency */
-        spi_pdata.speed_hz = clk_get_rate(periph_clk);
-
         spi_resources[0].start = bcm63xx_regset_address(RSET_SPI);
         spi_resources[0].end = spi_resources[0].start;
         spi_resources[1].start = bcm63xx_get_irq_number(IRQ_SPI);
diff --git a/arch/mips/include/asm/hugetlb.h b/arch/mips/include/asm/hugetlb.h
index ef99db994c2f..fe0d15d32660 100644
--- a/arch/mips/include/asm/hugetlb.h
+++ b/arch/mips/include/asm/hugetlb.h
@@ -10,6 +10,7 @@
 #define __ASM_HUGETLB_H
 
 #include <asm/page.h>
+#include <asm-generic/hugetlb.h>
 
 
 static inline int is_hugepage_only_range(struct mm_struct *mm,
diff --git a/arch/mips/include/asm/linkage.h b/arch/mips/include/asm/linkage.h
index e9a940d1b0c6..2767dda9e309 100644
--- a/arch/mips/include/asm/linkage.h
+++ b/arch/mips/include/asm/linkage.h
@@ -6,5 +6,8 @@
 #endif
 
 #define __weak __attribute__((weak))
+#define cond_syscall(x) asm(".weak\t" #x "\n" #x "\t=\tsys_ni_syscall")
+#define SYSCALL_ALIAS(alias, name)                                      \
+        asm ( #alias " = " #name "\n\t.globl " #alias)
 
 #endif
diff --git a/arch/mips/include/asm/mach-bcm63xx/bcm63xx_dev_spi.h b/arch/mips/include/asm/mach-bcm63xx/bcm63xx_dev_spi.h
index c9bae1362606..b0184cf02575 100644
--- a/arch/mips/include/asm/mach-bcm63xx/bcm63xx_dev_spi.h
+++ b/arch/mips/include/asm/mach-bcm63xx/bcm63xx_dev_spi.h
@@ -13,7 +13,6 @@ struct bcm63xx_spi_pdata {
         unsigned int    msg_ctl_width;
         int             bus_num;
         int             num_chipselect;
-        u32             speed_hz;
 };
 
 enum bcm63xx_regs_spi {
diff --git a/arch/mips/include/asm/unistd.h b/arch/mips/include/asm/unistd.h
index 64f661e32879..63c9c886173a 100644
--- a/arch/mips/include/asm/unistd.h
+++ b/arch/mips/include/asm/unistd.h
@@ -63,12 +63,4 @@
 
 #endif /* !__ASSEMBLY__ */
 
-/*
- * "Conditional" syscalls
- *
- * What we want is __attribute__((weak,alias("sys_ni_syscall"))),
- * but it doesn't work on all toolchains, so we just do it by hand
- */
-#define cond_syscall(x) asm(".weak\t" #x "\n" #x "\t=\tsys_ni_syscall")
-
 #endif /* _ASM_UNISTD_H */
diff --git a/arch/mips/kernel/Makefile b/arch/mips/kernel/Makefile
index de75fb50562b..520a908d45d6 100644
--- a/arch/mips/kernel/Makefile
+++ b/arch/mips/kernel/Makefile
@@ -92,8 +92,6 @@ CFLAGS_cpu-bugs64.o	= $(shell if $(CC) $(KBUILD_CFLAGS) -Wa,-mdaddi -c -o /dev/n
 
 obj-$(CONFIG_HAVE_STD_PC_SERIAL_PORT)   += 8250-platform.o
 
-obj-$(CONFIG_MIPS_CPUFREQ)      += cpufreq/
-
 obj-$(CONFIG_PERF_EVENTS)       += perf_event.o
 obj-$(CONFIG_HW_PERF_EVENTS)    += perf_event_mipsxx.o
 
diff --git a/arch/mips/kernel/cpufreq/Kconfig b/arch/mips/kernel/cpufreq/Kconfig
deleted file mode 100644
index 58c601eee6fd..000000000000
--- a/arch/mips/kernel/cpufreq/Kconfig
+++ /dev/null
@@ -1,41 +0,0 @@
-#
-# CPU Frequency scaling
-#
-
-config MIPS_EXTERNAL_TIMER
-        bool
-
-config MIPS_CPUFREQ
-        bool
-        default y
-        depends on CPU_SUPPORTS_CPUFREQ && MIPS_EXTERNAL_TIMER
-
-if MIPS_CPUFREQ
-
-menu "CPU Frequency scaling"
-
-source "drivers/cpufreq/Kconfig"
-
-if CPU_FREQ
-
-comment "CPUFreq processor drivers"
-
-config LOONGSON2_CPUFREQ
-        tristate "Loongson2 CPUFreq Driver"
-        select CPU_FREQ_TABLE
-        depends on MIPS_CPUFREQ
-        help
-          This option adds a CPUFreq driver for loongson processors which
-          support software configurable cpu frequency.
-
-          Loongson2F and it's successors support this feature.
-
-          For details, take a look at <file:Documentation/cpu-freq/>.
-
-          If in doubt, say N.
-
-endif   # CPU_FREQ
-
-endmenu
-
-endif   # MIPS_CPUFREQ
diff --git a/arch/mips/kernel/cpufreq/Makefile b/arch/mips/kernel/cpufreq/Makefile
deleted file mode 100644
index 05a5715ee38c..000000000000
--- a/arch/mips/kernel/cpufreq/Makefile
+++ /dev/null
@@ -1,5 +0,0 @@
-#
-# Makefile for the Linux/MIPS cpufreq.
-#
-
-obj-$(CONFIG_LOONGSON2_CPUFREQ) += loongson2_cpufreq.o
diff --git a/arch/mips/kernel/cpufreq/loongson2_cpufreq.c b/arch/mips/kernel/cpufreq/loongson2_cpufreq.c
deleted file mode 100644
index 3237c5235f9c..000000000000
--- a/arch/mips/kernel/cpufreq/loongson2_cpufreq.c
+++ /dev/null
@@ -1,255 +0,0 @@
-/*
- * Cpufreq driver for the loongson-2 processors
- *
- * The 2E revision of loongson processor not support this feature.
- *
- * Copyright (C) 2006 - 2008 Lemote Inc. & Insititute of Computing Technology
- * Author: Yanhua, yanh@lemote.com
- *
- * 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.
- */
-#include <linux/cpufreq.h>
-#include <linux/module.h>
-#include <linux/err.h>
-#include <linux/sched.h>        /* set_cpus_allowed() */
-#include <linux/delay.h>
-#include <linux/platform_device.h>
-
-#include <asm/clock.h>
-
-#include <asm/mach-loongson/loongson.h>
-
-static uint nowait;
-
-static struct clk *cpuclk;
-
-static void (*saved_cpu_wait) (void);
-
-static int loongson2_cpu_freq_notifier(struct notifier_block *nb,
-                                        unsigned long val, void *data);
-
-static struct notifier_block loongson2_cpufreq_notifier_block = {
-        .notifier_call = loongson2_cpu_freq_notifier
-};
-
-static int loongson2_cpu_freq_notifier(struct notifier_block *nb,
-                                        unsigned long val, void *data)
-{
-        if (val == CPUFREQ_POSTCHANGE)
-                current_cpu_data.udelay_val = loops_per_jiffy;
-
-        return 0;
-}
-
-static unsigned int loongson2_cpufreq_get(unsigned int cpu)
-{
-        return clk_get_rate(cpuclk);
-}
-
-/*
- * Here we notify other drivers of the proposed change and the final change.
- */
-static int loongson2_cpufreq_target(struct cpufreq_policy *policy,
-                                     unsigned int target_freq,
-                                     unsigned int relation)
-{
-        unsigned int cpu = policy->cpu;
-        unsigned int newstate = 0;
-        cpumask_t cpus_allowed;
-        struct cpufreq_freqs freqs;
-        unsigned int freq;
-
-        if (!cpu_online(cpu))
-                return -ENODEV;
-
-        cpus_allowed = current->cpus_allowed;
-        set_cpus_allowed_ptr(current, cpumask_of(cpu));
-
-        if (cpufreq_frequency_table_target
-            (policy, &loongson2_clockmod_table[0], target_freq, relation,
-             &newstate))
-                return -EINVAL;
-
-        freq =
-            ((cpu_clock_freq / 1000) *
-             loongson2_clockmod_table[newstate].index) / 8;
-        if (freq < policy->min || freq > policy->max)
-                return -EINVAL;
-
-        pr_debug("cpufreq: requested frequency %u Hz\n", target_freq * 1000);
-
-        freqs.cpu = cpu;
-        freqs.old = loongson2_cpufreq_get(cpu);
-        freqs.new = freq;
-        freqs.flags = 0;
-
-        if (freqs.new == freqs.old)
-                return 0;
-
-        /* notifiers */
-        cpufreq_notify_transition(&freqs, CPUFREQ_PRECHANGE);
-
-        set_cpus_allowed_ptr(current, &cpus_allowed);
-
-        /* setting the cpu frequency */
-        clk_set_rate(cpuclk, freq);
-
-        /* notifiers */
-        cpufreq_notify_transition(&freqs, CPUFREQ_POSTCHANGE);
-
-        pr_debug("cpufreq: set frequency %u kHz\n", freq);
-
-        return 0;
-}
-
-static int loongson2_cpufreq_cpu_init(struct cpufreq_policy *policy)
-{
-        int i;
-        unsigned long rate;
-        int ret;
-
-        if (!cpu_online(policy->cpu))
-                return -ENODEV;
-
-        cpuclk = clk_get(NULL, "cpu_clk");
-        if (IS_ERR(cpuclk)) {
-                printk(KERN_ERR "cpufreq: couldn't get CPU clk\n");
-                return PTR_ERR(cpuclk);
-        }
-
-        rate = cpu_clock_freq / 1000;
-        if (!rate) {
-                clk_put(cpuclk);
-                return -EINVAL;
-        }
-        ret = clk_set_rate(cpuclk, rate);
-        if (ret) {
-                clk_put(cpuclk);
-                return ret;
-        }
-
-        /* clock table init */
-        for (i = 2;
-             (loongson2_clockmod_table[i].frequency != CPUFREQ_TABLE_END);
-             i++)
-                loongson2_clockmod_table[i].frequency = (rate * i) / 8;
-
-        policy->cur = loongson2_cpufreq_get(policy->cpu);
-
-        cpufreq_frequency_table_get_attr(&loongson2_clockmod_table[0],
-                                         policy->cpu);
-
-        return cpufreq_frequency_table_cpuinfo(policy,
-                                            &loongson2_clockmod_table[0]);
-}
-
-static int loongson2_cpufreq_verify(struct cpufreq_policy *policy)
-{
-        return cpufreq_frequency_table_verify(policy,
-                                              &loongson2_clockmod_table[0]);
-}
-
-static int loongson2_cpufreq_exit(struct cpufreq_policy *policy)
-{
-        clk_put(cpuclk);
-        return 0;
-}
-
-static struct freq_attr *loongson2_table_attr[] = {
-        &cpufreq_freq_attr_scaling_available_freqs,
-        NULL,
-};
-
-static struct cpufreq_driver loongson2_cpufreq_driver = {
-        .owner = THIS_MODULE,
-        .name = "loongson2",
-        .init = loongson2_cpufreq_cpu_init,
-        .verify = loongson2_cpufreq_verify,
-        .target = loongson2_cpufreq_target,
-        .get = loongson2_cpufreq_get,
-        .exit = loongson2_cpufreq_exit,
-        .attr = loongson2_table_attr,
-};
-
-static struct platform_device_id platform_device_ids[] = {
-        {
-                .name = "loongson2_cpufreq",
-        },
-        {}
-};
-
-MODULE_DEVICE_TABLE(platform, platform_device_ids);
-
-static struct platform_driver platform_driver = {
-        .driver = {
-                .name = "loongson2_cpufreq",
-                .owner = THIS_MODULE,
-        },
-        .id_table = platform_device_ids,
-};
-
-/*
- * This is the simple version of Loongson-2 wait, Maybe we need do this in
- * interrupt disabled context.
- */
-
-static DEFINE_SPINLOCK(loongson2_wait_lock);
-
-static void loongson2_cpu_wait(void)
-{
-        unsigned long flags;
-        u32 cpu_freq;
-
-        spin_lock_irqsave(&loongson2_wait_lock, flags);
-        cpu_freq = LOONGSON_CHIPCFG0;
-        LOONGSON_CHIPCFG0 &= ~0x7;      /* Put CPU into wait mode */
-        LOONGSON_CHIPCFG0 = cpu_freq;   /* Restore CPU state */
-        spin_unlock_irqrestore(&loongson2_wait_lock, flags);
-}
-
-static int __init cpufreq_init(void)
-{
-        int ret;
-
-        /* Register platform stuff */
-        ret = platform_driver_register(&platform_driver);
-        if (ret)
-                return ret;
-
-        pr_info("cpufreq: Loongson-2F CPU frequency driver.\n");
-
-        cpufreq_register_notifier(&loongson2_cpufreq_notifier_block,
-                                  CPUFREQ_TRANSITION_NOTIFIER);
-
-        ret = cpufreq_register_driver(&loongson2_cpufreq_driver);
-
-        if (!ret && !nowait) {
-                saved_cpu_wait = cpu_wait;
-                cpu_wait = loongson2_cpu_wait;
-        }
-
-        return ret;
-}
-
-static void __exit cpufreq_exit(void)
-{
-        if (!nowait && saved_cpu_wait)
-                cpu_wait = saved_cpu_wait;
-        cpufreq_unregister_driver(&loongson2_cpufreq_driver);
-        cpufreq_unregister_notifier(&loongson2_cpufreq_notifier_block,
-                                    CPUFREQ_TRANSITION_NOTIFIER);
-
-        platform_driver_unregister(&platform_driver);
-}
-
-module_init(cpufreq_init);
-module_exit(cpufreq_exit);
-
-module_param(nowait, uint, 0644);
-MODULE_PARM_DESC(nowait, "Disable Loongson-2F specific wait");
-
-MODULE_AUTHOR("Yanhua <yanh@lemote.com>");
-MODULE_DESCRIPTION("cpufreq driver for Loongson2F");
-MODULE_LICENSE("GPL");
diff --git a/arch/mips/kernel/early_printk.c b/arch/mips/kernel/early_printk.c
index 9e6440eaa455..505cb77d1280 100644
--- a/arch/mips/kernel/early_printk.c
+++ b/arch/mips/kernel/early_printk.c
@@ -7,7 +7,9 @@
  * Copyright (C) 2007 MIPS Technologies, Inc.
  *   written by Ralf Baechle (ralf@linux-mips.org)
  */
+#include <linux/kernel.h>
 #include <linux/console.h>
+#include <linux/printk.h>
 #include <linux/init.h>
 
 #include <asm/setup.h>
@@ -24,20 +26,18 @@ static void early_console_write(struct console *con, const char *s, unsigned n)
         }
 }
 
-static struct console early_console = {
+static struct console early_console_prom = {
         .name   = "early",
         .write  = early_console_write,
         .flags  = CON_PRINTBUFFER | CON_BOOT,
         .index  = -1
 };
 
-static int early_console_initialized __initdata;
-
 void __init setup_early_printk(void)
 {
-        if (early_console_initialized)
+        if (early_console)
                 return;
-        early_console_initialized = 1;
+        early_console = &early_console_prom;
 
-        register_console(&early_console);
+        register_console(&early_console_prom);
 }
diff --git a/arch/mips/kernel/linux32.c b/arch/mips/kernel/linux32.c
index db9655f08892..d1d576b765f5 100644
--- a/arch/mips/kernel/linux32.c
+++ b/arch/mips/kernel/linux32.c
@@ -119,99 +119,6 @@ SYSCALL_DEFINE6(32_pwrite, unsigned int, fd, const char __user *, buf,
         return sys_pwrite64(fd, buf, count, merge_64(a4, a5));
 }
 
-#ifdef CONFIG_SYSVIPC
-
-SYSCALL_DEFINE6(32_ipc, u32, call, long, first, long, second, long, third,
-        unsigned long, ptr, unsigned long, fifth)
-{
-        int version, err;
-
-        version = call >> 16; /* hack for backward compatibility */
-        call &= 0xffff;
-
-        switch (call) {
-        case SEMOP:
-                /* struct sembuf is the same on 32 and 64bit :)) */
-                err = sys_semtimedop(first, compat_ptr(ptr), second, NULL);
-                break;
-        case SEMTIMEDOP:
-                err = compat_sys_semtimedop(first, compat_ptr(ptr), second,
-                                            compat_ptr(fifth));
-                break;
-        case SEMGET:
-                err = sys_semget(first, second, third);
-                break;
-        case SEMCTL:
-                err = compat_sys_semctl(first, second, third, compat_ptr(ptr));
-                break;
-        case MSGSND:
-                err = compat_sys_msgsnd(first, second, third, compat_ptr(ptr));
-                break;
-        case MSGRCV:
-                err = compat_sys_msgrcv(first, second, fifth, third,
-                                        version, compat_ptr(ptr));
-                break;
-        case MSGGET:
-                err = sys_msgget((key_t) first, second);
-                break;
-        case MSGCTL:
-                err = compat_sys_msgctl(first, second, compat_ptr(ptr));
-                break;
-        case SHMAT:
-                err = compat_sys_shmat(first, second, third, version,
-                                       compat_ptr(ptr));
-                break;
-        case SHMDT:
-                err = sys_shmdt(compat_ptr(ptr));
-                break;
-        case SHMGET:
-                err = sys_shmget(first, (unsigned)second, third);
-                break;
-        case SHMCTL:
-                err = compat_sys_shmctl(first, second, compat_ptr(ptr));
-                break;
-        default:
-                err = -ENOSYS;
-                break;
-        }
-
-        return err;
-}
-
-#else
-
-SYSCALL_DEFINE6(32_ipc, u32, call, int, first, int, second, int, third,
-        u32, ptr, u32, fifth)
-{
-        return -ENOSYS;
-}
-
-#endif /* CONFIG_SYSVIPC */
-
-#ifdef CONFIG_MIPS32_N32
-SYSCALL_DEFINE4(n32_semctl, int, semid, int, semnum, int, cmd, u32, arg)
-{
-        /* compat_sys_semctl expects a pointer to union semun */
-        u32 __user *uptr = compat_alloc_user_space(sizeof(u32));
-        if (put_user(arg, uptr))
-                return -EFAULT;
-        return compat_sys_semctl(semid, semnum, cmd, uptr);
-}
-
-SYSCALL_DEFINE4(n32_msgsnd, int, msqid, u32, msgp, unsigned int, msgsz,
-        int, msgflg)
-{
-        return compat_sys_msgsnd(msqid, msgsz, msgflg, compat_ptr(msgp));
-}
-
-SYSCALL_DEFINE5(n32_msgrcv, int, msqid, u32, msgp, size_t, msgsz,
-        int, msgtyp, int, msgflg)
-{
-        return compat_sys_msgrcv(msqid, msgsz, msgtyp, msgflg, IPC_64,
-                                 compat_ptr(msgp));
-}
-#endif
-
 SYSCALL_DEFINE1(32_personality, unsigned long, personality)
 {
         unsigned int p = personality & 0xffffffff;
@@ -226,26 +133,6 @@ SYSCALL_DEFINE1(32_personality, unsigned long, personality)
         return ret;
 }
 
-SYSCALL_DEFINE4(32_sendfile, long, out_fd, long, in_fd,
-        compat_off_t __user *, offset, s32, count)
-{
-        mm_segment_t old_fs = get_fs();
-        int ret;
-        off_t of;
-
-        if (offset && get_user(of, offset))
-                return -EFAULT;
-
-        set_fs(KERNEL_DS);
-        ret = sys_sendfile(out_fd, in_fd, offset ? (off_t __user *)&of : NULL, count);
-        set_fs(old_fs);
-
-        if (offset && put_user(of, offset))
-                return -EFAULT;
-
-        return ret;
-}
-
 asmlinkage ssize_t sys32_readahead(int fd, u32 pad0, u64 a2, u64 a3,
                                    size_t count)
 {
@@ -279,12 +166,6 @@ asmlinkage long sys32_fallocate(int fd, int mode, unsigned offset_a2,
                              merge_64(len_a4, len_a5));
 }
 
-asmlinkage long sys32_lookup_dcookie(u32 a0, u32 a1, char __user *buf,
-        size_t len)
-{
-        return sys_lookup_dcookie(merge_64(a0, a1), buf, len);
-}
-
 SYSCALL_DEFINE6(32_fanotify_mark, int, fanotify_fd, unsigned int, flags,
                 u64, a3, u64, a4, int, dfd, const char  __user *, pathname)
 {
diff --git a/arch/mips/kernel/process.c b/arch/mips/kernel/process.c
index 3be4405c2d14..cfc742d75b7f 100644
--- a/arch/mips/kernel/process.c
+++ b/arch/mips/kernel/process.c
@@ -41,44 +41,26 @@
 #include <asm/inst.h>
 #include <asm/stacktrace.h>
 
-/*
- * The idle thread. There's no useful work to be done, so just try to conserve
- * power and have a low exit latency (ie sit in a loop waiting for somebody to
- * say that they'd like to reschedule)
- */
-void __noreturn cpu_idle(void)
+#ifdef CONFIG_HOTPLUG_CPU
+void arch_cpu_idle_dead(void)
 {
-        int cpu;
-
-        /* CPU is going idle. */
-        cpu = smp_processor_id();
+        /* What the heck is this check doing ? */
+        if (!cpu_isset(smp_processor_id(), cpu_callin_map))
+                play_dead();
+}
+#endif
 
-        /* endless idle loop with no priority at all */
-        while (1) {
-                tick_nohz_idle_enter();
-                rcu_idle_enter();
-                while (!need_resched() && cpu_online(cpu)) {
+void arch_cpu_idle(void)
+{
 #ifdef CONFIG_MIPS_MT_SMTC
-                        extern void smtc_idle_loop_hook(void);
+        extern void smtc_idle_loop_hook(void);
 
-                        smtc_idle_loop_hook();
+        smtc_idle_loop_hook();
 #endif
-
-                        if (cpu_wait) {
-                                /* Don't trace irqs off for idle */
-                                stop_critical_timings();
-                                (*cpu_wait)();
-                                start_critical_timings();
-                        }
-                }
-#ifdef CONFIG_HOTPLUG_CPU
-                if (!cpu_online(cpu) && !cpu_isset(cpu, cpu_callin_map))
-                        play_dead();
-#endif
-                rcu_idle_exit();
-                tick_nohz_idle_exit();
-                schedule_preempt_disabled();
-        }
+        if (cpu_wait)
+                (*cpu_wait)();
+        else
+                local_irq_enable();
 }
 
 asmlinkage void ret_from_fork(void);
diff --git a/arch/mips/kernel/scall64-n32.S b/arch/mips/kernel/scall64-n32.S
index 693d60b0855f..edcb6594e7b5 100644
--- a/arch/mips/kernel/scall64-n32.S
+++ b/arch/mips/kernel/scall64-n32.S
@@ -143,7 +143,7 @@ EXPORT(sysn32_call_table)
         PTR     compat_sys_setitimer
         PTR     sys_alarm
         PTR     sys_getpid
-        PTR     sys_32_sendfile
+        PTR     compat_sys_sendfile
         PTR     sys_socket                      /* 6040 */
         PTR     sys_connect
         PTR     sys_accept
@@ -168,11 +168,11 @@ EXPORT(sysn32_call_table)
         PTR     sys_newuname
         PTR     sys_semget
         PTR     sys_semop
-        PTR     sys_n32_semctl
+        PTR     compat_sys_semctl
         PTR     sys_shmdt                       /* 6065 */
         PTR     sys_msgget
-        PTR     sys_n32_msgsnd
-        PTR     sys_n32_msgrcv
+        PTR     compat_sys_msgsnd
+        PTR     compat_sys_msgrcv
         PTR     compat_sys_msgctl
         PTR     compat_sys_fcntl                /* 6070 */
         PTR     sys_flock
diff --git a/arch/mips/kernel/scall64-o32.S b/arch/mips/kernel/scall64-o32.S
index af8887f779f1..103bfe570fe8 100644
--- a/arch/mips/kernel/scall64-o32.S
+++ b/arch/mips/kernel/scall64-o32.S
@@ -309,7 +309,7 @@ sys_call_table:
         PTR     compat_sys_wait4
         PTR     sys_swapoff                     /* 4115 */
         PTR     compat_sys_sysinfo
-        PTR     sys_32_ipc
+        PTR     compat_sys_ipc
         PTR     sys_fsync
         PTR     sys32_sigreturn
         PTR     __sys_clone                     /* 4120 */
@@ -399,7 +399,7 @@ sys_call_table:
         PTR     sys_capget
         PTR     sys_capset                      /* 4205 */
         PTR     compat_sys_sigaltstack
-        PTR     sys_32_sendfile
+        PTR     compat_sys_sendfile
         PTR     sys_ni_syscall
         PTR     sys_ni_syscall
         PTR     sys_mips_mmap2                  /* 4210 */
@@ -439,7 +439,7 @@ sys_call_table:
         PTR     compat_sys_io_submit
         PTR     sys_io_cancel                   /* 4245 */
         PTR     sys_exit_group
-        PTR     sys32_lookup_dcookie
+        PTR     compat_sys_lookup_dcookie
         PTR     sys_epoll_create
         PTR     sys_epoll_ctl
         PTR     sys_epoll_wait                  /* 4250 */
diff --git a/arch/mips/kernel/smp.c b/arch/mips/kernel/smp.c
index 66bf4e22d9b9..aee04af213c5 100644
--- a/arch/mips/kernel/smp.c
+++ b/arch/mips/kernel/smp.c
@@ -139,7 +139,7 @@ asmlinkage __cpuinit void start_secondary(void)
         WARN_ON_ONCE(!irqs_disabled());
         mp_ops->smp_finish();
 
-        cpu_idle();
+        cpu_startup_entry(CPUHP_ONLINE);
 }
 
 /*
diff --git a/arch/mips/kernel/traps.c b/arch/mips/kernel/traps.c
index c3abb88170fc..25225515451f 100644
--- a/arch/mips/kernel/traps.c
+++ b/arch/mips/kernel/traps.c
@@ -206,19 +206,6 @@ void show_stack(struct task_struct *task, unsigned long *sp)
         show_stacktrace(task, &regs);
 }
 
-/*
- * The architecture-independent dump_stack generator
- */
-void dump_stack(void)
-{
-        struct pt_regs regs;
-
-        prepare_frametrace(&regs);
-        show_backtrace(current, &regs);
-}
-
-EXPORT_SYMBOL(dump_stack);
-
 static void show_code(unsigned int __user *pc)
 {
         long i;
@@ -244,7 +231,7 @@ static void __show_regs(const struct pt_regs *regs)
         unsigned int cause = regs->cp0_cause;
         int i;
 
-        printk("Cpu %d\n", smp_processor_id());
+        show_regs_print_info(KERN_DEFAULT);
 
         /*
          * Saved main processor registers
diff --git a/arch/mips/mm/init.c b/arch/mips/mm/init.c
index 67929251286c..3d0346dbccf4 100644
--- a/arch/mips/mm/init.c
+++ b/arch/mips/mm/init.c
@@ -77,10 +77,9 @@ EXPORT_SYMBOL_GPL(empty_zero_page);
 /*
  * Not static inline because used by IP27 special magic initialization code
  */
-unsigned long setup_zero_pages(void)
+void setup_zero_pages(void)
 {
-        unsigned int order;
-        unsigned long size;
+        unsigned int order, i;
         struct page *page;
 
         if (cpu_has_vce)
@@ -94,15 +93,10 @@ unsigned long setup_zero_pages(void)
 
         page = virt_to_page((void *)empty_zero_page);
         split_page(page, order);
-        while (page < virt_to_page((void *)(empty_zero_page + (PAGE_SIZE << order)))) {
-                SetPageReserved(page);
-                page++;
-        }
-
-        size = PAGE_SIZE << order;
-        zero_page_mask = (size - 1) & PAGE_MASK;
+        for (i = 0; i < (1 << order); i++, page++)
+                mark_page_reserved(page);
 
-        return 1UL << order;
+        zero_page_mask = ((PAGE_SIZE << order) - 1) & PAGE_MASK;
 }
 
 #ifdef CONFIG_MIPS_MT_SMTC
@@ -380,7 +374,7 @@ void __init mem_init(void)
         high_memory = (void *) __va(max_low_pfn << PAGE_SHIFT);
 
         totalram_pages += free_all_bootmem();
-        totalram_pages -= setup_zero_pages();   /* Setup zeroed pages.  */
+        setup_zero_pages();     /* Setup zeroed pages.  */
 
         reservedpages = ram = 0;
         for (tmp = 0; tmp < max_low_pfn; tmp++)
@@ -399,12 +393,8 @@ void __init mem_init(void)
                         SetPageReserved(page);
                         continue;
                 }
-                ClearPageReserved(page);
-                init_page_count(page);
-                __free_page(page);
-                totalhigh_pages++;
+                free_highmem_page(page);
         }
-        totalram_pages += totalhigh_pages;
         num_physpages += totalhigh_pages;
 #endif
 
@@ -440,11 +430,8 @@ void free_init_pages(const char *what, unsigned long begin, unsigned long end)
                 struct page *page = pfn_to_page(pfn);
                 void *addr = phys_to_virt(PFN_PHYS(pfn));
 
-                ClearPageReserved(page);
-                init_page_count(page);
                 memset(addr, POISON_FREE_INITMEM, PAGE_SIZE);
-                __free_page(page);
-                totalram_pages++;
+                free_reserved_page(page);
         }
         printk(KERN_INFO "Freeing %s: %ldk freed\n", what, (end - begin) >> 10);
 }
@@ -452,18 +439,14 @@ void free_init_pages(const char *what, unsigned long begin, unsigned long end)
 #ifdef CONFIG_BLK_DEV_INITRD
 void free_initrd_mem(unsigned long start, unsigned long end)
 {
-        free_init_pages("initrd memory",
-                        virt_to_phys((void *)start),
-                        virt_to_phys((void *)end));
+        free_reserved_area(start, end, POISON_FREE_INITMEM, "initrd");
 }
 #endif
 
 void __init_refok free_initmem(void)
 {
         prom_free_prom_memory();
-        free_init_pages("unused kernel memory",
-                        __pa_symbol(&__init_begin),
-                        __pa_symbol(&__init_end));
+        free_initmem_default(POISON_FREE_INITMEM);
 }
 
 #ifndef CONFIG_MIPS_PGD_C0_CONTEXT
diff --git a/arch/mips/pci/pci.c b/arch/mips/pci/pci.c
index 0872f12f268d..594e60d6a43b 100644
--- a/arch/mips/pci/pci.c
+++ b/arch/mips/pci/pci.c
@@ -115,7 +115,6 @@ static void pcibios_scanbus(struct pci_controller *hose)
                         pci_bus_assign_resources(bus);
                         pci_enable_bridges(bus);
                 }
-                bus->dev.of_node = hose->of_node;
         }
 }
 
@@ -169,6 +168,13 @@ void pci_load_of_ranges(struct pci_controller *hose, struct device_node *node)
                 }
         }
 }
+
+struct device_node *pcibios_get_phb_of_node(struct pci_bus *bus)
+{
+        struct pci_controller *hose = bus->sysdata;
+
+        return of_node_get(hose->of_node);
+}
 #endif
 
 static DEFINE_MUTEX(pci_scan_mutex);
diff --git a/arch/mips/sgi-ip27/ip27-memory.c b/arch/mips/sgi-ip27/ip27-memory.c
index 3505d08ff2fd..5f2bddb1860e 100644
--- a/arch/mips/sgi-ip27/ip27-memory.c
+++ b/arch/mips/sgi-ip27/ip27-memory.c
@@ -457,7 +457,7 @@ void __init prom_free_prom_memory(void)
         /* We got nothing to free here ...  */
 }
 
-extern unsigned long setup_zero_pages(void);
+extern void setup_zero_pages(void);
 
 void __init paging_init(void)
 {
@@ -492,7 +492,7 @@ void __init mem_init(void)
                 totalram_pages += free_all_bootmem_node(NODE_DATA(node));
         }
 
-        totalram_pages -= setup_zero_pages();   /* This comes from node 0 */
+        setup_zero_pages();     /* This comes from node 0 */
 
         codesize =  (unsigned long) &_etext - (unsigned long) &_text;
         datasize =  (unsigned long) &_edata - (unsigned long) &_etext;
diff --git a/arch/mn10300/include/asm/thread_info.h b/arch/mn10300/include/asm/thread_info.h
index f90062b0622d..224b4262486d 100644
--- a/arch/mn10300/include/asm/thread_info.h
+++ b/arch/mn10300/include/asm/thread_info.h
@@ -165,8 +165,6 @@ void arch_release_thread_info(struct thread_info *ti);
 #define _TIF_WORK_MASK          0x0000FFFE      /* work to do on interrupt/exception return */
 #define _TIF_ALLWORK_MASK       0x0000FFFF      /* work to do on any return to u-space */
 
-#define tsk_is_polling(t) test_tsk_thread_flag(t, TIF_POLLING_NRFLAG)
-
 #endif /* __KERNEL__ */
 
 #endif /* _ASM_THREAD_INFO_H */
diff --git a/arch/mn10300/include/asm/unistd.h b/arch/mn10300/include/asm/unistd.h
index 7f9d9adfa51e..9d4e2d1ef90e 100644
--- a/arch/mn10300/include/asm/unistd.h
+++ b/arch/mn10300/include/asm/unistd.h
@@ -45,14 +45,4 @@
 #define __ARCH_WANT_SYS_VFORK
 #define __ARCH_WANT_SYS_CLONE
 
-/*
- * "Conditional" syscalls
- *
- * What we want is __attribute__((weak,alias("sys_ni_syscall"))),
- * but it doesn't work on all toolchains, so we just do it by hand
- */
-#ifndef cond_syscall
-#define cond_syscall(x) asm(".weak\t" #x "\n\t.set\t" #x ",sys_ni_syscall");
-#endif
-
 #endif /* _ASM_UNISTD_H */
diff --git a/arch/mn10300/kernel/process.c b/arch/mn10300/kernel/process.c
index 84f4e97e3074..3707da583d05 100644
--- a/arch/mn10300/kernel/process.c
+++ b/arch/mn10300/kernel/process.c
@@ -50,77 +50,19 @@ unsigned long thread_saved_pc(struct task_struct *tsk)
 void (*pm_power_off)(void);
 EXPORT_SYMBOL(pm_power_off);
 
-#if !defined(CONFIG_SMP) || defined(CONFIG_HOTPLUG_CPU)
-/*
- * we use this if we don't have any better idle routine
- */
-static void default_idle(void)
-{
-        local_irq_disable();
-        if (!need_resched())
-                safe_halt();
-        else
-                local_irq_enable();
-}
-
-#else /* !CONFIG_SMP || CONFIG_HOTPLUG_CPU  */
 /*
  * On SMP it's slightly faster (but much more power-consuming!)
  * to poll the ->work.need_resched flag instead of waiting for the
  * cross-CPU IPI to arrive. Use this option with caution.
+ *
+ * tglx: No idea why this depends on HOTPLUG_CPU !?!
  */
-static inline void poll_idle(void)
-{
-        int oldval;
-
-        local_irq_enable();
-
-        /*
-         * Deal with another CPU just having chosen a thread to
-         * run here:
-         */
-        oldval = test_and_clear_thread_flag(TIF_NEED_RESCHED);
-
-        if (!oldval) {
-                set_thread_flag(TIF_POLLING_NRFLAG);
-                while (!need_resched())
-                        cpu_relax();
-                clear_thread_flag(TIF_POLLING_NRFLAG);
-        } else {
-                set_need_resched();
-        }
-}
-#endif /* !CONFIG_SMP || CONFIG_HOTPLUG_CPU */
-
-/*
- * the idle thread
- * - there's no useful work to be done, so just try to conserve power and have
- *   a low exit latency (ie sit in a loop waiting for somebody to say that
- *   they'd like to reschedule)
- */
-void cpu_idle(void)
+#if !defined(CONFIG_SMP) || defined(CONFIG_HOTPLUG_CPU)
+void arch_cpu_idle(void)
 {
-        /* endless idle loop with no priority at all */
-        for (;;) {
-                rcu_idle_enter();
-                while (!need_resched()) {
-                        void (*idle)(void);
-
-                        smp_rmb();
-                        if (!idle) {
-#if defined(CONFIG_SMP) && !defined(CONFIG_HOTPLUG_CPU)
-                                idle = poll_idle;
-#else  /* CONFIG_SMP && !CONFIG_HOTPLUG_CPU */
-                                idle = default_idle;
-#endif /* CONFIG_SMP && !CONFIG_HOTPLUG_CPU */
-                        }
-                        idle();
-                }
-                rcu_idle_exit();
-
-                schedule_preempt_disabled();
-        }
+        safe_halt();
 }
+#endif
 
 void release_segments(struct mm_struct *mm)
 {
@@ -155,6 +97,7 @@ void machine_power_off(void)
 
 void show_regs(struct pt_regs *regs)
 {
+        show_regs_print_info(KERN_DEFAULT);
 }
 
 /*
diff --git a/arch/mn10300/kernel/smp.c b/arch/mn10300/kernel/smp.c
index 5d7e152a23b7..a17f9c9c14c9 100644
--- a/arch/mn10300/kernel/smp.c
+++ b/arch/mn10300/kernel/smp.c
@@ -675,7 +675,7 @@ int __init start_secondary(void *unused)
 #ifdef CONFIG_GENERIC_CLOCKEVENTS
         init_clockevents();
 #endif
-        cpu_idle();
+        cpu_startup_entry(CPUHP_ONLINE);
         return 0;
 }
 
@@ -935,8 +935,6 @@ int __cpu_up(unsigned int cpu, struct task_struct *tidle)
         int timeout;
 
 #ifdef CONFIG_HOTPLUG_CPU
-        if (num_online_cpus() == 1)
-                disable_hlt();
         if (sleep_mode[cpu])
                 run_wakeup_cpu(cpu);
 #endif /* CONFIG_HOTPLUG_CPU */
@@ -1003,9 +1001,6 @@ int __cpu_disable(void)
 void __cpu_die(unsigned int cpu)
 {
         run_sleep_cpu(cpu);
-
-        if (num_online_cpus() == 1)
-                enable_hlt();
 }
 
 #ifdef CONFIG_MN10300_CACHE_ENABLED
diff --git a/arch/mn10300/kernel/traps.c b/arch/mn10300/kernel/traps.c
index b900e5afa0ae..a7a987c7954f 100644
--- a/arch/mn10300/kernel/traps.c
+++ b/arch/mn10300/kernel/traps.c
@@ -294,17 +294,6 @@ void show_stack(struct task_struct *task, unsigned long *sp)
 }
 
 /*
- * the architecture-independent dump_stack generator
- */
-void dump_stack(void)
-{
-        unsigned long stack;
-
-        show_stack(current, &stack);
-}
-EXPORT_SYMBOL(dump_stack);
-
-/*
  * dump the register file in the specified exception frame
  */
 void show_registers_only(struct pt_regs *regs)
diff --git a/arch/mn10300/mm/init.c b/arch/mn10300/mm/init.c
index e57e5bc23562..5a8ace63a6b4 100644
--- a/arch/mn10300/mm/init.c
+++ b/arch/mn10300/mm/init.c
@@ -139,30 +139,11 @@ void __init mem_init(void)
 }
 
 /*
- *
- */
-void free_init_pages(char *what, unsigned long begin, unsigned long end)
-{
-        unsigned long addr;
-
-        for (addr = begin; addr < end; addr += PAGE_SIZE) {
-                ClearPageReserved(virt_to_page(addr));
-                init_page_count(virt_to_page(addr));
-                memset((void *) addr, 0xcc, PAGE_SIZE);
-                free_page(addr);
-                totalram_pages++;
-        }
-        printk(KERN_INFO "Freeing %s: %ldk freed\n", what, (end - begin) >> 10);
-}
-
-/*
  * recycle memory containing stuff only required for initialisation
  */
 void free_initmem(void)
 {
-        free_init_pages("unused kernel memory",
-                        (unsigned long) &__init_begin,
-                        (unsigned long) &__init_end);
+        free_initmem_default(POISON_FREE_INITMEM);
 }
 
 /*
@@ -171,6 +152,6 @@ void free_initmem(void)
 #ifdef CONFIG_BLK_DEV_INITRD
 void free_initrd_mem(unsigned long start, unsigned long end)
 {
-        free_init_pages("initrd memory", start, end);
+        free_reserved_area(start, end, POISON_FREE_INITMEM, "initrd");
 }
 #endif
diff --git a/arch/openrisc/include/asm/thread_info.h b/arch/openrisc/include/asm/thread_info.h
index 07f3212422ad..d797acc901e4 100644
--- a/arch/openrisc/include/asm/thread_info.h
+++ b/arch/openrisc/include/asm/thread_info.h
@@ -128,8 +128,6 @@ register struct thread_info *current_thread_info_reg asm("r10");
 /* For OpenRISC, this is anything in the LSW other than syscall trace */
 #define _TIF_WORK_MASK (0xff & ~(_TIF_SYSCALL_TRACE|_TIF_SINGLESTEP))
 
-#define tsk_is_polling(t) test_tsk_thread_flag(t, TIF_POLLING_NRFLAG)
-
 #endif /* __KERNEL__ */
 
 #endif /* _ASM_THREAD_INFO_H */
diff --git a/arch/openrisc/kernel/Makefile b/arch/openrisc/kernel/Makefile
index 35f92ce51c24..ec6d9d37cefd 100644
--- a/arch/openrisc/kernel/Makefile
+++ b/arch/openrisc/kernel/Makefile
@@ -4,7 +4,7 @@
 
 extra-y := head.o vmlinux.lds
 
-obj-y   := setup.o idle.o or32_ksyms.o process.o dma.o \
+obj-y   := setup.o or32_ksyms.o process.o dma.o \
            traps.o time.o irq.o entry.o ptrace.o signal.o \
            sys_call_table.o
 
diff --git a/arch/openrisc/kernel/idle.c b/arch/openrisc/kernel/idle.c
deleted file mode 100644
index 5e8a3b6d6bc6..000000000000
--- a/arch/openrisc/kernel/idle.c
+++ /dev/null
@@ -1,73 +0,0 @@
-/*
- * OpenRISC idle.c
- *
- * Linux architectural port borrowing liberally from similar works of
- * others.  All original copyrights apply as per the original source
- * declaration.
- *
- * Modifications for the OpenRISC architecture:
- * Copyright (C) 2003 Matjaz Breskvar <phoenix@bsemi.com>
- * Copyright (C) 2010-2011 Jonas Bonn <jonas@southpole.se>
- *
- *      This program is free software; you can redistribute it and/or
- *      modify it under the terms of the GNU General Public License
- *      as published by the Free Software Foundation; either version
- *      2 of the License, or (at your option) any later version.
- *
- * Idle daemon for or32.  Idle daemon will handle any action
- * that needs to be taken when the system becomes idle.
- */
-
-#include <linux/errno.h>
-#include <linux/sched.h>
-#include <linux/kernel.h>
-#include <linux/mm.h>
-#include <linux/smp.h>
-#include <linux/stddef.h>
-#include <linux/unistd.h>
-#include <linux/ptrace.h>
-#include <linux/slab.h>
-#include <linux/tick.h>
-
-#include <asm/pgtable.h>
-#include <asm/uaccess.h>
-#include <asm/io.h>
-#include <asm/processor.h>
-#include <asm/mmu.h>
-#include <asm/cache.h>
-#include <asm/pgalloc.h>
-
-void (*powersave) (void) = NULL;
-
-void cpu_idle(void)
-{
-        set_thread_flag(TIF_POLLING_NRFLAG);
-
-        /* endless idle loop with no priority at all */
-        while (1) {
-                tick_nohz_idle_enter();
-                rcu_idle_enter();
-
-                while (!need_resched()) {
-                        check_pgt_cache();
-                        rmb();
-
-                        clear_thread_flag(TIF_POLLING_NRFLAG);
-
-                        local_irq_disable();
-                        /* Don't trace irqs off for idle */
-                        stop_critical_timings();
-                        if (!need_resched() && powersave != NULL)
-                                powersave();
-                        start_critical_timings();
-                        local_irq_enable();
-                        set_thread_flag(TIF_POLLING_NRFLAG);
-                }
-
-                rcu_idle_exit();
-                tick_nohz_idle_exit();
-                preempt_enable_no_resched();
-                schedule();
-                preempt_disable();
-        }
-}
diff --git a/arch/openrisc/kernel/process.c b/arch/openrisc/kernel/process.c
index 00c233bf0d06..386af258591d 100644
--- a/arch/openrisc/kernel/process.c
+++ b/arch/openrisc/kernel/process.c
@@ -90,6 +90,7 @@ void show_regs(struct pt_regs *regs)
 {
         extern void show_registers(struct pt_regs *regs);
 
+        show_regs_print_info(KERN_DEFAULT);
         /* __PHX__ cleanup this mess */
         show_registers(regs);
 }
diff --git a/arch/openrisc/kernel/traps.c b/arch/openrisc/kernel/traps.c
index 5cce396016d0..3d3f6062f49c 100644
--- a/arch/openrisc/kernel/traps.c
+++ b/arch/openrisc/kernel/traps.c
@@ -105,17 +105,6 @@ void show_trace_task(struct task_struct *tsk)
          */
 }
 
-/*
- * The architecture-independent backtrace generator
- */
-void dump_stack(void)
-{
-        unsigned long stack;
-
-        show_stack(current, &stack);
-}
-EXPORT_SYMBOL(dump_stack);
-
 void show_registers(struct pt_regs *regs)
 {
         int i;
diff --git a/arch/openrisc/mm/init.c b/arch/openrisc/mm/init.c
index e7fdc50c4bf0..b3cbc6703837 100644
--- a/arch/openrisc/mm/init.c
+++ b/arch/openrisc/mm/init.c
@@ -43,6 +43,7 @@
 #include <asm/kmap_types.h>
 #include <asm/fixmap.h>
 #include <asm/tlbflush.h>
+#include <asm/sections.h>
 
 int mem_init_done;
 
@@ -201,9 +202,6 @@ void __init paging_init(void)
 
 /* References to section boundaries */
 
-extern char _stext, _etext, _edata, __bss_start, _end;
-extern char __init_begin, __init_end;
-
 static int __init free_pages_init(void)
 {
         int reservedpages, pfn;
@@ -263,30 +261,11 @@ void __init mem_init(void)
 #ifdef CONFIG_BLK_DEV_INITRD
 void free_initrd_mem(unsigned long start, unsigned long end)
 {
-        printk(KERN_INFO "Freeing initrd memory: %ldk freed\n",
-               (end - start) >> 10);
-
-        for (; start < end; start += PAGE_SIZE) {
-                ClearPageReserved(virt_to_page(start));
-                init_page_count(virt_to_page(start));
-                free_page(start);
-                totalram_pages++;
-        }
+        free_reserved_area(start, end, 0, "initrd");
 }
 #endif
 
 void free_initmem(void)
 {
-        unsigned long addr;
-
-        addr = (unsigned long)(&__init_begin);
-        for (; addr < (unsigned long)(&__init_end); addr += PAGE_SIZE) {
-                ClearPageReserved(virt_to_page(addr));
-                init_page_count(virt_to_page(addr));
-                free_page(addr);
-                totalram_pages++;
-        }
-        printk(KERN_INFO "Freeing unused kernel memory: %luk freed\n",
-               ((unsigned long)&__init_end -
-                (unsigned long)&__init_begin) >> 10);
+        free_initmem_default(0);
 }
diff --git a/arch/parisc/Kconfig b/arch/parisc/Kconfig
index 0339181bf3ac..433e75a2ee9a 100644
--- a/arch/parisc/Kconfig
+++ b/arch/parisc/Kconfig
@@ -1,5 +1,6 @@
 config PARISC
         def_bool y
+        select ARCH_HAS_DEBUG_STRICT_USER_COPY_CHECKS
         select HAVE_IDE
         select HAVE_OPROFILE
         select HAVE_FUNCTION_TRACER if 64BIT
diff --git a/arch/parisc/Kconfig.debug b/arch/parisc/Kconfig.debug
index 7305ac8f7f5b..bc989e522a04 100644
--- a/arch/parisc/Kconfig.debug
+++ b/arch/parisc/Kconfig.debug
@@ -12,18 +12,4 @@ config DEBUG_RODATA
          portion of the kernel code won't be covered by a TLB anymore.
          If in doubt, say "N".
 
-config DEBUG_STRICT_USER_COPY_CHECKS
-        bool "Strict copy size checks"
-        depends on DEBUG_KERNEL && !TRACE_BRANCH_PROFILING
-        ---help---
-          Enabling this option turns a certain set of sanity checks for user
-          copy operations into compile time failures.
-
-          The copy_from_user() etc checks are there to help test if there
-          are sufficient security checks on the length argument of
-          the copy operation, by having gcc prove that the argument is
-          within bounds.
-
-          If unsure, or if you run an older (pre 4.4) gcc, say N.
-
 endmenu
diff --git a/arch/parisc/include/asm/thread_info.h b/arch/parisc/include/asm/thread_info.h
index d1fb79a36f3d..6182832e5b6c 100644
--- a/arch/parisc/include/asm/thread_info.h
+++ b/arch/parisc/include/asm/thread_info.h
@@ -77,8 +77,6 @@ struct thread_info {
 #define _TIF_SYSCALL_TRACE_MASK (_TIF_SYSCALL_TRACE | _TIF_SINGLESTEP | \
                                  _TIF_BLOCKSTEP)
 
-#define tsk_is_polling(t) test_tsk_thread_flag(t, TIF_POLLING_NRFLAG)
-
 #endif /* __KERNEL__ */
 
 #endif /* _ASM_PARISC_THREAD_INFO_H */
diff --git a/arch/parisc/include/asm/unistd.h b/arch/parisc/include/asm/unistd.h
index ae9a46cbfd92..74d835820ee7 100644
--- a/arch/parisc/include/asm/unistd.h
+++ b/arch/parisc/include/asm/unistd.h
@@ -170,12 +170,4 @@ type name(type1 arg1, type2 arg2, type3 arg3, type4 arg4, type5 arg5)	\
 
 #undef STR
 
-/*
- * "Conditional" syscalls
- *
- * What we want is __attribute__((weak,alias("sys_ni_syscall"))),
- * but it doesn't work on all toolchains, so we just do it by hand
- */
-#define cond_syscall(x) asm(".weak\t" #x "\n\t.set\t" #x ",sys_ni_syscall")
-
 #endif /* _ASM_PARISC_UNISTD_H_ */
diff --git a/arch/parisc/kernel/process.c b/arch/parisc/kernel/process.c
index d13507246c5d..55f92b614182 100644
--- a/arch/parisc/kernel/process.c
+++ b/arch/parisc/kernel/process.c
@@ -59,28 +59,6 @@
 #include <asm/unwind.h>
 #include <asm/sections.h>
 
-/*
- * The idle thread. There's no useful work to be
- * done, so just try to conserve power and have a
- * low exit latency (ie sit in a loop waiting for
- * somebody to say that they'd like to reschedule)
- */
-void cpu_idle(void)
-{
-        set_thread_flag(TIF_POLLING_NRFLAG);
-
-        /* endless idle loop with no priority at all */
-        while (1) {
-                rcu_idle_enter();
-                while (!need_resched())
-                        barrier();
-                rcu_idle_exit();
-                schedule_preempt_disabled();
-                check_pgt_cache();
-        }
-}
-
-
 #define COMMAND_GLOBAL  F_EXTEND(0xfffe0030)
 #define CMD_RESET       5       /* reset any module */
 
diff --git a/arch/parisc/kernel/smp.c b/arch/parisc/kernel/smp.c
index 6266730efd61..fd1bb1519c2b 100644
--- a/arch/parisc/kernel/smp.c
+++ b/arch/parisc/kernel/smp.c
@@ -329,7 +329,7 @@ void __init smp_callin(void)
 
         local_irq_enable();  /* Interrupts have been off until now */
 
-        cpu_idle();      /* Wait for timer to schedule some work */
+        cpu_startup_entry(CPUHP_ONLINE);
 
         /* NOTREACHED */
         panic("smp_callin() AAAAaaaaahhhh....\n");
diff --git a/arch/parisc/kernel/sys_parisc32.c b/arch/parisc/kernel/sys_parisc32.c
index 051c8b90231f..f517e08e7f0d 100644
--- a/arch/parisc/kernel/sys_parisc32.c
+++ b/arch/parisc/kernel/sys_parisc32.c
@@ -60,47 +60,6 @@ asmlinkage long sys32_unimplemented(int r26, int r25, int r24, int r23,
     return -ENOSYS;
 }
 
-/* Note: it is necessary to treat out_fd and in_fd as unsigned ints, with the
- * corresponding cast to a signed int to insure that the proper conversion
- * (sign extension) between the register representation of a signed int (msr in
- * 32-bit mode) and the register representation of a signed int (msr in 64-bit
- * mode) is performed.
- */
-asmlinkage long sys32_sendfile(u32 out_fd, u32 in_fd,
-                               compat_off_t __user *offset, compat_size_t count)
-{
-        return compat_sys_sendfile((int)out_fd, (int)in_fd, offset, count);
-}
-
-asmlinkage long sys32_sendfile64(u32 out_fd, u32 in_fd,
-                                 compat_loff_t __user *offset, compat_size_t count)
-{
-        return sys_sendfile64((int)out_fd, (int)in_fd,
-                                (loff_t __user *)offset, count);
-}
-
-asmlinkage long sys32_semctl(int semid, int semnum, int cmd, union semun arg)
-{
-        union semun u;
-        
-        if (cmd == SETVAL) {
-                /* Ugh.  arg is a union of int,ptr,ptr,ptr, so is 8 bytes.
-                 * The int should be in the first 4, but our argument
-                 * frobbing has left it in the last 4.
-                 */
-                u.val = *((int *)&arg + 1);
-                return sys_semctl (semid, semnum, cmd, u);
-        }
-        return sys_semctl (semid, semnum, cmd, arg);
-}
-
-long sys32_lookup_dcookie(u32 cookie_high, u32 cookie_low, char __user *buf,
-                          size_t len)
-{
-        return sys_lookup_dcookie((u64)cookie_high << 32 | cookie_low,
-                                  buf, len);
-}
-
 asmlinkage long compat_sys_fanotify_mark(int fan_fd, int flags, u32 mask_hi,
                                          u32 mask_lo, int fd,
                                          const char __user *pathname)
diff --git a/arch/parisc/kernel/syscall_table.S b/arch/parisc/kernel/syscall_table.S
index f57dc137b8dd..0c9107285e66 100644
--- a/arch/parisc/kernel/syscall_table.S
+++ b/arch/parisc/kernel/syscall_table.S
@@ -198,7 +198,7 @@
         ENTRY_SAME(madvise)
         ENTRY_SAME(clone_wrapper)       /* 120 */
         ENTRY_SAME(setdomainname)
-        ENTRY_DIFF(sendfile)
+        ENTRY_COMP(sendfile)
         /* struct sockaddr... */
         ENTRY_SAME(recvfrom)
         /* struct timex contains longs */
@@ -282,7 +282,7 @@
         ENTRY_COMP(recvmsg)
         ENTRY_SAME(semop)               /* 185 */
         ENTRY_SAME(semget)
-        ENTRY_DIFF(semctl)
+        ENTRY_COMP(semctl)
         ENTRY_COMP(msgsnd)
         ENTRY_COMP(msgrcv)
         ENTRY_SAME(msgget)              /* 190 */
@@ -304,7 +304,7 @@
         ENTRY_SAME(gettid)
         ENTRY_OURS(readahead)
         ENTRY_SAME(tkill)
-        ENTRY_DIFF(sendfile64)
+        ENTRY_COMP(sendfile64)
         ENTRY_COMP(futex)               /* 210 */
         ENTRY_COMP(sched_setaffinity)
         ENTRY_COMP(sched_getaffinity)
@@ -318,7 +318,7 @@
         ENTRY_SAME(alloc_hugepages)     /* 220 */
         ENTRY_SAME(free_hugepages)
         ENTRY_SAME(exit_group)
-        ENTRY_DIFF(lookup_dcookie)
+        ENTRY_COMP(lookup_dcookie)
         ENTRY_SAME(epoll_create)
         ENTRY_SAME(epoll_ctl)           /* 225 */
         ENTRY_SAME(epoll_wait)
diff --git a/arch/parisc/kernel/traps.c b/arch/parisc/kernel/traps.c
index aeb8f8f2c07a..f702bff0bed9 100644
--- a/arch/parisc/kernel/traps.c
+++ b/arch/parisc/kernel/traps.c
@@ -126,6 +126,8 @@ void show_regs(struct pt_regs *regs)
         user = user_mode(regs);
         level = user ? KERN_DEBUG : KERN_CRIT;
 
+        show_regs_print_info(level);
+
         print_gr(level, regs);
 
         for (i = 0; i < 8; i += 4)
@@ -158,14 +160,6 @@ void show_regs(struct pt_regs *regs)
         }
 }
 
-
-void dump_stack(void)
-{
-        show_stack(NULL, NULL);
-}
-
-EXPORT_SYMBOL(dump_stack);
-
 static void do_show_stack(struct unwind_frame_info *info)
 {
         int i = 1;
diff --git a/arch/parisc/mm/init.c b/arch/parisc/mm/init.c
index 3ac462de53a4..157b931e7b09 100644
--- a/arch/parisc/mm/init.c
+++ b/arch/parisc/mm/init.c
@@ -505,7 +505,6 @@ static void __init map_pages(unsigned long start_vaddr,
 
 void free_initmem(void)
 {
-        unsigned long addr;
         unsigned long init_begin = (unsigned long)__init_begin;
         unsigned long init_end = (unsigned long)__init_end;
 
@@ -533,19 +532,10 @@ void free_initmem(void)
          * pages are no-longer executable */
         flush_icache_range(init_begin, init_end);
         
-        for (addr = init_begin; addr < init_end; addr += PAGE_SIZE) {
-                ClearPageReserved(virt_to_page(addr));
-                init_page_count(virt_to_page(addr));
-                free_page(addr);
-                num_physpages++;
-                totalram_pages++;
-        }
+        num_physpages += free_initmem_default(0);
 
         /* set up a new led state on systems shipped LED State panel */
         pdc_chassis_send_status(PDC_CHASSIS_DIRECT_BCOMPLETE);
-        
-        printk(KERN_INFO "Freeing unused kernel memory: %luk freed\n",
-                (init_end - init_begin) >> 10);
 }
 
 
@@ -697,6 +687,8 @@ void show_mem(unsigned int filter)
 
         printk(KERN_INFO "Mem-info:\n");
         show_free_areas(filter);
+        if (filter & SHOW_MEM_FILTER_PAGE_COUNT)
+                return;
 #ifndef CONFIG_DISCONTIGMEM
         i = max_mapnr;
         while (i-- > 0) {
@@ -1107,15 +1099,6 @@ void flush_tlb_all(void)
 #ifdef CONFIG_BLK_DEV_INITRD
 void free_initrd_mem(unsigned long start, unsigned long end)
 {
-        if (start >= end)
-                return;
-        printk(KERN_INFO "Freeing initrd memory: %ldk freed\n", (end - start) >> 10);
-        for (; start < end; start += PAGE_SIZE) {
-                ClearPageReserved(virt_to_page(start));
-                init_page_count(virt_to_page(start));
-                free_page(start);
-                num_physpages++;
-                totalram_pages++;
-        }
+        num_physpages += free_reserved_area(start, end, 0, "initrd");
 }
 #endif
diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig
index ea5bb045983a..a0259edae5c9 100644
--- a/arch/powerpc/Kconfig
+++ b/arch/powerpc/Kconfig
@@ -114,7 +114,6 @@ config PPC
         select USE_GENERIC_SMP_HELPERS if SMP
         select HAVE_OPROFILE
         select HAVE_DEBUG_KMEMLEAK
-        select HAVE_SYSCALL_WRAPPERS if PPC64
         select GENERIC_ATOMIC64 if PPC32
         select ARCH_HAS_ATOMIC64_DEC_IF_POSITIVE
         select HAVE_PERF_EVENTS
diff --git a/arch/powerpc/include/asm/hugetlb.h b/arch/powerpc/include/asm/hugetlb.h
index 62e11a32c4c2..4fcbd6b14a3a 100644
--- a/arch/powerpc/include/asm/hugetlb.h
+++ b/arch/powerpc/include/asm/hugetlb.h
@@ -3,6 +3,7 @@
 
 #ifdef CONFIG_HUGETLB_PAGE
 #include <asm/page.h>
+#include <asm-generic/hugetlb.h>
 
 extern struct kmem_cache *hugepte_cache;
 
diff --git a/arch/powerpc/include/asm/linkage.h b/arch/powerpc/include/asm/linkage.h
new file mode 100644
index 000000000000..b36f650a13ff
--- /dev/null
+++ b/arch/powerpc/include/asm/linkage.h
@@ -0,0 +1,13 @@
+#ifndef _ASM_POWERPC_LINKAGE_H
+#define _ASM_POWERPC_LINKAGE_H
+
+#ifdef CONFIG_PPC64
+#define cond_syscall(x) \
+        asm ("\t.weak " #x "\n\t.set " #x ", sys_ni_syscall\n"          \
+             "\t.weak ." #x "\n\t.set ." #x ", .sys_ni_syscall\n")
+#define SYSCALL_ALIAS(alias, name)                                      \
+        asm ("\t.globl " #alias "\n\t.set " #alias ", " #name "\n"      \
+             "\t.globl ." #alias "\n\t.set ." #alias ", ." #name)
+#endif
+
+#endif  /* _ASM_POWERPC_LINKAGE_H */
diff --git a/arch/powerpc/include/asm/systbl.h b/arch/powerpc/include/asm/systbl.h
index ebbec52d21bd..43523fe0d8b4 100644
--- a/arch/powerpc/include/asm/systbl.h
+++ b/arch/powerpc/include/asm/systbl.h
@@ -190,7 +190,7 @@ SYSCALL_SPU(getcwd)
 SYSCALL_SPU(capget)
 SYSCALL_SPU(capset)
 COMPAT_SYS(sigaltstack)
-SYSX_SPU(sys_sendfile,compat_sys_sendfile_wrapper,sys_sendfile)
+COMPAT_SYS_SPU(sendfile)
 SYSCALL(ni_syscall)
 SYSCALL(ni_syscall)
 PPC_SYS(vfork)
@@ -230,7 +230,7 @@ COMPAT_SYS_SPU(sched_setaffinity)
 COMPAT_SYS_SPU(sched_getaffinity)
 SYSCALL(ni_syscall)
 SYSCALL(ni_syscall)
-SYSX(sys_ni_syscall,compat_sys_sendfile64_wrapper,sys_sendfile64)
+SYS32ONLY(sendfile64)
 COMPAT_SYS_SPU(io_setup)
 SYSCALL_SPU(io_destroy)
 COMPAT_SYS_SPU(io_getevents)
@@ -239,7 +239,7 @@ SYSCALL_SPU(io_cancel)
 SYSCALL(set_tid_address)
 SYSX_SPU(sys_fadvise64,ppc32_fadvise64,sys_fadvise64)
 SYSCALL(exit_group)
-SYSX(sys_lookup_dcookie,ppc32_lookup_dcookie,sys_lookup_dcookie)
+COMPAT_SYS(lookup_dcookie)
 SYSCALL_SPU(epoll_create)
 SYSCALL_SPU(epoll_ctl)
 SYSCALL_SPU(epoll_wait)
@@ -273,8 +273,8 @@ COMPAT_SYS(mq_timedreceive)
 COMPAT_SYS(mq_notify)
 COMPAT_SYS(mq_getsetattr)
 COMPAT_SYS(kexec_load)
-COMPAT_SYS(add_key)
-COMPAT_SYS(request_key)
+SYSCALL(add_key)
+SYSCALL(request_key)
 COMPAT_SYS(keyctl)
 COMPAT_SYS(waitid)
 SYSCALL(ioprio_set)
diff --git a/arch/powerpc/include/asm/thread_info.h b/arch/powerpc/include/asm/thread_info.h
index 406b7b9a1341..8ceea14d6fe4 100644
--- a/arch/powerpc/include/asm/thread_info.h
+++ b/arch/powerpc/include/asm/thread_info.h
@@ -182,8 +182,6 @@ static inline bool test_thread_local_flags(unsigned int flags)
 #define is_32bit_task() (1)
 #endif
 
-#define tsk_is_polling(t) test_tsk_thread_flag(t, TIF_POLLING_NRFLAG)
-
 #endif  /* !__ASSEMBLY__ */
 
 #endif /* __KERNEL__ */
diff --git a/arch/powerpc/include/asm/unistd.h b/arch/powerpc/include/asm/unistd.h
index 1487f0f12293..3ca819f541bf 100644
--- a/arch/powerpc/include/asm/unistd.h
+++ b/arch/powerpc/include/asm/unistd.h
@@ -56,11 +56,5 @@
 #define __ARCH_WANT_SYS_VFORK
 #define __ARCH_WANT_SYS_CLONE
 
-/*
- * "Conditional" syscalls
- */
-#define cond_syscall(x) \
-        asmlinkage long x (void) __attribute__((weak,alias("sys_ni_syscall")))
-
 #endif          /* __ASSEMBLY__ */
 #endif /* _ASM_POWERPC_UNISTD_H_ */
diff --git a/arch/powerpc/include/asm/uprobes.h b/arch/powerpc/include/asm/uprobes.h
index b532060d0916..23016020915e 100644
--- a/arch/powerpc/include/asm/uprobes.h
+++ b/arch/powerpc/include/asm/uprobes.h
@@ -51,4 +51,5 @@ extern int  arch_uprobe_post_xol(struct arch_uprobe *aup, struct pt_regs *regs);
 extern bool arch_uprobe_xol_was_trapped(struct task_struct *tsk);
 extern int  arch_uprobe_exception_notify(struct notifier_block *self, unsigned long val, void *data);
 extern void arch_uprobe_abort_xol(struct arch_uprobe *aup, struct pt_regs *regs);
+extern unsigned long arch_uretprobe_hijack_return_addr(unsigned long trampoline_vaddr, struct pt_regs *regs);
 #endif  /* _ASM_UPROBES_H */
diff --git a/arch/powerpc/include/uapi/asm/linkage.h b/arch/powerpc/include/uapi/asm/linkage.h
deleted file mode 100644
index e1c4ac1cc4ba..000000000000
--- a/arch/powerpc/include/uapi/asm/linkage.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef _ASM_POWERPC_LINKAGE_H
-#define _ASM_POWERPC_LINKAGE_H
-
-/* Nothing to see here... */
-
-#endif  /* _ASM_POWERPC_LINKAGE_H */
diff --git a/arch/powerpc/kernel/crash_dump.c b/arch/powerpc/kernel/crash_dump.c
index b3ba5163eae2..9ec3fe174cba 100644
--- a/arch/powerpc/kernel/crash_dump.c
+++ b/arch/powerpc/kernel/crash_dump.c
@@ -150,10 +150,7 @@ void crash_free_reserved_phys_range(unsigned long begin, unsigned long end)
                 if (addr <= rtas_end && ((addr + PAGE_SIZE) > rtas_start))
                         continue;
 
-                ClearPageReserved(pfn_to_page(addr >> PAGE_SHIFT));
-                init_page_count(pfn_to_page(addr >> PAGE_SHIFT));
-                free_page((unsigned long)__va(addr));
-                totalram_pages++;
+                free_reserved_page(pfn_to_page(addr >> PAGE_SHIFT));
         }
 }
 #endif
diff --git a/arch/powerpc/kernel/fadump.c b/arch/powerpc/kernel/fadump.c
index 06c8202a69cf..2230fd0ca3e4 100644
--- a/arch/powerpc/kernel/fadump.c
+++ b/arch/powerpc/kernel/fadump.c
@@ -1045,10 +1045,7 @@ static void fadump_release_memory(unsigned long begin, unsigned long end)
                 if (addr <= ra_end && ((addr + PAGE_SIZE) > ra_start))
                         continue;
 
-                ClearPageReserved(pfn_to_page(addr >> PAGE_SHIFT));
-                init_page_count(pfn_to_page(addr >> PAGE_SHIFT));
-                free_page((unsigned long)__va(addr));
-                totalram_pages++;
+                free_reserved_page(pfn_to_page(addr >> PAGE_SHIFT));
         }
 }
 
diff --git a/arch/powerpc/kernel/idle.c b/arch/powerpc/kernel/idle.c
index ea78761aa169..939ea7ef0dc8 100644
--- a/arch/powerpc/kernel/idle.c
+++ b/arch/powerpc/kernel/idle.c
@@ -33,11 +33,6 @@
 #include <asm/runlatch.h>
 #include <asm/smp.h>
 
-#ifdef CONFIG_HOTPLUG_CPU
-#define cpu_should_die()        cpu_is_offline(smp_processor_id())
-#else
-#define cpu_should_die()        0
-#endif
 
 unsigned long cpuidle_disable = IDLE_NO_OVERRIDE;
 EXPORT_SYMBOL(cpuidle_disable);
@@ -50,64 +45,38 @@ static int __init powersave_off(char *arg)
 }
 __setup("powersave=off", powersave_off);
 
-/*
- * The body of the idle task.
- */
-void cpu_idle(void)
+#ifdef CONFIG_HOTPLUG_CPU
+void arch_cpu_idle_dead(void)
 {
-        set_thread_flag(TIF_POLLING_NRFLAG);
-        while (1) {
-                tick_nohz_idle_enter();
-                rcu_idle_enter();
-
-                while (!need_resched() && !cpu_should_die()) {
-                        ppc64_runlatch_off();
-
-                        if (ppc_md.power_save) {
-                                clear_thread_flag(TIF_POLLING_NRFLAG);
-                                /*
-                                 * smp_mb is so clearing of TIF_POLLING_NRFLAG
-                                 * is ordered w.r.t. need_resched() test.
-                                 */
-                                smp_mb();
-                                local_irq_disable();
-
-                                /* Don't trace irqs off for idle */
-                                stop_critical_timings();
-
-                                /* check again after disabling irqs */
-                                if (!need_resched() && !cpu_should_die())
-                                        ppc_md.power_save();
-
-                                start_critical_timings();
-
-                                /* Some power_save functions return with
-                                 * interrupts enabled, some don't.
-                                 */
-                                if (irqs_disabled())
-                                        local_irq_enable();
-                                set_thread_flag(TIF_POLLING_NRFLAG);
-
-                        } else {
-                                /*
-                                 * Go into low thread priority and possibly
-                                 * low power mode.
-                                 */
-                                HMT_low();
-                                HMT_very_low();
-                        }
-                }
+        sched_preempt_enable_no_resched();
+        cpu_die();
+}
+#endif
 
-                HMT_medium();
-                ppc64_runlatch_on();
-                rcu_idle_exit();
-                tick_nohz_idle_exit();
-                if (cpu_should_die()) {
-                        sched_preempt_enable_no_resched();
-                        cpu_die();
-                }
-                schedule_preempt_disabled();
+void arch_cpu_idle(void)
+{
+        ppc64_runlatch_off();
+
+        if (ppc_md.power_save) {
+                ppc_md.power_save();
+                /*
+                 * Some power_save functions return with
+                 * interrupts enabled, some don't.
+                 */
+                if (irqs_disabled())
+                        local_irq_enable();
+        } else {
+                local_irq_enable();
+                /*
+                 * Go into low thread priority and possibly
+                 * low power mode.
+                 */
+                HMT_low();
+                HMT_very_low();
         }
+
+        HMT_medium();
+        ppc64_runlatch_on();
 }
 
 int powersave_nap;
diff --git a/arch/powerpc/kernel/kvm.c b/arch/powerpc/kernel/kvm.c
index a61b133c4f99..6782221d49bd 100644
--- a/arch/powerpc/kernel/kvm.c
+++ b/arch/powerpc/kernel/kvm.c
@@ -756,12 +756,7 @@ static __init void kvm_free_tmp(void)
         end = (ulong)&kvm_tmp[ARRAY_SIZE(kvm_tmp)] & PAGE_MASK;
 
         /* Free the tmp space we don't need */
-        for (; start < end; start += PAGE_SIZE) {
-                ClearPageReserved(virt_to_page(start));
-                init_page_count(virt_to_page(start));
-                free_page(start);
-                totalram_pages++;
-        }
+        free_reserved_area(start, end, 0, NULL);
 }
 
 static int __init kvm_guest_init(void)
diff --git a/arch/powerpc/kernel/nvram_64.c b/arch/powerpc/kernel/nvram_64.c
index bec1e930ed73..48fbc2b97e95 100644
--- a/arch/powerpc/kernel/nvram_64.c
+++ b/arch/powerpc/kernel/nvram_64.c
@@ -511,8 +511,7 @@ int __init nvram_scan_partitions(void)
                                "detected: 0-length partition\n");
                         goto out;
                 }
-                tmp_part = (struct nvram_partition *)
-                        kmalloc(sizeof(struct nvram_partition), GFP_KERNEL);
+                tmp_part = kmalloc(sizeof(struct nvram_partition), GFP_KERNEL);
                 err = -ENOMEM;
                 if (!tmp_part) {
                         printk(KERN_ERR "nvram_scan_partitions: kmalloc failed\n");
diff --git a/arch/powerpc/kernel/process.c b/arch/powerpc/kernel/process.c
index 16e77a81ab4f..13a8d9d0b5cb 100644
--- a/arch/powerpc/kernel/process.c
+++ b/arch/powerpc/kernel/process.c
@@ -831,6 +831,8 @@ void show_regs(struct pt_regs * regs)
 {
         int i, trap;
 
+        show_regs_print_info(KERN_DEFAULT);
+
         printk("NIP: "REG" LR: "REG" CTR: "REG"\n",
                regs->nip, regs->link, regs->ctr);
         printk("REGS: %p TRAP: %04lx   %s  (%s)\n",
@@ -850,12 +852,6 @@ void show_regs(struct pt_regs * regs)
 #else
                 printk("DAR: "REG", DSISR: %08lx\n", regs->dar, regs->dsisr);
 #endif
-        printk("TASK = %p[%d] '%s' THREAD: %p",
-               current, task_pid_nr(current), current->comm, task_thread_info(current));
-
-#ifdef CONFIG_SMP
-        printk(" CPU: %d", raw_smp_processor_id());
-#endif /* CONFIG_SMP */
 
         for (i = 0;  i < 32;  i++) {
                 if ((i % REGS_PER_LINE) == 0)
@@ -1362,12 +1358,6 @@ void show_stack(struct task_struct *tsk, unsigned long *stack)
         } while (count++ < kstack_depth_to_print);
 }
 
-void dump_stack(void)
-{
-        show_stack(current, NULL);
-}
-EXPORT_SYMBOL(dump_stack);
-
 #ifdef CONFIG_PPC64
 /* Called with hard IRQs off */
 void __ppc64_runlatch_on(void)
diff --git a/arch/powerpc/kernel/smp.c b/arch/powerpc/kernel/smp.c
index 76bd9da8cb71..ee7ac5e6e28a 100644
--- a/arch/powerpc/kernel/smp.c
+++ b/arch/powerpc/kernel/smp.c
@@ -669,7 +669,7 @@ __cpuinit void start_secondary(void *unused)
 
         local_irq_enable();
 
-        cpu_idle();
+        cpu_startup_entry(CPUHP_ONLINE);
 
         BUG();
 }
diff --git a/arch/powerpc/kernel/sys_ppc32.c b/arch/powerpc/kernel/sys_ppc32.c
index d0bafc0cdf06..cd6e19d263b3 100644
--- a/arch/powerpc/kernel/sys_ppc32.c
+++ b/arch/powerpc/kernel/sys_ppc32.c
@@ -61,91 +61,6 @@ asmlinkage long ppc32_select(u32 n, compat_ulong_t __user *inp,
         return compat_sys_select((int)n, inp, outp, exp, compat_ptr(tvp_x));
 }
 
-#ifdef CONFIG_SYSVIPC
-long compat_sys_ipc(u32 call, u32 first, u32 second, u32 third, compat_uptr_t ptr,
-               u32 fifth)
-{
-        int version;
-
-        version = call >> 16; /* hack for backward compatibility */
-        call &= 0xffff;
-
-        switch (call) {
-
-        case SEMTIMEDOP:
-                if (fifth)
-                        /* sign extend semid */
-                        return compat_sys_semtimedop((int)first,
-                                                     compat_ptr(ptr), second,
-                                                     compat_ptr(fifth));
-                /* else fall through for normal semop() */
-        case SEMOP:
-                /* struct sembuf is the same on 32 and 64bit :)) */
-                /* sign extend semid */
-                return sys_semtimedop((int)first, compat_ptr(ptr), second,
-                                      NULL);
-        case SEMGET:
-                /* sign extend key, nsems */
-                return sys_semget((int)first, (int)second, third);
-        case SEMCTL:
-                /* sign extend semid, semnum */
-                return compat_sys_semctl((int)first, (int)second, third,
-                                         compat_ptr(ptr));
-
-        case MSGSND:
-                /* sign extend msqid */
-                return compat_sys_msgsnd((int)first, (int)second, third,
-                                         compat_ptr(ptr));
-        case MSGRCV:
-                /* sign extend msqid, msgtyp */
-                return compat_sys_msgrcv((int)first, second, (int)fifth,
-                                         third, version, compat_ptr(ptr));
-        case MSGGET:
-                /* sign extend key */
-                return sys_msgget((int)first, second);
-        case MSGCTL:
-                /* sign extend msqid */
-                return compat_sys_msgctl((int)first, second, compat_ptr(ptr));
-
-        case SHMAT:
-                /* sign extend shmid */
-                return compat_sys_shmat((int)first, second, third, version,
-                                        compat_ptr(ptr));
-        case SHMDT:
-                return sys_shmdt(compat_ptr(ptr));
-        case SHMGET:
-                /* sign extend key_t */
-                return sys_shmget((int)first, second, third);
-        case SHMCTL:
-                /* sign extend shmid */
-                return compat_sys_shmctl((int)first, second, compat_ptr(ptr));
-
-        default:
-                return -ENOSYS;
-        }
-
-        return -ENOSYS;
-}
-#endif
-
-/* Note: it is necessary to treat out_fd and in_fd as unsigned ints, 
- * with the corresponding cast to a signed int to insure that the 
- * proper conversion (sign extension) between the register representation of a signed int (msr in 32-bit mode)
- * and the register representation of a signed int (msr in 64-bit mode) is performed.
- */
-asmlinkage long compat_sys_sendfile_wrapper(u32 out_fd, u32 in_fd,
-                                            compat_off_t __user *offset, u32 count)
-{
-        return compat_sys_sendfile((int)out_fd, (int)in_fd, offset, count);
-}
-
-asmlinkage long compat_sys_sendfile64_wrapper(u32 out_fd, u32 in_fd,
-                                              compat_loff_t __user *offset, u32 count)
-{
-        return sys_sendfile((int)out_fd, (int)in_fd,
-                            (off_t __user *)offset, count);
-}
-
 unsigned long compat_sys_mmap2(unsigned long addr, size_t len,
                           unsigned long prot, unsigned long flags,
                           unsigned long fd, unsigned long pgoff)
@@ -195,13 +110,6 @@ asmlinkage int compat_sys_ftruncate64(unsigned int fd, u32 reg4, unsigned long h
         return sys_ftruncate(fd, (high << 32) | low);
 }
 
-long ppc32_lookup_dcookie(u32 cookie_high, u32 cookie_low, char __user *buf,
-                          size_t len)
-{
-        return sys_lookup_dcookie((u64)cookie_high << 32 | cookie_low,
-                                  buf, len);
-}
-
 long ppc32_fadvise64(int fd, u32 unused, u32 offset_high, u32 offset_low,
                      size_t len, int advice)
 {
@@ -209,23 +117,6 @@ long ppc32_fadvise64(int fd, u32 unused, u32 offset_high, u32 offset_low,
                              advice);
 }
 
-asmlinkage long compat_sys_add_key(const char __user *_type,
-                              const char __user *_description,
-                              const void __user *_payload,
-                              u32 plen,
-                              u32 ringid)
-{
-        return sys_add_key(_type, _description, _payload, plen, ringid);
-}
-
-asmlinkage long compat_sys_request_key(const char __user *_type,
-                                  const char __user *_description,
-                                  const char __user *_callout_info,
-                                  u32 destringid)
-{
-        return sys_request_key(_type, _description, _callout_info, destringid);
-}
-
 asmlinkage long compat_sys_sync_file_range2(int fd, unsigned int flags,
                                    unsigned offset_hi, unsigned offset_lo,
                                    unsigned nbytes_hi, unsigned nbytes_lo)
diff --git a/arch/powerpc/kernel/udbg.c b/arch/powerpc/kernel/udbg.c
index f9748498fe58..13b867093499 100644
--- a/arch/powerpc/kernel/udbg.c
+++ b/arch/powerpc/kernel/udbg.c
@@ -156,15 +156,13 @@ static struct console udbg_console = {
         .index  = 0,
 };
 
-static int early_console_initialized;
-
 /*
  * Called by setup_system after ppc_md->probe and ppc_md->early_init.
  * Call it again after setting udbg_putc in ppc_md->setup_arch.
  */
 void __init register_early_udbg_console(void)
 {
-        if (early_console_initialized)
+        if (early_console)
                 return;
 
         if (!udbg_putc)
@@ -174,7 +172,7 @@ void __init register_early_udbg_console(void)
                 printk(KERN_INFO "early console immortal !\n");
                 udbg_console.flags &= ~CON_BOOT;
         }
-        early_console_initialized = 1;
+        early_console = &udbg_console;
         register_console(&udbg_console);
 }
 
diff --git a/arch/powerpc/kernel/uprobes.c b/arch/powerpc/kernel/uprobes.c
index bc77834dbf43..59f419b935f2 100644
--- a/arch/powerpc/kernel/uprobes.c
+++ b/arch/powerpc/kernel/uprobes.c
@@ -31,6 +31,16 @@
 #define UPROBE_TRAP_NR  UINT_MAX
 
 /**
+ * is_trap_insn - check if the instruction is a trap variant
+ * @insn: instruction to be checked.
+ * Returns true if @insn is a trap variant.
+ */
+bool is_trap_insn(uprobe_opcode_t *insn)
+{
+        return (is_trap(*insn));
+}
+
+/**
  * arch_uprobe_analyze_insn
  * @mm: the probed address space.
  * @arch_uprobe: the probepoint information.
@@ -43,12 +53,6 @@ int arch_uprobe_analyze_insn(struct arch_uprobe *auprobe,
         if (addr & 0x03)
                 return -EINVAL;
 
-        /*
-         * We currently don't support a uprobe on an already
-         * existing breakpoint instruction underneath
-         */
-        if (is_trap(auprobe->ainsn))
-                return -ENOTSUPP;
         return 0;
 }
 
@@ -188,3 +192,16 @@ bool arch_uprobe_skip_sstep(struct arch_uprobe *auprobe, struct pt_regs *regs)
 
         return false;
 }
+
+unsigned long
+arch_uretprobe_hijack_return_addr(unsigned long trampoline_vaddr, struct pt_regs *regs)
+{
+        unsigned long orig_ret_vaddr;
+
+        orig_ret_vaddr = regs->link;
+
+        /* Replace the return addr with trampoline addr */
+        regs->link = trampoline_vaddr;
+
+        return orig_ret_vaddr;
+}
diff --git a/arch/powerpc/kvm/book3s_pr.c b/arch/powerpc/kvm/book3s_pr.c
index 5e93438afb06..dbdc15aa8127 100644
--- a/arch/powerpc/kvm/book3s_pr.c
+++ b/arch/powerpc/kvm/book3s_pr.c
@@ -1039,7 +1039,7 @@ struct kvm_vcpu *kvmppc_core_vcpu_create(struct kvm *kvm, unsigned int id)
         if (!vcpu_book3s)
                 goto out;
 
-        vcpu_book3s->shadow_vcpu = (struct kvmppc_book3s_shadow_vcpu *)
+        vcpu_book3s->shadow_vcpu =
                 kzalloc(sizeof(*vcpu_book3s->shadow_vcpu), GFP_KERNEL);
         if (!vcpu_book3s->shadow_vcpu)
                 goto free_vcpu;
diff --git a/arch/powerpc/mm/init_64.c b/arch/powerpc/mm/init_64.c
index 7e2246fb2f31..5a535b73ea18 100644
--- a/arch/powerpc/mm/init_64.c
+++ b/arch/powerpc/mm/init_64.c
@@ -263,19 +263,14 @@ static __meminit void vmemmap_list_populate(unsigned long phys,
         vmemmap_list = vmem_back;
 }
 
-int __meminit vmemmap_populate(struct page *start_page,
-                               unsigned long nr_pages, int node)
+int __meminit vmemmap_populate(unsigned long start, unsigned long end, int node)
 {
-        unsigned long start = (unsigned long)start_page;
-        unsigned long end = (unsigned long)(start_page + nr_pages);
         unsigned long page_size = 1 << mmu_psize_defs[mmu_vmemmap_psize].shift;
 
         /* Align to the page size of the linear mapping. */
         start = _ALIGN_DOWN(start, page_size);
 
-        pr_debug("vmemmap_populate page %p, %ld pages, node %d\n",
-                 start_page, nr_pages, node);
-        pr_debug(" -> map %lx..%lx\n", start, end);
+        pr_debug("vmemmap_populate %lx..%lx, node %d\n", start, end, node);
 
         for (; start < end; start += page_size) {
                 void *p;
@@ -298,7 +293,7 @@ int __meminit vmemmap_populate(struct page *start_page,
         return 0;
 }
 
-void vmemmap_free(struct page *memmap, unsigned long nr_pages)
+void vmemmap_free(unsigned long start, unsigned long end)
 {
 }
 
diff --git a/arch/powerpc/mm/mem.c b/arch/powerpc/mm/mem.c
index f1f7409a4183..cd76c454942f 100644
--- a/arch/powerpc/mm/mem.c
+++ b/arch/powerpc/mm/mem.c
@@ -352,13 +352,9 @@ void __init mem_init(void)
                         struct page *page = pfn_to_page(pfn);
                         if (memblock_is_reserved(paddr))
                                 continue;
-                        ClearPageReserved(page);
-                        init_page_count(page);
-                        __free_page(page);
-                        totalhigh_pages++;
+                        free_highmem_page(page);
                         reservedpages--;
                 }
-                totalram_pages += totalhigh_pages;
                 printk(KERN_DEBUG "High memory: %luk\n",
                        totalhigh_pages << (PAGE_SHIFT-10));
         }
@@ -405,39 +401,14 @@ void __init mem_init(void)
 
 void free_initmem(void)
 {
-        unsigned long addr;
-
         ppc_md.progress = ppc_printk_progress;
-
-        addr = (unsigned long)__init_begin;
-        for (; addr < (unsigned long)__init_end; addr += PAGE_SIZE) {
-                memset((void *)addr, POISON_FREE_INITMEM, PAGE_SIZE);
-                ClearPageReserved(virt_to_page(addr));
-                init_page_count(virt_to_page(addr));
-                free_page(addr);
-                totalram_pages++;
-        }
-        pr_info("Freeing unused kernel memory: %luk freed\n",
-                ((unsigned long)__init_end -
-                (unsigned long)__init_begin) >> 10);
+        free_initmem_default(POISON_FREE_INITMEM);
 }
 
 #ifdef CONFIG_BLK_DEV_INITRD
 void __init free_initrd_mem(unsigned long start, unsigned long end)
 {
-        if (start >= end)
-                return;
-
-        start = _ALIGN_DOWN(start, PAGE_SIZE);
-        end = _ALIGN_UP(end, PAGE_SIZE);
-        pr_info("Freeing initrd memory: %ldk freed\n", (end - start) >> 10);
-
-        for (; start < end; start += PAGE_SIZE) {
-                ClearPageReserved(virt_to_page(start));
-                init_page_count(virt_to_page(start));
-                free_page(start);
-                totalram_pages++;
-        }
+        free_reserved_area(start, end, 0, "initrd");
 }
 #endif
 
diff --git a/arch/powerpc/mm/numa.c b/arch/powerpc/mm/numa.c
index bba87ca2b4d7..fa33c546e778 100644
--- a/arch/powerpc/mm/numa.c
+++ b/arch/powerpc/mm/numa.c
@@ -22,6 +22,7 @@
 #include <linux/pfn.h>
 #include <linux/cpuset.h>
 #include <linux/node.h>
+#include <linux/slab.h>
 #include <asm/sparsemem.h>
 #include <asm/prom.h>
 #include <asm/smp.h>
@@ -62,14 +63,11 @@ static int distance_lookup_table[MAX_NUMNODES][MAX_DISTANCE_REF_POINTS];
  */
 static void __init setup_node_to_cpumask_map(void)
 {
-        unsigned int node, num = 0;
+        unsigned int node;
 
         /* setup nr_node_ids if not done yet */
-        if (nr_node_ids == MAX_NUMNODES) {
-                for_each_node_mask(node, node_possible_map)
-                        num = node;
-                nr_node_ids = num + 1;
-        }
+        if (nr_node_ids == MAX_NUMNODES)
+                setup_nr_node_ids();
 
         /* allocate the map */
         for (node = 0; node < nr_node_ids; node++)
diff --git a/arch/powerpc/platforms/44x/Kconfig b/arch/powerpc/platforms/44x/Kconfig
index 0effe9f5a1ea..7be93367d92f 100644
--- a/arch/powerpc/platforms/44x/Kconfig
+++ b/arch/powerpc/platforms/44x/Kconfig
@@ -274,6 +274,8 @@ config 440EPX
         select IBM_EMAC_EMAC4
         select IBM_EMAC_RGMII
         select IBM_EMAC_ZMII
+        select USB_EHCI_BIG_ENDIAN_MMIO
+        select USB_EHCI_BIG_ENDIAN_DESC
 
 config 440GRX
         bool
diff --git a/arch/powerpc/platforms/512x/Kconfig b/arch/powerpc/platforms/512x/Kconfig
index c16999802ecf..381a592826a2 100644
--- a/arch/powerpc/platforms/512x/Kconfig
+++ b/arch/powerpc/platforms/512x/Kconfig
@@ -7,6 +7,8 @@ config PPC_MPC512x
         select PPC_PCI_CHOICE
         select FSL_PCI if PCI
         select ARCH_WANT_OPTIONAL_GPIOLIB
+        select USB_EHCI_BIG_ENDIAN_MMIO
+        select USB_EHCI_BIG_ENDIAN_DESC
 
 config MPC5121_ADS
         bool "Freescale MPC5121E ADS"
diff --git a/arch/powerpc/platforms/512x/mpc512x_shared.c b/arch/powerpc/platforms/512x/mpc512x_shared.c
index d30235b7e3f7..db6ac389ef8c 100644
--- a/arch/powerpc/platforms/512x/mpc512x_shared.c
+++ b/arch/powerpc/platforms/512x/mpc512x_shared.c
@@ -172,12 +172,9 @@ static struct fsl_diu_shared_fb __attribute__ ((__aligned__(8))) diu_shared_fb;
 
 static inline void mpc512x_free_bootmem(struct page *page)
 {
-        __ClearPageReserved(page);
         BUG_ON(PageTail(page));
         BUG_ON(atomic_read(&page->_count) > 1);
-        atomic_set(&page->_count, 1);
-        __free_page(page);
-        totalram_pages++;
+        free_reserved_page(page);
 }
 
 void mpc512x_release_bootmem(void)
diff --git a/arch/powerpc/platforms/cell/Kconfig b/arch/powerpc/platforms/cell/Kconfig
index 53aaefeb3386..9978f594cac0 100644
--- a/arch/powerpc/platforms/cell/Kconfig
+++ b/arch/powerpc/platforms/cell/Kconfig
@@ -113,34 +113,10 @@ config CBE_THERM
         default m
         depends on CBE_RAS && SPU_BASE
 
-config CBE_CPUFREQ
-        tristate "CBE frequency scaling"
-        depends on CBE_RAS && CPU_FREQ
-        default m
-        help
-          This adds the cpufreq driver for Cell BE processors.
-          For details, take a look at <file:Documentation/cpu-freq/>.
-          If you don't have such processor, say N
-
-config CBE_CPUFREQ_PMI_ENABLE
-        bool "CBE frequency scaling using PMI interface"
-        depends on CBE_CPUFREQ
-        default n
-        help
-          Select this, if you want to use the PMI interface
-          to switch frequencies. Using PMI, the
-          processor will not only be able to run at lower speed,
-          but also at lower core voltage.
-
-config CBE_CPUFREQ_PMI
-        tristate
-        depends on CBE_CPUFREQ_PMI_ENABLE
-        default CBE_CPUFREQ
-
 config PPC_PMI
         tristate
         default y
-        depends on CBE_CPUFREQ_PMI || PPC_IBM_CELL_POWERBUTTON
+        depends on CPU_FREQ_CBE_PMI || PPC_IBM_CELL_POWERBUTTON
         help
           PMI (Platform Management Interrupt) is a way to
           communicate with the BMC (Baseboard Management Controller).
diff --git a/arch/powerpc/platforms/cell/Makefile b/arch/powerpc/platforms/cell/Makefile
index a4a89350bcfc..fe053e7c73ee 100644
--- a/arch/powerpc/platforms/cell/Makefile
+++ b/arch/powerpc/platforms/cell/Makefile
@@ -5,9 +5,6 @@ obj-$(CONFIG_PPC_CELL_NATIVE)		+= iommu.o setup.o spider-pic.o \
 obj-$(CONFIG_CBE_RAS)                   += ras.o
 
 obj-$(CONFIG_CBE_THERM)                 += cbe_thermal.o
-obj-$(CONFIG_CBE_CPUFREQ_PMI)           += cbe_cpufreq_pmi.o
-obj-$(CONFIG_CBE_CPUFREQ)               += cbe-cpufreq.o
-cbe-cpufreq-y                           += cbe_cpufreq_pervasive.o cbe_cpufreq.o
 obj-$(CONFIG_CBE_CPUFREQ_SPU_GOVERNOR)  += cpufreq_spudemand.o
 
 obj-$(CONFIG_PPC_IBM_CELL_POWERBUTTON)  += cbe_powerbutton.o
diff --git a/arch/powerpc/platforms/cell/cbe_cpufreq.c b/arch/powerpc/platforms/cell/cbe_cpufreq.c
deleted file mode 100644
index d4c39e32f147..000000000000
--- a/arch/powerpc/platforms/cell/cbe_cpufreq.c
+++ /dev/null
@@ -1,209 +0,0 @@
-/*
- * cpufreq driver for the cell processor
- *
- * (C) Copyright IBM Deutschland Entwicklung GmbH 2005-2007
- *
- * Author: Christian Krafft <krafft@de.ibm.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2, or (at your option)
- * any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
-#include <linux/cpufreq.h>
-#include <linux/module.h>
-#include <linux/of_platform.h>
-
-#include <asm/machdep.h>
-#include <asm/prom.h>
-#include <asm/cell-regs.h>
-#include "cbe_cpufreq.h"
-
-static DEFINE_MUTEX(cbe_switch_mutex);
-
-
-/* the CBE supports an 8 step frequency scaling */
-static struct cpufreq_frequency_table cbe_freqs[] = {
-        {1,     0},
-        {2,     0},
-        {3,     0},
-        {4,     0},
-        {5,     0},
-        {6,     0},
-        {8,     0},
-        {10,    0},
-        {0,     CPUFREQ_TABLE_END},
-};
-
-/*
- * hardware specific functions
- */
-
-static int set_pmode(unsigned int cpu, unsigned int slow_mode)
-{
-        int rc;
-
-        if (cbe_cpufreq_has_pmi)
-                rc = cbe_cpufreq_set_pmode_pmi(cpu, slow_mode);
-        else
-                rc = cbe_cpufreq_set_pmode(cpu, slow_mode);
-
-        pr_debug("register contains slow mode %d\n", cbe_cpufreq_get_pmode(cpu));
-
-        return rc;
-}
-
-/*
- * cpufreq functions
- */
-
-static int cbe_cpufreq_cpu_init(struct cpufreq_policy *policy)
-{
-        const u32 *max_freqp;
-        u32 max_freq;
-        int i, cur_pmode;
-        struct device_node *cpu;
-
-        cpu = of_get_cpu_node(policy->cpu, NULL);
-
-        if (!cpu)
-                return -ENODEV;
-
-        pr_debug("init cpufreq on CPU %d\n", policy->cpu);
-
-        /*
-         * Let's check we can actually get to the CELL regs
-         */
-        if (!cbe_get_cpu_pmd_regs(policy->cpu) ||
-            !cbe_get_cpu_mic_tm_regs(policy->cpu)) {
-                pr_info("invalid CBE regs pointers for cpufreq\n");
-                return -EINVAL;
-        }
-
-        max_freqp = of_get_property(cpu, "clock-frequency", NULL);
-
-        of_node_put(cpu);
-
-        if (!max_freqp)
-                return -EINVAL;
-
-        /* we need the freq in kHz */
-        max_freq = *max_freqp / 1000;
-
-        pr_debug("max clock-frequency is at %u kHz\n", max_freq);
-        pr_debug("initializing frequency table\n");
-
-        /* initialize frequency table */
-        for (i=0; cbe_freqs[i].frequency!=CPUFREQ_TABLE_END; i++) {
-                cbe_freqs[i].frequency = max_freq / cbe_freqs[i].index;
-                pr_debug("%d: %d\n", i, cbe_freqs[i].frequency);
-        }
-
-        /* if DEBUG is enabled set_pmode() measures the latency
-         * of a transition */
-        policy->cpuinfo.transition_latency = 25000;
-
-        cur_pmode = cbe_cpufreq_get_pmode(policy->cpu);
-        pr_debug("current pmode is at %d\n",cur_pmode);
-
-        policy->cur = cbe_freqs[cur_pmode].frequency;
-
-#ifdef CONFIG_SMP
-        cpumask_copy(policy->cpus, cpu_sibling_mask(policy->cpu));
-#endif
-
-        cpufreq_frequency_table_get_attr(cbe_freqs, policy->cpu);
-
-        /* this ensures that policy->cpuinfo_min
-         * and policy->cpuinfo_max are set correctly */
-        return cpufreq_frequency_table_cpuinfo(policy, cbe_freqs);
-}
-
-static int cbe_cpufreq_cpu_exit(struct cpufreq_policy *policy)
-{
-        cpufreq_frequency_table_put_attr(policy->cpu);
-        return 0;
-}
-
-static int cbe_cpufreq_verify(struct cpufreq_policy *policy)
-{
-        return cpufreq_frequency_table_verify(policy, cbe_freqs);
-}
-
-static int cbe_cpufreq_target(struct cpufreq_policy *policy,
-                              unsigned int target_freq,
-                              unsigned int relation)
-{
-        int rc;
-        struct cpufreq_freqs freqs;
-        unsigned int cbe_pmode_new;
-
-        cpufreq_frequency_table_target(policy,
-                                       cbe_freqs,
-                                       target_freq,
-                                       relation,
-                                       &cbe_pmode_new);
-
-        freqs.old = policy->cur;
-        freqs.new = cbe_freqs[cbe_pmode_new].frequency;
-        freqs.cpu = policy->cpu;
-
-        mutex_lock(&cbe_switch_mutex);
-        cpufreq_notify_transition(&freqs, CPUFREQ_PRECHANGE);
-
-        pr_debug("setting frequency for cpu %d to %d kHz, " \
-                 "1/%d of max frequency\n",
-                 policy->cpu,
-                 cbe_freqs[cbe_pmode_new].frequency,
-                 cbe_freqs[cbe_pmode_new].index);
-
-        rc = set_pmode(policy->cpu, cbe_pmode_new);
-
-        cpufreq_notify_transition(&freqs, CPUFREQ_POSTCHANGE);
-        mutex_unlock(&cbe_switch_mutex);
-
-        return rc;
-}
-
-static struct cpufreq_driver cbe_cpufreq_driver = {
-        .verify         = cbe_cpufreq_verify,
-        .target         = cbe_cpufreq_target,
-        .init           = cbe_cpufreq_cpu_init,
-        .exit           = cbe_cpufreq_cpu_exit,
-        .name           = "cbe-cpufreq",
-        .owner          = THIS_MODULE,
-        .flags          = CPUFREQ_CONST_LOOPS,
-};
-
-/*
- * module init and destoy
- */
-
-static int __init cbe_cpufreq_init(void)
-{
-        if (!machine_is(cell))
-                return -ENODEV;
-
-        return cpufreq_register_driver(&cbe_cpufreq_driver);
-}
-
-static void __exit cbe_cpufreq_exit(void)
-{
-        cpufreq_unregister_driver(&cbe_cpufreq_driver);
-}
-
-module_init(cbe_cpufreq_init);
-module_exit(cbe_cpufreq_exit);
-
-MODULE_LICENSE("GPL");
-MODULE_AUTHOR("Christian Krafft <krafft@de.ibm.com>");
diff --git a/arch/powerpc/platforms/cell/cbe_cpufreq.h b/arch/powerpc/platforms/cell/cbe_cpufreq.h
deleted file mode 100644
index c1d86bfa92ff..000000000000
--- a/arch/powerpc/platforms/cell/cbe_cpufreq.h
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * cbe_cpufreq.h
- *
- * This file contains the definitions used by the cbe_cpufreq driver.
- *
- * (C) Copyright IBM Deutschland Entwicklung GmbH 2005-2007
- *
- * Author: Christian Krafft <krafft@de.ibm.com>
- *
- */
-
-#include <linux/cpufreq.h>
-#include <linux/types.h>
-
-int cbe_cpufreq_set_pmode(int cpu, unsigned int pmode);
-int cbe_cpufreq_get_pmode(int cpu);
-
-int cbe_cpufreq_set_pmode_pmi(int cpu, unsigned int pmode);
-
-#if defined(CONFIG_CBE_CPUFREQ_PMI) || defined(CONFIG_CBE_CPUFREQ_PMI_MODULE)
-extern bool cbe_cpufreq_has_pmi;
-#else
-#define cbe_cpufreq_has_pmi (0)
-#endif
diff --git a/arch/powerpc/platforms/cell/cbe_cpufreq_pervasive.c b/arch/powerpc/platforms/cell/cbe_cpufreq_pervasive.c
deleted file mode 100644
index 20472e487b6f..000000000000
--- a/arch/powerpc/platforms/cell/cbe_cpufreq_pervasive.c
+++ /dev/null
@@ -1,115 +0,0 @@
-/*
- * pervasive backend for the cbe_cpufreq driver
- *
- * This driver makes use of the pervasive unit to
- * engage the desired frequency.
- *
- * (C) Copyright IBM Deutschland Entwicklung GmbH 2005-2007
- *
- * Author: Christian Krafft <krafft@de.ibm.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2, or (at your option)
- * any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
-#include <linux/io.h>
-#include <linux/kernel.h>
-#include <linux/time.h>
-#include <asm/machdep.h>
-#include <asm/hw_irq.h>
-#include <asm/cell-regs.h>
-
-#include "cbe_cpufreq.h"
-
-/* to write to MIC register */
-static u64 MIC_Slow_Fast_Timer_table[] = {
-        [0 ... 7] = 0x007fc00000000000ull,
-};
-
-/* more values for the MIC */
-static u64 MIC_Slow_Next_Timer_table[] = {
-        0x0000240000000000ull,
-        0x0000268000000000ull,
-        0x000029C000000000ull,
-        0x00002D0000000000ull,
-        0x0000300000000000ull,
-        0x0000334000000000ull,
-        0x000039C000000000ull,
-        0x00003FC000000000ull,
-};
-
-
-int cbe_cpufreq_set_pmode(int cpu, unsigned int pmode)
-{
-        struct cbe_pmd_regs __iomem *pmd_regs;
-        struct cbe_mic_tm_regs __iomem *mic_tm_regs;
-        unsigned long flags;
-        u64 value;
-#ifdef DEBUG
-        long time;
-#endif
-
-        local_irq_save(flags);
-
-        mic_tm_regs = cbe_get_cpu_mic_tm_regs(cpu);
-        pmd_regs = cbe_get_cpu_pmd_regs(cpu);
-
-#ifdef DEBUG
-        time = jiffies;
-#endif
-
-        out_be64(&mic_tm_regs->slow_fast_timer_0, MIC_Slow_Fast_Timer_table[pmode]);
-        out_be64(&mic_tm_regs->slow_fast_timer_1, MIC_Slow_Fast_Timer_table[pmode]);
-
-        out_be64(&mic_tm_regs->slow_next_timer_0, MIC_Slow_Next_Timer_table[pmode]);
-        out_be64(&mic_tm_regs->slow_next_timer_1, MIC_Slow_Next_Timer_table[pmode]);
-
-        value = in_be64(&pmd_regs->pmcr);
-        /* set bits to zero */
-        value &= 0xFFFFFFFFFFFFFFF8ull;
-        /* set bits to next pmode */
-        value |= pmode;
-
-        out_be64(&pmd_regs->pmcr, value);
-
-#ifdef DEBUG
-        /* wait until new pmode appears in status register */
-        value = in_be64(&pmd_regs->pmsr) & 0x07;
-        while (value != pmode) {
-                cpu_relax();
-                value = in_be64(&pmd_regs->pmsr) & 0x07;
-        }
-
-        time = jiffies  - time;
-        time = jiffies_to_msecs(time);
-        pr_debug("had to wait %lu ms for a transition using " \
-                 "pervasive unit\n", time);
-#endif
-        local_irq_restore(flags);
-
-        return 0;
-}
-
-
-int cbe_cpufreq_get_pmode(int cpu)
-{
-        int ret;
-        struct cbe_pmd_regs __iomem *pmd_regs;
-
-        pmd_regs = cbe_get_cpu_pmd_regs(cpu);
-        ret = in_be64(&pmd_regs->pmsr) & 0x07;
-
-        return ret;
-}
-
diff --git a/arch/powerpc/platforms/cell/cbe_cpufreq_pmi.c b/arch/powerpc/platforms/cell/cbe_cpufreq_pmi.c
deleted file mode 100644
index 60a07a4f9326..000000000000
--- a/arch/powerpc/platforms/cell/cbe_cpufreq_pmi.c
+++ /dev/null
@@ -1,156 +0,0 @@
-/*
- * pmi backend for the cbe_cpufreq driver
- *
- * (C) Copyright IBM Deutschland Entwicklung GmbH 2005-2007
- *
- * Author: Christian Krafft <krafft@de.ibm.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2, or (at your option)
- * any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
-#include <linux/kernel.h>
-#include <linux/types.h>
-#include <linux/timer.h>
-#include <linux/module.h>
-#include <linux/of_platform.h>
-
-#include <asm/processor.h>
-#include <asm/prom.h>
-#include <asm/pmi.h>
-#include <asm/cell-regs.h>
-
-#ifdef DEBUG
-#include <asm/time.h>
-#endif
-
-#include "cbe_cpufreq.h"
-
-static u8 pmi_slow_mode_limit[MAX_CBE];
-
-bool cbe_cpufreq_has_pmi = false;
-EXPORT_SYMBOL_GPL(cbe_cpufreq_has_pmi);
-
-/*
- * hardware specific functions
- */
-
-int cbe_cpufreq_set_pmode_pmi(int cpu, unsigned int pmode)
-{
-        int ret;
-        pmi_message_t pmi_msg;
-#ifdef DEBUG
-        long time;
-#endif
-        pmi_msg.type = PMI_TYPE_FREQ_CHANGE;
-        pmi_msg.data1 = cbe_cpu_to_node(cpu);
-        pmi_msg.data2 = pmode;
-
-#ifdef DEBUG
-        time = jiffies;
-#endif
-        pmi_send_message(pmi_msg);
-
-#ifdef DEBUG
-        time = jiffies  - time;
-        time = jiffies_to_msecs(time);
-        pr_debug("had to wait %lu ms for a transition using " \
-                 "PMI\n", time);
-#endif
-        ret = pmi_msg.data2;
-        pr_debug("PMI returned slow mode %d\n", ret);
-
-        return ret;
-}
-EXPORT_SYMBOL_GPL(cbe_cpufreq_set_pmode_pmi);
-
-
-static void cbe_cpufreq_handle_pmi(pmi_message_t pmi_msg)
-{
-        u8 node, slow_mode;
-
-        BUG_ON(pmi_msg.type != PMI_TYPE_FREQ_CHANGE);
-
-        node = pmi_msg.data1;
-        slow_mode = pmi_msg.data2;
-
-        pmi_slow_mode_limit[node] = slow_mode;
-
-        pr_debug("cbe_handle_pmi: node: %d max_freq: %d\n", node, slow_mode);
-}
-
-static int pmi_notifier(struct notifier_block *nb,
-                                       unsigned long event, void *data)
-{
-        struct cpufreq_policy *policy = data;
-        struct cpufreq_frequency_table *cbe_freqs;
-        u8 node;
-
-        /* Should this really be called for CPUFREQ_ADJUST, CPUFREQ_INCOMPATIBLE
-         * and CPUFREQ_NOTIFY policy events?)
-         */
-        if (event == CPUFREQ_START)
-                return 0;
-
-        cbe_freqs = cpufreq_frequency_get_table(policy->cpu);
-        node = cbe_cpu_to_node(policy->cpu);
-
-        pr_debug("got notified, event=%lu, node=%u\n", event, node);
-
-        if (pmi_slow_mode_limit[node] != 0) {
-                pr_debug("limiting node %d to slow mode %d\n",
-                         node, pmi_slow_mode_limit[node]);
-
-                cpufreq_verify_within_limits(policy, 0,
-
-                        cbe_freqs[pmi_slow_mode_limit[node]].frequency);
-        }
-
-        return 0;
-}
-
-static struct notifier_block pmi_notifier_block = {
-        .notifier_call = pmi_notifier,
-};
-
-static struct pmi_handler cbe_pmi_handler = {
-        .type                   = PMI_TYPE_FREQ_CHANGE,
-        .handle_pmi_message     = cbe_cpufreq_handle_pmi,
-};
-
-
-
-static int __init cbe_cpufreq_pmi_init(void)
-{
-        cbe_cpufreq_has_pmi = pmi_register_handler(&cbe_pmi_handler) == 0;
-
-        if (!cbe_cpufreq_has_pmi)
-                return -ENODEV;
-
-        cpufreq_register_notifier(&pmi_notifier_block, CPUFREQ_POLICY_NOTIFIER);
-
-        return 0;
-}
-
-static void __exit cbe_cpufreq_pmi_exit(void)
-{
-        cpufreq_unregister_notifier(&pmi_notifier_block, CPUFREQ_POLICY_NOTIFIER);
-        pmi_unregister_handler(&cbe_pmi_handler);
-}
-
-module_init(cbe_cpufreq_pmi_init);
-module_exit(cbe_cpufreq_pmi_exit);
-
-MODULE_LICENSE("GPL");
-MODULE_AUTHOR("Christian Krafft <krafft@de.ibm.com>");
diff --git a/arch/powerpc/platforms/pasemi/cpufreq.c b/arch/powerpc/platforms/pasemi/cpufreq.c
index 890f30e70f98..be1e7958909e 100644
--- a/arch/powerpc/platforms/pasemi/cpufreq.c
+++ b/arch/powerpc/platforms/pasemi/cpufreq.c
@@ -273,10 +273,9 @@ static int pas_cpufreq_target(struct cpufreq_policy *policy,
 
         freqs.old = policy->cur;
         freqs.new = pas_freqs[pas_astate_new].frequency;
-        freqs.cpu = policy->cpu;
 
         mutex_lock(&pas_switch_mutex);
-        cpufreq_notify_transition(&freqs, CPUFREQ_PRECHANGE);
+        cpufreq_notify_transition(policy, &freqs, CPUFREQ_PRECHANGE);
 
         pr_debug("setting frequency for cpu %d to %d kHz, 1/%d of max frequency\n",
                  policy->cpu,
@@ -288,7 +287,7 @@ static int pas_cpufreq_target(struct cpufreq_policy *policy,
         for_each_online_cpu(i)
                 set_astate(i, pas_astate_new);
 
-        cpufreq_notify_transition(&freqs, CPUFREQ_POSTCHANGE);
+        cpufreq_notify_transition(policy, &freqs, CPUFREQ_POSTCHANGE);
         mutex_unlock(&pas_switch_mutex);
 
         ppc_proc_freq = freqs.new * 1000ul;
diff --git a/arch/powerpc/platforms/powermac/cpufreq_32.c b/arch/powerpc/platforms/powermac/cpufreq_32.c
index 311b804353b1..3104fad82480 100644
--- a/arch/powerpc/platforms/powermac/cpufreq_32.c
+++ b/arch/powerpc/platforms/powermac/cpufreq_32.c
@@ -335,7 +335,8 @@ static int pmu_set_cpu_speed(int low_speed)
         return 0;
 }
 
-static int do_set_cpu_speed(int speed_mode, int notify)
+static int do_set_cpu_speed(struct cpufreq_policy *policy, int speed_mode,
+                int notify)
 {
         struct cpufreq_freqs freqs;
         unsigned long l3cr;
@@ -343,13 +344,12 @@ static int do_set_cpu_speed(int speed_mode, int notify)
 
         freqs.old = cur_freq;
         freqs.new = (speed_mode == CPUFREQ_HIGH) ? hi_freq : low_freq;
-        freqs.cpu = smp_processor_id();
 
         if (freqs.old == freqs.new)
                 return 0;
 
         if (notify)
-                cpufreq_notify_transition(&freqs, CPUFREQ_PRECHANGE);
+                cpufreq_notify_transition(policy, &freqs, CPUFREQ_PRECHANGE);
         if (speed_mode == CPUFREQ_LOW &&
             cpu_has_feature(CPU_FTR_L3CR)) {
                 l3cr = _get_L3CR();
@@ -366,7 +366,7 @@ static int do_set_cpu_speed(int speed_mode, int notify)
                         _set_L3CR(prev_l3cr);
         }
         if (notify)
-                cpufreq_notify_transition(&freqs, CPUFREQ_POSTCHANGE);
+                cpufreq_notify_transition(policy, &freqs, CPUFREQ_POSTCHANGE);
         cur_freq = (speed_mode == CPUFREQ_HIGH) ? hi_freq : low_freq;
 
         return 0;
@@ -393,7 +393,7 @@ static int pmac_cpufreq_target(	struct cpufreq_policy *policy,
                         target_freq, relation, &newstate))
                 return -EINVAL;
 
-        rc = do_set_cpu_speed(newstate, 1);
+        rc = do_set_cpu_speed(policy, newstate, 1);
 
         ppc_proc_freq = cur_freq * 1000ul;
         return rc;
@@ -442,7 +442,7 @@ static int pmac_cpufreq_suspend(struct cpufreq_policy *policy)
         no_schedule = 1;
         sleep_freq = cur_freq;
         if (cur_freq == low_freq && !is_pmu_based)
-                do_set_cpu_speed(CPUFREQ_HIGH, 0);
+                do_set_cpu_speed(policy, CPUFREQ_HIGH, 0);
         return 0;
 }
 
@@ -458,7 +458,7 @@ static int pmac_cpufreq_resume(struct cpufreq_policy *policy)
          * is that we force a switch to whatever it was, which is
          * probably high speed due to our suspend() routine
          */
-        do_set_cpu_speed(sleep_freq == low_freq ?
+        do_set_cpu_speed(policy, sleep_freq == low_freq ?
                          CPUFREQ_LOW : CPUFREQ_HIGH, 0);
 
         ppc_proc_freq = cur_freq * 1000ul;
diff --git a/arch/powerpc/platforms/powermac/cpufreq_64.c b/arch/powerpc/platforms/powermac/cpufreq_64.c
index 9650c6029c82..7ba423431cfe 100644
--- a/arch/powerpc/platforms/powermac/cpufreq_64.c
+++ b/arch/powerpc/platforms/powermac/cpufreq_64.c
@@ -339,11 +339,10 @@ static int g5_cpufreq_target(struct cpufreq_policy *policy,
 
         freqs.old = g5_cpu_freqs[g5_pmode_cur].frequency;
         freqs.new = g5_cpu_freqs[newstate].frequency;
-        freqs.cpu = 0;
 
-        cpufreq_notify_transition(&freqs, CPUFREQ_PRECHANGE);
+        cpufreq_notify_transition(policy, &freqs, CPUFREQ_PRECHANGE);
         rc = g5_switch_freq(newstate);
-        cpufreq_notify_transition(&freqs, CPUFREQ_POSTCHANGE);
+        cpufreq_notify_transition(policy, &freqs, CPUFREQ_POSTCHANGE);
 
         mutex_unlock(&g5_switch_mutex);
 
diff --git a/arch/powerpc/platforms/pseries/hotplug-memory.c b/arch/powerpc/platforms/pseries/hotplug-memory.c
index 2372c609fa2b..9a432de363b8 100644
--- a/arch/powerpc/platforms/pseries/hotplug-memory.c
+++ b/arch/powerpc/platforms/pseries/hotplug-memory.c
@@ -72,6 +72,7 @@ unsigned long memory_block_size_bytes(void)
         return get_memblock_size();
 }
 
+#ifdef CONFIG_MEMORY_HOTREMOVE
 static int pseries_remove_memblock(unsigned long base, unsigned int memblock_size)
 {
         unsigned long start, start_pfn;
@@ -153,6 +154,17 @@ static int pseries_remove_memory(struct device_node *np)
         ret = pseries_remove_memblock(base, lmb_size);
         return ret;
 }
+#else
+static inline int pseries_remove_memblock(unsigned long base,
+                                          unsigned int memblock_size)
+{
+        return -EOPNOTSUPP;
+}
+static inline int pseries_remove_memory(struct device_node *np)
+{
+        return -EOPNOTSUPP;
+}
+#endif /* CONFIG_MEMORY_HOTREMOVE */
 
 static int pseries_add_memory(struct device_node *np)
 {
diff --git a/arch/powerpc/platforms/pseries/processor_idle.c b/arch/powerpc/platforms/pseries/processor_idle.c
index 4d806b419606..4644efa06941 100644
--- a/arch/powerpc/platforms/pseries/processor_idle.c
+++ b/arch/powerpc/platforms/pseries/processor_idle.c
@@ -23,8 +23,8 @@
 #include "pseries.h"
 
 struct cpuidle_driver pseries_idle_driver = {
-        .name =         "pseries_idle",
-        .owner =        THIS_MODULE,
+        .name             = "pseries_idle",
+        .owner            = THIS_MODULE,
 };
 
 #define MAX_IDLE_STATE_COUNT    2
@@ -33,10 +33,8 @@ static int max_idle_state = MAX_IDLE_STATE_COUNT - 1;
 static struct cpuidle_device __percpu *pseries_cpuidle_devices;
 static struct cpuidle_state *cpuidle_state_table;
 
-static inline void idle_loop_prolog(unsigned long *in_purr, ktime_t *kt_before)
+static inline void idle_loop_prolog(unsigned long *in_purr)
 {
-
-        *kt_before = ktime_get();
         *in_purr = mfspr(SPRN_PURR);
         /*
          * Indicate to the HV that we are idle. Now would be
@@ -45,12 +43,10 @@ static inline void idle_loop_prolog(unsigned long *in_purr, ktime_t *kt_before)
         get_lppaca()->idle = 1;
 }
 
-static inline  s64 idle_loop_epilog(unsigned long in_purr, ktime_t kt_before)
+static inline void idle_loop_epilog(unsigned long in_purr)
 {
         get_lppaca()->wait_state_cycles += mfspr(SPRN_PURR) - in_purr;
         get_lppaca()->idle = 0;
-
-        return ktime_to_us(ktime_sub(ktime_get(), kt_before));
 }
 
 static int snooze_loop(struct cpuidle_device *dev,
@@ -58,10 +54,9 @@ static int snooze_loop(struct cpuidle_device *dev,
                         int index)
 {
         unsigned long in_purr;
-        ktime_t kt_before;
         int cpu = dev->cpu;
 
-        idle_loop_prolog(&in_purr, &kt_before);
+        idle_loop_prolog(&in_purr);
         local_irq_enable();
         set_thread_flag(TIF_POLLING_NRFLAG);
 
@@ -75,8 +70,8 @@ static int snooze_loop(struct cpuidle_device *dev,
         clear_thread_flag(TIF_POLLING_NRFLAG);
         smp_mb();
 
-        dev->last_residency =
-                (int)idle_loop_epilog(in_purr, kt_before);
+        idle_loop_epilog(in_purr);
+
         return index;
 }
 
@@ -102,9 +97,8 @@ static int dedicated_cede_loop(struct cpuidle_device *dev,
                                 int index)
 {
         unsigned long in_purr;
-        ktime_t kt_before;
 
-        idle_loop_prolog(&in_purr, &kt_before);
+        idle_loop_prolog(&in_purr);
         get_lppaca()->donate_dedicated_cpu = 1;
 
         ppc64_runlatch_off();
@@ -112,8 +106,9 @@ static int dedicated_cede_loop(struct cpuidle_device *dev,
         check_and_cede_processor();
 
         get_lppaca()->donate_dedicated_cpu = 0;
-        dev->last_residency =
-                (int)idle_loop_epilog(in_purr, kt_before);
+
+        idle_loop_epilog(in_purr);
+
         return index;
 }
 
@@ -122,9 +117,8 @@ static int shared_cede_loop(struct cpuidle_device *dev,
                         int index)
 {
         unsigned long in_purr;
-        ktime_t kt_before;
 
-        idle_loop_prolog(&in_purr, &kt_before);
+        idle_loop_prolog(&in_purr);
 
         /*
          * Yield the processor to the hypervisor.  We return if
@@ -135,8 +129,8 @@ static int shared_cede_loop(struct cpuidle_device *dev,
          */
         check_and_cede_processor();
 
-        dev->last_residency =
-                (int)idle_loop_epilog(in_purr, kt_before);
+        idle_loop_epilog(in_purr);
+
         return index;
 }
 
diff --git a/arch/powerpc/xmon/xmon.c b/arch/powerpc/xmon/xmon.c
index 13f85defabed..3e34cd224b7c 100644
--- a/arch/powerpc/xmon/xmon.c
+++ b/arch/powerpc/xmon/xmon.c
@@ -2947,7 +2947,7 @@ static void sysrq_handle_xmon(int key)
 
 static struct sysrq_key_op sysrq_xmon_op = {
         .handler =      sysrq_handle_xmon,
-        .help_msg =     "Xmon",
+        .help_msg =     "xmon(x)",
         .action_msg =   "Entering xmon",
 };
 
diff --git a/arch/s390/Kconfig b/arch/s390/Kconfig
index eb8fb629f00b..2c9789da0e24 100644
--- a/arch/s390/Kconfig
+++ b/arch/s390/Kconfig
@@ -91,6 +91,7 @@ config S390
         select ARCH_INLINE_WRITE_UNLOCK_BH
         select ARCH_INLINE_WRITE_UNLOCK_IRQ
         select ARCH_INLINE_WRITE_UNLOCK_IRQRESTORE
+        select ARCH_HAS_DEBUG_STRICT_USER_COPY_CHECKS
         select ARCH_SAVE_PAGE_KEYS if HIBERNATION
         select ARCH_WANT_IPC_PARSE_VERSION
         select BUILDTIME_EXTABLE_SORT
@@ -131,7 +132,6 @@ config S390
         select HAVE_PERF_EVENTS
         select HAVE_REGS_AND_STACK_ACCESS_API
         select HAVE_SYSCALL_TRACEPOINTS
-        select HAVE_SYSCALL_WRAPPERS
         select HAVE_UID16 if 32BIT
         select HAVE_VIRT_CPU_ACCOUNTING
         select VIRT_TO_BUS
@@ -375,19 +375,6 @@ config PACK_STACK
 
           Say Y if you are unsure.
 
-config SMALL_STACK
-        def_bool n
-        prompt "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. 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
         def_bool y
         prompt "Detect kernel stack overflow"
diff --git a/arch/s390/Kconfig.debug b/arch/s390/Kconfig.debug
index fc32a2df4974..c56878e1245f 100644
--- a/arch/s390/Kconfig.debug
+++ b/arch/s390/Kconfig.debug
@@ -17,20 +17,6 @@ config STRICT_DEVMEM
 
           If you are unsure, say Y.
 
-config DEBUG_STRICT_USER_COPY_CHECKS
-        def_bool n
-        prompt "Strict user copy size checks"
-        ---help---
-          Enabling this option turns a certain set of sanity checks for user
-          copy operations into compile time warnings.
-
-          The copy_from_user() etc checks are there to help test if there
-          are sufficient security checks on the length argument of
-          the copy operation, by having gcc prove that the argument is
-          within bounds.
-
-          If unsure, or if you run an older (pre 4.4) gcc, say N.
-
 config S390_PTDUMP
         bool "Export kernel pagetable layout to userspace via debugfs"
         depends on DEBUG_KERNEL
diff --git a/arch/s390/Makefile b/arch/s390/Makefile
index 7e3ce78d4290..a7d68a467ce8 100644
--- a/arch/s390/Makefile
+++ b/arch/s390/Makefile
@@ -55,22 +55,12 @@ cflags-$(CONFIG_FRAME_POINTER) += -fno-optimize-sibling-calls
 ifeq ($(call cc-option-yn,-mkernel-backchain),y)
 cflags-$(CONFIG_PACK_STACK)  += -mkernel-backchain -D__PACK_STACK
 aflags-$(CONFIG_PACK_STACK)  += -D__PACK_STACK
-cflags-$(CONFIG_SMALL_STACK) += -D__SMALL_STACK
-aflags-$(CONFIG_SMALL_STACK) += -D__SMALL_STACK
-ifdef CONFIG_SMALL_STACK
-STACK_SIZE := $(shell echo $$(($(STACK_SIZE)/2)) )
-endif
 endif
 
 # new style option for packed stacks
 ifeq ($(call cc-option-yn,-mpacked-stack),y)
 cflags-$(CONFIG_PACK_STACK)  += -mpacked-stack -D__PACK_STACK
 aflags-$(CONFIG_PACK_STACK)  += -D__PACK_STACK
-cflags-$(CONFIG_SMALL_STACK) += -D__SMALL_STACK
-aflags-$(CONFIG_SMALL_STACK) += -D__SMALL_STACK
-ifdef CONFIG_SMALL_STACK
-STACK_SIZE := $(shell echo $$(($(STACK_SIZE)/2)) )
-endif
 endif
 
 ifeq ($(call cc-option-yn,-mstack-size=8192 -mstack-guard=128),y)
diff --git a/arch/s390/hypfs/hypfs_dbfs.c b/arch/s390/hypfs/hypfs_dbfs.c
index 9fd4a40c6752..bb5dd496614f 100644
--- a/arch/s390/hypfs/hypfs_dbfs.c
+++ b/arch/s390/hypfs/hypfs_dbfs.c
@@ -105,9 +105,7 @@ void hypfs_dbfs_remove_file(struct hypfs_dbfs_file *df)
 int hypfs_dbfs_init(void)
 {
         dbfs_dir = debugfs_create_dir("s390_hypfs", NULL);
-        if (IS_ERR(dbfs_dir))
-                return PTR_ERR(dbfs_dir);
-        return 0;
+        return PTR_RET(dbfs_dir);
 }
 
 void hypfs_dbfs_exit(void)
diff --git a/arch/s390/include/asm/bitops.h b/arch/s390/include/asm/bitops.h
index 15422933c60b..4d8604e311f3 100644
--- a/arch/s390/include/asm/bitops.h
+++ b/arch/s390/include/asm/bitops.h
@@ -61,8 +61,6 @@ extern const char _sb_findmap[];
 
 #ifndef CONFIG_64BIT
 
-#define __BITOPS_ALIGN          3
-#define __BITOPS_WORDSIZE       32
 #define __BITOPS_OR             "or"
 #define __BITOPS_AND            "nr"
 #define __BITOPS_XOR            "xr"
@@ -81,8 +79,6 @@ extern const char _sb_findmap[];
 
 #else /* CONFIG_64BIT */
 
-#define __BITOPS_ALIGN          7
-#define __BITOPS_WORDSIZE       64
 #define __BITOPS_OR             "ogr"
 #define __BITOPS_AND            "ngr"
 #define __BITOPS_XOR            "xgr"
@@ -101,8 +97,7 @@ extern const char _sb_findmap[];
 
 #endif /* CONFIG_64BIT */
 
-#define __BITOPS_WORDS(bits) (((bits)+__BITOPS_WORDSIZE-1)/__BITOPS_WORDSIZE)
-#define __BITOPS_BARRIER() asm volatile("" : : : "memory")
+#define __BITOPS_WORDS(bits) (((bits) + BITS_PER_LONG - 1) / BITS_PER_LONG)
 
 #ifdef CONFIG_SMP
 /*
@@ -114,9 +109,9 @@ static inline void set_bit_cs(unsigned long nr, volatile unsigned long *ptr)
 
         addr = (unsigned long) ptr;
         /* calculate address for CS */
-        addr += (nr ^ (nr & (__BITOPS_WORDSIZE - 1))) >> 3;
+        addr += (nr ^ (nr & (BITS_PER_LONG - 1))) >> 3;
         /* make OR mask */
-        mask = 1UL << (nr & (__BITOPS_WORDSIZE - 1));
+        mask = 1UL << (nr & (BITS_PER_LONG - 1));
         /* Do the atomic update. */
         __BITOPS_LOOP(old, new, addr, mask, __BITOPS_OR);
 }
@@ -130,9 +125,9 @@ static inline void clear_bit_cs(unsigned long nr, volatile unsigned long *ptr)
 
         addr = (unsigned long) ptr;
         /* calculate address for CS */
-        addr += (nr ^ (nr & (__BITOPS_WORDSIZE - 1))) >> 3;
+        addr += (nr ^ (nr & (BITS_PER_LONG - 1))) >> 3;
         /* make AND mask */
-        mask = ~(1UL << (nr & (__BITOPS_WORDSIZE - 1)));
+        mask = ~(1UL << (nr & (BITS_PER_LONG - 1)));
         /* Do the atomic update. */
         __BITOPS_LOOP(old, new, addr, mask, __BITOPS_AND);
 }
@@ -146,9 +141,9 @@ static inline void change_bit_cs(unsigned long nr, volatile unsigned long *ptr)
 
         addr = (unsigned long) ptr;
         /* calculate address for CS */
-        addr += (nr ^ (nr & (__BITOPS_WORDSIZE - 1))) >> 3;
+        addr += (nr ^ (nr & (BITS_PER_LONG - 1))) >> 3;
         /* make XOR mask */
-        mask = 1UL << (nr & (__BITOPS_WORDSIZE - 1));
+        mask = 1UL << (nr & (BITS_PER_LONG - 1));
         /* Do the atomic update. */
         __BITOPS_LOOP(old, new, addr, mask, __BITOPS_XOR);
 }
@@ -163,12 +158,12 @@ test_and_set_bit_cs(unsigned long nr, volatile unsigned long *ptr)
 
         addr = (unsigned long) ptr;
         /* calculate address for CS */
-        addr += (nr ^ (nr & (__BITOPS_WORDSIZE - 1))) >> 3;
+        addr += (nr ^ (nr & (BITS_PER_LONG - 1))) >> 3;
         /* make OR/test mask */
-        mask = 1UL << (nr & (__BITOPS_WORDSIZE - 1));
+        mask = 1UL << (nr & (BITS_PER_LONG - 1));
         /* Do the atomic update. */
         __BITOPS_LOOP(old, new, addr, mask, __BITOPS_OR);
-        __BITOPS_BARRIER();
+        barrier();
         return (old & mask) != 0;
 }
 
@@ -182,12 +177,12 @@ test_and_clear_bit_cs(unsigned long nr, volatile unsigned long *ptr)
 
         addr = (unsigned long) ptr;
         /* calculate address for CS */
-        addr += (nr ^ (nr & (__BITOPS_WORDSIZE - 1))) >> 3;
+        addr += (nr ^ (nr & (BITS_PER_LONG - 1))) >> 3;
         /* make AND/test mask */
-        mask = ~(1UL << (nr & (__BITOPS_WORDSIZE - 1)));
+        mask = ~(1UL << (nr & (BITS_PER_LONG - 1)));
         /* Do the atomic update. */
         __BITOPS_LOOP(old, new, addr, mask, __BITOPS_AND);
-        __BITOPS_BARRIER();
+        barrier();
         return (old ^ new) != 0;
 }
 
@@ -201,12 +196,12 @@ test_and_change_bit_cs(unsigned long nr, volatile unsigned long *ptr)
 
         addr = (unsigned long) ptr;
         /* calculate address for CS */
-        addr += (nr ^ (nr & (__BITOPS_WORDSIZE - 1))) >> 3;
+        addr += (nr ^ (nr & (BITS_PER_LONG - 1))) >> 3;
         /* make XOR/test mask */
-        mask = 1UL << (nr & (__BITOPS_WORDSIZE - 1));
+        mask = 1UL << (nr & (BITS_PER_LONG - 1));
         /* Do the atomic update. */
         __BITOPS_LOOP(old, new, addr, mask, __BITOPS_XOR);
-        __BITOPS_BARRIER();
+        barrier();
         return (old & mask) != 0;
 }
 #endif /* CONFIG_SMP */
@@ -218,7 +213,7 @@ static inline void __set_bit(unsigned long nr, volatile unsigned long *ptr)
 {
         unsigned long addr;
 
-        addr = (unsigned long) ptr + ((nr ^ (__BITOPS_WORDSIZE - 8)) >> 3);
+        addr = (unsigned long) ptr + ((nr ^ (BITS_PER_LONG - 8)) >> 3);
         asm volatile(
                 "       oc      %O0(1,%R0),%1"
                 : "=Q" (*(char *) addr) : "Q" (_oi_bitmap[nr & 7]) : "cc" );
@@ -229,7 +224,7 @@ __constant_set_bit(const unsigned long nr, volatile unsigned long *ptr)
 {
         unsigned long addr;
 
-        addr = ((unsigned long) ptr) + ((nr ^ (__BITOPS_WORDSIZE - 8)) >> 3);
+        addr = ((unsigned long) ptr) + ((nr ^ (BITS_PER_LONG - 8)) >> 3);
         *(unsigned char *) addr |= 1 << (nr & 7);
 }
 
@@ -246,7 +241,7 @@ __clear_bit(unsigned long nr, volatile unsigned long *ptr)
 {
         unsigned long addr;
 
-        addr = (unsigned long) ptr + ((nr ^ (__BITOPS_WORDSIZE - 8)) >> 3);
+        addr = (unsigned long) ptr + ((nr ^ (BITS_PER_LONG - 8)) >> 3);
         asm volatile(
                 "       nc      %O0(1,%R0),%1"
                 : "=Q" (*(char *) addr) : "Q" (_ni_bitmap[nr & 7]) : "cc" );
@@ -257,7 +252,7 @@ __constant_clear_bit(const unsigned long nr, volatile unsigned long *ptr)
 {
         unsigned long addr;
 
-        addr = ((unsigned long) ptr) + ((nr ^ (__BITOPS_WORDSIZE - 8)) >> 3);
+        addr = ((unsigned long) ptr) + ((nr ^ (BITS_PER_LONG - 8)) >> 3);
         *(unsigned char *) addr &= ~(1 << (nr & 7));
 }
 
@@ -273,7 +268,7 @@ static inline void __change_bit(unsigned long nr, volatile unsigned long *ptr)
 {
         unsigned long addr;
 
-        addr = (unsigned long) ptr + ((nr ^ (__BITOPS_WORDSIZE - 8)) >> 3);
+        addr = (unsigned long) ptr + ((nr ^ (BITS_PER_LONG - 8)) >> 3);
         asm volatile(
                 "       xc      %O0(1,%R0),%1"
                 : "=Q" (*(char *) addr) : "Q" (_oi_bitmap[nr & 7]) : "cc" );
@@ -284,7 +279,7 @@ __constant_change_bit(const unsigned long nr, volatile unsigned long *ptr)
 {
         unsigned long addr;
 
-        addr = ((unsigned long) ptr) + ((nr ^ (__BITOPS_WORDSIZE - 8)) >> 3);
+        addr = ((unsigned long) ptr) + ((nr ^ (BITS_PER_LONG - 8)) >> 3);
         *(unsigned char *) addr ^= 1 << (nr & 7);
 }
 
@@ -302,7 +297,7 @@ test_and_set_bit_simple(unsigned long nr, volatile unsigned long *ptr)
         unsigned long addr;
         unsigned char ch;
 
-        addr = (unsigned long) ptr + ((nr ^ (__BITOPS_WORDSIZE - 8)) >> 3);
+        addr = (unsigned long) ptr + ((nr ^ (BITS_PER_LONG - 8)) >> 3);
         ch = *(unsigned char *) addr;
         asm volatile(
                 "       oc      %O0(1,%R0),%1"
@@ -321,7 +316,7 @@ test_and_clear_bit_simple(unsigned long nr, volatile unsigned long *ptr)
         unsigned long addr;
         unsigned char ch;
 
-        addr = (unsigned long) ptr + ((nr ^ (__BITOPS_WORDSIZE - 8)) >> 3);
+        addr = (unsigned long) ptr + ((nr ^ (BITS_PER_LONG - 8)) >> 3);
         ch = *(unsigned char *) addr;
         asm volatile(
                 "       nc      %O0(1,%R0),%1"
@@ -340,7 +335,7 @@ test_and_change_bit_simple(unsigned long nr, volatile unsigned long *ptr)
         unsigned long addr;
         unsigned char ch;
 
-        addr = (unsigned long) ptr + ((nr ^ (__BITOPS_WORDSIZE - 8)) >> 3);
+        addr = (unsigned long) ptr + ((nr ^ (BITS_PER_LONG - 8)) >> 3);
         ch = *(unsigned char *) addr;
         asm volatile(
                 "       xc      %O0(1,%R0),%1"
@@ -376,7 +371,7 @@ static inline int __test_bit(unsigned long nr, const volatile unsigned long *ptr
         unsigned long addr;
         unsigned char ch;
 
-        addr = (unsigned long) ptr + ((nr ^ (__BITOPS_WORDSIZE - 8)) >> 3);
+        addr = (unsigned long) ptr + ((nr ^ (BITS_PER_LONG - 8)) >> 3);
         ch = *(volatile unsigned char *) addr;
         return (ch >> (nr & 7)) & 1;
 }
@@ -384,7 +379,7 @@ static inline int __test_bit(unsigned long nr, const volatile unsigned long *ptr
 static inline int 
 __constant_test_bit(unsigned long nr, const volatile unsigned long *addr) {
     return (((volatile char *) addr)
-            [(nr^(__BITOPS_WORDSIZE-8))>>3] & (1<<(nr&7))) != 0;
+            [(nr^(BITS_PER_LONG-8))>>3] & (1<<(nr&7))) != 0;
 }
 
 #define test_bit(nr,addr) \
@@ -693,18 +688,18 @@ static inline int find_next_bit_left(const unsigned long *addr,
 
         if (offset >= size)
                 return size;
-        bit = offset & (__BITOPS_WORDSIZE - 1);
+        bit = offset & (BITS_PER_LONG - 1);
         offset -= bit;
         size -= offset;
-        p = addr + offset / __BITOPS_WORDSIZE;
+        p = addr + offset / BITS_PER_LONG;
         if (bit) {
                 set = __flo_word(0, *p & (~0UL << bit));
                 if (set >= size)
                         return size + offset;
-                if (set < __BITOPS_WORDSIZE)
+                if (set < BITS_PER_LONG)
                         return set + offset;
-                offset += __BITOPS_WORDSIZE;
-                size -= __BITOPS_WORDSIZE;
+                offset += BITS_PER_LONG;
+                size -= BITS_PER_LONG;
                 p++;
         }
         return offset + find_first_bit_left(p, size);
@@ -736,22 +731,22 @@ static inline int find_next_zero_bit (const unsigned long * addr,
 
         if (offset >= size)
                 return size;
-        bit = offset & (__BITOPS_WORDSIZE - 1);
+        bit = offset & (BITS_PER_LONG - 1);
         offset -= bit;
         size -= offset;
-        p = addr + offset / __BITOPS_WORDSIZE;
+        p = addr + offset / BITS_PER_LONG;
         if (bit) {
                 /*
-                 * __ffz_word returns __BITOPS_WORDSIZE
+                 * __ffz_word returns BITS_PER_LONG
                  * if no zero bit is present in the word.
                  */
                 set = __ffz_word(bit, *p >> bit);
                 if (set >= size)
                         return size + offset;
-                if (set < __BITOPS_WORDSIZE)
+                if (set < BITS_PER_LONG)
                         return set + offset;
-                offset += __BITOPS_WORDSIZE;
-                size -= __BITOPS_WORDSIZE;
+                offset += BITS_PER_LONG;
+                size -= BITS_PER_LONG;
                 p++;
         }
         return offset + find_first_zero_bit(p, size);
@@ -773,22 +768,22 @@ static inline int find_next_bit (const unsigned long * addr,
 
         if (offset >= size)
                 return size;
-        bit = offset & (__BITOPS_WORDSIZE - 1);
+        bit = offset & (BITS_PER_LONG - 1);
         offset -= bit;
         size -= offset;
-        p = addr + offset / __BITOPS_WORDSIZE;
+        p = addr + offset / BITS_PER_LONG;
         if (bit) {
                 /*
-                 * __ffs_word returns __BITOPS_WORDSIZE
+                 * __ffs_word returns BITS_PER_LONG
                  * if no one bit is present in the word.
                  */
                 set = __ffs_word(0, *p & (~0UL << bit));
                 if (set >= size)
                         return size + offset;
-                if (set < __BITOPS_WORDSIZE)
+                if (set < BITS_PER_LONG)
                         return set + offset;
-                offset += __BITOPS_WORDSIZE;
-                size -= __BITOPS_WORDSIZE;
+                offset += BITS_PER_LONG;
+                size -= BITS_PER_LONG;
                 p++;
         }
         return offset + find_first_bit(p, size);
@@ -843,22 +838,22 @@ static inline int find_next_zero_bit_le(void *vaddr, unsigned long size,
 
         if (offset >= size)
                 return size;
-        bit = offset & (__BITOPS_WORDSIZE - 1);
+        bit = offset & (BITS_PER_LONG - 1);
         offset -= bit;
         size -= offset;
-        p = addr + offset / __BITOPS_WORDSIZE;
+        p = addr + offset / BITS_PER_LONG;
         if (bit) {
                 /*
-                 * s390 version of ffz returns __BITOPS_WORDSIZE
+                 * s390 version of ffz returns BITS_PER_LONG
                  * if no zero bit is present in the word.
                  */
                 set = __ffz_word(bit, __load_ulong_le(p, 0) >> bit);
                 if (set >= size)
                         return size + offset;
-                if (set < __BITOPS_WORDSIZE)
+                if (set < BITS_PER_LONG)
                         return set + offset;
-                offset += __BITOPS_WORDSIZE;
-                size -= __BITOPS_WORDSIZE;
+                offset += BITS_PER_LONG;
+                size -= BITS_PER_LONG;
                 p++;
         }
         return offset + find_first_zero_bit_le(p, size);
@@ -885,22 +880,22 @@ static inline int find_next_bit_le(void *vaddr, unsigned long size,
 
         if (offset >= size)
                 return size;
-        bit = offset & (__BITOPS_WORDSIZE - 1);
+        bit = offset & (BITS_PER_LONG - 1);
         offset -= bit;
         size -= offset;
-        p = addr + offset / __BITOPS_WORDSIZE;
+        p = addr + offset / BITS_PER_LONG;
         if (bit) {
                 /*
-                 * s390 version of ffz returns __BITOPS_WORDSIZE
+                 * s390 version of ffz returns BITS_PER_LONG
                  * if no zero bit is present in the word.
                  */
                 set = __ffs_word(0, __load_ulong_le(p, 0) & (~0UL << bit));
                 if (set >= size)
                         return size + offset;
-                if (set < __BITOPS_WORDSIZE)
+                if (set < BITS_PER_LONG)
                         return set + offset;
-                offset += __BITOPS_WORDSIZE;
-                size -= __BITOPS_WORDSIZE;
+                offset += BITS_PER_LONG;
+                size -= BITS_PER_LONG;
                 p++;
         }
         return offset + find_first_bit_le(p, size);
diff --git a/arch/s390/include/asm/ccwdev.h b/arch/s390/include/asm/ccwdev.h
index e6061617a50b..f201af8be580 100644
--- a/arch/s390/include/asm/ccwdev.h
+++ b/arch/s390/include/asm/ccwdev.h
@@ -220,7 +220,8 @@ extern void ccw_device_get_id(struct ccw_device *, struct ccw_dev_id *);
 #define to_ccwdrv(n) container_of(n, struct ccw_driver, driver)
 
 extern struct ccw_device *ccw_device_probe_console(void);
-extern int ccw_device_force_console(void);
+extern void ccw_device_wait_idle(struct ccw_device *);
+extern int ccw_device_force_console(struct ccw_device *);
 
 int ccw_device_siosl(struct ccw_device *);
 
diff --git a/arch/s390/include/asm/cio.h b/arch/s390/include/asm/cio.h
index ad2b924167d7..ffb898961c8d 100644
--- a/arch/s390/include/asm/cio.h
+++ b/arch/s390/include/asm/cio.h
@@ -296,8 +296,6 @@ static inline int ccw_dev_id_is_equal(struct ccw_dev_id *dev_id1,
         return 0;
 }
 
-extern void wait_cons_dev(void);
-
 extern void css_schedule_reprobe(void);
 
 extern void reipl_ccw_dev(struct ccw_dev_id *id);
diff --git a/arch/s390/include/asm/compat.h b/arch/s390/include/asm/compat.h
index f8c6df6cd1f0..c1e7c646727c 100644
--- a/arch/s390/include/asm/compat.h
+++ b/arch/s390/include/asm/compat.h
@@ -70,6 +70,22 @@ typedef u32		compat_ulong_t;
 typedef u64             compat_u64;
 typedef u32             compat_uptr_t;
 
+typedef struct {
+        u32 mask;
+        u32 addr;
+} __aligned(8) psw_compat_t;
+
+typedef struct {
+        psw_compat_t psw;
+        u32 gprs[NUM_GPRS];
+        u32 acrs[NUM_ACRS];
+        u32 orig_gpr2;
+} s390_compat_regs;
+
+typedef struct {
+        u32 gprs_high[NUM_GPRS];
+} s390_compat_regs_high;
+
 struct compat_timespec {
         compat_time_t   tv_sec;
         s32             tv_nsec;
@@ -124,18 +140,33 @@ struct compat_flock64 {
 };
 
 struct compat_statfs {
-        s32             f_type;
-        s32             f_bsize;
-        s32             f_blocks;
-        s32             f_bfree;
-        s32             f_bavail;
-        s32             f_files;
-        s32             f_ffree;
+        u32             f_type;
+        u32             f_bsize;
+        u32             f_blocks;
+        u32             f_bfree;
+        u32             f_bavail;
+        u32             f_files;
+        u32             f_ffree;
+        compat_fsid_t   f_fsid;
+        u32             f_namelen;
+        u32             f_frsize;
+        u32             f_flags;
+        u32             f_spare[4];
+};
+
+struct compat_statfs64 {
+        u32             f_type;
+        u32             f_bsize;
+        u64             f_blocks;
+        u64             f_bfree;
+        u64             f_bavail;
+        u64             f_files;
+        u64             f_ffree;
         compat_fsid_t   f_fsid;
-        s32             f_namelen;
-        s32             f_frsize;
-        s32             f_flags;
-        s32             f_spare[5];
+        u32             f_namelen;
+        u32             f_frsize;
+        u32             f_flags;
+        u32             f_spare[4];
 };
 
 #define COMPAT_RLIM_OLD_INFINITY        0x7fffffff
@@ -248,8 +279,6 @@ static inline int is_compat_task(void)
         return is_32bit_task();
 }
 
-#endif
-
 static inline void __user *arch_compat_alloc_user_space(long len)
 {
         unsigned long stack;
@@ -260,6 +289,8 @@ static inline void __user *arch_compat_alloc_user_space(long len)
         return (void __user *) (stack - len);
 }
 
+#endif
+
 struct compat_ipc64_perm {
         compat_key_t key;
         __compat_uid32_t uid;
diff --git a/arch/s390/include/asm/elf.h b/arch/s390/include/asm/elf.h
index 1bfdf24b85a2..78f4f8711d58 100644
--- a/arch/s390/include/asm/elf.h
+++ b/arch/s390/include/asm/elf.h
@@ -119,6 +119,8 @@
  */
 
 #include <asm/ptrace.h>
+#include <asm/compat.h>
+#include <asm/syscall.h>
 #include <asm/user.h>
 
 typedef s390_fp_regs elf_fpregset_t;
@@ -180,18 +182,31 @@ extern unsigned long elf_hwcap;
 extern char elf_platform[];
 #define ELF_PLATFORM (elf_platform)
 
-#ifdef CONFIG_64BIT
+#ifndef CONFIG_COMPAT
+#define SET_PERSONALITY(ex) \
+do {                                                            \
+        set_personality(PER_LINUX |                             \
+                (current->personality & (~PER_MASK)));          \
+        current_thread_info()->sys_call_table =                 \
+                (unsigned long) &sys_call_table;                \
+} while (0)
+#else /* CONFIG_COMPAT */
 #define SET_PERSONALITY(ex)                                     \
 do {                                                            \
         if (personality(current->personality) != PER_LINUX32)   \
                 set_personality(PER_LINUX |                     \
                         (current->personality & ~PER_MASK));    \
-        if ((ex).e_ident[EI_CLASS] == ELFCLASS32)               \
+        if ((ex).e_ident[EI_CLASS] == ELFCLASS32) {             \
                 set_thread_flag(TIF_31BIT);                     \
-        else                                                    \
+                current_thread_info()->sys_call_table =         \
+                        (unsigned long) &sys_call_table_emu;    \
+        } else {                                                \
                 clear_thread_flag(TIF_31BIT);                   \
+                current_thread_info()->sys_call_table =         \
+                        (unsigned long) &sys_call_table;        \
+        }                                                       \
 } while (0)
-#endif /* CONFIG_64BIT */
+#endif /* CONFIG_COMPAT */
 
 #define STACK_RND_MASK  0x7ffUL
 
diff --git a/arch/s390/include/asm/hugetlb.h b/arch/s390/include/asm/hugetlb.h
index 593753ee07f3..bd90359d6d22 100644
--- a/arch/s390/include/asm/hugetlb.h
+++ b/arch/s390/include/asm/hugetlb.h
@@ -114,7 +114,7 @@ static inline pte_t huge_ptep_get_and_clear(struct mm_struct *mm,
 #define huge_ptep_set_wrprotect(__mm, __addr, __ptep)                   \
 ({                                                                      \
         pte_t __pte = huge_ptep_get(__ptep);                            \
-        if (pte_write(__pte)) {                                         \
+        if (huge_pte_write(__pte)) {                                    \
                 huge_ptep_invalidate(__mm, __addr, __ptep);             \
                 set_huge_pte_at(__mm, __addr, __ptep,                   \
                                 huge_pte_wrprotect(__pte));             \
@@ -127,4 +127,58 @@ static inline void huge_ptep_clear_flush(struct vm_area_struct *vma,
         huge_ptep_invalidate(vma->vm_mm, address, ptep);
 }
 
+static inline pte_t mk_huge_pte(struct page *page, pgprot_t pgprot)
+{
+        pte_t pte;
+        pmd_t pmd;
+
+        pmd = mk_pmd_phys(page_to_phys(page), pgprot);
+        pte_val(pte) = pmd_val(pmd);
+        return pte;
+}
+
+static inline int huge_pte_write(pte_t pte)
+{
+        pmd_t pmd;
+
+        pmd_val(pmd) = pte_val(pte);
+        return pmd_write(pmd);
+}
+
+static inline int huge_pte_dirty(pte_t pte)
+{
+        /* No dirty bit in the segment table entry. */
+        return 0;
+}
+
+static inline pte_t huge_pte_mkwrite(pte_t pte)
+{
+        pmd_t pmd;
+
+        pmd_val(pmd) = pte_val(pte);
+        pte_val(pte) = pmd_val(pmd_mkwrite(pmd));
+        return pte;
+}
+
+static inline pte_t huge_pte_mkdirty(pte_t pte)
+{
+        /* No dirty bit in the segment table entry. */
+        return pte;
+}
+
+static inline pte_t huge_pte_modify(pte_t pte, pgprot_t newprot)
+{
+        pmd_t pmd;
+
+        pmd_val(pmd) = pte_val(pte);
+        pte_val(pte) = pmd_val(pmd_modify(pmd, newprot));
+        return pte;
+}
+
+static inline void huge_pte_clear(struct mm_struct *mm, unsigned long addr,
+                                  pte_t *ptep)
+{
+        pmd_clear((pmd_t *) ptep);
+}
+
 #endif /* _ASM_S390_HUGETLB_H */
diff --git a/arch/s390/include/asm/pci.h b/arch/s390/include/asm/pci.h
index 05333b7f0469..6c1801235db9 100644
--- a/arch/s390/include/asm/pci.h
+++ b/arch/s390/include/asm/pci.h
@@ -140,6 +140,7 @@ static inline bool zdev_enabled(struct zpci_dev *zdev)
 struct zpci_dev *zpci_alloc_device(void);
 int zpci_create_device(struct zpci_dev *);
 int zpci_enable_device(struct zpci_dev *);
+int zpci_disable_device(struct zpci_dev *);
 void zpci_stop_device(struct zpci_dev *);
 void zpci_free_device(struct zpci_dev *);
 int zpci_scan_device(struct zpci_dev *);
diff --git a/arch/s390/include/asm/pci_debug.h b/arch/s390/include/asm/pci_debug.h
index 6bbec4265b6e..1ca5d1047c71 100644
--- a/arch/s390/include/asm/pci_debug.h
+++ b/arch/s390/include/asm/pci_debug.h
@@ -7,14 +7,11 @@ extern debug_info_t *pci_debug_msg_id;
 extern debug_info_t *pci_debug_err_id;
 
 #ifdef CONFIG_PCI_DEBUG
-#define zpci_dbg(fmt, args...)                                                  \
-        do {                                                                    \
-                if (pci_debug_msg_id->level >= 2)                               \
-                        debug_sprintf_event(pci_debug_msg_id, 2, fmt , ## args);\
-        } while (0)
+#define zpci_dbg(imp, fmt, args...)                             \
+        debug_sprintf_event(pci_debug_msg_id, imp, fmt, ##args)
 
 #else /* !CONFIG_PCI_DEBUG */
-#define zpci_dbg(fmt, args...) do { } while (0)
+#define zpci_dbg(imp, fmt, args...) do { } while (0)
 #endif
 
 #define zpci_err(text...)                                                       \
diff --git a/arch/s390/include/asm/pci_insn.h b/arch/s390/include/asm/pci_insn.h
index 1486a98d5dad..e6a2bdd4d705 100644
--- a/arch/s390/include/asm/pci_insn.h
+++ b/arch/s390/include/asm/pci_insn.h
@@ -1,10 +1,6 @@
 #ifndef _ASM_S390_PCI_INSN_H
 #define _ASM_S390_PCI_INSN_H
 
-#include <linux/delay.h>
-
-#define ZPCI_INSN_BUSY_DELAY    1       /* 1 microsecond */
-
 /* Load/Store status codes */
 #define ZPCI_PCI_ST_FUNC_NOT_ENABLED            4
 #define ZPCI_PCI_ST_FUNC_IN_ERR                 8
@@ -82,199 +78,12 @@ struct zpci_fib {
         u64 reserved7;
 } __packed;
 
-/* Modify PCI Function Controls */
-static inline u8 __mpcifc(u64 req, struct zpci_fib *fib, u8 *status)
-{
-        u8 cc;
-
-        asm volatile (
-                "       .insn   rxy,0xe300000000d0,%[req],%[fib]\n"
-                "       ipm     %[cc]\n"
-                "       srl     %[cc],28\n"
-                : [cc] "=d" (cc), [req] "+d" (req), [fib] "+Q" (*fib)
-                : : "cc");
-        *status = req >> 24 & 0xff;
-        return cc;
-}
-
-static inline int mpcifc_instr(u64 req, struct zpci_fib *fib)
-{
-        u8 cc, status;
-
-        do {
-                cc = __mpcifc(req, fib, &status);
-                if (cc == 2)
-                        msleep(ZPCI_INSN_BUSY_DELAY);
-        } while (cc == 2);
-
-        if (cc)
-                printk_once(KERN_ERR "%s: error cc: %d  status: %d\n",
-                             __func__, cc, status);
-        return (cc) ? -EIO : 0;
-}
-
-/* Refresh PCI Translations */
-static inline u8 __rpcit(u64 fn, u64 addr, u64 range, u8 *status)
-{
-        register u64 __addr asm("2") = addr;
-        register u64 __range asm("3") = range;
-        u8 cc;
-
-        asm volatile (
-                "       .insn   rre,0xb9d30000,%[fn],%[addr]\n"
-                "       ipm     %[cc]\n"
-                "       srl     %[cc],28\n"
-                : [cc] "=d" (cc), [fn] "+d" (fn)
-                : [addr] "d" (__addr), "d" (__range)
-                : "cc");
-        *status = fn >> 24 & 0xff;
-        return cc;
-}
-
-static inline int rpcit_instr(u64 fn, u64 addr, u64 range)
-{
-        u8 cc, status;
-
-        do {
-                cc = __rpcit(fn, addr, range, &status);
-                if (cc == 2)
-                        udelay(ZPCI_INSN_BUSY_DELAY);
-        } while (cc == 2);
-
-        if (cc)
-                printk_once(KERN_ERR "%s: error cc: %d  status: %d  dma_addr: %Lx  size: %Lx\n",
-                            __func__, cc, status, addr, range);
-        return (cc) ? -EIO : 0;
-}
-
-/* Store PCI function controls */
-static inline u8 __stpcifc(u32 handle, u8 space, struct zpci_fib *fib, u8 *status)
-{
-        u64 fn = (u64) handle << 32 | space << 16;
-        u8 cc;
-
-        asm volatile (
-                "       .insn   rxy,0xe300000000d4,%[fn],%[fib]\n"
-                "       ipm     %[cc]\n"
-                "       srl     %[cc],28\n"
-                : [cc] "=d" (cc), [fn] "+d" (fn), [fib] "=m" (*fib)
-                : : "cc");
-        *status = fn >> 24 & 0xff;
-        return cc;
-}
-
-/* Set Interruption Controls */
-static inline void sic_instr(u16 ctl, char *unused, u8 isc)
-{
-        asm volatile (
-                "       .insn   rsy,0xeb00000000d1,%[ctl],%[isc],%[u]\n"
-                : : [ctl] "d" (ctl), [isc] "d" (isc << 27), [u] "Q" (*unused));
-}
-
-/* PCI Load */
-static inline u8 __pcilg(u64 *data, u64 req, u64 offset, u8 *status)
-{
-        register u64 __req asm("2") = req;
-        register u64 __offset asm("3") = offset;
-        u64 __data;
-        u8 cc;
-
-        asm volatile (
-                "       .insn   rre,0xb9d20000,%[data],%[req]\n"
-                "       ipm     %[cc]\n"
-                "       srl     %[cc],28\n"
-                : [cc] "=d" (cc), [data] "=d" (__data), [req] "+d" (__req)
-                :  "d" (__offset)
-                : "cc");
-        *status = __req >> 24 & 0xff;
-        *data = __data;
-        return cc;
-}
-
-static inline int pcilg_instr(u64 *data, u64 req, u64 offset)
-{
-        u8 cc, status;
-
-        do {
-                cc = __pcilg(data, req, offset, &status);
-                if (cc == 2)
-                        udelay(ZPCI_INSN_BUSY_DELAY);
-        } while (cc == 2);
-
-        if (cc) {
-                printk_once(KERN_ERR "%s: error cc: %d  status: %d  req: %Lx  offset: %Lx\n",
-                            __func__, cc, status, req, offset);
-                /* TODO: on IO errors set data to 0xff...
-                 * here or in users of pcilg (le conversion)?
-                 */
-        }
-        return (cc) ? -EIO : 0;
-}
-
-/* PCI Store */
-static inline u8 __pcistg(u64 data, u64 req, u64 offset, u8 *status)
-{
-        register u64 __req asm("2") = req;
-        register u64 __offset asm("3") = offset;
-        u8 cc;
-
-        asm volatile (
-                "       .insn   rre,0xb9d00000,%[data],%[req]\n"
-                "       ipm     %[cc]\n"
-                "       srl     %[cc],28\n"
-                : [cc] "=d" (cc), [req] "+d" (__req)
-                : "d" (__offset), [data] "d" (data)
-                : "cc");
-        *status = __req >> 24 & 0xff;
-        return cc;
-}
-
-static inline int pcistg_instr(u64 data, u64 req, u64 offset)
-{
-        u8 cc, status;
-
-        do {
-                cc = __pcistg(data, req, offset, &status);
-                if (cc == 2)
-                        udelay(ZPCI_INSN_BUSY_DELAY);
-        } while (cc == 2);
-
-        if (cc)
-                printk_once(KERN_ERR "%s: error cc: %d  status: %d  req: %Lx  offset: %Lx\n",
-                        __func__, cc, status, req, offset);
-        return (cc) ? -EIO : 0;
-}
-
-/* PCI Store Block */
-static inline u8 __pcistb(const u64 *data, u64 req, u64 offset, u8 *status)
-{
-        u8 cc;
-
-        asm volatile (
-                "       .insn   rsy,0xeb00000000d0,%[req],%[offset],%[data]\n"
-                "       ipm     %[cc]\n"
-                "       srl     %[cc],28\n"
-                : [cc] "=d" (cc), [req] "+d" (req)
-                : [offset] "d" (offset), [data] "Q" (*data)
-                : "cc");
-        *status = req >> 24 & 0xff;
-        return cc;
-}
-
-static inline int pcistb_instr(const u64 *data, u64 req, u64 offset)
-{
-        u8 cc, status;
-
-        do {
-                cc = __pcistb(data, req, offset, &status);
-                if (cc == 2)
-                        udelay(ZPCI_INSN_BUSY_DELAY);
-        } while (cc == 2);
 
-        if (cc)
-                printk_once(KERN_ERR "%s: error cc: %d  status: %d  req: %Lx  offset: %Lx\n",
-                            __func__, cc, status, req, offset);
-        return (cc) ? -EIO : 0;
-}
+int s390pci_mod_fc(u64 req, struct zpci_fib *fib);
+int s390pci_refresh_trans(u64 fn, u64 addr, u64 range);
+int s390pci_load(u64 *data, u64 req, u64 offset);
+int s390pci_store(u64 data, u64 req, u64 offset);
+int s390pci_store_block(const u64 *data, u64 req, u64 offset);
+void set_irq_ctrl(u16 ctl, char *unused, u8 isc);
 
 #endif
diff --git a/arch/s390/include/asm/pci_io.h b/arch/s390/include/asm/pci_io.h
index 5fd81f31d6c7..83a9caa6ae53 100644
--- a/arch/s390/include/asm/pci_io.h
+++ b/arch/s390/include/asm/pci_io.h
@@ -36,7 +36,7 @@ static inline RETTYPE zpci_read_##RETTYPE(const volatile void __iomem *addr)	\
         u64 data;                                                               \
         int rc;                                                                 \
                                                                                 \
-        rc = pcilg_instr(&data, req, ZPCI_OFFSET(addr));                        \
+        rc = s390pci_load(&data, req, ZPCI_OFFSET(addr));                       \
         if (rc)                                                                 \
                 data = -1ULL;                                                   \
         return (RETTYPE) data;                                                  \
@@ -50,7 +50,7 @@ static inline void zpci_write_##VALTYPE(VALTYPE val,				\
         u64 req = ZPCI_CREATE_REQ(entry->fh, entry->bar, LENGTH);               \
         u64 data = (VALTYPE) val;                                               \
                                                                                 \
-        pcistg_instr(data, req, ZPCI_OFFSET(addr));                             \
+        s390pci_store(data, req, ZPCI_OFFSET(addr));                            \
 }
 
 zpci_read(8, u64)
@@ -83,15 +83,18 @@ static inline int zpci_write_single(u64 req, const u64 *data, u64 offset, u8 len
                 val = 0;                /* let FW report error */
                 break;
         }
-        return pcistg_instr(val, req, offset);
+        return s390pci_store(val, req, offset);
 }
 
 static inline int zpci_read_single(u64 req, u64 *dst, u64 offset, u8 len)
 {
         u64 data;
-        u8 cc;
+        int cc;
+
+        cc = s390pci_load(&data, req, offset);
+        if (cc)
+                goto out;
 
-        cc = pcilg_instr(&data,  req, offset);
         switch (len) {
         case 1:
                 *((u8 *) dst) = (u8) data;
@@ -106,12 +109,13 @@ static inline int zpci_read_single(u64 req, u64 *dst, u64 offset, u8 len)
                 *((u64 *) dst) = (u64) data;
                 break;
         }
+out:
         return cc;
 }
 
 static inline int zpci_write_block(u64 req, const u64 *data, u64 offset)
 {
-        return pcistb_instr(data, req, offset);
+        return s390pci_store_block(data, req, offset);
 }
 
 static inline u8 zpci_get_max_write_size(u64 src, u64 dst, int len, int max)
diff --git a/arch/s390/include/asm/pgtable.h b/arch/s390/include/asm/pgtable.h
index 3cb47cf02530..b4622915bd15 100644
--- a/arch/s390/include/asm/pgtable.h
+++ b/arch/s390/include/asm/pgtable.h
@@ -424,6 +424,13 @@ extern unsigned long MODULES_END;
 #define __S110  PAGE_RW
 #define __S111  PAGE_RW
 
+/*
+ * Segment entry (large page) protection definitions.
+ */
+#define SEGMENT_NONE    __pgprot(_HPAGE_TYPE_NONE)
+#define SEGMENT_RO      __pgprot(_HPAGE_TYPE_RO)
+#define SEGMENT_RW      __pgprot(_HPAGE_TYPE_RW)
+
 static inline int mm_exclusive(struct mm_struct *mm)
 {
         return likely(mm == current->active_mm &&
@@ -764,6 +771,8 @@ void gmap_disable(struct gmap *gmap);
 int gmap_map_segment(struct gmap *gmap, unsigned long from,
                      unsigned long to, unsigned long length);
 int gmap_unmap_segment(struct gmap *gmap, unsigned long to, unsigned long len);
+unsigned long __gmap_translate(unsigned long address, struct gmap *);
+unsigned long gmap_translate(unsigned long address, struct gmap *);
 unsigned long __gmap_fault(unsigned long address, struct gmap *);
 unsigned long gmap_fault(unsigned long address, struct gmap *);
 void gmap_discard(unsigned long from, unsigned long to, struct gmap *);
@@ -912,26 +921,6 @@ static inline pte_t pte_mkspecial(pte_t pte)
 #ifdef CONFIG_HUGETLB_PAGE
 static inline pte_t pte_mkhuge(pte_t pte)
 {
-        /*
-         * PROT_NONE needs to be remapped from the pte type to the ste type.
-         * The HW invalid bit is also different for pte and ste. The pte
-         * invalid bit happens to be the same as the ste _SEGMENT_ENTRY_LARGE
-         * bit, so we don't have to clear it.
-         */
-        if (pte_val(pte) & _PAGE_INVALID) {
-                if (pte_val(pte) & _PAGE_SWT)
-                        pte_val(pte) |= _HPAGE_TYPE_NONE;
-                pte_val(pte) |= _SEGMENT_ENTRY_INV;
-        }
-        /*
-         * Clear SW pte bits, there are no SW bits in a segment table entry.
-         */
-        pte_val(pte) &= ~(_PAGE_SWT | _PAGE_SWX | _PAGE_SWC |
-                          _PAGE_SWR | _PAGE_SWW);
-        /*
-         * Also set the change-override bit because we don't need dirty bit
-         * tracking for hugetlbfs pages.
-         */
         pte_val(pte) |= (_SEGMENT_ENTRY_LARGE | _SEGMENT_ENTRY_CO);
         return pte;
 }
@@ -1276,31 +1265,7 @@ static inline void __pmd_idte(unsigned long address, pmd_t *pmdp)
         }
 }
 
-#ifdef CONFIG_TRANSPARENT_HUGEPAGE
-
-#define SEGMENT_NONE    __pgprot(_HPAGE_TYPE_NONE)
-#define SEGMENT_RO      __pgprot(_HPAGE_TYPE_RO)
-#define SEGMENT_RW      __pgprot(_HPAGE_TYPE_RW)
-
-#define __HAVE_ARCH_PGTABLE_DEPOSIT
-extern void pgtable_trans_huge_deposit(struct mm_struct *mm, pgtable_t pgtable);
-
-#define __HAVE_ARCH_PGTABLE_WITHDRAW
-extern pgtable_t pgtable_trans_huge_withdraw(struct mm_struct *mm);
-
-static inline int pmd_trans_splitting(pmd_t pmd)
-{
-        return pmd_val(pmd) & _SEGMENT_ENTRY_SPLIT;
-}
-
-static inline void set_pmd_at(struct mm_struct *mm, unsigned long addr,
-                              pmd_t *pmdp, pmd_t entry)
-{
-        if (!(pmd_val(entry) & _SEGMENT_ENTRY_INV) && MACHINE_HAS_EDAT1)
-                pmd_val(entry) |= _SEGMENT_ENTRY_CO;
-        *pmdp = entry;
-}
-
+#if defined(CONFIG_TRANSPARENT_HUGEPAGE) || defined(CONFIG_HUGETLB_PAGE)
 static inline unsigned long massage_pgprot_pmd(pgprot_t pgprot)
 {
         /*
@@ -1321,10 +1286,11 @@ static inline pmd_t pmd_modify(pmd_t pmd, pgprot_t newprot)
         return pmd;
 }
 
-static inline pmd_t pmd_mkhuge(pmd_t pmd)
+static inline pmd_t mk_pmd_phys(unsigned long physpage, pgprot_t pgprot)
 {
-        pmd_val(pmd) |= _SEGMENT_ENTRY_LARGE;
-        return pmd;
+        pmd_t __pmd;
+        pmd_val(__pmd) = physpage + massage_pgprot_pmd(pgprot);
+        return __pmd;
 }
 
 static inline pmd_t pmd_mkwrite(pmd_t pmd)
@@ -1334,6 +1300,34 @@ static inline pmd_t pmd_mkwrite(pmd_t pmd)
                 pmd_val(pmd) &= ~_SEGMENT_ENTRY_RO;
         return pmd;
 }
+#endif /* CONFIG_TRANSPARENT_HUGEPAGE || CONFIG_HUGETLB_PAGE */
+
+#ifdef CONFIG_TRANSPARENT_HUGEPAGE
+
+#define __HAVE_ARCH_PGTABLE_DEPOSIT
+extern void pgtable_trans_huge_deposit(struct mm_struct *mm, pgtable_t pgtable);
+
+#define __HAVE_ARCH_PGTABLE_WITHDRAW
+extern pgtable_t pgtable_trans_huge_withdraw(struct mm_struct *mm);
+
+static inline int pmd_trans_splitting(pmd_t pmd)
+{
+        return pmd_val(pmd) & _SEGMENT_ENTRY_SPLIT;
+}
+
+static inline void set_pmd_at(struct mm_struct *mm, unsigned long addr,
+                              pmd_t *pmdp, pmd_t entry)
+{
+        if (!(pmd_val(entry) & _SEGMENT_ENTRY_INV) && MACHINE_HAS_EDAT1)
+                pmd_val(entry) |= _SEGMENT_ENTRY_CO;
+        *pmdp = entry;
+}
+
+static inline pmd_t pmd_mkhuge(pmd_t pmd)
+{
+        pmd_val(pmd) |= _SEGMENT_ENTRY_LARGE;
+        return pmd;
+}
 
 static inline pmd_t pmd_wrprotect(pmd_t pmd)
 {
@@ -1430,13 +1424,6 @@ static inline void pmdp_set_wrprotect(struct mm_struct *mm,
         }
 }
 
-static inline pmd_t mk_pmd_phys(unsigned long physpage, pgprot_t pgprot)
-{
-        pmd_t __pmd;
-        pmd_val(__pmd) = physpage + massage_pgprot_pmd(pgprot);
-        return __pmd;
-}
-
 #define pfn_pmd(pfn, pgprot)    mk_pmd_phys(__pa((pfn) << PAGE_SHIFT), (pgprot))
 #define mk_pmd(page, pgprot)    pfn_pmd(page_to_pfn(page), (pgprot))
 
diff --git a/arch/s390/include/asm/processor.h b/arch/s390/include/asm/processor.h
index 94e749c90230..6b499870662f 100644
--- a/arch/s390/include/asm/processor.h
+++ b/arch/s390/include/asm/processor.h
@@ -161,7 +161,8 @@ extern unsigned long thread_saved_pc(struct task_struct *t);
 
 extern void show_code(struct pt_regs *regs);
 extern void print_fn_code(unsigned char *code, unsigned long len);
-extern int insn_to_mnemonic(unsigned char *instruction, char buf[8]);
+extern int insn_to_mnemonic(unsigned char *instruction, char *buf,
+                            unsigned int len);
 
 unsigned long get_wchan(struct task_struct *p);
 #define task_pt_regs(tsk) ((struct pt_regs *) \
diff --git a/arch/s390/include/asm/ptrace.h b/arch/s390/include/asm/ptrace.h
index 3ee5da3bc10c..559512a455da 100644
--- a/arch/s390/include/asm/ptrace.h
+++ b/arch/s390/include/asm/ptrace.h
@@ -9,9 +9,7 @@
 #include <uapi/asm/ptrace.h>
 
 #ifndef __ASSEMBLY__
-#ifndef __s390x__
-#else /* __s390x__ */
-#endif /* __s390x__ */
+
 extern long psw_kernel_bits;
 extern long psw_user_bits;
 
@@ -77,8 +75,6 @@ struct per_struct_kernel {
 #define PER_CONTROL_SUSPENSION          0x00400000UL
 #define PER_CONTROL_ALTERATION          0x00200000UL
 
-#ifdef __s390x__
-#endif /* __s390x__ */
 /*
  * These are defined as per linux/ptrace.h, which see.
  */
diff --git a/arch/s390/include/asm/syscall.h b/arch/s390/include/asm/syscall.h
index fe7b99759e12..cd29d2f4e4f3 100644
--- a/arch/s390/include/asm/syscall.h
+++ b/arch/s390/include/asm/syscall.h
@@ -23,6 +23,7 @@
  * type here is what we want [need] for both 32 bit and 64 bit systems.
  */
 extern const unsigned int sys_call_table[];
+extern const unsigned int sys_call_table_emu[];
 
 static inline long syscall_get_nr(struct task_struct *task,
                                   struct pt_regs *regs)
diff --git a/arch/s390/include/asm/thread_info.h b/arch/s390/include/asm/thread_info.h
index 9e2cfe0349c3..eb5f64d26d06 100644
--- a/arch/s390/include/asm/thread_info.h
+++ b/arch/s390/include/asm/thread_info.h
@@ -14,13 +14,8 @@
 #define THREAD_ORDER 1
 #define ASYNC_ORDER  1
 #else /* CONFIG_64BIT */
-#ifndef __SMALL_STACK
 #define THREAD_ORDER 2
 #define ASYNC_ORDER  2
-#else
-#define THREAD_ORDER 1
-#define ASYNC_ORDER  1
-#endif
 #endif /* CONFIG_64BIT */
 
 #define THREAD_SIZE (PAGE_SIZE << THREAD_ORDER)
@@ -41,6 +36,7 @@ struct thread_info {
         struct task_struct      *task;          /* main task structure */
         struct exec_domain      *exec_domain;   /* execution domain */
         unsigned long           flags;          /* low level flags */
+        unsigned long           sys_call_table; /* System call table address */
         unsigned int            cpu;            /* current CPU */
         int                     preempt_count;  /* 0 => preemptable, <0 => BUG */
         struct restart_block    restart_block;
diff --git a/arch/s390/include/asm/unistd.h b/arch/s390/include/asm/unistd.h
index a6667a952969..651886353551 100644
--- a/arch/s390/include/asm/unistd.h
+++ b/arch/s390/include/asm/unistd.h
@@ -54,12 +54,4 @@
 #define __ARCH_WANT_SYS_VFORK
 #define __ARCH_WANT_SYS_CLONE
 
-/*
- * "Conditional" syscalls
- *
- * What we want is __attribute__((weak,alias("sys_ni_syscall"))),
- * but it doesn't work on all toolchains, so we just do it by hand
- */
-#define cond_syscall(x) asm(".weak\t" #x "\n\t.set\t" #x ",sys_ni_syscall")
-
 #endif /* _ASM_S390_UNISTD_H_ */
diff --git a/arch/s390/include/uapi/asm/ptrace.h b/arch/s390/include/uapi/asm/ptrace.h
index a5ca214b34fd..3aa9f1ec5b29 100644
--- a/arch/s390/include/uapi/asm/ptrace.h
+++ b/arch/s390/include/uapi/asm/ptrace.h
@@ -215,12 +215,6 @@ typedef struct
         unsigned long addr;
 } __attribute__ ((aligned(8))) psw_t;
 
-typedef struct
-{
-        __u32   mask;
-        __u32   addr;
-} __attribute__ ((aligned(8))) psw_compat_t;
-
 #ifndef __s390x__
 
 #define PSW_MASK_PER            0x40000000UL
@@ -295,20 +289,6 @@ typedef struct
         unsigned long orig_gpr2;
 } s390_regs;
 
-typedef struct
-{
-        psw_compat_t    psw;
-        __u32           gprs[NUM_GPRS];
-        __u32           acrs[NUM_ACRS];
-        __u32           orig_gpr2;
-} s390_compat_regs;
-
-typedef struct
-{
-        __u32           gprs_high[NUM_GPRS];
-} s390_compat_regs_high;
-
-
 /*
  * Now for the user space program event recording (trace) definitions.
  * The following structures are used only for the ptrace interface, don't
diff --git a/arch/s390/include/uapi/asm/statfs.h b/arch/s390/include/uapi/asm/statfs.h
index 5acca0a34c20..a61d538756f2 100644
--- a/arch/s390/include/uapi/asm/statfs.h
+++ b/arch/s390/include/uapi/asm/statfs.h
@@ -7,9 +7,6 @@
 #ifndef _S390_STATFS_H
 #define _S390_STATFS_H
 
-#ifndef __s390x__
-#include <asm-generic/statfs.h>
-#else
 /*
  * We can't use <asm-generic/statfs.h> because in 64-bit mode
  * we mix ints of different sizes in our struct statfs.
@@ -21,49 +18,33 @@ typedef __kernel_fsid_t	fsid_t;
 #endif
 
 struct statfs {
-        int  f_type;
-        int  f_bsize;
-        long f_blocks;
-        long f_bfree;
-        long f_bavail;
-        long f_files;
-        long f_ffree;
+        unsigned int    f_type;
+        unsigned int    f_bsize;
+        unsigned long   f_blocks;
+        unsigned long   f_bfree;
+        unsigned long   f_bavail;
+        unsigned long   f_files;
+        unsigned long   f_ffree;
         __kernel_fsid_t f_fsid;
-        int  f_namelen;
-        int  f_frsize;
-        int  f_flags;
-        int  f_spare[4];
+        unsigned int    f_namelen;
+        unsigned int    f_frsize;
+        unsigned int    f_flags;
+        unsigned int    f_spare[4];
 };
 
 struct statfs64 {
-        int  f_type;
-        int  f_bsize;
-        long f_blocks;
-        long f_bfree;
-        long f_bavail;
-        long f_files;
-        long f_ffree;
+        unsigned int    f_type;
+        unsigned int    f_bsize;
+        unsigned long   f_blocks;
+        unsigned long   f_bfree;
+        unsigned long   f_bavail;
+        unsigned long   f_files;
+        unsigned long   f_ffree;
         __kernel_fsid_t f_fsid;
-        int  f_namelen;
-        int  f_frsize;
-        int  f_flags;
-        int  f_spare[4];
+        unsigned int    f_namelen;
+        unsigned int    f_frsize;
+        unsigned int    f_flags;
+        unsigned int    f_spare[4];
 };
 
-struct compat_statfs64 {
-        __u32 f_type;
-        __u32 f_bsize;
-        __u64 f_blocks;
-        __u64 f_bfree;
-        __u64 f_bavail;
-        __u64 f_files;
-        __u64 f_ffree;
-        __kernel_fsid_t f_fsid;
-        __u32 f_namelen;
-        __u32 f_frsize;
-        __u32 f_flags;
-        __u32 f_spare[4];
-};
-
-#endif /* __s390x__ */
 #endif
diff --git a/arch/s390/kernel/Makefile b/arch/s390/kernel/Makefile
index 2ac311ef5c9b..1386fcaf4ef6 100644
--- a/arch/s390/kernel/Makefile
+++ b/arch/s390/kernel/Makefile
@@ -14,16 +14,25 @@ endif
 CFLAGS_smp.o    := -Wno-nonnull
 
 #
+# Disable tailcall optimizations for stack / callchain walking functions
+# since this might generate broken code when accessing register 15 and
+# passing its content to other functions.
+#
+CFLAGS_stacktrace.o     += -fno-optimize-sibling-calls
+CFLAGS_dumpstack.o      += -fno-optimize-sibling-calls
+
+#
 # Pass UTS_MACHINE for user_regset definition
 #
 CFLAGS_ptrace.o         += -DUTS_MACHINE='"$(UTS_MACHINE)"'
 
 CFLAGS_sysinfo.o += -Iinclude/math-emu -Iarch/s390/math-emu -w
 
-obj-y   :=  bitmap.o traps.o time.o process.o base.o early.o setup.o vtime.o \
-            processor.o sys_s390.o ptrace.o signal.o cpcmd.o ebcdic.o nmi.o \
-            debug.o irq.o ipl.o dis.o diag.o mem_detect.o sclp.o vdso.o \
-            sysinfo.o jump_label.o lgr.o os_info.o machine_kexec.o pgm_check.o
+obj-y   := bitmap.o traps.o time.o process.o base.o early.o setup.o vtime.o
+obj-y   += processor.o sys_s390.o ptrace.o signal.o cpcmd.o ebcdic.o nmi.o
+obj-y   += debug.o irq.o ipl.o dis.o diag.o mem_detect.o sclp.o vdso.o
+obj-y   += sysinfo.o jump_label.o lgr.o os_info.o machine_kexec.o pgm_check.o
+obj-y   += dumpstack.o
 
 obj-y   += $(if $(CONFIG_64BIT),entry64.o,entry.o)
 obj-y   += $(if $(CONFIG_64BIT),reipl64.o,reipl.o)
diff --git a/arch/s390/kernel/asm-offsets.c b/arch/s390/kernel/asm-offsets.c
index fface87056eb..7a82f9f70100 100644
--- a/arch/s390/kernel/asm-offsets.c
+++ b/arch/s390/kernel/asm-offsets.c
@@ -35,6 +35,7 @@ int main(void)
         DEFINE(__TI_task, offsetof(struct thread_info, task));
         DEFINE(__TI_domain, offsetof(struct thread_info, exec_domain));
         DEFINE(__TI_flags, offsetof(struct thread_info, flags));
+        DEFINE(__TI_sysc_table, offsetof(struct thread_info, sys_call_table));
         DEFINE(__TI_cpu, offsetof(struct thread_info, cpu));
         DEFINE(__TI_precount, offsetof(struct thread_info, preempt_count));
         DEFINE(__TI_user_timer, offsetof(struct thread_info, user_timer));
diff --git a/arch/s390/kernel/compat_linux.c b/arch/s390/kernel/compat_linux.c
index 19f26de27fae..8b6e4f5288a2 100644
--- a/arch/s390/kernel/compat_linux.c
+++ b/arch/s390/kernel/compat_linux.c
@@ -288,51 +288,13 @@ asmlinkage long sys32_getegid16(void)
         return high2lowgid(from_kgid_munged(current_user_ns(), current_egid()));
 }
 
-/*
- * sys32_ipc() is the de-multiplexer for the SysV IPC calls in 32bit emulation.
- *
- * This is really horribly ugly.
- */
 #ifdef CONFIG_SYSVIPC
-asmlinkage long sys32_ipc(u32 call, int first, int second, int third, u32 ptr)
+COMPAT_SYSCALL_DEFINE5(s390_ipc, uint, call, int, first, unsigned long, second,
+                unsigned long, third, compat_uptr_t, ptr)
 {
         if (call >> 16)         /* hack for backward compatibility */
                 return -EINVAL;
-        switch (call) {
-        case SEMTIMEDOP:
-                return compat_sys_semtimedop(first, compat_ptr(ptr),
-                                             second, compat_ptr(third));
-        case SEMOP:
-                /* struct sembuf is the same on 32 and 64bit :)) */
-                return sys_semtimedop(first, compat_ptr(ptr),
-                                      second, NULL);
-        case SEMGET:
-                return sys_semget(first, second, third);
-        case SEMCTL:
-                return compat_sys_semctl(first, second, third,
-                                         compat_ptr(ptr));
-        case MSGSND:
-                return compat_sys_msgsnd(first, second, third,
-                                         compat_ptr(ptr));
-        case MSGRCV:
-                return compat_sys_msgrcv(first, second, 0, third,
-                                         0, compat_ptr(ptr));
-        case MSGGET:
-                return sys_msgget((key_t) first, second);
-        case MSGCTL:
-                return compat_sys_msgctl(first, second, compat_ptr(ptr));
-        case SHMAT:
-                return compat_sys_shmat(first, second, third,
-                                        0, compat_ptr(ptr));
-        case SHMDT:
-                return sys_shmdt(compat_ptr(ptr));
-        case SHMGET:
-                return sys_shmget(first, (unsigned)second, third);
-        case SHMCTL:
-                return compat_sys_shmctl(first, second, compat_ptr(ptr));
-        }
-
-        return -ENOSYS;
+        return compat_sys_ipc(call, first, second, third, ptr, third);
 }
 #endif
 
@@ -373,48 +335,6 @@ asmlinkage compat_ssize_t sys32_readahead(int fd, u32 offhi, u32 offlo, s32 coun
         return sys_readahead(fd, ((loff_t)AA(offhi) << 32) | AA(offlo), count);
 }
 
-asmlinkage long sys32_sendfile(int out_fd, int in_fd, compat_off_t __user *offset, size_t count)
-{
-        mm_segment_t old_fs = get_fs();
-        int ret;
-        off_t of;
-        
-        if (offset && get_user(of, offset))
-                return -EFAULT;
-                
-        set_fs(KERNEL_DS);
-        ret = sys_sendfile(out_fd, in_fd,
-                           offset ? (off_t __force __user *) &of : NULL, count);
-        set_fs(old_fs);
-        
-        if (offset && put_user(of, offset))
-                return -EFAULT;
-                
-        return ret;
-}
-
-asmlinkage long sys32_sendfile64(int out_fd, int in_fd,
-                                compat_loff_t __user *offset, s32 count)
-{
-        mm_segment_t old_fs = get_fs();
-        int ret;
-        loff_t lof;
-        
-        if (offset && get_user(lof, offset))
-                return -EFAULT;
-                
-        set_fs(KERNEL_DS);
-        ret = sys_sendfile64(out_fd, in_fd,
-                             offset ? (loff_t __force __user *) &lof : NULL,
-                             count);
-        set_fs(old_fs);
-        
-        if (offset && put_user(lof, offset))
-                return -EFAULT;
-                
-        return ret;
-}
-
 struct stat64_emu31 {
         unsigned long long  st_dev;
         unsigned int    __pad1;
diff --git a/arch/s390/kernel/compat_linux.h b/arch/s390/kernel/compat_linux.h
index 00d92a5a6f6c..976518c0592a 100644
--- a/arch/s390/kernel/compat_linux.h
+++ b/arch/s390/kernel/compat_linux.h
@@ -94,7 +94,6 @@ long sys32_getuid16(void);
 long sys32_geteuid16(void);
 long sys32_getgid16(void);
 long sys32_getegid16(void);
-long sys32_ipc(u32 call, int first, int second, int third, u32 ptr);
 long sys32_truncate64(const char __user * path, unsigned long high,
                       unsigned long low);
 long sys32_ftruncate64(unsigned int fd, unsigned long high, unsigned long low);
@@ -106,10 +105,6 @@ long sys32_pread64(unsigned int fd, char __user *ubuf, size_t count,
 long sys32_pwrite64(unsigned int fd, const char __user *ubuf,
                     size_t count, u32 poshi, u32 poslo);
 compat_ssize_t sys32_readahead(int fd, u32 offhi, u32 offlo, s32 count);
-long sys32_sendfile(int out_fd, int in_fd, compat_off_t __user *offset,
-                    size_t count);
-long sys32_sendfile64(int out_fd, int in_fd, compat_loff_t __user *offset,
-                      s32 count);
 long sys32_stat64(const char __user * filename, struct stat64_emu31 __user * statbuf);
 long sys32_lstat64(const char __user * filename,
                    struct stat64_emu31 __user * statbuf);
diff --git a/arch/s390/kernel/compat_signal.c b/arch/s390/kernel/compat_signal.c
index 6de049fbe62d..c439ac9ced09 100644
--- a/arch/s390/kernel/compat_signal.c
+++ b/arch/s390/kernel/compat_signal.c
@@ -362,6 +362,7 @@ static int setup_frame32(int sig, struct k_sigaction *ka,
                 /* set extra registers only for synchronous signals */
                 regs->gprs[4] = regs->int_code & 127;
                 regs->gprs[5] = regs->int_parm_long;
+                regs->gprs[6] = task_thread_info(current)->last_break;
         }
 
         /* Place signal number on stack to allow backtrace from handler.  */
@@ -421,6 +422,7 @@ static int setup_rt_frame32(int sig, struct k_sigaction *ka, siginfo_t *info,
         regs->gprs[2] = map_signal(sig);
         regs->gprs[3] = (__force __u64) &frame->info;
         regs->gprs[4] = (__force __u64) &frame->uc;
+        regs->gprs[5] = task_thread_info(current)->last_break;
         return 0;
 
 give_sigsegv:
diff --git a/arch/s390/kernel/compat_wrapper.S b/arch/s390/kernel/compat_wrapper.S
index 3c98c4dc5aca..17644c8e10e1 100644
--- a/arch/s390/kernel/compat_wrapper.S
+++ b/arch/s390/kernel/compat_wrapper.S
@@ -258,11 +258,6 @@ ENTRY(sys32_mmap2_wrapper)
         llgtr   %r2,%r2                 # struct mmap_arg_struct_emu31 *
         jg      sys32_mmap2                     # branch to system call
 
-ENTRY(compat_sys_getrusage_wrapper)
-        lgfr    %r2,%r2                 # int
-        llgtr   %r3,%r3                 # struct rusage_emu31 *
-        jg      compat_sys_getrusage    # branch to system call
-
 ENTRY(compat_sys_gettimeofday_wrapper)
         llgtr   %r2,%r2                 # struct timeval_emu31 *
         llgtr   %r3,%r3                 # struct timezone *
@@ -393,14 +388,6 @@ ENTRY(compat_sys_sysinfo_wrapper)
         llgtr   %r2,%r2                 # struct sysinfo_emu31 *
         jg      compat_sys_sysinfo      # branch to system call
 
-ENTRY(sys32_ipc_wrapper)
-        llgfr   %r2,%r2                 # uint
-        lgfr    %r3,%r3                 # int
-        lgfr    %r4,%r4                 # int
-        lgfr    %r5,%r5                 # int
-        llgfr   %r6,%r6                 # u32
-        jg      sys32_ipc               # branch to system call
-
 ENTRY(sys32_fsync_wrapper)
         llgfr   %r2,%r2                 # unsigned int
         jg      sys_fsync               # branch to system call
@@ -666,13 +653,6 @@ ENTRY(sys32_capset_wrapper)
         llgtr   %r3,%r3                 # const cap_user_data_t
         jg      sys_capset              # branch to system call
 
-ENTRY(sys32_sendfile_wrapper)
-        lgfr    %r2,%r2                 # int
-        lgfr    %r3,%r3                 # int
-        llgtr   %r4,%r4                 # __kernel_off_emu31_t *
-        llgfr   %r5,%r5                 # size_t
-        jg      sys32_sendfile          # branch to system call
-
 #sys32_vfork_wrapper                    # done in vfork_glue
 
 ENTRY(sys32_truncate64_wrapper)
@@ -938,13 +918,6 @@ ENTRY(sys_epoll_wait_wrapper)
         lgfr    %r5,%r5                 # int
         jg      sys_epoll_wait          # branch to system call
 
-ENTRY(sys32_lookup_dcookie_wrapper)
-        sllg    %r2,%r2,32              # get high word of 64bit dcookie
-        or      %r2,%r3                 # get low word of 64bit dcookie
-        llgtr   %r3,%r4                 # char *
-        llgfr   %r4,%r5                 # size_t
-        jg      sys_lookup_dcookie
-
 ENTRY(sys32_fadvise64_wrapper)
         lgfr    %r2,%r2                 # int
         sllg    %r3,%r3,32              # get high word of 64bit loff_t
@@ -1264,29 +1237,12 @@ ENTRY(sys_tee_wrapper)
         llgfr   %r5,%r5                 # unsigned int
         jg      sys_tee
 
-ENTRY(compat_sys_vmsplice_wrapper)
-        lgfr    %r2,%r2                 # int
-        llgtr   %r3,%r3                 # compat_iovec *
-        llgfr   %r4,%r4                 # unsigned int
-        llgfr   %r5,%r5                 # unsigned int
-        jg      compat_sys_vmsplice
-
 ENTRY(sys_getcpu_wrapper)
         llgtr   %r2,%r2                 # unsigned *
         llgtr   %r3,%r3                 # unsigned *
         llgtr   %r4,%r4                 # struct getcpu_cache *
         jg      sys_getcpu
 
-ENTRY(compat_sys_epoll_pwait_wrapper)
-        lgfr    %r2,%r2                 # int
-        llgtr   %r3,%r3                 # struct compat_epoll_event *
-        lgfr    %r4,%r4                 # int
-        lgfr    %r5,%r5                 # int
-        llgtr   %r6,%r6                 # compat_sigset_t *
-        llgf    %r0,164(%r15)           # compat_size_t
-        stg     %r0,160(%r15)
-        jg      compat_sys_epoll_pwait
-
 ENTRY(compat_sys_utimes_wrapper)
         llgtr   %r2,%r2                 # char *
         llgtr   %r3,%r3                 # struct compat_timeval *
@@ -1299,12 +1255,6 @@ ENTRY(compat_sys_utimensat_wrapper)
         lgfr    %r5,%r5                 # int
         jg      compat_sys_utimensat
 
-ENTRY(compat_sys_signalfd_wrapper)
-        lgfr    %r2,%r2                 # int
-        llgtr   %r3,%r3                 # compat_sigset_t *
-        llgfr   %r4,%r4                 # compat_size_t
-        jg      compat_sys_signalfd
-
 ENTRY(sys_eventfd_wrapper)
         llgfr   %r2,%r2                 # unsigned int
         jg      sys_eventfd
@@ -1323,13 +1273,6 @@ ENTRY(sys_timerfd_create_wrapper)
         lgfr    %r3,%r3                 # int
         jg      sys_timerfd_create
 
-ENTRY(compat_sys_signalfd4_wrapper)
-        lgfr    %r2,%r2                 # int
-        llgtr   %r3,%r3                 # compat_sigset_t *
-        llgfr   %r4,%r4                 # compat_size_t
-        lgfr    %r5,%r5                 # int
-        jg      compat_sys_signalfd4
-
 ENTRY(sys_eventfd2_wrapper)
         llgfr   %r2,%r2                 # unsigned int
         lgfr    %r3,%r3                 # int
@@ -1361,13 +1304,6 @@ ENTRY(sys32_readahead_wrapper)
         lgfr    %r5,%r5                 # s32
         jg      sys32_readahead         # branch to system call
 
-ENTRY(sys32_sendfile64_wrapper)
-        lgfr    %r2,%r2                 # int
-        lgfr    %r3,%r3                 # int
-        llgtr   %r4,%r4                 # compat_loff_t *
-        lgfr    %r5,%r5                 # s32
-        jg      sys32_sendfile64        # branch to system call
-
 ENTRY(sys_tkill_wrapper)
         lgfr    %r2,%r2                 # pid_t
         lgfr    %r3,%r3                 # int
diff --git a/arch/s390/kernel/dis.c b/arch/s390/kernel/dis.c
index 3ad5e9540160..7f4a4a8c847c 100644
--- a/arch/s390/kernel/dis.c
+++ b/arch/s390/kernel/dis.c
@@ -1696,14 +1696,15 @@ static struct insn *find_insn(unsigned char *code)
  * insn_to_mnemonic - decode an s390 instruction
  * @instruction: instruction to decode
  * @buf: buffer to fill with mnemonic
+ * @len: length of buffer
  *
  * Decode the instruction at @instruction and store the corresponding
- * mnemonic into @buf.
+ * mnemonic into @buf of length @len.
  * @buf is left unchanged if the instruction could not be decoded.
  * Returns:
  *  %0 on success, %-ENOENT if the instruction was not found.
  */
-int insn_to_mnemonic(unsigned char *instruction, char buf[8])
+int insn_to_mnemonic(unsigned char *instruction, char *buf, unsigned int len)
 {
         struct insn *insn;
 
@@ -1711,10 +1712,10 @@ int insn_to_mnemonic(unsigned char *instruction, char buf[8])
         if (!insn)
                 return -ENOENT;
         if (insn->name[0] == '\0')
-                snprintf(buf, 8, "%s",
+                snprintf(buf, len, "%s",
                          long_insn_name[(int) insn->name[1]]);
         else
-                snprintf(buf, 8, "%.5s", insn->name);
+                snprintf(buf, len, "%.5s", insn->name);
         return 0;
 }
 EXPORT_SYMBOL_GPL(insn_to_mnemonic);
diff --git a/arch/s390/kernel/dumpstack.c b/arch/s390/kernel/dumpstack.c
new file mode 100644
index 000000000000..298297477257
--- /dev/null
+++ b/arch/s390/kernel/dumpstack.c
@@ -0,0 +1,212 @@
+/*
+ * Stack dumping functions
+ *
+ *  Copyright IBM Corp. 1999, 2013
+ */
+
+#include <linux/kallsyms.h>
+#include <linux/hardirq.h>
+#include <linux/kprobes.h>
+#include <linux/utsname.h>
+#include <linux/export.h>
+#include <linux/kdebug.h>
+#include <linux/ptrace.h>
+#include <linux/module.h>
+#include <linux/sched.h>
+#include <asm/processor.h>
+#include <asm/debug.h>
+#include <asm/ipl.h>
+
+#ifndef CONFIG_64BIT
+#define LONG "%08lx "
+#define FOURLONG "%08lx %08lx %08lx %08lx\n"
+static int kstack_depth_to_print = 12;
+#else /* CONFIG_64BIT */
+#define LONG "%016lx "
+#define FOURLONG "%016lx %016lx %016lx %016lx\n"
+static int kstack_depth_to_print = 20;
+#endif /* CONFIG_64BIT */
+
+/*
+ * For show_trace we have tree different stack to consider:
+ *   - the panic stack which is used if the kernel stack has overflown
+ *   - the asynchronous interrupt stack (cpu related)
+ *   - the synchronous kernel stack (process related)
+ * The stack trace can start at any of the three stack and can potentially
+ * touch all of them. The order is: panic stack, async stack, sync stack.
+ */
+static unsigned long
+__show_trace(unsigned long sp, unsigned long low, unsigned long high)
+{
+        struct stack_frame *sf;
+        struct pt_regs *regs;
+
+        while (1) {
+                sp = sp & PSW_ADDR_INSN;
+                if (sp < low || sp > high - sizeof(*sf))
+                        return sp;
+                sf = (struct stack_frame *) sp;
+                printk("([<%016lx>] ", sf->gprs[8] & PSW_ADDR_INSN);
+                print_symbol("%s)\n", sf->gprs[8] & PSW_ADDR_INSN);
+                /* Follow the backchain. */
+                while (1) {
+                        low = sp;
+                        sp = sf->back_chain & PSW_ADDR_INSN;
+                        if (!sp)
+                                break;
+                        if (sp <= low || sp > high - sizeof(*sf))
+                                return sp;
+                        sf = (struct stack_frame *) sp;
+                        printk(" [<%016lx>] ", sf->gprs[8] & PSW_ADDR_INSN);
+                        print_symbol("%s\n", sf->gprs[8] & PSW_ADDR_INSN);
+                }
+                /* Zero backchain detected, check for interrupt frame. */
+                sp = (unsigned long) (sf + 1);
+                if (sp <= low || sp > high - sizeof(*regs))
+                        return sp;
+                regs = (struct pt_regs *) sp;
+                printk(" [<%016lx>] ", regs->psw.addr & PSW_ADDR_INSN);
+                print_symbol("%s\n", regs->psw.addr & PSW_ADDR_INSN);
+                low = sp;
+                sp = regs->gprs[15];
+        }
+}
+
+static void show_trace(struct task_struct *task, unsigned long *stack)
+{
+        register unsigned long __r15 asm ("15");
+        unsigned long sp;
+
+        sp = (unsigned long) stack;
+        if (!sp)
+                sp = task ? task->thread.ksp : __r15;
+        printk("Call Trace:\n");
+#ifdef CONFIG_CHECK_STACK
+        sp = __show_trace(sp, S390_lowcore.panic_stack - 4096,
+                          S390_lowcore.panic_stack);
+#endif
+        sp = __show_trace(sp, S390_lowcore.async_stack - ASYNC_SIZE,
+                          S390_lowcore.async_stack);
+        if (task)
+                __show_trace(sp, (unsigned long) task_stack_page(task),
+                             (unsigned long) task_stack_page(task) + THREAD_SIZE);
+        else
+                __show_trace(sp, S390_lowcore.thread_info,
+                             S390_lowcore.thread_info + THREAD_SIZE);
+        if (!task)
+                task = current;
+        debug_show_held_locks(task);
+}
+
+void show_stack(struct task_struct *task, unsigned long *sp)
+{
+        register unsigned long *__r15 asm ("15");
+        unsigned long *stack;
+        int i;
+
+        if (!sp)
+                stack = task ? (unsigned long *) task->thread.ksp : __r15;
+        else
+                stack = sp;
+
+        for (i = 0; i < kstack_depth_to_print; i++) {
+                if (((addr_t) stack & (THREAD_SIZE-1)) == 0)
+                        break;
+                if ((i * sizeof(long) % 32) == 0)
+                        printk("%s       ", i == 0 ? "" : "\n");
+                printk(LONG, *stack++);
+        }
+        printk("\n");
+        show_trace(task, sp);
+}
+
+static void show_last_breaking_event(struct pt_regs *regs)
+{
+#ifdef CONFIG_64BIT
+        printk("Last Breaking-Event-Address:\n");
+        printk(" [<%016lx>] ", regs->args[0] & PSW_ADDR_INSN);
+        print_symbol("%s\n", regs->args[0] & PSW_ADDR_INSN);
+#endif
+}
+
+static inline int mask_bits(struct pt_regs *regs, unsigned long bits)
+{
+        return (regs->psw.mask & bits) / ((~bits + 1) & bits);
+}
+
+void show_registers(struct pt_regs *regs)
+{
+        char *mode;
+
+        mode = user_mode(regs) ? "User" : "Krnl";
+        printk("%s PSW : %p %p",
+               mode, (void *) regs->psw.mask,
+               (void *) regs->psw.addr);
+        print_symbol(" (%s)\n", regs->psw.addr & PSW_ADDR_INSN);
+        printk("           R:%x T:%x IO:%x EX:%x Key:%x M:%x W:%x "
+               "P:%x AS:%x CC:%x PM:%x", mask_bits(regs, PSW_MASK_PER),
+               mask_bits(regs, PSW_MASK_DAT), mask_bits(regs, PSW_MASK_IO),
+               mask_bits(regs, PSW_MASK_EXT), mask_bits(regs, PSW_MASK_KEY),
+               mask_bits(regs, PSW_MASK_MCHECK), mask_bits(regs, PSW_MASK_WAIT),
+               mask_bits(regs, PSW_MASK_PSTATE), mask_bits(regs, PSW_MASK_ASC),
+               mask_bits(regs, PSW_MASK_CC), mask_bits(regs, PSW_MASK_PM));
+#ifdef CONFIG_64BIT
+        printk(" EA:%x", mask_bits(regs, PSW_MASK_EA | PSW_MASK_BA));
+#endif
+        printk("\n%s GPRS: " FOURLONG, mode,
+               regs->gprs[0], regs->gprs[1], regs->gprs[2], regs->gprs[3]);
+        printk("           " FOURLONG,
+               regs->gprs[4], regs->gprs[5], regs->gprs[6], regs->gprs[7]);
+        printk("           " FOURLONG,
+               regs->gprs[8], regs->gprs[9], regs->gprs[10], regs->gprs[11]);
+        printk("           " FOURLONG,
+               regs->gprs[12], regs->gprs[13], regs->gprs[14], regs->gprs[15]);
+        show_code(regs);
+}
+
+void show_regs(struct pt_regs *regs)
+{
+        show_regs_print_info(KERN_DEFAULT);
+        show_registers(regs);
+        /* Show stack backtrace if pt_regs is from kernel mode */
+        if (!user_mode(regs))
+                show_trace(NULL, (unsigned long *) regs->gprs[15]);
+        show_last_breaking_event(regs);
+}
+
+static DEFINE_SPINLOCK(die_lock);
+
+void die(struct pt_regs *regs, const char *str)
+{
+        static int die_counter;
+
+        oops_enter();
+        lgr_info_log();
+        debug_stop_all();
+        console_verbose();
+        spin_lock_irq(&die_lock);
+        bust_spinlocks(1);
+        printk("%s: %04x [#%d] ", str, regs->int_code & 0xffff, ++die_counter);
+#ifdef CONFIG_PREEMPT
+        printk("PREEMPT ");
+#endif
+#ifdef CONFIG_SMP
+        printk("SMP ");
+#endif
+#ifdef CONFIG_DEBUG_PAGEALLOC
+        printk("DEBUG_PAGEALLOC");
+#endif
+        printk("\n");
+        notify_die(DIE_OOPS, str, regs, 0, regs->int_code & 0xffff, SIGSEGV);
+        print_modules();
+        show_regs(regs);
+        bust_spinlocks(0);
+        add_taint(TAINT_DIE, LOCKDEP_NOW_UNRELIABLE);
+        spin_unlock_irq(&die_lock);
+        if (in_interrupt())
+                panic("Fatal exception in interrupt");
+        if (panic_on_oops)
+                panic("Fatal exception: panic_on_oops");
+        oops_exit();
+        do_exit(SIGSEGV);
+}
diff --git a/arch/s390/kernel/entry.S b/arch/s390/kernel/entry.S
index 94feff7d6132..4d5e6f8a7978 100644
--- a/arch/s390/kernel/entry.S
+++ b/arch/s390/kernel/entry.S
@@ -45,6 +45,7 @@ _TIF_TRACE    = (_TIF_SYSCALL_TRACE | _TIF_SYSCALL_AUDIT | _TIF_SECCOMP | \
 
 STACK_SHIFT = PAGE_SHIFT + THREAD_ORDER
 STACK_SIZE  = 1 << STACK_SHIFT
+STACK_INIT  = STACK_SIZE - STACK_FRAME_OVERHEAD - __PT_SIZE
 
 #define BASED(name) name-system_call(%r13)
 
@@ -97,10 +98,10 @@ STACK_SIZE  = 1 << STACK_SHIFT
         sra     %r14,\shift
         jnz     1f
         CHECK_STACK 1<<\shift,\savearea
+        ahi     %r15,-(STACK_FRAME_OVERHEAD + __PT_SIZE)
         j       2f
 1:      l       %r15,\stack             # load target stack
-2:      ahi     %r15,-(STACK_FRAME_OVERHEAD + __PT_SIZE)
-        la      %r11,STACK_FRAME_OVERHEAD(%r15)
+2:      la      %r11,STACK_FRAME_OVERHEAD(%r15)
         .endm
 
         .macro  ADD64 high,low,timer
@@ -150,7 +151,7 @@ ENTRY(__switch_to)
         l       %r4,__THREAD_info(%r2)          # get thread_info of prev
         l       %r5,__THREAD_info(%r3)          # get thread_info of next
         lr      %r15,%r5
-        ahi     %r15,STACK_SIZE                 # end of kernel stack of next
+        ahi     %r15,STACK_INIT                 # end of kernel stack of next
         st      %r3,__LC_CURRENT                # store task struct of next
         st      %r5,__LC_THREAD_INFO            # store thread info of next
         st      %r15,__LC_KERNEL_STACK          # store end of kernel stack
@@ -178,7 +179,6 @@ sysc_stm:
         l       %r13,__LC_SVC_NEW_PSW+4
 sysc_per:
         l       %r15,__LC_KERNEL_STACK
-        ahi     %r15,-(STACK_FRAME_OVERHEAD + __PT_SIZE)
         la      %r11,STACK_FRAME_OVERHEAD(%r15) # pointer to pt_regs
 sysc_vtime:
         UPDATE_VTIME %r8,%r9,__LC_SYNC_ENTER_TIMER
@@ -188,6 +188,7 @@ sysc_vtime:
         mvc     __PT_INT_CODE(4,%r11),__LC_SVC_ILC
 sysc_do_svc:
         oi      __TI_flags+3(%r12),_TIF_SYSCALL
+        l       %r10,__TI_sysc_table(%r12)      # 31 bit system call table
         lh      %r8,__PT_INT_CODE+2(%r11)
         sla     %r8,2                           # shift and test for svc0
         jnz     sysc_nr_ok
@@ -198,7 +199,6 @@ sysc_do_svc:
         lr      %r8,%r1
         sla     %r8,2
 sysc_nr_ok:
-        l       %r10,BASED(.Lsys_call_table)    # 31 bit system call table
         xc      __SF_BACKCHAIN(4,%r15),__SF_BACKCHAIN(%r15)
         st      %r2,__PT_ORIG_GPR2(%r11)
         st      %r7,STACK_FRAME_OVERHEAD(%r15)
@@ -359,11 +359,11 @@ ENTRY(pgm_check_handler)
         tm      __LC_PGM_ILC+3,0x80     # check for per exception
         jnz     pgm_svcper              # -> single stepped svc
 0:      CHECK_STACK STACK_SIZE,__LC_SAVE_AREA_SYNC
+        ahi     %r15,-(STACK_FRAME_OVERHEAD + __PT_SIZE)
         j       2f
 1:      UPDATE_VTIME %r14,%r15,__LC_SYNC_ENTER_TIMER
         l       %r15,__LC_KERNEL_STACK
-2:      ahi     %r15,-(STACK_FRAME_OVERHEAD + __PT_SIZE)
-        la      %r11,STACK_FRAME_OVERHEAD(%r15)
+2:      la      %r11,STACK_FRAME_OVERHEAD(%r15)
         stm     %r0,%r7,__PT_R0(%r11)
         mvc     __PT_R8(32,%r11),__LC_SAVE_AREA_SYNC
         stm     %r8,%r9,__PT_PSW(%r11)
@@ -485,7 +485,6 @@ io_work:
 #
 io_work_user:
         l       %r1,__LC_KERNEL_STACK
-        ahi     %r1,-(STACK_FRAME_OVERHEAD + __PT_SIZE)
         mvc     STACK_FRAME_OVERHEAD(__PT_SIZE,%r1),0(%r11)
         xc      __SF_BACKCHAIN(4,%r1),__SF_BACKCHAIN(%r1)
         la      %r11,STACK_FRAME_OVERHEAD(%r1)
@@ -646,7 +645,6 @@ mcck_skip:
         tm      __PT_PSW+1(%r11),0x01   # returning to user ?
         jno     mcck_return
         l       %r1,__LC_KERNEL_STACK   # switch to kernel stack
-        ahi     %r1,-(STACK_FRAME_OVERHEAD + __PT_SIZE)
         mvc     STACK_FRAME_OVERHEAD(__PT_SIZE,%r1),0(%r11)
         xc      __SF_BACKCHAIN(4,%r1),__SF_BACKCHAIN(%r1)
         la      %r11,STACK_FRAME_OVERHEAD(%r15)
@@ -674,6 +672,7 @@ mcck_panic:
         sra     %r14,PAGE_SHIFT
         jz      0f
         l       %r15,__LC_PANIC_STACK
+        j       mcck_skip
 0:      ahi     %r15,-(STACK_FRAME_OVERHEAD + __PT_SIZE)
         j       mcck_skip
 
@@ -714,12 +713,10 @@ ENTRY(restart_int_handler)
  */
 stack_overflow:
         l       %r15,__LC_PANIC_STACK   # change to panic stack
-        ahi     %r15,-__PT_SIZE         # create pt_regs
-        stm     %r0,%r7,__PT_R0(%r15)
-        stm     %r8,%r9,__PT_PSW(%r15)
+        la      %r11,STACK_FRAME_OVERHEAD(%r15)
+        stm     %r0,%r7,__PT_R0(%r11)
+        stm     %r8,%r9,__PT_PSW(%r11)
         mvc     __PT_R8(32,%r11),0(%r14)
-        lr      %r15,%r11
-        ahi     %r15,-STACK_FRAME_OVERHEAD
         l       %r1,BASED(1f)
         xc      __SF_BACKCHAIN(4,%r15),__SF_BACKCHAIN(%r15)
         lr      %r2,%r11                # pass pointer to pt_regs
@@ -799,15 +796,14 @@ cleanup_system_call:
         mvc     __LC_LAST_UPDATE_TIMER(8),__LC_SYNC_ENTER_TIMER
         # set up saved register 11
         l       %r15,__LC_KERNEL_STACK
-        ahi     %r15,-__PT_SIZE
-        st      %r15,12(%r11)           # r11 pt_regs pointer
+        la      %r9,STACK_FRAME_OVERHEAD(%r15)
+        st      %r9,12(%r11)            # r11 pt_regs pointer
         # fill pt_regs
-        mvc     __PT_R8(32,%r15),__LC_SAVE_AREA_SYNC
-        stm     %r0,%r7,__PT_R0(%r15)
-        mvc     __PT_PSW(8,%r15),__LC_SVC_OLD_PSW
-        mvc     __PT_INT_CODE(4,%r15),__LC_SVC_ILC
+        mvc     __PT_R8(32,%r9),__LC_SAVE_AREA_SYNC
+        stm     %r0,%r7,__PT_R0(%r9)
+        mvc     __PT_PSW(8,%r9),__LC_SVC_OLD_PSW
+        mvc     __PT_INT_CODE(4,%r9),__LC_SVC_ILC
         # setup saved register 15
-        ahi     %r15,-STACK_FRAME_OVERHEAD
         st      %r15,28(%r11)           # r15 stack pointer
         # set new psw address and exit
         l       %r9,BASED(cleanup_table+4)      # sysc_do_svc + 0x80000000
@@ -910,7 +906,6 @@ cleanup_idle_wait:
 .Ltrace_enter:          .long   do_syscall_trace_enter
 .Ltrace_exit:           .long   do_syscall_trace_exit
 .Lschedule_tail:        .long   schedule_tail
-.Lsys_call_table:       .long   sys_call_table
 .Lsysc_per:             .long   sysc_per + 0x80000000
 #ifdef CONFIG_TRACE_IRQFLAGS
 .Lhardirqs_on:          .long   trace_hardirqs_on_caller
diff --git a/arch/s390/kernel/entry.h b/arch/s390/kernel/entry.h
index c3a736a3ed44..aa0ab02e9595 100644
--- a/arch/s390/kernel/entry.h
+++ b/arch/s390/kernel/entry.h
@@ -7,6 +7,7 @@
 #include <asm/cputime.h>
 
 extern void *restart_stack;
+extern unsigned long suspend_zero_pages;
 
 void system_call(void);
 void pgm_check_handler(void);
diff --git a/arch/s390/kernel/entry64.S b/arch/s390/kernel/entry64.S
index 2e6d60c55f90..4c17eece707e 100644
--- a/arch/s390/kernel/entry64.S
+++ b/arch/s390/kernel/entry64.S
@@ -39,6 +39,7 @@ __PT_R15     =	__PT_GPRS + 120
 
 STACK_SHIFT = PAGE_SHIFT + THREAD_ORDER
 STACK_SIZE  = 1 << STACK_SHIFT
+STACK_INIT = STACK_SIZE - STACK_FRAME_OVERHEAD - __PT_SIZE
 
 _TIF_WORK_SVC = (_TIF_SIGPENDING | _TIF_NOTIFY_RESUME | _TIF_NEED_RESCHED | \
                  _TIF_MCCK_PENDING | _TIF_PER_TRAP )
@@ -124,10 +125,10 @@ _TIF_EXIT_SIE = (_TIF_SIGPENDING | _TIF_NEED_RESCHED | _TIF_MCCK_PENDING)
         srag    %r14,%r14,\shift
         jnz     1f
         CHECK_STACK 1<<\shift,\savearea
+        aghi    %r15,-(STACK_FRAME_OVERHEAD + __PT_SIZE)
         j       2f
 1:      lg      %r15,\stack             # load target stack
-2:      aghi    %r15,-(STACK_FRAME_OVERHEAD + __PT_SIZE)
-        la      %r11,STACK_FRAME_OVERHEAD(%r15)
+2:      la      %r11,STACK_FRAME_OVERHEAD(%r15)
         .endm
 
         .macro UPDATE_VTIME scratch,enter_timer
@@ -177,7 +178,7 @@ ENTRY(__switch_to)
         lg      %r4,__THREAD_info(%r2)          # get thread_info of prev
         lg      %r5,__THREAD_info(%r3)          # get thread_info of next
         lgr     %r15,%r5
-        aghi    %r15,STACK_SIZE                 # end of kernel stack of next
+        aghi    %r15,STACK_INIT                 # end of kernel stack of next
         stg     %r3,__LC_CURRENT                # store task struct of next
         stg     %r5,__LC_THREAD_INFO            # store thread info of next
         stg     %r15,__LC_KERNEL_STACK          # store end of kernel stack
@@ -203,10 +204,8 @@ sysc_stmg:
         stmg    %r8,%r15,__LC_SAVE_AREA_SYNC
         lg      %r10,__LC_LAST_BREAK
         lg      %r12,__LC_THREAD_INFO
-        larl    %r13,system_call
 sysc_per:
         lg      %r15,__LC_KERNEL_STACK
-        aghi    %r15,-(STACK_FRAME_OVERHEAD + __PT_SIZE)
         la      %r11,STACK_FRAME_OVERHEAD(%r15) # pointer to pt_regs
 sysc_vtime:
         UPDATE_VTIME %r13,__LC_SYNC_ENTER_TIMER
@@ -217,6 +216,7 @@ sysc_vtime:
         mvc     __PT_INT_CODE(4,%r11),__LC_SVC_ILC
 sysc_do_svc:
         oi      __TI_flags+7(%r12),_TIF_SYSCALL
+        lg      %r10,__TI_sysc_table(%r12)      # address of system call table
         llgh    %r8,__PT_INT_CODE+2(%r11)
         slag    %r8,%r8,2                       # shift and test for svc 0
         jnz     sysc_nr_ok
@@ -227,13 +227,6 @@ sysc_do_svc:
         sth     %r1,__PT_INT_CODE+2(%r11)
         slag    %r8,%r1,2
 sysc_nr_ok:
-        larl    %r10,sys_call_table             # 64 bit system call table
-#ifdef CONFIG_COMPAT
-        tm      __TI_flags+5(%r12),(_TIF_31BIT>>16)
-        jno     sysc_noemu
-        larl    %r10,sys_call_table_emu         # 31 bit system call table
-sysc_noemu:
-#endif
         xc      __SF_BACKCHAIN(8,%r15),__SF_BACKCHAIN(%r15)
         stg     %r2,__PT_ORIG_GPR2(%r11)
         stg     %r7,STACK_FRAME_OVERHEAD(%r15)
@@ -389,6 +382,7 @@ ENTRY(pgm_check_handler)
         tm      __LC_PGM_ILC+3,0x80     # check for per exception
         jnz     pgm_svcper              # -> single stepped svc
 0:      CHECK_STACK STACK_SIZE,__LC_SAVE_AREA_SYNC
+        aghi    %r15,-(STACK_FRAME_OVERHEAD + __PT_SIZE)
         j       2f
 1:      UPDATE_VTIME %r14,__LC_SYNC_ENTER_TIMER
         LAST_BREAK %r14
@@ -398,8 +392,7 @@ ENTRY(pgm_check_handler)
         tm      __LC_PGM_ILC+2,0x02     # check for transaction abort
         jz      2f
         mvc     __THREAD_trap_tdb(256,%r14),0(%r13)
-2:      aghi    %r15,-(STACK_FRAME_OVERHEAD + __PT_SIZE)
-        la      %r11,STACK_FRAME_OVERHEAD(%r15)
+2:      la      %r11,STACK_FRAME_OVERHEAD(%r15)
         stmg    %r0,%r7,__PT_R0(%r11)
         mvc     __PT_R8(64,%r11),__LC_SAVE_AREA_SYNC
         stmg    %r8,%r9,__PT_PSW(%r11)
@@ -526,7 +519,6 @@ io_work:
 #
 io_work_user:
         lg      %r1,__LC_KERNEL_STACK
-        aghi    %r1,-(STACK_FRAME_OVERHEAD + __PT_SIZE)
         mvc     STACK_FRAME_OVERHEAD(__PT_SIZE,%r1),0(%r11)
         xc      __SF_BACKCHAIN(8,%r1),__SF_BACKCHAIN(%r1)
         la      %r11,STACK_FRAME_OVERHEAD(%r1)
@@ -688,7 +680,6 @@ mcck_skip:
         tm      __PT_PSW+1(%r11),0x01   # returning to user ?
         jno     mcck_return
         lg      %r1,__LC_KERNEL_STACK   # switch to kernel stack
-        aghi    %r1,-(STACK_FRAME_OVERHEAD + __PT_SIZE)
         mvc     STACK_FRAME_OVERHEAD(__PT_SIZE,%r1),0(%r11)
         xc      __SF_BACKCHAIN(8,%r1),__SF_BACKCHAIN(%r1)
         la      %r11,STACK_FRAME_OVERHEAD(%r1)
@@ -755,14 +746,12 @@ ENTRY(restart_int_handler)
  * Setup a pt_regs so that show_trace can provide a good call trace.
  */
 stack_overflow:
-        lg      %r11,__LC_PANIC_STACK   # change to panic stack
-        aghi    %r11,-__PT_SIZE         # create pt_regs
+        lg      %r15,__LC_PANIC_STACK   # change to panic stack
+        la      %r11,STACK_FRAME_OVERHEAD(%r15)
         stmg    %r0,%r7,__PT_R0(%r11)
         stmg    %r8,%r9,__PT_PSW(%r11)
         mvc     __PT_R8(64,%r11),0(%r14)
         stg     %r10,__PT_ORIG_GPR2(%r11) # store last break to orig_gpr2
-        lgr     %r15,%r11
-        aghi    %r15,-STACK_FRAME_OVERHEAD
         xc      __SF_BACKCHAIN(8,%r15),__SF_BACKCHAIN(%r15)
         lgr     %r2,%r11                # pass pointer to pt_regs
         jg      kernel_stack_overflow
@@ -846,15 +835,14 @@ cleanup_system_call:
         mvc     __TI_last_break(8,%r12),16(%r11)
 0:      # set up saved register r11
         lg      %r15,__LC_KERNEL_STACK
-        aghi    %r15,-__PT_SIZE
-        stg     %r15,24(%r11)           # r11 pt_regs pointer
+        la      %r9,STACK_FRAME_OVERHEAD(%r15)
+        stg     %r9,24(%r11)            # r11 pt_regs pointer
         # fill pt_regs
-        mvc     __PT_R8(64,%r15),__LC_SAVE_AREA_SYNC
-        stmg    %r0,%r7,__PT_R0(%r15)
-        mvc     __PT_PSW(16,%r15),__LC_SVC_OLD_PSW
-        mvc     __PT_INT_CODE(4,%r15),__LC_SVC_ILC
+        mvc     __PT_R8(64,%r9),__LC_SAVE_AREA_SYNC
+        stmg    %r0,%r7,__PT_R0(%r9)
+        mvc     __PT_PSW(16,%r9),__LC_SVC_OLD_PSW
+        mvc     __PT_INT_CODE(4,%r9),__LC_SVC_ILC
         # setup saved register r15
-        aghi    %r15,-STACK_FRAME_OVERHEAD
         stg     %r15,56(%r11)           # r15 stack pointer
         # set new psw address and exit
         larl    %r9,sysc_do_svc
@@ -1011,6 +999,7 @@ sys_call_table:
 #ifdef CONFIG_COMPAT
 
 #define SYSCALL(esa,esame,emu)  .long emu
+        .globl  sys_call_table_emu
 sys_call_table_emu:
 #include "syscalls.S"
 #undef SYSCALL
diff --git a/arch/s390/kernel/irq.c b/arch/s390/kernel/irq.c
index 1630f439cd2a..4f5ef62934a4 100644
--- a/arch/s390/kernel/irq.c
+++ b/arch/s390/kernel/irq.c
@@ -33,7 +33,7 @@ struct irq_class {
 };
 
 /*
- * The list of "main" irq classes on s390. This is the list of interrrupts
+ * The list of "main" irq classes on s390. This is the list of interrupts
  * that appear both in /proc/stat ("intr" line) and /proc/interrupts.
  * Historically only external and I/O interrupts have been part of /proc/stat.
  * We can't add the split external and I/O sub classes since the first field
diff --git a/arch/s390/kernel/machine_kexec.c b/arch/s390/kernel/machine_kexec.c
index b3de27700016..ac2178161ec3 100644
--- a/arch/s390/kernel/machine_kexec.c
+++ b/arch/s390/kernel/machine_kexec.c
@@ -13,6 +13,7 @@
 #include <linux/reboot.h>
 #include <linux/ftrace.h>
 #include <linux/debug_locks.h>
+#include <linux/suspend.h>
 #include <asm/cio.h>
 #include <asm/setup.h>
 #include <asm/pgtable.h>
@@ -67,6 +68,35 @@ void setup_regs(void)
         memcpy((void *) SAVE_AREA_BASE, (void *) sa, sizeof(struct save_area));
 }
 
+/*
+ * PM notifier callback for kdump
+ */
+static int machine_kdump_pm_cb(struct notifier_block *nb, unsigned long action,
+                               void *ptr)
+{
+        switch (action) {
+        case PM_SUSPEND_PREPARE:
+        case PM_HIBERNATION_PREPARE:
+                if (crashk_res.start)
+                        crash_map_reserved_pages();
+                break;
+        case PM_POST_SUSPEND:
+        case PM_POST_HIBERNATION:
+                if (crashk_res.start)
+                        crash_unmap_reserved_pages();
+                break;
+        default:
+                return NOTIFY_DONE;
+        }
+        return NOTIFY_OK;
+}
+
+static int __init machine_kdump_pm_init(void)
+{
+        pm_notifier(machine_kdump_pm_cb, 0);
+        return 0;
+}
+arch_initcall(machine_kdump_pm_init);
 #endif
 
 /*
diff --git a/arch/s390/kernel/process.c b/arch/s390/kernel/process.c
index 536d64579d9a..2bc3eddae34a 100644
--- a/arch/s390/kernel/process.c
+++ b/arch/s390/kernel/process.c
@@ -61,18 +61,8 @@ unsigned long thread_saved_pc(struct task_struct *tsk)
         return sf->gprs[8];
 }
 
-/*
- * The idle loop on a S390...
- */
-static void default_idle(void)
+void arch_cpu_idle(void)
 {
-        if (cpu_is_offline(smp_processor_id()))
-                cpu_die();
-        local_irq_disable();
-        if (need_resched()) {
-                local_irq_enable();
-                return;
-        }
         local_mcck_disable();
         if (test_thread_flag(TIF_MCCK_PENDING)) {
                 local_mcck_enable();
@@ -83,19 +73,15 @@ static void default_idle(void)
         vtime_stop_cpu();
 }
 
-void cpu_idle(void)
+void arch_cpu_idle_exit(void)
 {
-        for (;;) {
-                tick_nohz_idle_enter();
-                rcu_idle_enter();
-                while (!need_resched() && !test_thread_flag(TIF_MCCK_PENDING))
-                        default_idle();
-                rcu_idle_exit();
-                tick_nohz_idle_exit();
-                if (test_thread_flag(TIF_MCCK_PENDING))
-                        s390_handle_mcck();
-                schedule_preempt_disabled();
-        }
+        if (test_thread_flag(TIF_MCCK_PENDING))
+                s390_handle_mcck();
+}
+
+void arch_cpu_idle_dead(void)
+{
+        cpu_die();
 }
 
 extern void __kprobes kernel_thread_starter(void);
diff --git a/arch/s390/kernel/setup.c b/arch/s390/kernel/setup.c
index 29268859d8ee..0f419c5765c8 100644
--- a/arch/s390/kernel/setup.c
+++ b/arch/s390/kernel/setup.c
@@ -377,11 +377,14 @@ static void __init setup_lowcore(void)
                 PSW_MASK_DAT | PSW_MASK_MCHECK;
         lc->io_new_psw.addr = PSW_ADDR_AMODE | (unsigned long) io_int_handler;
         lc->clock_comparator = -1ULL;
-        lc->kernel_stack = ((unsigned long) &init_thread_union) + THREAD_SIZE;
+        lc->kernel_stack = ((unsigned long) &init_thread_union)
+                + THREAD_SIZE - STACK_FRAME_OVERHEAD - sizeof(struct pt_regs);
         lc->async_stack = (unsigned long)
-                __alloc_bootmem(ASYNC_SIZE, ASYNC_SIZE, 0) + ASYNC_SIZE;
+                __alloc_bootmem(ASYNC_SIZE, ASYNC_SIZE, 0)
+                + ASYNC_SIZE - STACK_FRAME_OVERHEAD - sizeof(struct pt_regs);
         lc->panic_stack = (unsigned long)
-                __alloc_bootmem(PAGE_SIZE, PAGE_SIZE, 0) + PAGE_SIZE;
+                __alloc_bootmem(PAGE_SIZE, PAGE_SIZE, 0)
+                + PAGE_SIZE - STACK_FRAME_OVERHEAD - sizeof(struct pt_regs);
         lc->current_task = (unsigned long) init_thread_union.thread_info.task;
         lc->thread_info = (unsigned long) &init_thread_union;
         lc->machine_flags = S390_lowcore.machine_flags;
diff --git a/arch/s390/kernel/smp.c b/arch/s390/kernel/smp.c
index 549c9d173c0f..8074cb4b7cbf 100644
--- a/arch/s390/kernel/smp.c
+++ b/arch/s390/kernel/smp.c
@@ -181,8 +181,10 @@ static int __cpuinit pcpu_alloc_lowcore(struct pcpu *pcpu, int cpu)
         lc = pcpu->lowcore;
         memcpy(lc, &S390_lowcore, 512);
         memset((char *) lc + 512, 0, sizeof(*lc) - 512);
-        lc->async_stack = pcpu->async_stack + ASYNC_SIZE;
-        lc->panic_stack = pcpu->panic_stack + PAGE_SIZE;
+        lc->async_stack = pcpu->async_stack + ASYNC_SIZE
+                - STACK_FRAME_OVERHEAD - sizeof(struct pt_regs);
+        lc->panic_stack = pcpu->panic_stack + PAGE_SIZE
+                - STACK_FRAME_OVERHEAD - sizeof(struct pt_regs);
         lc->cpu_nr = cpu;
 #ifndef CONFIG_64BIT
         if (MACHINE_HAS_IEEE) {
@@ -253,7 +255,8 @@ static void pcpu_attach_task(struct pcpu *pcpu, struct task_struct *tsk)
         struct _lowcore *lc = pcpu->lowcore;
         struct thread_info *ti = task_thread_info(tsk);
 
-        lc->kernel_stack = (unsigned long) task_stack_page(tsk) + THREAD_SIZE;
+        lc->kernel_stack = (unsigned long) task_stack_page(tsk)
+                + THREAD_SIZE - STACK_FRAME_OVERHEAD - sizeof(struct pt_regs);
         lc->thread_info = (unsigned long) task_thread_info(tsk);
         lc->current_task = (unsigned long) tsk;
         lc->user_timer = ti->user_timer;
@@ -711,8 +714,7 @@ static void __cpuinit smp_start_secondary(void *cpuvoid)
         set_cpu_online(smp_processor_id(), true);
         inc_irq_stat(CPU_RST);
         local_irq_enable();
-        /* cpu_idle will call schedule for us */
-        cpu_idle();
+        cpu_startup_entry(CPUHP_ONLINE);
 }
 
 /* Upping and downing of CPUs */
@@ -810,8 +812,10 @@ void __init smp_prepare_boot_cpu(void)
         pcpu->state = CPU_STATE_CONFIGURED;
         pcpu->address = boot_cpu_address;
         pcpu->lowcore = (struct _lowcore *)(unsigned long) store_prefix();
-        pcpu->async_stack = S390_lowcore.async_stack - ASYNC_SIZE;
-        pcpu->panic_stack = S390_lowcore.panic_stack - PAGE_SIZE;
+        pcpu->async_stack = S390_lowcore.async_stack - ASYNC_SIZE
+                + STACK_FRAME_OVERHEAD + sizeof(struct pt_regs);
+        pcpu->panic_stack = S390_lowcore.panic_stack - PAGE_SIZE
+                + STACK_FRAME_OVERHEAD + sizeof(struct pt_regs);
         S390_lowcore.percpu_offset = __per_cpu_offset[0];
         smp_cpu_set_polarization(0, POLARIZATION_UNKNOWN);
         set_cpu_present(0, true);
diff --git a/arch/s390/kernel/suspend.c b/arch/s390/kernel/suspend.c
index aa1494d0e380..c479d2f9605b 100644
--- a/arch/s390/kernel/suspend.c
+++ b/arch/s390/kernel/suspend.c
@@ -41,6 +41,7 @@ struct page_key_data {
 static struct page_key_data *page_key_data;
 static struct page_key_data *page_key_rp, *page_key_wp;
 static unsigned long page_key_rx, page_key_wx;
+unsigned long suspend_zero_pages;
 
 /*
  * For each page in the hibernation image one additional byte is
@@ -149,6 +150,36 @@ int pfn_is_nosave(unsigned long pfn)
         return 0;
 }
 
+/*
+ * PM notifier callback for suspend
+ */
+static int suspend_pm_cb(struct notifier_block *nb, unsigned long action,
+                         void *ptr)
+{
+        switch (action) {
+        case PM_SUSPEND_PREPARE:
+        case PM_HIBERNATION_PREPARE:
+                suspend_zero_pages = __get_free_pages(GFP_KERNEL, LC_ORDER);
+                if (!suspend_zero_pages)
+                        return NOTIFY_BAD;
+                break;
+        case PM_POST_SUSPEND:
+        case PM_POST_HIBERNATION:
+                free_pages(suspend_zero_pages, LC_ORDER);
+                break;
+        default:
+                return NOTIFY_DONE;
+        }
+        return NOTIFY_OK;
+}
+
+static int __init suspend_pm_init(void)
+{
+        pm_notifier(suspend_pm_cb, 0);
+        return 0;
+}
+arch_initcall(suspend_pm_init);
+
 void save_processor_state(void)
 {
         /* swsusp_arch_suspend() actually saves all cpu register contents.
diff --git a/arch/s390/kernel/swsusp_asm64.S b/arch/s390/kernel/swsusp_asm64.S
index d4ca4e0617b5..c487be4cfc81 100644
--- a/arch/s390/kernel/swsusp_asm64.S
+++ b/arch/s390/kernel/swsusp_asm64.S
@@ -36,8 +36,8 @@ ENTRY(swsusp_arch_suspend)
         /* Store prefix register on stack */
         stpx    __SF_EMPTY(%r15)
 
-        /* Save prefix register contents for lowcore */
-        llgf    %r4,__SF_EMPTY(%r15)
+        /* Save prefix register contents for lowcore copy */
+        llgf    %r10,__SF_EMPTY(%r15)
 
         /* Get pointer to save area */
         lghi    %r1,0x1000
@@ -91,7 +91,18 @@ ENTRY(swsusp_arch_suspend)
         xc      __SF_EMPTY(4,%r15),__SF_EMPTY(%r15)
         spx     __SF_EMPTY(%r15)
 
+        /* Save absolute zero pages */
+        larl    %r2,suspend_zero_pages
+        lg      %r2,0(%r2)
+        lghi    %r4,0
+        lghi    %r3,2*PAGE_SIZE
+        lghi    %r5,2*PAGE_SIZE
+1:      mvcle   %r2,%r4,0
+        jo      1b
+
+        /* Copy lowcore to absolute zero lowcore */
         lghi    %r2,0
+        lgr     %r4,%r10
         lghi    %r3,2*PAGE_SIZE
         lghi    %r5,2*PAGE_SIZE
 1:      mvcle   %r2,%r4,0
@@ -248,8 +259,20 @@ restore_registers:
         /* Load old stack */
         lg      %r15,0x2f8(%r13)
 
+        /* Save prefix register */
+        mvc __SF_EMPTY(4,%r15),0x318(%r13)
+
+        /* Restore absolute zero pages */
+        lghi    %r2,0
+        larl    %r4,suspend_zero_pages
+        lg      %r4,0(%r4)
+        lghi    %r3,2*PAGE_SIZE
+        lghi    %r5,2*PAGE_SIZE
+1:      mvcle   %r2,%r4,0
+        jo      1b
+
         /* Restore prefix register */
-        spx     0x318(%r13)
+        spx     __SF_EMPTY(%r15)
 
         /* Activate DAT */
         stosm   __SF_EMPTY(%r15),0x04
diff --git a/arch/s390/kernel/sys_s390.c b/arch/s390/kernel/sys_s390.c
index d0964d22adb5..23eb222c1658 100644
--- a/arch/s390/kernel/sys_s390.c
+++ b/arch/s390/kernel/sys_s390.c
@@ -132,19 +132,9 @@ SYSCALL_DEFINE1(s390_fadvise64_64, struct fadvise64_64_args __user *, args)
  * to
  *   %r2: fd, %r3: mode, %r4/%r5: offset, 96(%r15)-103(%r15): len
  */
-SYSCALL_DEFINE(s390_fallocate)(int fd, int mode, loff_t offset,
-                               u32 len_high, u32 len_low)
+SYSCALL_DEFINE5(s390_fallocate, int, fd, int, mode, loff_t, offset,
+                               u32, len_high, u32, len_low)
 {
         return sys_fallocate(fd, mode, offset, ((u64)len_high << 32) | len_low);
 }
-#ifdef CONFIG_HAVE_SYSCALL_WRAPPERS
-asmlinkage long SyS_s390_fallocate(long fd, long mode, loff_t offset,
-                                   long len_high, long len_low)
-{
-        return SYSC_s390_fallocate((int) fd, (int) mode, offset,
-                                   (u32) len_high, (u32) len_low);
-}
-SYSCALL_ALIAS(sys_s390_fallocate, SyS_s390_fallocate);
-#endif
-
 #endif
diff --git a/arch/s390/kernel/syscalls.S b/arch/s390/kernel/syscalls.S
index 630b935d1284..d2baabed7148 100644
--- a/arch/s390/kernel/syscalls.S
+++ b/arch/s390/kernel/syscalls.S
@@ -85,7 +85,7 @@ SYSCALL(sys_sigpending,sys_sigpending,compat_sys_sigpending_wrapper)
 SYSCALL(sys_sethostname,sys_sethostname,sys32_sethostname_wrapper)
 SYSCALL(sys_setrlimit,sys_setrlimit,compat_sys_setrlimit_wrapper)       /* 75 */
 SYSCALL(sys_old_getrlimit,sys_getrlimit,compat_sys_old_getrlimit_wrapper)
-SYSCALL(sys_getrusage,sys_getrusage,compat_sys_getrusage_wrapper)
+SYSCALL(sys_getrusage,sys_getrusage,compat_sys_getrusage)
 SYSCALL(sys_gettimeofday,sys_gettimeofday,compat_sys_gettimeofday_wrapper)
 SYSCALL(sys_settimeofday,sys_settimeofday,compat_sys_settimeofday_wrapper)
 SYSCALL(sys_getgroups16,sys_ni_syscall,sys32_getgroups16_wrapper)       /* 80 old getgroups16 syscall */
@@ -118,14 +118,14 @@ SYSCALL(sys_newstat,sys_newstat,compat_sys_newstat_wrapper)
 SYSCALL(sys_newlstat,sys_newlstat,compat_sys_newlstat_wrapper)
 SYSCALL(sys_newfstat,sys_newfstat,compat_sys_newfstat_wrapper)
 NI_SYSCALL                                                      /* old uname syscall */
-SYSCALL(sys_lookup_dcookie,sys_lookup_dcookie,sys32_lookup_dcookie_wrapper)     /* 110 */
+SYSCALL(sys_lookup_dcookie,sys_lookup_dcookie,compat_sys_lookup_dcookie)        /* 110 */
 SYSCALL(sys_vhangup,sys_vhangup,sys_vhangup)
 NI_SYSCALL                                                      /* old "idle" system call */
 NI_SYSCALL                                                      /* vm86old for i386 */
 SYSCALL(sys_wait4,sys_wait4,compat_sys_wait4)
 SYSCALL(sys_swapoff,sys_swapoff,sys32_swapoff_wrapper)          /* 115 */
 SYSCALL(sys_sysinfo,sys_sysinfo,compat_sys_sysinfo_wrapper)
-SYSCALL(sys_s390_ipc,sys_s390_ipc,sys32_ipc_wrapper)
+SYSCALL(sys_s390_ipc,sys_s390_ipc,compat_sys_s390_ipc)
 SYSCALL(sys_fsync,sys_fsync,sys32_fsync_wrapper)
 SYSCALL(sys_sigreturn,sys_sigreturn,sys32_sigreturn)
 SYSCALL(sys_clone,sys_clone,sys_clone_wrapper)                  /* 120 */
@@ -195,7 +195,7 @@ SYSCALL(sys_getcwd,sys_getcwd,sys32_getcwd_wrapper)
 SYSCALL(sys_capget,sys_capget,sys32_capget_wrapper)
 SYSCALL(sys_capset,sys_capset,sys32_capset_wrapper)             /* 185 */
 SYSCALL(sys_sigaltstack,sys_sigaltstack,compat_sys_sigaltstack)
-SYSCALL(sys_sendfile,sys_sendfile64,sys32_sendfile_wrapper)
+SYSCALL(sys_sendfile,sys_sendfile64,compat_sys_sendfile)
 NI_SYSCALL                                                      /* streams1 */
 NI_SYSCALL                                                      /* streams2 */
 SYSCALL(sys_vfork,sys_vfork,sys_vfork)                          /* 190 */
@@ -231,7 +231,7 @@ SYSCALL(sys_madvise,sys_madvise,sys32_madvise_wrapper)
 SYSCALL(sys_getdents64,sys_getdents64,sys32_getdents64_wrapper) /* 220 */
 SYSCALL(sys_fcntl64,sys_ni_syscall,compat_sys_fcntl64_wrapper)
 SYSCALL(sys_readahead,sys_readahead,sys32_readahead_wrapper)
-SYSCALL(sys_sendfile64,sys_ni_syscall,sys32_sendfile64_wrapper)
+SYSCALL(sys_sendfile64,sys_ni_syscall,compat_sys_sendfile64)
 SYSCALL(sys_setxattr,sys_setxattr,sys32_setxattr_wrapper)
 SYSCALL(sys_lsetxattr,sys_lsetxattr,sys32_lsetxattr_wrapper)    /* 225 */
 SYSCALL(sys_fsetxattr,sys_fsetxattr,sys32_fsetxattr_wrapper)
@@ -317,20 +317,20 @@ SYSCALL(sys_get_robust_list,sys_get_robust_list,compat_sys_get_robust_list)
 SYSCALL(sys_splice,sys_splice,sys_splice_wrapper)
 SYSCALL(sys_sync_file_range,sys_sync_file_range,sys_sync_file_range_wrapper)
 SYSCALL(sys_tee,sys_tee,sys_tee_wrapper)
-SYSCALL(sys_vmsplice,sys_vmsplice,compat_sys_vmsplice_wrapper)
+SYSCALL(sys_vmsplice,sys_vmsplice,compat_sys_vmsplice)
 NI_SYSCALL                                                      /* 310 sys_move_pages */
 SYSCALL(sys_getcpu,sys_getcpu,sys_getcpu_wrapper)
-SYSCALL(sys_epoll_pwait,sys_epoll_pwait,compat_sys_epoll_pwait_wrapper)
+SYSCALL(sys_epoll_pwait,sys_epoll_pwait,compat_sys_epoll_pwait)
 SYSCALL(sys_utimes,sys_utimes,compat_sys_utimes_wrapper)
 SYSCALL(sys_s390_fallocate,sys_fallocate,sys_fallocate_wrapper)
 SYSCALL(sys_utimensat,sys_utimensat,compat_sys_utimensat_wrapper)       /* 315 */
-SYSCALL(sys_signalfd,sys_signalfd,compat_sys_signalfd_wrapper)
+SYSCALL(sys_signalfd,sys_signalfd,compat_sys_signalfd)
 NI_SYSCALL                                              /* 317 old sys_timer_fd */
 SYSCALL(sys_eventfd,sys_eventfd,sys_eventfd_wrapper)
 SYSCALL(sys_timerfd_create,sys_timerfd_create,sys_timerfd_create_wrapper)
 SYSCALL(sys_timerfd_settime,sys_timerfd_settime,compat_sys_timerfd_settime) /* 320 */
 SYSCALL(sys_timerfd_gettime,sys_timerfd_gettime,compat_sys_timerfd_gettime)
-SYSCALL(sys_signalfd4,sys_signalfd4,compat_sys_signalfd4_wrapper)
+SYSCALL(sys_signalfd4,sys_signalfd4,compat_sys_signalfd4)
 SYSCALL(sys_eventfd2,sys_eventfd2,sys_eventfd2_wrapper)
 SYSCALL(sys_inotify_init1,sys_inotify_init1,sys_inotify_init1_wrapper)
 SYSCALL(sys_pipe2,sys_pipe2,sys_pipe2_wrapper) /* 325 */
diff --git a/arch/s390/kernel/traps.c b/arch/s390/kernel/traps.c
index 13dd63fba367..c5762324d9ee 100644
--- a/arch/s390/kernel/traps.c
+++ b/arch/s390/kernel/traps.c
@@ -12,49 +12,16 @@
  * 'Traps.c' handles hardware traps and faults after we have saved some
  * state in 'asm.s'.
  */
-#include <linux/sched.h>
-#include <linux/kernel.h>
-#include <linux/string.h>
-#include <linux/errno.h>
+#include <linux/kprobes.h>
+#include <linux/kdebug.h>
+#include <linux/module.h>
 #include <linux/ptrace.h>
-#include <linux/timer.h>
+#include <linux/sched.h>
 #include <linux/mm.h>
-#include <linux/smp.h>
-#include <linux/init.h>
-#include <linux/interrupt.h>
-#include <linux/seq_file.h>
-#include <linux/delay.h>
-#include <linux/module.h>
-#include <linux/kdebug.h>
-#include <linux/kallsyms.h>
-#include <linux/reboot.h>
-#include <linux/kprobes.h>
-#include <linux/bug.h>
-#include <linux/utsname.h>
-#include <asm/uaccess.h>
-#include <asm/io.h>
-#include <linux/atomic.h>
-#include <asm/mathemu.h>
-#include <asm/cpcmd.h>
-#include <asm/lowcore.h>
-#include <asm/debug.h>
-#include <asm/ipl.h>
 #include "entry.h"
 
 int show_unhandled_signals = 1;
 
-#define stack_pointer ({ void **sp; asm("la %0,0(15)" : "=&d" (sp)); sp; })
-
-#ifndef CONFIG_64BIT
-#define LONG "%08lx "
-#define FOURLONG "%08lx %08lx %08lx %08lx\n"
-static int kstack_depth_to_print = 12;
-#else /* CONFIG_64BIT */
-#define LONG "%016lx "
-#define FOURLONG "%016lx %016lx %016lx %016lx\n"
-static int kstack_depth_to_print = 20;
-#endif /* CONFIG_64BIT */
-
 static inline void __user *get_trap_ip(struct pt_regs *regs)
 {
 #ifdef CONFIG_64BIT
@@ -72,215 +39,6 @@ static inline void __user *get_trap_ip(struct pt_regs *regs)
 #endif
 }
 
-/*
- * For show_trace we have tree different stack to consider:
- *   - the panic stack which is used if the kernel stack has overflown
- *   - the asynchronous interrupt stack (cpu related)
- *   - the synchronous kernel stack (process related)
- * The stack trace can start at any of the three stack and can potentially
- * touch all of them. The order is: panic stack, async stack, sync stack.
- */
-static unsigned long
-__show_trace(unsigned long sp, unsigned long low, unsigned long high)
-{
-        struct stack_frame *sf;
-        struct pt_regs *regs;
-
-        while (1) {
-                sp = sp & PSW_ADDR_INSN;
-                if (sp < low || sp > high - sizeof(*sf))
-                        return sp;
-                sf = (struct stack_frame *) sp;
-                printk("([<%016lx>] ", sf->gprs[8] & PSW_ADDR_INSN);
-                print_symbol("%s)\n", sf->gprs[8] & PSW_ADDR_INSN);
-                /* Follow the backchain. */
-                while (1) {
-                        low = sp;
-                        sp = sf->back_chain & PSW_ADDR_INSN;
-                        if (!sp)
-                                break;
-                        if (sp <= low || sp > high - sizeof(*sf))
-                                return sp;
-                        sf = (struct stack_frame *) sp;
-                        printk(" [<%016lx>] ", sf->gprs[8] & PSW_ADDR_INSN);
-                        print_symbol("%s\n", sf->gprs[8] & PSW_ADDR_INSN);
-                }
-                /* Zero backchain detected, check for interrupt frame. */
-                sp = (unsigned long) (sf + 1);
-                if (sp <= low || sp > high - sizeof(*regs))
-                        return sp;
-                regs = (struct pt_regs *) sp;
-                printk(" [<%016lx>] ", regs->psw.addr & PSW_ADDR_INSN);
-                print_symbol("%s\n", regs->psw.addr & PSW_ADDR_INSN);
-                low = sp;
-                sp = regs->gprs[15];
-        }
-}
-
-static void show_trace(struct task_struct *task, unsigned long *stack)
-{
-        register unsigned long __r15 asm ("15");
-        unsigned long sp;
-
-        sp = (unsigned long) stack;
-        if (!sp)
-                sp = task ? task->thread.ksp : __r15;
-        printk("Call Trace:\n");
-#ifdef CONFIG_CHECK_STACK
-        sp = __show_trace(sp, S390_lowcore.panic_stack - 4096,
-                          S390_lowcore.panic_stack);
-#endif
-        sp = __show_trace(sp, S390_lowcore.async_stack - ASYNC_SIZE,
-                          S390_lowcore.async_stack);
-        if (task)
-                __show_trace(sp, (unsigned long) task_stack_page(task),
-                             (unsigned long) task_stack_page(task) + THREAD_SIZE);
-        else
-                __show_trace(sp, S390_lowcore.thread_info,
-                             S390_lowcore.thread_info + THREAD_SIZE);
-        if (!task)
-                task = current;
-        debug_show_held_locks(task);
-}
-
-void show_stack(struct task_struct *task, unsigned long *sp)
-{
-        register unsigned long * __r15 asm ("15");
-        unsigned long *stack;
-        int i;
-
-        if (!sp)
-                stack = task ? (unsigned long *) task->thread.ksp : __r15;
-        else
-                stack = sp;
-
-        for (i = 0; i < kstack_depth_to_print; i++) {
-                if (((addr_t) stack & (THREAD_SIZE-1)) == 0)
-                        break;
-                if ((i * sizeof(long) % 32) == 0)
-                        printk("%s       ", i == 0 ? "" : "\n");
-                printk(LONG, *stack++);
-        }
-        printk("\n");
-        show_trace(task, sp);
-}
-
-static void show_last_breaking_event(struct pt_regs *regs)
-{
-#ifdef CONFIG_64BIT
-        printk("Last Breaking-Event-Address:\n");
-        printk(" [<%016lx>] ", regs->args[0] & PSW_ADDR_INSN);
-        print_symbol("%s\n", regs->args[0] & PSW_ADDR_INSN);
-#endif
-}
-
-/*
- * The architecture-independent dump_stack generator
- */
-void dump_stack(void)
-{
-        printk("CPU: %d %s %s %.*s\n",
-               task_thread_info(current)->cpu, print_tainted(),
-               init_utsname()->release,
-               (int)strcspn(init_utsname()->version, " "),
-               init_utsname()->version);
-        printk("Process %s (pid: %d, task: %p, ksp: %p)\n",
-               current->comm, current->pid, current,
-               (void *) current->thread.ksp);
-        show_stack(NULL, NULL);
-}
-EXPORT_SYMBOL(dump_stack);
-
-static inline int mask_bits(struct pt_regs *regs, unsigned long bits)
-{
-        return (regs->psw.mask & bits) / ((~bits + 1) & bits);
-}
-
-void show_registers(struct pt_regs *regs)
-{
-        char *mode;
-
-        mode = user_mode(regs) ? "User" : "Krnl";
-        printk("%s PSW : %p %p",
-               mode, (void *) regs->psw.mask,
-               (void *) regs->psw.addr);
-        print_symbol(" (%s)\n", regs->psw.addr & PSW_ADDR_INSN);
-        printk("           R:%x T:%x IO:%x EX:%x Key:%x M:%x W:%x "
-               "P:%x AS:%x CC:%x PM:%x", mask_bits(regs, PSW_MASK_PER),
-               mask_bits(regs, PSW_MASK_DAT), mask_bits(regs, PSW_MASK_IO),
-               mask_bits(regs, PSW_MASK_EXT), mask_bits(regs, PSW_MASK_KEY),
-               mask_bits(regs, PSW_MASK_MCHECK), mask_bits(regs, PSW_MASK_WAIT),
-               mask_bits(regs, PSW_MASK_PSTATE), mask_bits(regs, PSW_MASK_ASC),
-               mask_bits(regs, PSW_MASK_CC), mask_bits(regs, PSW_MASK_PM));
-#ifdef CONFIG_64BIT
-        printk(" EA:%x", mask_bits(regs, PSW_MASK_EA | PSW_MASK_BA));
-#endif
-        printk("\n%s GPRS: " FOURLONG, mode,
-               regs->gprs[0], regs->gprs[1], regs->gprs[2], regs->gprs[3]);
-        printk("           " FOURLONG,
-               regs->gprs[4], regs->gprs[5], regs->gprs[6], regs->gprs[7]);
-        printk("           " FOURLONG,
-               regs->gprs[8], regs->gprs[9], regs->gprs[10], regs->gprs[11]);
-        printk("           " FOURLONG,
-               regs->gprs[12], regs->gprs[13], regs->gprs[14], regs->gprs[15]);
-
-        show_code(regs);
-}       
-
-void show_regs(struct pt_regs *regs)
-{
-        printk("CPU: %d %s %s %.*s\n",
-               task_thread_info(current)->cpu, print_tainted(),
-               init_utsname()->release,
-               (int)strcspn(init_utsname()->version, " "),
-               init_utsname()->version);
-        printk("Process %s (pid: %d, task: %p, ksp: %p)\n",
-               current->comm, current->pid, current,
-               (void *) current->thread.ksp);
-        show_registers(regs);
-        /* Show stack backtrace if pt_regs is from kernel mode */
-        if (!user_mode(regs))
-                show_trace(NULL, (unsigned long *) regs->gprs[15]);
-        show_last_breaking_event(regs);
-}
-
-static DEFINE_SPINLOCK(die_lock);
-
-void die(struct pt_regs *regs, const char *str)
-{
-        static int die_counter;
-
-        oops_enter();
-        lgr_info_log();
-        debug_stop_all();
-        console_verbose();
-        spin_lock_irq(&die_lock);
-        bust_spinlocks(1);
-        printk("%s: %04x [#%d] ", str, regs->int_code & 0xffff, ++die_counter);
-#ifdef CONFIG_PREEMPT
-        printk("PREEMPT ");
-#endif
-#ifdef CONFIG_SMP
-        printk("SMP ");
-#endif
-#ifdef CONFIG_DEBUG_PAGEALLOC
-        printk("DEBUG_PAGEALLOC");
-#endif
-        printk("\n");
-        notify_die(DIE_OOPS, str, regs, 0, regs->int_code & 0xffff, SIGSEGV);
-        print_modules();
-        show_regs(regs);
-        bust_spinlocks(0);
-        add_taint(TAINT_DIE, LOCKDEP_NOW_UNRELIABLE);
-        spin_unlock_irq(&die_lock);
-        if (in_interrupt())
-                panic("Fatal exception in interrupt");
-        if (panic_on_oops)
-                panic("Fatal exception: panic_on_oops");
-        oops_exit();
-        do_exit(SIGSEGV);
-}
-
 static inline void report_user_fault(struct pt_regs *regs, int signr)
 {
         if ((task_pid_nr(current) > 1) && !show_unhandled_signals)
diff --git a/arch/s390/kernel/vtime.c b/arch/s390/kernel/vtime.c
index a0042acbd989..3fb09359eda6 100644
--- a/arch/s390/kernel/vtime.c
+++ b/arch/s390/kernel/vtime.c
@@ -158,8 +158,6 @@ void __kprobes vtime_stop_cpu(void)
         unsigned long psw_mask;
 
         trace_hardirqs_on();
-        /* Don't trace preempt off for idle. */
-        stop_critical_timings();
 
         /* Wait for external, I/O or machine check interrupt. */
         psw_mask = psw_kernel_bits | PSW_MASK_WAIT | PSW_MASK_DAT |
@@ -169,9 +167,6 @@ void __kprobes vtime_stop_cpu(void)
         /* Call the assembler magic in entry.S */
         psw_idle(idle, psw_mask);
 
-        /* Reenable preemption tracer. */
-        start_critical_timings();
-
         /* Account time spent with enabled wait psw loaded as idle time. */
         idle->sequence++;
         smp_wmb();
diff --git a/arch/s390/kvm/trace.h b/arch/s390/kvm/trace.h
index 2b29e62351d3..c2f582bb1cb2 100644
--- a/arch/s390/kvm/trace.h
+++ b/arch/s390/kvm/trace.h
@@ -67,7 +67,7 @@ TRACE_EVENT(kvm_s390_sie_fault,
 #define sie_intercept_code                              \
         {0x04, "Instruction"},                          \
         {0x08, "Program interruption"},                 \
-        {0x0C, "Instruction and program interuption"},  \
+        {0x0C, "Instruction and program interruption"}, \
         {0x10, "External request"},                     \
         {0x14, "External interruption"},                \
         {0x18, "I/O request"},                          \
@@ -117,7 +117,7 @@ TRACE_EVENT(kvm_s390_intercept_instruction,
                            __entry->instruction,
                            insn_to_mnemonic((unsigned char *)
                                             &__entry->instruction,
-                                         __entry->insn) ?
+                                         __entry->insn, sizeof(__entry->insn)) ?
                            "unknown" : __entry->insn)
         );
 
diff --git a/arch/s390/lib/Makefile b/arch/s390/lib/Makefile
index 6ab0d0b5cec8..20b0e97a7df2 100644
--- a/arch/s390/lib/Makefile
+++ b/arch/s390/lib/Makefile
@@ -3,7 +3,6 @@
 #
 
 lib-y += delay.o string.o uaccess_std.o uaccess_pt.o
-obj-y += usercopy.o
 obj-$(CONFIG_32BIT) += div64.o qrnnd.o ucmpdi2.o mem32.o
 obj-$(CONFIG_64BIT) += mem64.o
 lib-$(CONFIG_64BIT) += uaccess_mvcos.o
diff --git a/arch/s390/lib/usercopy.c b/arch/s390/lib/usercopy.c
deleted file mode 100644
index 14b363fec8a2..000000000000
--- a/arch/s390/lib/usercopy.c
+++ /dev/null
@@ -1,8 +0,0 @@
-#include <linux/module.h>
-#include <linux/bug.h>
-
-void copy_from_user_overflow(void)
-{
-        WARN(1, "Buffer overflow detected!\n");
-}
-EXPORT_SYMBOL(copy_from_user_overflow);
diff --git a/arch/s390/mm/cmm.c b/arch/s390/mm/cmm.c
index 479e94282910..9d84a1feefef 100644
--- a/arch/s390/mm/cmm.c
+++ b/arch/s390/mm/cmm.c
@@ -458,12 +458,10 @@ static int __init cmm_init(void)
         if (rc)
                 goto out_pm;
         cmm_thread_ptr = kthread_run(cmm_thread, NULL, "cmmthread");
-        rc = IS_ERR(cmm_thread_ptr) ? PTR_ERR(cmm_thread_ptr) : 0;
-        if (rc)
-                goto out_kthread;
-        return 0;
+        if (!IS_ERR(cmm_thread_ptr))
+                return 0;
 
-out_kthread:
+        rc = PTR_ERR(cmm_thread_ptr);
         unregister_pm_notifier(&cmm_power_notifier);
 out_pm:
         unregister_oom_notifier(&cmm_oom_nb);
diff --git a/arch/s390/mm/fault.c b/arch/s390/mm/fault.c
index 2fb9e63b8fc4..047c3e4c59a2 100644
--- a/arch/s390/mm/fault.c
+++ b/arch/s390/mm/fault.c
@@ -395,8 +395,13 @@ void __kprobes do_protection_exception(struct pt_regs *regs)
         int fault;
 
         trans_exc_code = regs->int_parm_long;
-        /* Protection exception is suppressing, decrement psw address. */
-        regs->psw.addr = __rewind_psw(regs->psw, regs->int_code >> 16);
+        /*
+         * Protection exceptions are suppressing, decrement psw address.
+         * The exception to this rule are aborted transactions, for these
+         * the PSW already points to the correct location.
+         */
+        if (!(regs->int_code & 0x200))
+                regs->psw.addr = __rewind_psw(regs->psw, regs->int_code >> 16);
         /*
          * Check for low-address protection.  This needs to be treated
          * as a special case because the translation exception code
diff --git a/arch/s390/mm/hugetlbpage.c b/arch/s390/mm/hugetlbpage.c
index 532525ec88c1..121089d57802 100644
--- a/arch/s390/mm/hugetlbpage.c
+++ b/arch/s390/mm/hugetlbpage.c
@@ -39,7 +39,7 @@ int arch_prepare_hugepage(struct page *page)
         if (!ptep)
                 return -ENOMEM;
 
-        pte = mk_pte(page, PAGE_RW);
+        pte_val(pte) = addr;
         for (i = 0; i < PTRS_PER_PTE; i++) {
                 set_pte_at(&init_mm, addr + i * PAGE_SIZE, ptep + i, pte);
                 pte_val(pte) += PAGE_SIZE;
diff --git a/arch/s390/mm/init.c b/arch/s390/mm/init.c
index 49ce6bb2c641..0b09b2342302 100644
--- a/arch/s390/mm/init.c
+++ b/arch/s390/mm/init.c
@@ -42,11 +42,10 @@ pgd_t swapper_pg_dir[PTRS_PER_PGD] __attribute__((__aligned__(PAGE_SIZE)));
 unsigned long empty_zero_page, zero_page_mask;
 EXPORT_SYMBOL(empty_zero_page);
 
-static unsigned long __init setup_zero_pages(void)
+static void __init setup_zero_pages(void)
 {
         struct cpuid cpu_id;
         unsigned int order;
-        unsigned long size;
         struct page *page;
         int i;
 
@@ -63,10 +62,18 @@ static unsigned long __init setup_zero_pages(void)
                 break;
         case 0x2097:    /* z10 */
         case 0x2098:    /* z10 */
-        default:
+        case 0x2817:    /* z196 */
+        case 0x2818:    /* z196 */
                 order = 2;
                 break;
+        case 0x2827:    /* zEC12 */
+        default:
+                order = 5;
+                break;
         }
+        /* Limit number of empty zero pages for small memory sizes */
+        if (order > 2 && totalram_pages <= 16384)
+                order = 2;
 
         empty_zero_page = __get_free_pages(GFP_KERNEL | __GFP_ZERO, order);
         if (!empty_zero_page)
@@ -75,14 +82,11 @@ static unsigned long __init setup_zero_pages(void)
         page = virt_to_page((void *) empty_zero_page);
         split_page(page, order);
         for (i = 1 << order; i > 0; i--) {
-                SetPageReserved(page);
+                mark_page_reserved(page);
                 page++;
         }
 
-        size = PAGE_SIZE << order;
-        zero_page_mask = (size - 1) & PAGE_MASK;
-
-        return 1UL << order;
+        zero_page_mask = ((PAGE_SIZE << order) - 1) & PAGE_MASK;
 }
 
 /*
@@ -139,7 +143,7 @@ void __init mem_init(void)
 
         /* this will put all low memory onto the freelists */
         totalram_pages += free_all_bootmem();
-        totalram_pages -= setup_zero_pages();   /* Setup zeroed pages. */
+        setup_zero_pages();     /* Setup zeroed pages. */
 
         reservedpages = 0;
 
@@ -158,34 +162,15 @@ void __init mem_init(void)
                PFN_ALIGN((unsigned long)&_eshared) - 1);
 }
 
-void free_init_pages(char *what, unsigned long begin, unsigned long end)
-{
-        unsigned long addr = begin;
-
-        if (begin >= end)
-                return;
-        for (; addr < end; addr += PAGE_SIZE) {
-                ClearPageReserved(virt_to_page(addr));
-                init_page_count(virt_to_page(addr));
-                memset((void *)(addr & PAGE_MASK), POISON_FREE_INITMEM,
-                       PAGE_SIZE);
-                free_page(addr);
-                totalram_pages++;
-        }
-        printk(KERN_INFO "Freeing %s: %luk freed\n", what, (end - begin) >> 10);
-}
-
 void free_initmem(void)
 {
-        free_init_pages("unused kernel memory",
-                        (unsigned long)&__init_begin,
-                        (unsigned long)&__init_end);
+        free_initmem_default(0);
 }
 
 #ifdef CONFIG_BLK_DEV_INITRD
 void __init free_initrd_mem(unsigned long start, unsigned long end)
 {
-        free_init_pages("initrd memory", start, end);
+        free_reserved_area(start, end, POISON_FREE_INITMEM, "initrd");
 }
 #endif
 
diff --git a/arch/s390/mm/pageattr.c b/arch/s390/mm/pageattr.c
index d21040ed5e59..80adfbf75065 100644
--- a/arch/s390/mm/pageattr.c
+++ b/arch/s390/mm/pageattr.c
@@ -9,31 +9,25 @@
 #include <asm/pgtable.h>
 #include <asm/page.h>
 
+static inline unsigned long sske_frame(unsigned long addr, unsigned char skey)
+{
+        asm volatile(".insn rrf,0xb22b0000,%[skey],%[addr],9,0"
+                     : [addr] "+a" (addr) : [skey] "d" (skey));
+        return addr;
+}
+
 void storage_key_init_range(unsigned long start, unsigned long end)
 {
-        unsigned long boundary, function, size;
+        unsigned long boundary, size;
 
         while (start < end) {
-                if (MACHINE_HAS_EDAT2) {
-                        /* set storage keys for a 2GB frame */
-                        function = 0x22000 | PAGE_DEFAULT_KEY;
-                        size = 1UL << 31;
-                        boundary = (start + size) & ~(size - 1);
-                        if (boundary <= end) {
-                                do {
-                                        start = pfmf(function, start);
-                                } while (start < boundary);
-                                continue;
-                        }
-                }
                 if (MACHINE_HAS_EDAT1) {
                         /* set storage keys for a 1MB frame */
-                        function = 0x21000 | PAGE_DEFAULT_KEY;
                         size = 1UL << 20;
                         boundary = (start + size) & ~(size - 1);
                         if (boundary <= end) {
                                 do {
-                                        start = pfmf(function, start);
+                                        start = sske_frame(start, PAGE_DEFAULT_KEY);
                                 } while (start < boundary);
                                 continue;
                         }
diff --git a/arch/s390/mm/pgtable.c b/arch/s390/mm/pgtable.c
index ae44d2a34313..bd954e96f51c 100644
--- a/arch/s390/mm/pgtable.c
+++ b/arch/s390/mm/pgtable.c
@@ -379,75 +379,183 @@ out_unmap:
 }
 EXPORT_SYMBOL_GPL(gmap_map_segment);
 
-/*
- * this function is assumed to be called with mmap_sem held
- */
-unsigned long __gmap_fault(unsigned long address, struct gmap *gmap)
+static unsigned long *gmap_table_walk(unsigned long address, struct gmap *gmap)
 {
-        unsigned long *table, vmaddr, segment;
-        struct mm_struct *mm;
-        struct gmap_pgtable *mp;
-        struct gmap_rmap *rmap;
-        struct vm_area_struct *vma;
-        struct page *page;
-        pgd_t *pgd;
-        pud_t *pud;
-        pmd_t *pmd;
+        unsigned long *table;
 
-        current->thread.gmap_addr = address;
-        mm = gmap->mm;
-        /* Walk the gmap address space page table */
         table = gmap->table + ((address >> 53) & 0x7ff);
         if (unlikely(*table & _REGION_ENTRY_INV))
-                return -EFAULT;
+                return ERR_PTR(-EFAULT);
         table = (unsigned long *)(*table & _REGION_ENTRY_ORIGIN);
         table = table + ((address >> 42) & 0x7ff);
         if (unlikely(*table & _REGION_ENTRY_INV))
-                return -EFAULT;
+                return ERR_PTR(-EFAULT);
         table = (unsigned long *)(*table & _REGION_ENTRY_ORIGIN);
         table = table + ((address >> 31) & 0x7ff);
         if (unlikely(*table & _REGION_ENTRY_INV))
-                return -EFAULT;
+                return ERR_PTR(-EFAULT);
         table = (unsigned long *)(*table & _REGION_ENTRY_ORIGIN);
         table = table + ((address >> 20) & 0x7ff);
+        return table;
+}
+
+/**
+ * __gmap_translate - translate a guest address to a user space address
+ * @address: guest address
+ * @gmap: pointer to guest mapping meta data structure
+ *
+ * Returns user space address which corresponds to the guest address or
+ * -EFAULT if no such mapping exists.
+ * This function does not establish potentially missing page table entries.
+ * The mmap_sem of the mm that belongs to the address space must be held
+ * when this function gets called.
+ */
+unsigned long __gmap_translate(unsigned long address, struct gmap *gmap)
+{
+        unsigned long *segment_ptr, vmaddr, segment;
+        struct gmap_pgtable *mp;
+        struct page *page;
 
+        current->thread.gmap_addr = address;
+        segment_ptr = gmap_table_walk(address, gmap);
+        if (IS_ERR(segment_ptr))
+                return PTR_ERR(segment_ptr);
         /* Convert the gmap address to an mm address. */
-        segment = *table;
-        if (likely(!(segment & _SEGMENT_ENTRY_INV))) {
+        segment = *segment_ptr;
+        if (!(segment & _SEGMENT_ENTRY_INV)) {
                 page = pfn_to_page(segment >> PAGE_SHIFT);
                 mp = (struct gmap_pgtable *) page->index;
                 return mp->vmaddr | (address & ~PMD_MASK);
         } else if (segment & _SEGMENT_ENTRY_RO) {
                 vmaddr = segment & _SEGMENT_ENTRY_ORIGIN;
-                vma = find_vma(mm, vmaddr);
-                if (!vma || vma->vm_start > vmaddr)
-                        return -EFAULT;
-
-                /* Walk the parent mm page table */
-                pgd = pgd_offset(mm, vmaddr);
-                pud = pud_alloc(mm, pgd, vmaddr);
-                if (!pud)
-                        return -ENOMEM;
-                pmd = pmd_alloc(mm, pud, vmaddr);
-                if (!pmd)
-                        return -ENOMEM;
-                if (!pmd_present(*pmd) &&
-                    __pte_alloc(mm, vma, pmd, vmaddr))
-                        return -ENOMEM;
-                /* pmd now points to a valid segment table entry. */
-                rmap = kmalloc(sizeof(*rmap), GFP_KERNEL|__GFP_REPEAT);
-                if (!rmap)
-                        return -ENOMEM;
-                /* Link gmap segment table entry location to page table. */
-                page = pmd_page(*pmd);
-                mp = (struct gmap_pgtable *) page->index;
-                rmap->entry = table;
-                spin_lock(&mm->page_table_lock);
+                return vmaddr | (address & ~PMD_MASK);
+        }
+        return -EFAULT;
+}
+EXPORT_SYMBOL_GPL(__gmap_translate);
+
+/**
+ * gmap_translate - translate a guest address to a user space address
+ * @address: guest address
+ * @gmap: pointer to guest mapping meta data structure
+ *
+ * Returns user space address which corresponds to the guest address or
+ * -EFAULT if no such mapping exists.
+ * This function does not establish potentially missing page table entries.
+ */
+unsigned long gmap_translate(unsigned long address, struct gmap *gmap)
+{
+        unsigned long rc;
+
+        down_read(&gmap->mm->mmap_sem);
+        rc = __gmap_translate(address, gmap);
+        up_read(&gmap->mm->mmap_sem);
+        return rc;
+}
+EXPORT_SYMBOL_GPL(gmap_translate);
+
+static int gmap_connect_pgtable(unsigned long segment,
+                                unsigned long *segment_ptr,
+                                struct gmap *gmap)
+{
+        unsigned long vmaddr;
+        struct vm_area_struct *vma;
+        struct gmap_pgtable *mp;
+        struct gmap_rmap *rmap;
+        struct mm_struct *mm;
+        struct page *page;
+        pgd_t *pgd;
+        pud_t *pud;
+        pmd_t *pmd;
+
+        mm = gmap->mm;
+        vmaddr = segment & _SEGMENT_ENTRY_ORIGIN;
+        vma = find_vma(mm, vmaddr);
+        if (!vma || vma->vm_start > vmaddr)
+                return -EFAULT;
+        /* Walk the parent mm page table */
+        pgd = pgd_offset(mm, vmaddr);
+        pud = pud_alloc(mm, pgd, vmaddr);
+        if (!pud)
+                return -ENOMEM;
+        pmd = pmd_alloc(mm, pud, vmaddr);
+        if (!pmd)
+                return -ENOMEM;
+        if (!pmd_present(*pmd) &&
+            __pte_alloc(mm, vma, pmd, vmaddr))
+                return -ENOMEM;
+        /* pmd now points to a valid segment table entry. */
+        rmap = kmalloc(sizeof(*rmap), GFP_KERNEL|__GFP_REPEAT);
+        if (!rmap)
+                return -ENOMEM;
+        /* Link gmap segment table entry location to page table. */
+        page = pmd_page(*pmd);
+        mp = (struct gmap_pgtable *) page->index;
+        rmap->entry = segment_ptr;
+        spin_lock(&mm->page_table_lock);
+        if (*segment_ptr == segment) {
                 list_add(&rmap->list, &mp->mapper);
-                spin_unlock(&mm->page_table_lock);
                 /* Set gmap segment table entry to page table. */
-                *table = pmd_val(*pmd) & PAGE_MASK;
-                return vmaddr | (address & ~PMD_MASK);
+                *segment_ptr = pmd_val(*pmd) & PAGE_MASK;
+                rmap = NULL;
+        }
+        spin_unlock(&mm->page_table_lock);
+        kfree(rmap);
+        return 0;
+}
+
+static void gmap_disconnect_pgtable(struct mm_struct *mm, unsigned long *table)
+{
+        struct gmap_rmap *rmap, *next;
+        struct gmap_pgtable *mp;
+        struct page *page;
+        int flush;
+
+        flush = 0;
+        spin_lock(&mm->page_table_lock);
+        page = pfn_to_page(__pa(table) >> PAGE_SHIFT);
+        mp = (struct gmap_pgtable *) page->index;
+        list_for_each_entry_safe(rmap, next, &mp->mapper, list) {
+                *rmap->entry =
+                        _SEGMENT_ENTRY_INV | _SEGMENT_ENTRY_RO | mp->vmaddr;
+                list_del(&rmap->list);
+                kfree(rmap);
+                flush = 1;
+        }
+        spin_unlock(&mm->page_table_lock);
+        if (flush)
+                __tlb_flush_global();
+}
+
+/*
+ * this function is assumed to be called with mmap_sem held
+ */
+unsigned long __gmap_fault(unsigned long address, struct gmap *gmap)
+{
+        unsigned long *segment_ptr, segment;
+        struct gmap_pgtable *mp;
+        struct page *page;
+        int rc;
+
+        current->thread.gmap_addr = address;
+        segment_ptr = gmap_table_walk(address, gmap);
+        if (IS_ERR(segment_ptr))
+                return -EFAULT;
+        /* Convert the gmap address to an mm address. */
+        while (1) {
+                segment = *segment_ptr;
+                if (!(segment & _SEGMENT_ENTRY_INV)) {
+                        /* Page table is present */
+                        page = pfn_to_page(segment >> PAGE_SHIFT);
+                        mp = (struct gmap_pgtable *) page->index;
+                        return mp->vmaddr | (address & ~PMD_MASK);
+                }
+                if (!(segment & _SEGMENT_ENTRY_RO))
+                        /* Nothing mapped in the gmap address space. */
+                        break;
+                rc = gmap_connect_pgtable(segment, segment_ptr, gmap);
+                if (rc)
+                        return rc;
         }
         return -EFAULT;
 }
@@ -511,29 +619,6 @@ void gmap_discard(unsigned long from, unsigned long to, struct gmap *gmap)
 }
 EXPORT_SYMBOL_GPL(gmap_discard);
 
-void gmap_unmap_notifier(struct mm_struct *mm, unsigned long *table)
-{
-        struct gmap_rmap *rmap, *next;
-        struct gmap_pgtable *mp;
-        struct page *page;
-        int flush;
-
-        flush = 0;
-        spin_lock(&mm->page_table_lock);
-        page = pfn_to_page(__pa(table) >> PAGE_SHIFT);
-        mp = (struct gmap_pgtable *) page->index;
-        list_for_each_entry_safe(rmap, next, &mp->mapper, list) {
-                *rmap->entry =
-                        _SEGMENT_ENTRY_INV | _SEGMENT_ENTRY_RO | mp->vmaddr;
-                list_del(&rmap->list);
-                kfree(rmap);
-                flush = 1;
-        }
-        spin_unlock(&mm->page_table_lock);
-        if (flush)
-                __tlb_flush_global();
-}
-
 static inline unsigned long *page_table_alloc_pgste(struct mm_struct *mm,
                                                     unsigned long vmaddr)
 {
@@ -586,8 +671,8 @@ static inline void page_table_free_pgste(unsigned long *table)
 {
 }
 
-static inline void gmap_unmap_notifier(struct mm_struct *mm,
-                                          unsigned long *table)
+static inline void gmap_disconnect_pgtable(struct mm_struct *mm,
+                                           unsigned long *table)
 {
 }
 
@@ -653,7 +738,7 @@ void page_table_free(struct mm_struct *mm, unsigned long *table)
         unsigned int bit, mask;
 
         if (mm_has_pgste(mm)) {
-                gmap_unmap_notifier(mm, table);
+                gmap_disconnect_pgtable(mm, table);
                 return page_table_free_pgste(table);
         }
         /* Free 1K/2K page table fragment of a 4K page */
@@ -696,7 +781,7 @@ void page_table_free_rcu(struct mmu_gather *tlb, unsigned long *table)
 
         mm = tlb->mm;
         if (mm_has_pgste(mm)) {
-                gmap_unmap_notifier(mm, table);
+                gmap_disconnect_pgtable(mm, table);
                 table = (unsigned long *) (__pa(table) | FRAG_MASK);
                 tlb_remove_table(tlb, table);
                 return;
diff --git a/arch/s390/mm/vmem.c b/arch/s390/mm/vmem.c
index ffab84db6907..35837054f734 100644
--- a/arch/s390/mm/vmem.c
+++ b/arch/s390/mm/vmem.c
@@ -191,19 +191,16 @@ static void vmem_remove_range(unsigned long start, unsigned long size)
 /*
  * Add a backed mem_map array to the virtual mem_map array.
  */
-int __meminit vmemmap_populate(struct page *start, unsigned long nr, int node)
+int __meminit vmemmap_populate(unsigned long start, unsigned long end, int node)
 {
-        unsigned long address, start_addr, end_addr;
+        unsigned long address = start;
         pgd_t *pg_dir;
         pud_t *pu_dir;
         pmd_t *pm_dir;
         pte_t *pt_dir;
         int ret = -ENOMEM;
 
-        start_addr = (unsigned long) start;
-        end_addr = (unsigned long) (start + nr);
-
-        for (address = start_addr; address < end_addr;) {
+        for (address = start; address < end;) {
                 pg_dir = pgd_offset_k(address);
                 if (pgd_none(*pg_dir)) {
                         pu_dir = vmem_pud_alloc();
@@ -262,14 +259,14 @@ int __meminit vmemmap_populate(struct page *start, unsigned long nr, int node)
                 }
                 address += PAGE_SIZE;
         }
-        memset(start, 0, nr * sizeof(struct page));
+        memset((void *)start, 0, end - start);
         ret = 0;
 out:
-        flush_tlb_kernel_range(start_addr, end_addr);
+        flush_tlb_kernel_range(start, end);
         return ret;
 }
 
-void vmemmap_free(struct page *memmap, unsigned long nr_pages)
+void vmemmap_free(unsigned long start, unsigned long end)
 {
 }
 
diff --git a/arch/s390/net/bpf_jit_comp.c b/arch/s390/net/bpf_jit_comp.c
index 0972e91cced2..82f165f8078c 100644
--- a/arch/s390/net/bpf_jit_comp.c
+++ b/arch/s390/net/bpf_jit_comp.c
@@ -747,10 +747,9 @@ void bpf_jit_compile(struct sk_filter *fp)
 
         if (!bpf_jit_enable)
                 return;
-        addrs = kmalloc(fp->len * sizeof(*addrs), GFP_KERNEL);
+        addrs = kcalloc(fp->len, sizeof(*addrs), GFP_KERNEL);
         if (addrs == NULL)
                 return;
-        memset(addrs, 0, fp->len * sizeof(*addrs));
         memset(&jit, 0, sizeof(cjit));
         memset(&cjit, 0, sizeof(cjit));
 
diff --git a/arch/s390/oprofile/init.c b/arch/s390/oprofile/init.c
index 584b93674ea4..ffeb17ce7f31 100644
--- a/arch/s390/oprofile/init.c
+++ b/arch/s390/oprofile/init.c
@@ -440,6 +440,7 @@ static int oprofile_hwsampler_init(struct oprofile_operations *ops)
                 switch (id.machine) {
                 case 0x2097: case 0x2098: ops->cpu_type = "s390/z10"; break;
                 case 0x2817: case 0x2818: ops->cpu_type = "s390/z196"; break;
+                case 0x2827:              ops->cpu_type = "s390/zEC12"; break;
                 default: return -ENODEV;
                 }
         }
diff --git a/arch/s390/pci/Makefile b/arch/s390/pci/Makefile
index f0f426a113ce..086a2e37935d 100644
--- a/arch/s390/pci/Makefile
+++ b/arch/s390/pci/Makefile
@@ -2,5 +2,5 @@
 # Makefile for the s390 PCI subsystem.
 #
 
-obj-$(CONFIG_PCI)       += pci.o pci_dma.o pci_clp.o pci_msi.o \
-                           pci_sysfs.o pci_event.o pci_debug.o
+obj-$(CONFIG_PCI)       += pci.o pci_dma.o pci_clp.o pci_msi.o pci_sysfs.o \
+                           pci_event.o pci_debug.o pci_insn.o
diff --git a/arch/s390/pci/pci.c b/arch/s390/pci/pci.c
index 27b4c17855b9..e6f15b5d8b7d 100644
--- a/arch/s390/pci/pci.c
+++ b/arch/s390/pci/pci.c
@@ -99,9 +99,6 @@ static int __read_mostly aisb_max;
 static struct kmem_cache *zdev_irq_cache;
 static struct kmem_cache *zdev_fmb_cache;
 
-debug_info_t *pci_debug_msg_id;
-debug_info_t *pci_debug_err_id;
-
 static inline int irq_to_msi_nr(unsigned int irq)
 {
         return irq & ZPCI_MSI_MASK;
@@ -179,7 +176,7 @@ static int zpci_register_airq(struct zpci_dev *zdev, unsigned int aisb,
         fib->aisb = (u64) bucket->aisb + aisb / 8;
         fib->aisbo = aisb & ZPCI_MSI_MASK;
 
-        rc = mpcifc_instr(req, fib);
+        rc = s390pci_mod_fc(req, fib);
         pr_debug("%s mpcifc returned noi: %d\n", __func__, fib->noi);
 
         free_page((unsigned long) fib);
@@ -209,7 +206,7 @@ static int mod_pci(struct zpci_dev *zdev, int fn, u8 dmaas, struct mod_pci_args
         fib->iota = args->iota;
         fib->fmb_addr = args->fmb_addr;
 
-        rc = mpcifc_instr(req, fib);
+        rc = s390pci_mod_fc(req, fib);
         free_page((unsigned long) fib);
         return rc;
 }
@@ -249,10 +246,9 @@ int zpci_fmb_enable_device(struct zpci_dev *zdev)
         if (zdev->fmb)
                 return -EINVAL;
 
-        zdev->fmb = kmem_cache_alloc(zdev_fmb_cache, GFP_KERNEL);
+        zdev->fmb = kmem_cache_zalloc(zdev_fmb_cache, GFP_KERNEL);
         if (!zdev->fmb)
                 return -ENOMEM;
-        memset(zdev->fmb, 0, sizeof(*zdev->fmb));
         WARN_ON((u64) zdev->fmb & 0xf);
 
         args.fmb_addr = virt_to_phys(zdev->fmb);
@@ -284,12 +280,12 @@ static int zpci_cfg_load(struct zpci_dev *zdev, int offset, u32 *val, u8 len)
         u64 data;
         int rc;
 
-        rc = pcilg_instr(&data, req, offset);
-        data = data << ((8 - len) * 8);
-        data = le64_to_cpu(data);
-        if (!rc)
+        rc = s390pci_load(&data, req, offset);
+        if (!rc) {
+                data = data << ((8 - len) * 8);
+                data = le64_to_cpu(data);
                 *val = (u32) data;
-        else
+        } else
                 *val = 0xffffffff;
         return rc;
 }
@@ -302,7 +298,7 @@ static int zpci_cfg_store(struct zpci_dev *zdev, int offset, u32 val, u8 len)
 
         data = cpu_to_le64(data);
         data = data >> ((8 - len) * 8);
-        rc = pcistg_instr(data, req, offset);
+        rc = s390pci_store(data, req, offset);
         return rc;
 }
 
@@ -409,20 +405,28 @@ static int pci_read(struct pci_bus *bus, unsigned int devfn, int where,
                     int size, u32 *val)
 {
         struct zpci_dev *zdev = get_zdev_by_bus(bus);
+        int ret;
 
         if (!zdev || devfn != ZPCI_DEVFN)
-                return 0;
-        return zpci_cfg_load(zdev, where, val, size);
+                ret = -ENODEV;
+        else
+                ret = zpci_cfg_load(zdev, where, val, size);
+
+        return ret;
 }
 
 static int pci_write(struct pci_bus *bus, unsigned int devfn, int where,
                      int size, u32 val)
 {
         struct zpci_dev *zdev = get_zdev_by_bus(bus);
+        int ret;
 
         if (!zdev || devfn != ZPCI_DEVFN)
-                return 0;
-        return zpci_cfg_store(zdev, where, val, size);
+                ret = -ENODEV;
+        else
+                ret = zpci_cfg_store(zdev, where, val, size);
+
+        return ret;
 }
 
 static struct pci_ops pci_root_ops = {
@@ -474,7 +478,7 @@ scan:
         }
 
         /* enable interrupts again */
-        sic_instr(SIC_IRQ_MODE_SINGLE, NULL, PCI_ISC);
+        set_irq_ctrl(SIC_IRQ_MODE_SINGLE, NULL, PCI_ISC);
 
         /* check again to not lose initiative */
         rmb();
@@ -596,19 +600,6 @@ static void zpci_map_resources(struct zpci_dev *zdev)
         }
 };
 
-static void zpci_unmap_resources(struct pci_dev *pdev)
-{
-        resource_size_t len;
-        int i;
-
-        for (i = 0; i < PCI_BAR_COUNT; i++) {
-                len = pci_resource_len(pdev, i);
-                if (!len)
-                        continue;
-                pci_iounmap(pdev, (void *) pdev->resource[i].start);
-        }
-};
-
 struct zpci_dev *zpci_alloc_device(void)
 {
         struct zpci_dev *zdev;
@@ -636,32 +627,6 @@ void zpci_free_device(struct zpci_dev *zdev)
         kfree(zdev);
 }
 
-/* Called on removal of pci_dev, leaves zpci and bus device */
-static void zpci_remove_device(struct pci_dev *pdev)
-{
-        struct zpci_dev *zdev = get_zdev(pdev);
-
-        dev_info(&pdev->dev, "Removing device %u\n", zdev->domain);
-        zdev->state = ZPCI_FN_STATE_CONFIGURED;
-        zpci_dma_exit_device(zdev);
-        zpci_fmb_disable_device(zdev);
-        zpci_sysfs_remove_device(&pdev->dev);
-        zpci_unmap_resources(pdev);
-        list_del(&zdev->entry);         /* can be called from init */
-        zdev->pdev = NULL;
-}
-
-static void zpci_scan_devices(void)
-{
-        struct zpci_dev *zdev;
-
-        mutex_lock(&zpci_list_lock);
-        list_for_each_entry(zdev, &zpci_list, entry)
-                if (zdev->state == ZPCI_FN_STATE_CONFIGURED)
-                        zpci_scan_device(zdev);
-        mutex_unlock(&zpci_list_lock);
-}
-
 /*
  * Too late for any s390 specific setup, since interrupts must be set up
  * already which requires DMA setup too and the pci scan will access the
@@ -688,12 +653,6 @@ int pcibios_enable_device(struct pci_dev *pdev, int mask)
         return 0;
 }
 
-void pcibios_disable_device(struct pci_dev *pdev)
-{
-        zpci_remove_device(pdev);
-        pdev->sysdata = NULL;
-}
-
 int pcibios_add_platform_entries(struct pci_dev *pdev)
 {
         return zpci_sysfs_add_device(&pdev->dev);
@@ -789,7 +748,7 @@ static int __init zpci_irq_init(void)
         spin_lock_init(&bucket->lock);
         /* set summary to 1 to be called every time for the ISC */
         *zpci_irq_si = 1;
-        sic_instr(SIC_IRQ_MODE_SINGLE, NULL, PCI_ISC);
+        set_irq_ctrl(SIC_IRQ_MODE_SINGLE, NULL, PCI_ISC);
         return 0;
 
 out_ai:
@@ -872,7 +831,19 @@ static void zpci_free_iomap(struct zpci_dev *zdev, int entry)
         spin_unlock(&zpci_iomap_lock);
 }
 
-static int zpci_create_device_bus(struct zpci_dev *zdev)
+int pcibios_add_device(struct pci_dev *pdev)
+{
+        struct zpci_dev *zdev = get_zdev(pdev);
+
+        zdev->pdev = pdev;
+        zpci_debug_init_device(zdev);
+        zpci_fmb_enable_device(zdev);
+        zpci_map_resources(zdev);
+
+        return 0;
+}
+
+static int zpci_scan_bus(struct zpci_dev *zdev)
 {
         struct resource *res;
         LIST_HEAD(resources);
@@ -909,8 +880,8 @@ static int zpci_create_device_bus(struct zpci_dev *zdev)
                 pci_add_resource(&resources, res);
         }
 
-        zdev->bus = pci_create_root_bus(NULL, ZPCI_BUS_NR, &pci_root_ops,
-                                        zdev, &resources);
+        zdev->bus = pci_scan_root_bus(NULL, ZPCI_BUS_NR, &pci_root_ops,
+                                      zdev, &resources);
         if (!zdev->bus)
                 return -EIO;
 
@@ -959,6 +930,13 @@ out:
 }
 EXPORT_SYMBOL_GPL(zpci_enable_device);
 
+int zpci_disable_device(struct zpci_dev *zdev)
+{
+        zpci_dma_exit_device(zdev);
+        return clp_disable_fh(zdev);
+}
+EXPORT_SYMBOL_GPL(zpci_disable_device);
+
 int zpci_create_device(struct zpci_dev *zdev)
 {
         int rc;
@@ -967,9 +945,16 @@ int zpci_create_device(struct zpci_dev *zdev)
         if (rc)
                 goto out;
 
-        rc = zpci_create_device_bus(zdev);
+        if (zdev->state == ZPCI_FN_STATE_CONFIGURED) {
+                rc = zpci_enable_device(zdev);
+                if (rc)
+                        goto out_free;
+
+                zdev->state = ZPCI_FN_STATE_ONLINE;
+        }
+        rc = zpci_scan_bus(zdev);
         if (rc)
-                goto out_bus;
+                goto out_disable;
 
         mutex_lock(&zpci_list_lock);
         list_add_tail(&zdev->entry, &zpci_list);
@@ -977,21 +962,12 @@ int zpci_create_device(struct zpci_dev *zdev)
                 hotplug_ops->create_slot(zdev);
         mutex_unlock(&zpci_list_lock);
 
-        if (zdev->state == ZPCI_FN_STATE_STANDBY)
-                return 0;
-
-        rc = zpci_enable_device(zdev);
-        if (rc)
-                goto out_start;
         return 0;
 
-out_start:
-        mutex_lock(&zpci_list_lock);
-        list_del(&zdev->entry);
-        if (hotplug_ops)
-                hotplug_ops->remove_slot(zdev);
-        mutex_unlock(&zpci_list_lock);
-out_bus:
+out_disable:
+        if (zdev->state == ZPCI_FN_STATE_ONLINE)
+                zpci_disable_device(zdev);
+out_free:
         zpci_free_domain(zdev);
 out:
         return rc;
@@ -1016,15 +992,9 @@ int zpci_scan_device(struct zpci_dev *zdev)
                 goto out;
         }
 
-        zpci_debug_init_device(zdev);
-        zpci_fmb_enable_device(zdev);
-        zpci_map_resources(zdev);
         pci_bus_add_devices(zdev->bus);
 
-        /* now that pdev was added to the bus mark it as used */
-        zdev->state = ZPCI_FN_STATE_ONLINE;
         return 0;
-
 out:
         zpci_dma_exit_device(zdev);
         clp_disable_fh(zdev);
@@ -1087,13 +1057,13 @@ void zpci_deregister_hp_ops(void)
 }
 EXPORT_SYMBOL_GPL(zpci_deregister_hp_ops);
 
-unsigned int s390_pci_probe = 1;
+unsigned int s390_pci_probe;
 EXPORT_SYMBOL_GPL(s390_pci_probe);
 
 char * __init pcibios_setup(char *str)
 {
-        if (!strcmp(str, "off")) {
-                s390_pci_probe = 0;
+        if (!strcmp(str, "on")) {
+                s390_pci_probe = 1;
                 return NULL;
         }
         return str;
@@ -1138,7 +1108,6 @@ static int __init pci_base_init(void)
         if (rc)
                 goto out_find;
 
-        zpci_scan_devices();
         return 0;
 
 out_find:
diff --git a/arch/s390/pci/pci_clp.c b/arch/s390/pci/pci_clp.c
index f339fe2feb15..bd34359d1546 100644
--- a/arch/s390/pci/pci_clp.c
+++ b/arch/s390/pci/pci_clp.c
@@ -13,6 +13,7 @@
 #include <linux/err.h>
 #include <linux/delay.h>
 #include <linux/pci.h>
+#include <asm/pci_debug.h>
 #include <asm/pci_clp.h>
 
 /*
@@ -144,6 +145,7 @@ int clp_add_pci_device(u32 fid, u32 fh, int configured)
         struct zpci_dev *zdev;
         int rc;
 
+        zpci_dbg(3, "add fid:%x, fh:%x, c:%d\n", fid, fh, configured);
         zdev = zpci_alloc_device();
         if (IS_ERR(zdev))
                 return PTR_ERR(zdev);
@@ -204,8 +206,8 @@ static int clp_set_pci_fn(u32 *fh, u8 nr_dma_as, u8 command)
         if (!rc && rrb->response.hdr.rsp == CLP_RC_OK)
                 *fh = rrb->response.fh;
         else {
-                pr_err("Set PCI FN failed with response: %x  cc: %d\n",
-                        rrb->response.hdr.rsp, rc);
+                zpci_dbg(0, "SPF fh:%x, cc:%d, resp:%x\n", *fh, rc,
+                         rrb->response.hdr.rsp);
                 rc = -EIO;
         }
         clp_free_block(rrb);
@@ -221,6 +223,8 @@ int clp_enable_fh(struct zpci_dev *zdev, u8 nr_dma_as)
         if (!rc)
                 /* Success -> store enabled handle in zdev */
                 zdev->fh = fh;
+
+        zpci_dbg(3, "ena fid:%x, fh:%x, rc:%d\n", zdev->fid, zdev->fh, rc);
         return rc;
 }
 
@@ -237,9 +241,8 @@ int clp_disable_fh(struct zpci_dev *zdev)
         if (!rc)
                 /* Success -> store disabled handle in zdev */
                 zdev->fh = fh;
-        else
-                dev_err(&zdev->pdev->dev,
-                        "Failed to disable fn handle: 0x%x\n", fh);
+
+        zpci_dbg(3, "dis fid:%x, fh:%x, rc:%d\n", zdev->fid, zdev->fh, rc);
         return rc;
 }
 
diff --git a/arch/s390/pci/pci_debug.c b/arch/s390/pci/pci_debug.c
index a5d07bc2a547..771b82359af4 100644
--- a/arch/s390/pci/pci_debug.c
+++ b/arch/s390/pci/pci_debug.c
@@ -11,12 +11,17 @@
 #include <linux/kernel.h>
 #include <linux/seq_file.h>
 #include <linux/debugfs.h>
+#include <linux/export.h>
 #include <linux/pci.h>
 #include <asm/debug.h>
 
 #include <asm/pci_dma.h>
 
 static struct dentry *debugfs_root;
+debug_info_t *pci_debug_msg_id;
+EXPORT_SYMBOL_GPL(pci_debug_msg_id);
+debug_info_t *pci_debug_err_id;
+EXPORT_SYMBOL_GPL(pci_debug_err_id);
 
 static char *pci_perf_names[] = {
         /* hardware counters */
@@ -168,7 +173,6 @@ int __init zpci_debug_init(void)
                 return -EINVAL;
         debug_register_view(pci_debug_msg_id, &debug_sprintf_view);
         debug_set_level(pci_debug_msg_id, 3);
-        zpci_dbg("Debug view initialized\n");
 
         /* error log */
         pci_debug_err_id = debug_register("pci_error", 2, 1, 16);
@@ -176,7 +180,6 @@ int __init zpci_debug_init(void)
                 return -EINVAL;
         debug_register_view(pci_debug_err_id, &debug_hex_ascii_view);
         debug_set_level(pci_debug_err_id, 6);
-        zpci_err("Debug view initialized\n");
 
         debugfs_root = debugfs_create_dir("pci", NULL);
         return 0;
diff --git a/arch/s390/pci/pci_dma.c b/arch/s390/pci/pci_dma.c
index a547419907c3..f8e69d5bc0a9 100644
--- a/arch/s390/pci/pci_dma.c
+++ b/arch/s390/pci/pci_dma.c
@@ -169,8 +169,9 @@ static int dma_update_trans(struct zpci_dev *zdev, unsigned long pa,
                  * needs to be redone!
                  */
                 goto no_refresh;
-        rc = rpcit_instr((u64) zdev->fh << 32, start_dma_addr,
-                          nr_pages * PAGE_SIZE);
+
+        rc = s390pci_refresh_trans((u64) zdev->fh << 32, start_dma_addr,
+                                   nr_pages * PAGE_SIZE);
 
 no_refresh:
         spin_unlock_irqrestore(&zdev->dma_table_lock, irq_flags);
@@ -268,8 +269,6 @@ static dma_addr_t s390_dma_map_pages(struct device *dev, struct page *page,
         int flags = ZPCI_PTE_VALID;
         dma_addr_t dma_addr;
 
-        WARN_ON_ONCE(offset > PAGE_SIZE);
-
         /* This rounds up number of pages based on size and offset */
         nr_pages = iommu_num_pages(pa, size, PAGE_SIZE);
         iommu_page_index = dma_alloc_iommu(zdev, nr_pages);
@@ -291,7 +290,7 @@ static dma_addr_t s390_dma_map_pages(struct device *dev, struct page *page,
 
         if (!dma_update_trans(zdev, pa, dma_addr, size, flags)) {
                 atomic64_add(nr_pages, (atomic64_t *) &zdev->fmb->mapped_pages);
-                return dma_addr + offset;
+                return dma_addr + (offset & ~PAGE_MASK);
         }
 
 out_free:
diff --git a/arch/s390/pci/pci_insn.c b/arch/s390/pci/pci_insn.c
new file mode 100644
index 000000000000..22eeb9d7ffeb
--- /dev/null
+++ b/arch/s390/pci/pci_insn.c
@@ -0,0 +1,202 @@
+/*
+ * s390 specific pci instructions
+ *
+ * Copyright IBM Corp. 2013
+ */
+
+#include <linux/export.h>
+#include <linux/errno.h>
+#include <linux/delay.h>
+#include <asm/pci_insn.h>
+#include <asm/processor.h>
+
+#define ZPCI_INSN_BUSY_DELAY    1       /* 1 microsecond */
+
+/* Modify PCI Function Controls */
+static inline u8 __mpcifc(u64 req, struct zpci_fib *fib, u8 *status)
+{
+        u8 cc;
+
+        asm volatile (
+                "       .insn   rxy,0xe300000000d0,%[req],%[fib]\n"
+                "       ipm     %[cc]\n"
+                "       srl     %[cc],28\n"
+                : [cc] "=d" (cc), [req] "+d" (req), [fib] "+Q" (*fib)
+                : : "cc");
+        *status = req >> 24 & 0xff;
+        return cc;
+}
+
+int s390pci_mod_fc(u64 req, struct zpci_fib *fib)
+{
+        u8 cc, status;
+
+        do {
+                cc = __mpcifc(req, fib, &status);
+                if (cc == 2)
+                        msleep(ZPCI_INSN_BUSY_DELAY);
+        } while (cc == 2);
+
+        if (cc)
+                printk_once(KERN_ERR "%s: error cc: %d  status: %d\n",
+                             __func__, cc, status);
+        return (cc) ? -EIO : 0;
+}
+
+/* Refresh PCI Translations */
+static inline u8 __rpcit(u64 fn, u64 addr, u64 range, u8 *status)
+{
+        register u64 __addr asm("2") = addr;
+        register u64 __range asm("3") = range;
+        u8 cc;
+
+        asm volatile (
+                "       .insn   rre,0xb9d30000,%[fn],%[addr]\n"
+                "       ipm     %[cc]\n"
+                "       srl     %[cc],28\n"
+                : [cc] "=d" (cc), [fn] "+d" (fn)
+                : [addr] "d" (__addr), "d" (__range)
+                : "cc");
+        *status = fn >> 24 & 0xff;
+        return cc;
+}
+
+int s390pci_refresh_trans(u64 fn, u64 addr, u64 range)
+{
+        u8 cc, status;
+
+        do {
+                cc = __rpcit(fn, addr, range, &status);
+                if (cc == 2)
+                        udelay(ZPCI_INSN_BUSY_DELAY);
+        } while (cc == 2);
+
+        if (cc)
+                printk_once(KERN_ERR "%s: error cc: %d  status: %d  dma_addr: %Lx  size: %Lx\n",
+                            __func__, cc, status, addr, range);
+        return (cc) ? -EIO : 0;
+}
+
+/* Set Interruption Controls */
+void set_irq_ctrl(u16 ctl, char *unused, u8 isc)
+{
+        asm volatile (
+                "       .insn   rsy,0xeb00000000d1,%[ctl],%[isc],%[u]\n"
+                : : [ctl] "d" (ctl), [isc] "d" (isc << 27), [u] "Q" (*unused));
+}
+
+/* PCI Load */
+static inline int __pcilg(u64 *data, u64 req, u64 offset, u8 *status)
+{
+        register u64 __req asm("2") = req;
+        register u64 __offset asm("3") = offset;
+        int cc = -ENXIO;
+        u64 __data;
+
+        asm volatile (
+                "       .insn   rre,0xb9d20000,%[data],%[req]\n"
+                "0:     ipm     %[cc]\n"
+                "       srl     %[cc],28\n"
+                "1:\n"
+                EX_TABLE(0b, 1b)
+                : [cc] "+d" (cc), [data] "=d" (__data), [req] "+d" (__req)
+                :  "d" (__offset)
+                : "cc");
+        *status = __req >> 24 & 0xff;
+        if (!cc)
+                *data = __data;
+
+        return cc;
+}
+
+int s390pci_load(u64 *data, u64 req, u64 offset)
+{
+        u8 status;
+        int cc;
+
+        do {
+                cc = __pcilg(data, req, offset, &status);
+                if (cc == 2)
+                        udelay(ZPCI_INSN_BUSY_DELAY);
+        } while (cc == 2);
+
+        if (cc)
+                printk_once(KERN_ERR "%s: error cc: %d  status: %d  req: %Lx  offset: %Lx\n",
+                            __func__, cc, status, req, offset);
+        return (cc > 0) ? -EIO : cc;
+}
+EXPORT_SYMBOL_GPL(s390pci_load);
+
+/* PCI Store */
+static inline int __pcistg(u64 data, u64 req, u64 offset, u8 *status)
+{
+        register u64 __req asm("2") = req;
+        register u64 __offset asm("3") = offset;
+        int cc = -ENXIO;
+
+        asm volatile (
+                "       .insn   rre,0xb9d00000,%[data],%[req]\n"
+                "0:     ipm     %[cc]\n"
+                "       srl     %[cc],28\n"
+                "1:\n"
+                EX_TABLE(0b, 1b)
+                : [cc] "+d" (cc), [req] "+d" (__req)
+                : "d" (__offset), [data] "d" (data)
+                : "cc");
+        *status = __req >> 24 & 0xff;
+        return cc;
+}
+
+int s390pci_store(u64 data, u64 req, u64 offset)
+{
+        u8 status;
+        int cc;
+
+        do {
+                cc = __pcistg(data, req, offset, &status);
+                if (cc == 2)
+                        udelay(ZPCI_INSN_BUSY_DELAY);
+        } while (cc == 2);
+
+        if (cc)
+                printk_once(KERN_ERR "%s: error cc: %d  status: %d  req: %Lx  offset: %Lx\n",
+                        __func__, cc, status, req, offset);
+        return (cc > 0) ? -EIO : cc;
+}
+EXPORT_SYMBOL_GPL(s390pci_store);
+
+/* PCI Store Block */
+static inline int __pcistb(const u64 *data, u64 req, u64 offset, u8 *status)
+{
+        int cc = -ENXIO;
+
+        asm volatile (
+                "       .insn   rsy,0xeb00000000d0,%[req],%[offset],%[data]\n"
+                "0:     ipm     %[cc]\n"
+                "       srl     %[cc],28\n"
+                "1:\n"
+                EX_TABLE(0b, 1b)
+                : [cc] "+d" (cc), [req] "+d" (req)
+                : [offset] "d" (offset), [data] "Q" (*data)
+                : "cc");
+        *status = req >> 24 & 0xff;
+        return cc;
+}
+
+int s390pci_store_block(const u64 *data, u64 req, u64 offset)
+{
+        u8 status;
+        int cc;
+
+        do {
+                cc = __pcistb(data, req, offset, &status);
+                if (cc == 2)
+                        udelay(ZPCI_INSN_BUSY_DELAY);
+        } while (cc == 2);
+
+        if (cc)
+                printk_once(KERN_ERR "%s: error cc: %d  status: %d  req: %Lx  offset: %Lx\n",
+                            __func__, cc, status, req, offset);
+        return (cc > 0) ? -EIO : cc;
+}
+EXPORT_SYMBOL_GPL(s390pci_store_block);
diff --git a/arch/s390/pci/pci_msi.c b/arch/s390/pci/pci_msi.c
index 0297931335e1..b097aed05a9b 100644
--- a/arch/s390/pci/pci_msi.c
+++ b/arch/s390/pci/pci_msi.c
@@ -18,8 +18,9 @@
 
 /* mapping of irq numbers to msi_desc */
 static struct hlist_head *msi_hash;
-static unsigned int msihash_shift = 6;
-#define msi_hashfn(nr)  hash_long(nr, msihash_shift)
+static const unsigned int msi_hash_bits = 8;
+#define MSI_HASH_BUCKETS (1U << msi_hash_bits)
+#define msi_hashfn(nr)  hash_long(nr, msi_hash_bits)
 
 static DEFINE_SPINLOCK(msi_map_lock);
 
@@ -74,6 +75,7 @@ int zpci_setup_msi_irq(struct zpci_dev *zdev, struct msi_desc *msi,
         map->irq = nr;
         map->msi = msi;
         zdev->msi_map[nr & ZPCI_MSI_MASK] = map;
+        INIT_HLIST_NODE(&map->msi_chain);
 
         pr_debug("%s hashing irq: %u  to bucket nr: %llu\n",
                 __func__, nr, msi_hashfn(nr));
@@ -125,11 +127,11 @@ int __init zpci_msihash_init(void)
 {
         unsigned int i;
 
-        msi_hash = kmalloc(256 * sizeof(*msi_hash), GFP_KERNEL);
+        msi_hash = kmalloc(MSI_HASH_BUCKETS * sizeof(*msi_hash), GFP_KERNEL);
         if (!msi_hash)
                 return -ENOMEM;
 
-        for (i = 0; i < (1U << msihash_shift); i++)
+        for (i = 0; i < MSI_HASH_BUCKETS; i++)
                 INIT_HLIST_HEAD(&msi_hash[i]);
         return 0;
 }
diff --git a/arch/score/kernel/process.c b/arch/score/kernel/process.c
index 79568466b578..f4c6d02421d3 100644
--- a/arch/score/kernel/process.c
+++ b/arch/score/kernel/process.c
@@ -41,24 +41,6 @@ void machine_halt(void) {}
 /* If or when software machine-power-off is implemented, add code here. */
 void machine_power_off(void) {}
 
-/*
- * The idle thread. There's no useful work to be
- * done, so just try to conserve power and have a
- * low exit latency (ie sit in a loop waiting for
- * somebody to say that they'd like to reschedule)
- */
-void __noreturn cpu_idle(void)
-{
-        /* endless idle loop with no priority at all */
-        while (1) {
-                rcu_idle_enter();
-                while (!need_resched())
-                        barrier();
-                rcu_idle_exit();
-                schedule_preempt_disabled();
-        }
-}
-
 void ret_from_fork(void);
 void ret_from_kernel_thread(void);
 
diff --git a/arch/score/kernel/traps.c b/arch/score/kernel/traps.c
index 0e46fb19a848..1517a7dcd6d9 100644
--- a/arch/score/kernel/traps.c
+++ b/arch/score/kernel/traps.c
@@ -117,6 +117,8 @@ static void show_code(unsigned int *pc)
  */
 void show_regs(struct pt_regs *regs)
 {
+        show_regs_print_info(KERN_DEFAULT);
+
         printk("r0 : %08lx %08lx %08lx %08lx %08lx %08lx %08lx %08lx\n",
                 regs->regs[0], regs->regs[1], regs->regs[2], regs->regs[3],
                 regs->regs[4], regs->regs[5], regs->regs[6], regs->regs[7]);
@@ -149,16 +151,6 @@ static void show_registers(struct pt_regs *regs)
         printk(KERN_NOTICE "\n");
 }
 
-/*
- * The architecture-independent dump_stack generator
- */
-void dump_stack(void)
-{
-        show_stack(current_thread_info()->task,
-                   (long *) get_irq_regs()->regs[0]);
-}
-EXPORT_SYMBOL(dump_stack);
-
 void __die(const char *str, struct pt_regs *regs, const char *file,
         const char *func, unsigned long line)
 {
diff --git a/arch/score/mm/init.c b/arch/score/mm/init.c
index cee6bce1e30c..1592aad7dbc4 100644
--- a/arch/score/mm/init.c
+++ b/arch/score/mm/init.c
@@ -43,7 +43,7 @@ EXPORT_SYMBOL_GPL(empty_zero_page);
 
 static struct kcore_list kcore_mem, kcore_vmalloc;
 
-static unsigned long setup_zero_page(void)
+static void setup_zero_page(void)
 {
         struct page *page;
 
@@ -52,9 +52,7 @@ static unsigned long setup_zero_page(void)
                 panic("Oh boy, that early out of memory?");
 
         page = virt_to_page((void *) empty_zero_page);
-        SetPageReserved(page);
-
-        return 1UL;
+        mark_page_reserved(page);
 }
 
 #ifndef CONFIG_NEED_MULTIPLE_NODES
@@ -84,7 +82,7 @@ void __init mem_init(void)
 
         high_memory = (void *) __va(max_low_pfn << PAGE_SHIFT);
         totalram_pages += free_all_bootmem();
-        totalram_pages -= setup_zero_page();    /* Setup zeroed pages. */
+        setup_zero_page();      /* Setup zeroed pages. */
         reservedpages = 0;
 
         for (tmp = 0; tmp < max_low_pfn; tmp++)
@@ -109,37 +107,16 @@ void __init mem_init(void)
 }
 #endif /* !CONFIG_NEED_MULTIPLE_NODES */
 
-static void free_init_pages(const char *what, unsigned long begin, unsigned long end)
-{
-        unsigned long pfn;
-
-        for (pfn = PFN_UP(begin); pfn < PFN_DOWN(end); pfn++) {
-                struct page *page = pfn_to_page(pfn);
-                void *addr = phys_to_virt(PFN_PHYS(pfn));
-
-                ClearPageReserved(page);
-                init_page_count(page);
-                memset(addr, POISON_FREE_INITMEM, PAGE_SIZE);
-                __free_page(page);
-                totalram_pages++;
-        }
-        printk(KERN_INFO "Freeing %s: %ldk freed\n", what, (end - begin) >> 10);
-}
-
 #ifdef CONFIG_BLK_DEV_INITRD
 void free_initrd_mem(unsigned long start, unsigned long end)
 {
-        free_init_pages("initrd memory",
-                virt_to_phys((void *) start),
-                virt_to_phys((void *) end));
+        free_reserved_area(start, end, POISON_FREE_INITMEM, "initrd");
 }
 #endif
 
 void __init_refok free_initmem(void)
 {
-        free_init_pages("unused kernel memory",
-        __pa(&__init_begin),
-        __pa(&__init_end));
+        free_initmem_default(POISON_FREE_INITMEM);
 }
 
 unsigned long pgd_current;
diff --git a/arch/sh/Kconfig b/arch/sh/Kconfig
index 5e859633ce69..78d8ace57272 100644
--- a/arch/sh/Kconfig
+++ b/arch/sh/Kconfig
@@ -33,6 +33,7 @@ config SUPERH
         select GENERIC_ATOMIC64
         select GENERIC_IRQ_SHOW
         select GENERIC_SMP_IDLE_THREAD
+        select GENERIC_IDLE_POLL_SETUP
         select GENERIC_CLOCKEVENTS
         select GENERIC_CMOS_UPDATE if SH_SH03 || SH_DREAMCAST
         select GENERIC_STRNCPY_FROM_USER
@@ -148,9 +149,6 @@ config ARCH_HAS_ILOG2_U32
 config ARCH_HAS_ILOG2_U64
         def_bool n
 
-config ARCH_HAS_DEFAULT_IDLE
-        def_bool y
-
 config NO_IOPORT
         def_bool !PCI
         depends on !SH_CAYMAN && !SH_SH4202_MICRODEV && !SH_SHMIN && \
@@ -624,25 +622,7 @@ config SH_CLK_CPG_LEGACY
 endmenu
 
 menu "CPU Frequency scaling"
-
 source "drivers/cpufreq/Kconfig"
-
-config SH_CPU_FREQ
-        tristate "SuperH CPU Frequency driver"
-        depends on CPU_FREQ
-        select CPU_FREQ_TABLE
-        help
-          This adds the cpufreq driver for SuperH. Any CPU that supports
-          clock rate rounding through the clock framework can use this
-          driver. While it will make the kernel slightly larger, this is
-          harmless for CPUs that don't support rate rounding. The driver
-          will also generate a notice in the boot log before disabling
-          itself if the CPU in question is not capable of rate rounding.
-
-          For details, take a look at <file:Documentation/cpu-freq>.
-
-          If unsure, say N.
-
 endmenu
 
 source "arch/sh/drivers/Kconfig"
diff --git a/arch/sh/boards/mach-ecovec24/setup.c b/arch/sh/boards/mach-ecovec24/setup.c
index aaff7671101b..764530c85aa9 100644
--- a/arch/sh/boards/mach-ecovec24/setup.c
+++ b/arch/sh/boards/mach-ecovec24/setup.c
@@ -254,11 +254,13 @@ static int usbhs_get_id(struct platform_device *pdev)
         return gpio_get_value(GPIO_PTB3);
 }
 
-static void usbhs_phy_reset(struct platform_device *pdev)
+static int usbhs_phy_reset(struct platform_device *pdev)
 {
         /* enable vbus if HOST */
         if (!gpio_get_value(GPIO_PTB3))
                 gpio_set_value(GPIO_PTB5, 1);
+
+        return 0;
 }
 
 static struct renesas_usbhs_platform_info usbhs_info = {
diff --git a/arch/sh/drivers/pci/pcie-sh7786.c b/arch/sh/drivers/pci/pcie-sh7786.c
index c2c85f6cd738..a162a7f86b2e 100644
--- a/arch/sh/drivers/pci/pcie-sh7786.c
+++ b/arch/sh/drivers/pci/pcie-sh7786.c
@@ -35,7 +35,7 @@ static unsigned int nr_ports;
 
 static struct sh7786_pcie_hwops {
         int (*core_init)(void);
-        async_func_ptr *port_init_hw;
+        async_func_t port_init_hw;
 } *sh7786_pcie_hwops;
 
 static struct resource sh7786_pci0_resources[] = {
diff --git a/arch/sh/include/asm/hugetlb.h b/arch/sh/include/asm/hugetlb.h
index b3808c7d67b2..699255d6d1c6 100644
--- a/arch/sh/include/asm/hugetlb.h
+++ b/arch/sh/include/asm/hugetlb.h
@@ -3,6 +3,7 @@
 
 #include <asm/cacheflush.h>
 #include <asm/page.h>
+#include <asm-generic/hugetlb.h>
 
 
 static inline int is_hugepage_only_range(struct mm_struct *mm,
diff --git a/arch/sh/include/asm/suspend.h b/arch/sh/include/asm/suspend.h
index e14567a7e9a1..70ae0b2888ab 100644
--- a/arch/sh/include/asm/suspend.h
+++ b/arch/sh/include/asm/suspend.h
@@ -14,9 +14,9 @@ struct swsusp_arch_regs {
 void sh_mobile_call_standby(unsigned long mode);
 
 #ifdef CONFIG_CPU_IDLE
-void sh_mobile_setup_cpuidle(void);
+int sh_mobile_setup_cpuidle(void);
 #else
-static inline void sh_mobile_setup_cpuidle(void) {}
+static inline int sh_mobile_setup_cpuidle(void) { return 0; }
 #endif
 
 /* notifier chains for pre/post sleep hooks */
diff --git a/arch/sh/include/asm/thread_info.h b/arch/sh/include/asm/thread_info.h
index 7d5ac4e48485..45a93669289d 100644
--- a/arch/sh/include/asm/thread_info.h
+++ b/arch/sh/include/asm/thread_info.h
@@ -207,8 +207,6 @@ static inline bool test_and_clear_restore_sigmask(void)
         return true;
 }
 
-#define tsk_is_polling(t) test_tsk_thread_flag(t, TIF_POLLING_NRFLAG)
-
 #endif  /* !__ASSEMBLY__ */
 
 #endif /* __KERNEL__ */
diff --git a/arch/sh/include/asm/unistd.h b/arch/sh/include/asm/unistd.h
index 5e90fa2b7eed..e77816c4b9bc 100644
--- a/arch/sh/include/asm/unistd.h
+++ b/arch/sh/include/asm/unistd.h
@@ -30,12 +30,4 @@
 # define __ARCH_WANT_SYS_VFORK
 # define __ARCH_WANT_SYS_CLONE
 
-/*
- * "Conditional" syscalls
- *
- * What we want is __attribute__((weak,alias("sys_ni_syscall"))),
- * but it doesn't work on all toolchains, so we just do it by hand
- */
-# define cond_syscall(x) asm(".weak\t" #x "\n\t.set\t" #x ",sys_ni_syscall")
-
 #include <uapi/asm/unistd.h>
diff --git a/arch/sh/kernel/Makefile b/arch/sh/kernel/Makefile
index f259b37874e9..261c8bfd75ce 100644
--- a/arch/sh/kernel/Makefile
+++ b/arch/sh/kernel/Makefile
@@ -31,7 +31,6 @@ obj-$(CONFIG_VSYSCALL)		+= vsyscall/
 obj-$(CONFIG_SMP)               += smp.o
 obj-$(CONFIG_SH_STANDARD_BIOS)  += sh_bios.o
 obj-$(CONFIG_KGDB)              += kgdb.o
-obj-$(CONFIG_SH_CPU_FREQ)       += cpufreq.o
 obj-$(CONFIG_MODULES)           += sh_ksyms_$(BITS).o module.o
 obj-$(CONFIG_KEXEC)             += machine_kexec.o relocate_kernel.o
 obj-$(CONFIG_CRASH_DUMP)        += crash_dump.o
diff --git a/arch/sh/kernel/cpu/shmobile/cpuidle.c b/arch/sh/kernel/cpu/shmobile/cpuidle.c
index 1ddc876d3b26..d30622592116 100644
--- a/arch/sh/kernel/cpu/shmobile/cpuidle.c
+++ b/arch/sh/kernel/cpu/shmobile/cpuidle.c
@@ -51,70 +51,53 @@ static int cpuidle_sleep_enter(struct cpuidle_device *dev,
         return k;
 }
 
-static struct cpuidle_device cpuidle_dev;
 static struct cpuidle_driver cpuidle_driver = {
-        .name                   = "sh_idle",
-        .owner                  = THIS_MODULE,
-        .en_core_tk_irqen       = 1,
+        .name   = "sh_idle",
+        .owner  = THIS_MODULE,
+        .states = {
+                {
+                        .exit_latency = 1,
+                        .target_residency = 1 * 2,
+                        .power_usage = 3,
+                        .flags = CPUIDLE_FLAG_TIME_VALID,
+                        .enter = cpuidle_sleep_enter,
+                        .name = "C1",
+                        .desc = "SuperH Sleep Mode",
+                },
+                {
+                        .exit_latency = 100,
+                        .target_residency = 1 * 2,
+                        .power_usage = 1,
+                        .flags = CPUIDLE_FLAG_TIME_VALID,
+                        .enter = cpuidle_sleep_enter,
+                        .name = "C2",
+                        .desc = "SuperH Sleep Mode [SF]",
+                        .disabled = true,
+                },
+                {
+                        .exit_latency = 2300,
+                        .target_residency = 1 * 2,
+                        .power_usage = 1,
+                        .flags = CPUIDLE_FLAG_TIME_VALID,
+                        .enter = cpuidle_sleep_enter,
+                        .name = "C3",
+                        .desc = "SuperH Mobile Standby Mode [SF]",
+                        .disabled = true,
+                },
+        },
+        .safe_state_index = 0,
+        .state_count = 3,
 };
 
-void sh_mobile_setup_cpuidle(void)
+int __init sh_mobile_setup_cpuidle(void)
 {
-        struct cpuidle_device *dev = &cpuidle_dev;
-        struct cpuidle_driver *drv = &cpuidle_driver;
-        struct cpuidle_state *state;
-        int i;
+        int ret;
 
+        if (sh_mobile_sleep_supported & SUSP_SH_SF)
+                cpuidle_driver.states[1].disabled = false;
 
-        for (i = 0; i < CPUIDLE_STATE_MAX; i++) {
-                drv->states[i].name[0] = '\0';
-                drv->states[i].desc[0] = '\0';
-        }
+        if (sh_mobile_sleep_supported & SUSP_SH_STANDBY)
+                cpuidle_driver.states[2].disabled = false;
 
-        i = CPUIDLE_DRIVER_STATE_START;
-
-        state = &drv->states[i++];
-        snprintf(state->name, CPUIDLE_NAME_LEN, "C1");
-        strncpy(state->desc, "SuperH Sleep Mode", CPUIDLE_DESC_LEN);
-        state->exit_latency = 1;
-        state->target_residency = 1 * 2;
-        state->power_usage = 3;
-        state->flags = 0;
-        state->flags |= CPUIDLE_FLAG_TIME_VALID;
-        state->enter = cpuidle_sleep_enter;
-
-        drv->safe_state_index = i-1;
-
-        if (sh_mobile_sleep_supported & SUSP_SH_SF) {
-                state = &drv->states[i++];
-                snprintf(state->name, CPUIDLE_NAME_LEN, "C2");
-                strncpy(state->desc, "SuperH Sleep Mode [SF]",
-                        CPUIDLE_DESC_LEN);
-                state->exit_latency = 100;
-                state->target_residency = 1 * 2;
-                state->power_usage = 1;
-                state->flags = 0;
-                state->flags |= CPUIDLE_FLAG_TIME_VALID;
-                state->enter = cpuidle_sleep_enter;
-        }
-
-        if (sh_mobile_sleep_supported & SUSP_SH_STANDBY) {
-                state = &drv->states[i++];
-                snprintf(state->name, CPUIDLE_NAME_LEN, "C3");
-                strncpy(state->desc, "SuperH Mobile Standby Mode [SF]",
-                        CPUIDLE_DESC_LEN);
-                state->exit_latency = 2300;
-                state->target_residency = 1 * 2;
-                state->power_usage = 1;
-                state->flags = 0;
-                state->flags |= CPUIDLE_FLAG_TIME_VALID;
-                state->enter = cpuidle_sleep_enter;
-        }
-
-        drv->state_count = i;
-        dev->state_count = i;
-
-        cpuidle_register_driver(&cpuidle_driver);
-
-        cpuidle_register_device(dev);
+        return cpuidle_register(&cpuidle_driver);
 }
diff --git a/arch/sh/kernel/cpu/shmobile/pm.c b/arch/sh/kernel/cpu/shmobile/pm.c
index 08d27fac8d08..ac37b7234f85 100644
--- a/arch/sh/kernel/cpu/shmobile/pm.c
+++ b/arch/sh/kernel/cpu/shmobile/pm.c
@@ -150,8 +150,7 @@ static const struct platform_suspend_ops sh_pm_ops = {
 static int __init sh_pm_init(void)
 {
         suspend_set_ops(&sh_pm_ops);
-        sh_mobile_setup_cpuidle();
-        return 0;
+        return sh_mobile_setup_cpuidle();
 }
 
 late_initcall(sh_pm_init);
diff --git a/arch/sh/kernel/cpufreq.c b/arch/sh/kernel/cpufreq.c
deleted file mode 100644
index e68b45b6f3f9..000000000000
--- a/arch/sh/kernel/cpufreq.c
+++ /dev/null
@@ -1,201 +0,0 @@
-/*
- * arch/sh/kernel/cpufreq.c
- *
- * cpufreq driver for the SuperH processors.
- *
- * Copyright (C) 2002 - 2012 Paul Mundt
- * Copyright (C) 2002 M. R. Brown
- *
- * Clock framework bits from arch/avr32/mach-at32ap/cpufreq.c
- *
- *   Copyright (C) 2004-2007 Atmel Corporation
- *
- * 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.
- */
-#define pr_fmt(fmt) "cpufreq: " fmt
-
-#include <linux/types.h>
-#include <linux/cpufreq.h>
-#include <linux/kernel.h>
-#include <linux/module.h>
-#include <linux/init.h>
-#include <linux/err.h>
-#include <linux/cpumask.h>
-#include <linux/cpu.h>
-#include <linux/smp.h>
-#include <linux/sched.h>        /* set_cpus_allowed() */
-#include <linux/clk.h>
-#include <linux/percpu.h>
-#include <linux/sh_clk.h>
-
-static DEFINE_PER_CPU(struct clk, sh_cpuclk);
-
-static unsigned int sh_cpufreq_get(unsigned int cpu)
-{
-        return (clk_get_rate(&per_cpu(sh_cpuclk, cpu)) + 500) / 1000;
-}
-
-/*
- * Here we notify other drivers of the proposed change and the final change.
- */
-static int sh_cpufreq_target(struct cpufreq_policy *policy,
-                             unsigned int target_freq,
-                             unsigned int relation)
-{
-        unsigned int cpu = policy->cpu;
-        struct clk *cpuclk = &per_cpu(sh_cpuclk, cpu);
-        cpumask_t cpus_allowed;
-        struct cpufreq_freqs freqs;
-        struct device *dev;
-        long freq;
-
-        if (!cpu_online(cpu))
-                return -ENODEV;
-
-        cpus_allowed = current->cpus_allowed;
-        set_cpus_allowed_ptr(current, cpumask_of(cpu));
-
-        BUG_ON(smp_processor_id() != cpu);
-
-        dev = get_cpu_device(cpu);
-
-        /* Convert target_freq from kHz to Hz */
-        freq = clk_round_rate(cpuclk, target_freq * 1000);
-
-        if (freq < (policy->min * 1000) || freq > (policy->max * 1000))
-                return -EINVAL;
-
-        dev_dbg(dev, "requested frequency %u Hz\n", target_freq * 1000);
-
-        freqs.cpu       = cpu;
-        freqs.old       = sh_cpufreq_get(cpu);
-        freqs.new       = (freq + 500) / 1000;
-        freqs.flags     = 0;
-
-        cpufreq_notify_transition(&freqs, CPUFREQ_PRECHANGE);
-        set_cpus_allowed_ptr(current, &cpus_allowed);
-        clk_set_rate(cpuclk, freq);
-        cpufreq_notify_transition(&freqs, CPUFREQ_POSTCHANGE);
-
-        dev_dbg(dev, "set frequency %lu Hz\n", freq);
-
-        return 0;
-}
-
-static int sh_cpufreq_verify(struct cpufreq_policy *policy)
-{
-        struct clk *cpuclk = &per_cpu(sh_cpuclk, policy->cpu);
-        struct cpufreq_frequency_table *freq_table;
-
-        freq_table = cpuclk->nr_freqs ? cpuclk->freq_table : NULL;
-        if (freq_table)
-                return cpufreq_frequency_table_verify(policy, freq_table);
-
-        cpufreq_verify_within_limits(policy, policy->cpuinfo.min_freq,
-                                     policy->cpuinfo.max_freq);
-
-        policy->min = (clk_round_rate(cpuclk, 1) + 500) / 1000;
-        policy->max = (clk_round_rate(cpuclk, ~0UL) + 500) / 1000;
-
-        cpufreq_verify_within_limits(policy, policy->cpuinfo.min_freq,
-                                     policy->cpuinfo.max_freq);
-
-        return 0;
-}
-
-static int sh_cpufreq_cpu_init(struct cpufreq_policy *policy)
-{
-        unsigned int cpu = policy->cpu;
-        struct clk *cpuclk = &per_cpu(sh_cpuclk, cpu);
-        struct cpufreq_frequency_table *freq_table;
-        struct device *dev;
-
-        if (!cpu_online(cpu))
-                return -ENODEV;
-
-        dev = get_cpu_device(cpu);
-
-        cpuclk = clk_get(dev, "cpu_clk");
-        if (IS_ERR(cpuclk)) {
-                dev_err(dev, "couldn't get CPU clk\n");
-                return PTR_ERR(cpuclk);
-        }
-
-        policy->cur = policy->min = policy->max = sh_cpufreq_get(cpu);
-
-        freq_table = cpuclk->nr_freqs ? cpuclk->freq_table : NULL;
-        if (freq_table) {
-                int result;
-
-                result = cpufreq_frequency_table_cpuinfo(policy, freq_table);
-                if (!result)
-                        cpufreq_frequency_table_get_attr(freq_table, cpu);
-        } else {
-                dev_notice(dev, "no frequency table found, falling back "
-                           "to rate rounding.\n");
-
-                policy->cpuinfo.min_freq =
-                        (clk_round_rate(cpuclk, 1) + 500) / 1000;
-                policy->cpuinfo.max_freq =
-                        (clk_round_rate(cpuclk, ~0UL) + 500) / 1000;
-        }
-
-        policy->min = policy->cpuinfo.min_freq;
-        policy->max = policy->cpuinfo.max_freq;
-
-        policy->cpuinfo.transition_latency = CPUFREQ_ETERNAL;
-
-        dev_info(dev, "CPU Frequencies - Minimum %u.%03u MHz, "
-               "Maximum %u.%03u MHz.\n",
-               policy->min / 1000, policy->min % 1000,
-               policy->max / 1000, policy->max % 1000);
-
-        return 0;
-}
-
-static int sh_cpufreq_cpu_exit(struct cpufreq_policy *policy)
-{
-        unsigned int cpu = policy->cpu;
-        struct clk *cpuclk = &per_cpu(sh_cpuclk, cpu);
-
-        cpufreq_frequency_table_put_attr(cpu);
-        clk_put(cpuclk);
-
-        return 0;
-}
-
-static struct freq_attr *sh_freq_attr[] = {
-        &cpufreq_freq_attr_scaling_available_freqs,
-        NULL,
-};
-
-static struct cpufreq_driver sh_cpufreq_driver = {
-        .owner          = THIS_MODULE,
-        .name           = "sh",
-        .get            = sh_cpufreq_get,
-        .target         = sh_cpufreq_target,
-        .verify         = sh_cpufreq_verify,
-        .init           = sh_cpufreq_cpu_init,
-        .exit           = sh_cpufreq_cpu_exit,
-        .attr           = sh_freq_attr,
-};
-
-static int __init sh_cpufreq_module_init(void)
-{
-        pr_notice("SuperH CPU frequency driver.\n");
-        return cpufreq_register_driver(&sh_cpufreq_driver);
-}
-
-static void __exit sh_cpufreq_module_exit(void)
-{
-        cpufreq_unregister_driver(&sh_cpufreq_driver);
-}
-
-module_init(sh_cpufreq_module_init);
-module_exit(sh_cpufreq_module_exit);
-
-MODULE_AUTHOR("Paul Mundt <lethal@linux-sh.org>");
-MODULE_DESCRIPTION("cpufreq driver for SuperH");
-MODULE_LICENSE("GPL");
diff --git a/arch/sh/kernel/dumpstack.c b/arch/sh/kernel/dumpstack.c
index 7617dc4129ac..b959f5592604 100644
--- a/arch/sh/kernel/dumpstack.c
+++ b/arch/sh/kernel/dumpstack.c
@@ -158,9 +158,3 @@ void show_stack(struct task_struct *tsk, unsigned long *sp)
                  (unsigned long)task_stack_page(tsk));
         show_trace(tsk, sp, NULL);
 }
-
-void dump_stack(void)
-{
-        show_stack(NULL, NULL);
-}
-EXPORT_SYMBOL(dump_stack);
diff --git a/arch/sh/kernel/idle.c b/arch/sh/kernel/idle.c
index 3d5a1b387cc0..2ea4483fd722 100644
--- a/arch/sh/kernel/idle.c
+++ b/arch/sh/kernel/idle.c
@@ -24,98 +24,24 @@
 
 static void (*sh_idle)(void);
 
-static int hlt_counter;
-
-static int __init nohlt_setup(char *__unused)
-{
-        hlt_counter = 1;
-        return 1;
-}
-__setup("nohlt", nohlt_setup);
-
-static int __init hlt_setup(char *__unused)
-{
-        hlt_counter = 0;
-        return 1;
-}
-__setup("hlt", hlt_setup);
-
-static inline int hlt_works(void)
-{
-        return !hlt_counter;
-}
-
-/*
- * On SMP it's slightly faster (but much more power-consuming!)
- * to poll the ->work.need_resched flag instead of waiting for the
- * cross-CPU IPI to arrive. Use this option with caution.
- */
-static void poll_idle(void)
+void default_idle(void)
 {
+        set_bl_bit();
         local_irq_enable();
-        while (!need_resched())
-                cpu_relax();
+        /* Isn't this racy ? */
+        cpu_sleep();
+        clear_bl_bit();
 }
 
-void default_idle(void)
+void arch_cpu_idle_dead(void)
 {
-        if (hlt_works()) {
-                clear_thread_flag(TIF_POLLING_NRFLAG);
-                smp_mb__after_clear_bit();
-
-                set_bl_bit();
-                if (!need_resched()) {
-                        local_irq_enable();
-                        cpu_sleep();
-                } else
-                        local_irq_enable();
-
-                set_thread_flag(TIF_POLLING_NRFLAG);
-                clear_bl_bit();
-        } else
-                poll_idle();
+        play_dead();
 }
 
-/*
- * The idle thread. There's no useful work to be done, so just try to conserve
- * power and have a low exit latency (ie sit in a loop waiting for somebody to
- * say that they'd like to reschedule)
- */
-void cpu_idle(void)
+void arch_cpu_idle(void)
 {
-        unsigned int cpu = smp_processor_id();
-
-        set_thread_flag(TIF_POLLING_NRFLAG);
-
-        /* endless idle loop with no priority at all */
-        while (1) {
-                tick_nohz_idle_enter();
-                rcu_idle_enter();
-
-                while (!need_resched()) {
-                        check_pgt_cache();
-                        rmb();
-
-                        if (cpu_is_offline(cpu))
-                                play_dead();
-
-                        local_irq_disable();
-                        /* Don't trace irqs off for idle */
-                        stop_critical_timings();
-                        if (cpuidle_idle_call())
-                                sh_idle();
-                        /*
-                         * Sanity check to ensure that sh_idle() returns
-                         * with IRQs enabled
-                         */
-                        WARN_ON(irqs_disabled());
-                        start_critical_timings();
-                }
-
-                rcu_idle_exit();
-                tick_nohz_idle_exit();
-                schedule_preempt_disabled();
-        }
+        if (cpuidle_idle_call())
+                sh_idle();
 }
 
 void __init select_idle_routine(void)
@@ -123,13 +49,8 @@ void __init select_idle_routine(void)
         /*
          * If a platform has set its own idle routine, leave it alone.
          */
-        if (sh_idle)
-                return;
-
-        if (hlt_works())
+        if (!sh_idle)
                 sh_idle = default_idle;
-        else
-                sh_idle = poll_idle;
 }
 
 void stop_this_cpu(void *unused)
diff --git a/arch/sh/kernel/process_32.c b/arch/sh/kernel/process_32.c
index 73eb66fc6253..ebd3933005b4 100644
--- a/arch/sh/kernel/process_32.c
+++ b/arch/sh/kernel/process_32.c
@@ -32,11 +32,7 @@
 void show_regs(struct pt_regs * regs)
 {
         printk("\n");
-        printk("Pid : %d, Comm: \t\t%s\n", task_pid_nr(current), current->comm);
-        printk("CPU : %d        \t\t%s  (%s %.*s)\n\n",
-               smp_processor_id(), print_tainted(), init_utsname()->release,
-               (int)strcspn(init_utsname()->version, " "),
-               init_utsname()->version);
+        show_regs_print_info(KERN_DEFAULT);
 
         print_symbol("PC is at %s\n", instruction_pointer(regs));
         print_symbol("PR is at %s\n", regs->pr);
diff --git a/arch/sh/kernel/process_64.c b/arch/sh/kernel/process_64.c
index e611c85144b1..174d124b419e 100644
--- a/arch/sh/kernel/process_64.c
+++ b/arch/sh/kernel/process_64.c
@@ -40,6 +40,7 @@ void show_regs(struct pt_regs *regs)
         unsigned long long ah, al, bh, bl, ch, cl;
 
         printk("\n");
+        show_regs_print_info(KERN_DEFAULT);
 
         ah = (regs->pc) >> 32;
         al = (regs->pc) & 0xffffffff;
diff --git a/arch/sh/kernel/sh_bios.c b/arch/sh/kernel/sh_bios.c
index 47475cca068a..fe584e516964 100644
--- a/arch/sh/kernel/sh_bios.c
+++ b/arch/sh/kernel/sh_bios.c
@@ -104,6 +104,7 @@ void sh_bios_vbr_reload(void)
                 );
 }
 
+#ifdef CONFIG_EARLY_PRINTK
 /*
  *      Print a string through the BIOS
  */
@@ -144,8 +145,6 @@ static struct console bios_console = {
         .index          = -1,
 };
 
-static struct console *early_console;
-
 static int __init setup_early_printk(char *buf)
 {
         int keep_early = 0;
@@ -170,3 +169,4 @@ static int __init setup_early_printk(char *buf)
         return 0;
 }
 early_param("earlyprintk", setup_early_printk);
+#endif
diff --git a/arch/sh/kernel/smp.c b/arch/sh/kernel/smp.c
index 2062aa88af41..45696451f0ea 100644
--- a/arch/sh/kernel/smp.c
+++ b/arch/sh/kernel/smp.c
@@ -203,7 +203,7 @@ asmlinkage void __cpuinit start_secondary(void)
         set_cpu_online(cpu, true);
         per_cpu(cpu_state, cpu) = CPU_ONLINE;
 
-        cpu_idle();
+        cpu_startup_entry(CPUHP_ONLINE);
 }
 
 extern struct {
diff --git a/arch/sh/mm/init.c b/arch/sh/mm/init.c
index 105794037143..20f9ead650d3 100644
--- a/arch/sh/mm/init.c
+++ b/arch/sh/mm/init.c
@@ -417,15 +417,13 @@ void __init mem_init(void)
 
         for_each_online_node(nid) {
                 pg_data_t *pgdat = NODE_DATA(nid);
-                unsigned long node_pages = 0;
                 void *node_high_memory;
 
                 num_physpages += pgdat->node_present_pages;
 
                 if (pgdat->node_spanned_pages)
-                        node_pages = free_all_bootmem_node(pgdat);
+                        totalram_pages += free_all_bootmem_node(pgdat);
 
-                totalram_pages += node_pages;
 
                 node_high_memory = (void *)__va((pgdat->node_start_pfn +
                                                  pgdat->node_spanned_pages) <<
@@ -501,31 +499,13 @@ void __init mem_init(void)
 
 void free_initmem(void)
 {
-        unsigned long addr;
-
-        addr = (unsigned long)(&__init_begin);
-        for (; addr < (unsigned long)(&__init_end); addr += PAGE_SIZE) {
-                ClearPageReserved(virt_to_page(addr));
-                init_page_count(virt_to_page(addr));
-                free_page(addr);
-                totalram_pages++;
-        }
-        printk("Freeing unused kernel memory: %ldk freed\n",
-               ((unsigned long)&__init_end -
-                (unsigned long)&__init_begin) >> 10);
+        free_initmem_default(0);
 }
 
 #ifdef CONFIG_BLK_DEV_INITRD
 void free_initrd_mem(unsigned long start, unsigned long end)
 {
-        unsigned long p;
-        for (p = start; p < end; p += PAGE_SIZE) {
-                ClearPageReserved(virt_to_page(p));
-                init_page_count(virt_to_page(p));
-                free_page(p);
-                totalram_pages++;
-        }
-        printk("Freeing initrd memory: %ldk freed\n", (end - start) >> 10);
+        free_reserved_area(start, end, 0, "initrd");
 }
 #endif
 
diff --git a/arch/sparc/Kconfig b/arch/sparc/Kconfig
index 3d361f236308..f5041d741dea 100644
--- a/arch/sparc/Kconfig
+++ b/arch/sparc/Kconfig
@@ -62,7 +62,6 @@ config SPARC64
         select HAVE_RCU_TABLE_FREE if SMP
         select HAVE_MEMBLOCK
         select HAVE_MEMBLOCK_NODE_MAP
-        select HAVE_SYSCALL_WRAPPERS
         select HAVE_ARCH_TRANSPARENT_HUGEPAGE
         select HAVE_DYNAMIC_FTRACE
         select HAVE_FTRACE_MCOUNT_RECORD
@@ -254,29 +253,6 @@ config HOTPLUG_CPU
 
 if SPARC64
 source "drivers/cpufreq/Kconfig"
-
-config US3_FREQ
-        tristate "UltraSPARC-III CPU Frequency driver"
-        depends on CPU_FREQ
-        select CPU_FREQ_TABLE
-        help
-          This adds the CPUFreq driver for UltraSPARC-III processors.
-
-          For details, take a look at <file:Documentation/cpu-freq>.
-
-          If in doubt, say N.
-
-config US2E_FREQ
-        tristate "UltraSPARC-IIe CPU Frequency driver"
-        depends on CPU_FREQ
-        select CPU_FREQ_TABLE
-        help
-          This adds the CPUFreq driver for UltraSPARC-IIe processors.
-
-          For details, take a look at <file:Documentation/cpu-freq>.
-
-          If in doubt, say N.
-
 endif
 
 config US3_MC
@@ -407,6 +383,8 @@ config SERIAL_CONSOLE
 config SPARC_LEON
         bool "Sparc Leon processor family"
         depends on SPARC32
+        select USB_EHCI_BIG_ENDIAN_MMIO
+        select USB_EHCI_BIG_ENDIAN_DESC
         ---help---
           If you say Y here if you are running on a SPARC-LEON processor.
           The LEON processor is a synthesizable VHDL model of the
diff --git a/arch/sparc/include/asm/hugetlb.h b/arch/sparc/include/asm/hugetlb.h
index 7eb57d245044..e4cab465b81f 100644
--- a/arch/sparc/include/asm/hugetlb.h
+++ b/arch/sparc/include/asm/hugetlb.h
@@ -2,6 +2,7 @@
 #define _ASM_SPARC64_HUGETLB_H
 
 #include <asm/page.h>
+#include <asm-generic/hugetlb.h>
 
 
 void set_huge_pte_at(struct mm_struct *mm, unsigned long addr,
diff --git a/arch/sparc/include/asm/thread_info_32.h b/arch/sparc/include/asm/thread_info_32.h
index 25849ae3e900..dd3807599bb9 100644
--- a/arch/sparc/include/asm/thread_info_32.h
+++ b/arch/sparc/include/asm/thread_info_32.h
@@ -132,8 +132,6 @@ register struct thread_info *current_thread_info_reg asm("g6");
 #define _TIF_DO_NOTIFY_RESUME_MASK      (_TIF_NOTIFY_RESUME | \
                                          _TIF_SIGPENDING)
 
-#define tsk_is_polling(t) test_tsk_thread_flag(t, TIF_POLLING_NRFLAG)
-
 #endif /* __KERNEL__ */
 
 #endif /* _ASM_THREAD_INFO_H */
diff --git a/arch/sparc/include/asm/thread_info_64.h b/arch/sparc/include/asm/thread_info_64.h
index 269bd92313df..d5e504251079 100644
--- a/arch/sparc/include/asm/thread_info_64.h
+++ b/arch/sparc/include/asm/thread_info_64.h
@@ -256,8 +256,6 @@ static inline bool test_and_clear_restore_sigmask(void)
         return true;
 }
 
-#define tsk_is_polling(t) test_tsk_thread_flag(t, TIF_POLLING_NRFLAG)
-
 #define thread32_stack_is_64bit(__SP) (((__SP) & 0x1) != 0)
 #define test_thread_64bit_stack(__SP) \
         ((test_thread_flag(TIF_32BIT) && !thread32_stack_is_64bit(__SP)) ? \
diff --git a/arch/sparc/include/asm/unistd.h b/arch/sparc/include/asm/unistd.h
index 5356810bd7e7..dfa53fdd5cbc 100644
--- a/arch/sparc/include/asm/unistd.h
+++ b/arch/sparc/include/asm/unistd.h
@@ -45,12 +45,4 @@
 #define __ARCH_WANT_COMPAT_SYS_SENDFILE
 #endif
 
-/*
- * "Conditional" syscalls
- *
- * What we want is __attribute__((weak,alias("sys_ni_syscall"))),
- * but it doesn't work on all toolchains, so we just do it by hand
- */
-#define cond_syscall(x) asm(".weak\t" #x "\n\t.set\t" #x ",sys_ni_syscall")
-
 #endif /* _SPARC_UNISTD_H */
diff --git a/arch/sparc/kernel/Makefile b/arch/sparc/kernel/Makefile
index 6cf591b7e1c6..5276fd4e9d03 100644
--- a/arch/sparc/kernel/Makefile
+++ b/arch/sparc/kernel/Makefile
@@ -102,9 +102,6 @@ obj-$(CONFIG_PCI_MSI)        += pci_msi.o
 
 obj-$(CONFIG_COMPAT)         += sys32.o sys_sparc32.o signal32.o
 
-# sparc64 cpufreq
-obj-$(CONFIG_US3_FREQ)  += us3_cpufreq.o
-obj-$(CONFIG_US2E_FREQ) += us2e_cpufreq.o
 obj-$(CONFIG_US3_MC)    += chmc.o
 
 obj-$(CONFIG_KPROBES)   += kprobes.o
diff --git a/arch/sparc/kernel/hvtramp.S b/arch/sparc/kernel/hvtramp.S
index 9365432904d6..605c960b2fa6 100644
--- a/arch/sparc/kernel/hvtramp.S
+++ b/arch/sparc/kernel/hvtramp.S
@@ -128,8 +128,7 @@ hv_cpu_startup:
 
         call            smp_callin
          nop
-        call            cpu_idle
-         mov            0, %o0
+
         call            cpu_panic
          nop
 
diff --git a/arch/sparc/kernel/process_32.c b/arch/sparc/kernel/process_32.c
index 62eede13831a..fdd819dfdacf 100644
--- a/arch/sparc/kernel/process_32.c
+++ b/arch/sparc/kernel/process_32.c
@@ -64,23 +64,12 @@ extern void fpsave(unsigned long *, unsigned long *, void *, unsigned long *);
 struct task_struct *last_task_used_math = NULL;
 struct thread_info *current_set[NR_CPUS];
 
-/*
- * the idle loop on a Sparc... ;)
- */
-void cpu_idle(void)
+/* Idle loop support. */
+void arch_cpu_idle(void)
 {
-        set_thread_flag(TIF_POLLING_NRFLAG);
-
-        /* endless idle loop with no priority at all */
-        for (;;) {
-                while (!need_resched()) {
-                        if (sparc_idle)
-                                (*sparc_idle)();
-                        else
-                                cpu_relax();
-                }
-                schedule_preempt_disabled();
-        }
+        if (sparc_idle)
+                (*sparc_idle)();
+        local_irq_enable();
 }
 
 /* XXX cli/sti -> local_irq_xxx here, check this works once SMP is fixed. */
@@ -123,6 +112,8 @@ void show_regs(struct pt_regs *r)
 {
         struct reg_window32 *rw = (struct reg_window32 *) r->u_regs[14];
 
+        show_regs_print_info(KERN_DEFAULT);
+
         printk("PSR: %08lx PC: %08lx NPC: %08lx Y: %08lx    %s\n",
                r->psr, r->pc, r->npc, r->y, print_tainted());
         printk("PC: <%pS>\n", (void *) r->pc);
@@ -153,11 +144,13 @@ void show_stack(struct task_struct *tsk, unsigned long *_ksp)
         struct reg_window32 *rw;
         int count = 0;
 
-        if (tsk != NULL)
-                task_base = (unsigned long) task_stack_page(tsk);
-        else
-                task_base = (unsigned long) current_thread_info();
+        if (!tsk)
+                tsk = current;
 
+        if (tsk == current && !_ksp)
+                __asm__ __volatile__("mov       %%fp, %0" : "=r" (_ksp));
+
+        task_base = (unsigned long) task_stack_page(tsk);
         fp = (unsigned long) _ksp;
         do {
                 /* Bogus frame pointer? */
@@ -173,17 +166,6 @@ void show_stack(struct task_struct *tsk, unsigned long *_ksp)
         printk("\n");
 }
 
-void dump_stack(void)
-{
-        unsigned long *ksp;
-
-        __asm__ __volatile__("mov       %%fp, %0"
-                             : "=r" (ksp));
-        show_stack(current, ksp);
-}
-
-EXPORT_SYMBOL(dump_stack);
-
 /*
  * Note: sparc64 has a pretty intricated thread_saved_pc, check it out.
  */
diff --git a/arch/sparc/kernel/process_64.c b/arch/sparc/kernel/process_64.c
index cdb80b2adbe0..baebab215492 100644
--- a/arch/sparc/kernel/process_64.c
+++ b/arch/sparc/kernel/process_64.c
@@ -52,20 +52,17 @@
 
 #include "kstack.h"
 
-static void sparc64_yield(int cpu)
+/* Idle loop support on sparc64. */
+void arch_cpu_idle(void)
 {
         if (tlb_type != hypervisor) {
                 touch_nmi_watchdog();
-                return;
-        }
-
-        clear_thread_flag(TIF_POLLING_NRFLAG);
-        smp_mb__after_clear_bit();
-
-        while (!need_resched() && !cpu_is_offline(cpu)) {
+        } else {
                 unsigned long pstate;
 
-                /* Disable interrupts. */
+                /* The sun4v sleeping code requires that we have PSTATE.IE cleared over
+                 * the cpu sleep hypervisor call.
+                 */
                 __asm__ __volatile__(
                         "rdpr %%pstate, %0\n\t"
                         "andn %0, %1, %0\n\t"
@@ -73,7 +70,7 @@ static void sparc64_yield(int cpu)
                         : "=&r" (pstate)
                         : "i" (PSTATE_IE));
 
-                if (!need_resched() && !cpu_is_offline(cpu))
+                if (!need_resched() && !cpu_is_offline(smp_processor_id()))
                         sun4v_cpu_yield();
 
                 /* Re-enable interrupts. */
@@ -84,36 +81,16 @@ static void sparc64_yield(int cpu)
                         : "=&r" (pstate)
                         : "i" (PSTATE_IE));
         }
-
-        set_thread_flag(TIF_POLLING_NRFLAG);
+        local_irq_enable();
 }
 
-/* The idle loop on sparc64. */
-void cpu_idle(void)
-{
-        int cpu = smp_processor_id();
-
-        set_thread_flag(TIF_POLLING_NRFLAG);
-
-        while(1) {
-                tick_nohz_idle_enter();
-                rcu_idle_enter();
-
-                while (!need_resched() && !cpu_is_offline(cpu))
-                        sparc64_yield(cpu);
-
-                rcu_idle_exit();
-                tick_nohz_idle_exit();
-
 #ifdef CONFIG_HOTPLUG_CPU
-                if (cpu_is_offline(cpu)) {
-                        sched_preempt_enable_no_resched();
-                        cpu_play_dead();
-                }
-#endif
-                schedule_preempt_disabled();
-        }
+void arch_cpu_idle_dead()
+{
+        sched_preempt_enable_no_resched();
+        cpu_play_dead();
 }
+#endif
 
 #ifdef CONFIG_COMPAT
 static void show_regwindow32(struct pt_regs *regs)
@@ -186,6 +163,8 @@ static void show_regwindow(struct pt_regs *regs)
 
 void show_regs(struct pt_regs *regs)
 {
+        show_regs_print_info(KERN_DEFAULT);
+
         printk("TSTATE: %016lx TPC: %016lx TNPC: %016lx Y: %08x    %s\n", regs->tstate,
                regs->tpc, regs->tnpc, regs->y, print_tainted());
         printk("TPC: <%pS>\n", (void *) regs->tpc);
@@ -315,7 +294,7 @@ static void sysrq_handle_globreg(int key)
 
 static struct sysrq_key_op sparc_globalreg_op = {
         .handler        = sysrq_handle_globreg,
-        .help_msg       = "global-regs(Y)",
+        .help_msg       = "global-regs(y)",
         .action_msg     = "Show Global CPU Regs",
 };
 
@@ -385,7 +364,7 @@ static void sysrq_handle_globpmu(int key)
 
 static struct sysrq_key_op sparc_globalpmu_op = {
         .handler        = sysrq_handle_globpmu,
-        .help_msg       = "global-pmu(X)",
+        .help_msg       = "global-pmu(x)",
         .action_msg     = "Show Global PMU Regs",
 };
 
diff --git a/arch/sparc/kernel/smp_32.c b/arch/sparc/kernel/smp_32.c
index 9e7e6d718367..e3f2b81c23f1 100644
--- a/arch/sparc/kernel/smp_32.c
+++ b/arch/sparc/kernel/smp_32.c
@@ -369,7 +369,7 @@ void __cpuinit sparc_start_secondary(void *arg)
         local_irq_enable();
 
         wmb();
-        cpu_idle();
+        cpu_startup_entry(CPUHP_ONLINE);
 
         /* We should never reach here! */
         BUG();
diff --git a/arch/sparc/kernel/smp_64.c b/arch/sparc/kernel/smp_64.c
index ca64d2a86ec0..77539eda928c 100644
--- a/arch/sparc/kernel/smp_64.c
+++ b/arch/sparc/kernel/smp_64.c
@@ -127,6 +127,8 @@ void __cpuinit smp_callin(void)
 
         /* idle thread is expected to have preempt disabled */
         preempt_disable();
+
+        cpu_startup_entry(CPUHP_ONLINE);
 }
 
 void cpu_panic(void)
diff --git a/arch/sparc/kernel/sys32.S b/arch/sparc/kernel/sys32.S
index 240a3cecc11e..2e680b5245c9 100644
--- a/arch/sparc/kernel/sys32.S
+++ b/arch/sparc/kernel/sys32.S
@@ -36,7 +36,6 @@ STUB:	sra	REG1, 0, REG1; \
         jmpl    %g1 + %lo(SYSCALL), %g0; \
         sra     REG3, 0, REG3
 
-SIGN1(sys32_getrusage, compat_sys_getrusage, %o0)
 SIGN1(sys32_readahead, compat_sys_readahead, %o0)
 SIGN2(sys32_fadvise64, compat_sys_fadvise64, %o0, %o4)
 SIGN2(sys32_fadvise64_64, compat_sys_fadvise64_64, %o0, %o5)
@@ -46,12 +45,9 @@ SIGN1(sys32_io_submit, compat_sys_io_submit, %o1)
 SIGN1(sys32_mq_open, compat_sys_mq_open, %o1)
 SIGN1(sys32_select, compat_sys_select, %o0)
 SIGN3(sys32_futex, compat_sys_futex, %o1, %o2, %o5)
-SIGN2(sys32_sendfile, compat_sys_sendfile, %o0, %o1)
 SIGN1(sys32_recvfrom, compat_sys_recvfrom, %o0)
 SIGN1(sys32_recvmsg, compat_sys_recvmsg, %o0)
 SIGN1(sys32_sendmsg, compat_sys_sendmsg, %o0)
-SIGN2(sys32_sync_file_range, compat_sync_file_range, %o0, %o5)
-SIGN1(sys32_vmsplice, compat_sys_vmsplice, %o0)
 
         .globl          sys32_mmap2
 sys32_mmap2:
diff --git a/arch/sparc/kernel/sys_sparc32.c b/arch/sparc/kernel/sys_sparc32.c
index f38f2280fade..3d0ddbc005fe 100644
--- a/arch/sparc/kernel/sys_sparc32.c
+++ b/arch/sparc/kernel/sys_sparc32.c
@@ -49,71 +49,6 @@
 #include <asm/mmu_context.h>
 #include <asm/compat_signal.h>
 
-#ifdef CONFIG_SYSVIPC                                                        
-asmlinkage long compat_sys_ipc(u32 call, u32 first, u32 second, u32 third, compat_uptr_t ptr, u32 fifth)
-{
-        int version;
-
-        version = call >> 16; /* hack for backward compatibility */
-        call &= 0xffff;
-
-        switch (call) {
-        case SEMTIMEDOP:
-                if (fifth)
-                        /* sign extend semid */
-                        return compat_sys_semtimedop((int)first,
-                                                     compat_ptr(ptr), second,
-                                                     compat_ptr(fifth));
-                /* else fall through for normal semop() */
-        case SEMOP:
-                /* struct sembuf is the same on 32 and 64bit :)) */
-                /* sign extend semid */
-                return sys_semtimedop((int)first, compat_ptr(ptr), second,
-                                      NULL);
-        case SEMGET:
-                /* sign extend key, nsems */
-                return sys_semget((int)first, (int)second, third);
-        case SEMCTL:
-                /* sign extend semid, semnum */
-                return compat_sys_semctl((int)first, (int)second, third,
-                                         compat_ptr(ptr));
-
-        case MSGSND:
-                /* sign extend msqid */
-                return compat_sys_msgsnd((int)first, (int)second, third,
-                                         compat_ptr(ptr));
-        case MSGRCV:
-                /* sign extend msqid, msgtyp */
-                return compat_sys_msgrcv((int)first, second, (int)fifth,
-                                         third, version, compat_ptr(ptr));
-        case MSGGET:
-                /* sign extend key */
-                return sys_msgget((int)first, second);
-        case MSGCTL:
-                /* sign extend msqid */
-                return compat_sys_msgctl((int)first, second, compat_ptr(ptr));
-
-        case SHMAT:
-                /* sign extend shmid */
-                return compat_sys_shmat((int)first, second, third, version,
-                                        compat_ptr(ptr));
-        case SHMDT:
-                return sys_shmdt(compat_ptr(ptr));
-        case SHMGET:
-                /* sign extend key_t */
-                return sys_shmget((int)first, second, third);
-        case SHMCTL:
-                /* sign extend shmid */
-                return compat_sys_shmctl((int)first, second, compat_ptr(ptr));
-
-        default:
-                return -ENOSYS;
-        }
-
-        return -ENOSYS;
-}
-#endif
-
 asmlinkage long sys32_truncate64(const char __user * path, unsigned long high, unsigned long low)
 {
         if ((int)high < 0)
@@ -303,15 +238,7 @@ long compat_sys_fadvise64_64(int fd,
                                 advice);
 }
 
-long sys32_lookup_dcookie(unsigned long cookie_high,
-                          unsigned long cookie_low,
-                          char __user *buf, size_t len)
-{
-        return sys_lookup_dcookie((cookie_high << 32) | cookie_low,
-                                  buf, len);
-}
-
-long compat_sync_file_range(int fd, unsigned long off_high, unsigned long off_low, unsigned long nb_high, unsigned long nb_low, int flags)
+long sys32_sync_file_range(unsigned int fd, unsigned long off_high, unsigned long off_low, unsigned long nb_high, unsigned long nb_low, unsigned int flags)
 {
         return sys_sync_file_range(fd,
                                    (off_high << 32) | off_low,
diff --git a/arch/sparc/kernel/sys_sparc_64.c b/arch/sparc/kernel/sys_sparc_64.c
index 708bc29d36a8..2daaaa6eda23 100644
--- a/arch/sparc/kernel/sys_sparc_64.c
+++ b/arch/sparc/kernel/sys_sparc_64.c
@@ -353,7 +353,7 @@ SYSCALL_DEFINE6(sparc_ipc, unsigned int, call, int, first, unsigned long, second
                 case SEMCTL: {
                         err = sys_semctl(first, second,
                                          (int)third | IPC_64,
-                                         (union semun) ptr);
+                                         (unsigned long) ptr);
                         goto out;
                 }
                 default:
@@ -470,10 +470,6 @@ SYSCALL_DEFINE2(64_munmap, unsigned long, addr, size_t, len)
 
         return vm_munmap(addr, len);
 }
-
-extern unsigned long do_mremap(unsigned long addr,
-        unsigned long old_len, unsigned long new_len,
-        unsigned long flags, unsigned long new_addr);
                 
 SYSCALL_DEFINE5(64_mremap, unsigned long, addr, unsigned long, old_len,
                 unsigned long, new_len, unsigned long, flags,
diff --git a/arch/sparc/kernel/systbls_64.S b/arch/sparc/kernel/systbls_64.S
index 088134834dab..8fd932080215 100644
--- a/arch/sparc/kernel/systbls_64.S
+++ b/arch/sparc/kernel/systbls_64.S
@@ -23,9 +23,9 @@ sys_call_table32:
 /*10*/  .word sys_unlink, sunos_execv, sys_chdir, sys_chown16, sys_mknod
 /*15*/  .word sys_chmod, sys_lchown16, sys_brk, sys_nis_syscall, compat_sys_lseek
 /*20*/  .word sys_getpid, sys_capget, sys_capset, sys_setuid16, sys_getuid16
-/*25*/  .word sys32_vmsplice, compat_sys_ptrace, sys_alarm, compat_sys_sigaltstack, sys_pause
+/*25*/  .word compat_sys_vmsplice, compat_sys_ptrace, sys_alarm, compat_sys_sigaltstack, sys_pause
 /*30*/  .word compat_sys_utime, sys_lchown, sys_fchown, sys_access, sys_nice
-        .word sys_chown, sys_sync, sys_kill, compat_sys_newstat, sys32_sendfile
+        .word sys_chown, sys_sync, sys_kill, compat_sys_newstat, compat_sys_sendfile
 /*40*/  .word compat_sys_newlstat, sys_dup, sys_sparc_pipe, compat_sys_times, sys_getuid
         .word sys_umount, sys_setgid16, sys_getgid16, sys_signal, sys_geteuid16
 /*50*/  .word sys_getegid16, sys_acct, sys_nis_syscall, sys_getgid, compat_sys_ioctl
@@ -41,7 +41,7 @@ sys_call_table32:
 /*100*/ .word sys_getpriority, sys32_rt_sigreturn, compat_sys_rt_sigaction, compat_sys_rt_sigprocmask, compat_sys_rt_sigpending
         .word compat_sys_rt_sigtimedwait, compat_sys_rt_sigqueueinfo, compat_sys_rt_sigsuspend, sys_setresuid, sys_getresuid
 /*110*/ .word sys_setresgid, sys_getresgid, sys_setregid, sys_nis_syscall, sys_nis_syscall
-        .word sys_getgroups, compat_sys_gettimeofday, sys32_getrusage, sys_nis_syscall, sys_getcwd
+        .word sys_getgroups, compat_sys_gettimeofday, compat_sys_getrusage, sys_nis_syscall, sys_getcwd
 /*120*/ .word compat_sys_readv, compat_sys_writev, compat_sys_settimeofday, sys_fchown16, sys_fchmod
         .word sys_nis_syscall, sys_setreuid16, sys_setregid16, sys_rename, compat_sys_truncate
 /*130*/ .word compat_sys_ftruncate, sys_flock, compat_sys_lstat64, sys_nis_syscall, sys_nis_syscall
@@ -59,7 +59,7 @@ sys_call_table32:
 /*190*/ .word sys_init_module, sys_sparc64_personality, sys_remap_file_pages, sys_epoll_create, sys_epoll_ctl
         .word sys_epoll_wait, sys_ioprio_set, sys_getppid, compat_sys_sparc_sigaction, sys_sgetmask
 /*200*/ .word sys_ssetmask, sys_sigsuspend, compat_sys_newlstat, sys_uselib, compat_sys_old_readdir
-        .word sys32_readahead, sys32_socketcall, sys_syslog, sys32_lookup_dcookie, sys32_fadvise64
+        .word sys32_readahead, sys32_socketcall, sys_syslog, compat_sys_lookup_dcookie, sys32_fadvise64
 /*210*/ .word sys32_fadvise64_64, sys_tgkill, sys_waitpid, sys_swapoff, compat_sys_sysinfo
         .word compat_sys_ipc, sys32_sigreturn, sys_clone, sys_ioprio_get, compat_sys_adjtimex
 /*220*/ .word compat_sys_sigprocmask, sys_ni_syscall, sys_delete_module, sys_ni_syscall, sys_getpgid
diff --git a/arch/sparc/kernel/trampoline_64.S b/arch/sparc/kernel/trampoline_64.S
index da1b781b5e65..2e973a26fbda 100644
--- a/arch/sparc/kernel/trampoline_64.S
+++ b/arch/sparc/kernel/trampoline_64.S
@@ -407,8 +407,7 @@ after_lock_tlb:
 
         call            smp_callin
          nop
-        call            cpu_idle
-         mov            0, %o0
+
         call            cpu_panic
          nop
 1:      b,a,pt          %xcc, 1b
diff --git a/arch/sparc/kernel/traps_64.c b/arch/sparc/kernel/traps_64.c
index 8d38ca97aa23..b3f833ab90eb 100644
--- a/arch/sparc/kernel/traps_64.c
+++ b/arch/sparc/kernel/traps_64.c
@@ -2350,13 +2350,6 @@ void show_stack(struct task_struct *tsk, unsigned long *_ksp)
         } while (++count < 16);
 }
 
-void dump_stack(void)
-{
-        show_stack(current, NULL);
-}
-
-EXPORT_SYMBOL(dump_stack);
-
 static inline struct reg_window *kernel_stack_up(struct reg_window *rw)
 {
         unsigned long fp = rw->ins[6];
diff --git a/arch/sparc/kernel/us2e_cpufreq.c b/arch/sparc/kernel/us2e_cpufreq.c
deleted file mode 100644
index 489fc15f3194..000000000000
--- a/arch/sparc/kernel/us2e_cpufreq.c
+++ /dev/null
@@ -1,413 +0,0 @@
-/* us2e_cpufreq.c: UltraSPARC-IIe cpu frequency support
- *
- * Copyright (C) 2003 David S. Miller (davem@redhat.com)
- *
- * Many thanks to Dominik Brodowski for fixing up the cpufreq
- * infrastructure in order to make this driver easier to implement.
- */
-
-#include <linux/kernel.h>
-#include <linux/module.h>
-#include <linux/sched.h>
-#include <linux/smp.h>
-#include <linux/cpufreq.h>
-#include <linux/threads.h>
-#include <linux/slab.h>
-#include <linux/delay.h>
-#include <linux/init.h>
-
-#include <asm/asi.h>
-#include <asm/timer.h>
-
-static struct cpufreq_driver *cpufreq_us2e_driver;
-
-struct us2e_freq_percpu_info {
-        struct cpufreq_frequency_table table[6];
-};
-
-/* Indexed by cpu number. */
-static struct us2e_freq_percpu_info *us2e_freq_table;
-
-#define HBIRD_MEM_CNTL0_ADDR    0x1fe0000f010UL
-#define HBIRD_ESTAR_MODE_ADDR   0x1fe0000f080UL
-
-/* UltraSPARC-IIe has five dividers: 1, 2, 4, 6, and 8.  These are controlled
- * in the ESTAR mode control register.
- */
-#define ESTAR_MODE_DIV_1        0x0000000000000000UL
-#define ESTAR_MODE_DIV_2        0x0000000000000001UL
-#define ESTAR_MODE_DIV_4        0x0000000000000003UL
-#define ESTAR_MODE_DIV_6        0x0000000000000002UL
-#define ESTAR_MODE_DIV_8        0x0000000000000004UL
-#define ESTAR_MODE_DIV_MASK     0x0000000000000007UL
-
-#define MCTRL0_SREFRESH_ENAB    0x0000000000010000UL
-#define MCTRL0_REFR_COUNT_MASK  0x0000000000007f00UL
-#define MCTRL0_REFR_COUNT_SHIFT 8
-#define MCTRL0_REFR_INTERVAL    7800
-#define MCTRL0_REFR_CLKS_P_CNT  64
-
-static unsigned long read_hbreg(unsigned long addr)
-{
-        unsigned long ret;
-
-        __asm__ __volatile__("ldxa      [%1] %2, %0"
-                             : "=&r" (ret)
-                             : "r" (addr), "i" (ASI_PHYS_BYPASS_EC_E));
-        return ret;
-}
-
-static void write_hbreg(unsigned long addr, unsigned long val)
-{
-        __asm__ __volatile__("stxa      %0, [%1] %2\n\t"
-                             "membar    #Sync"
-                             : /* no outputs */
-                             : "r" (val), "r" (addr), "i" (ASI_PHYS_BYPASS_EC_E)
-                             : "memory");
-        if (addr == HBIRD_ESTAR_MODE_ADDR) {
-                /* Need to wait 16 clock cycles for the PLL to lock.  */
-                udelay(1);
-        }
-}
-
-static void self_refresh_ctl(int enable)
-{
-        unsigned long mctrl = read_hbreg(HBIRD_MEM_CNTL0_ADDR);
-
-        if (enable)
-                mctrl |= MCTRL0_SREFRESH_ENAB;
-        else
-                mctrl &= ~MCTRL0_SREFRESH_ENAB;
-        write_hbreg(HBIRD_MEM_CNTL0_ADDR, mctrl);
-        (void) read_hbreg(HBIRD_MEM_CNTL0_ADDR);
-}
-
-static void frob_mem_refresh(int cpu_slowing_down,
-                             unsigned long clock_tick,
-                             unsigned long old_divisor, unsigned long divisor)
-{
-        unsigned long old_refr_count, refr_count, mctrl;
-
-        refr_count  = (clock_tick * MCTRL0_REFR_INTERVAL);
-        refr_count /= (MCTRL0_REFR_CLKS_P_CNT * divisor * 1000000000UL);
-
-        mctrl = read_hbreg(HBIRD_MEM_CNTL0_ADDR);
-        old_refr_count = (mctrl & MCTRL0_REFR_COUNT_MASK)
-                >> MCTRL0_REFR_COUNT_SHIFT;
-
-        mctrl &= ~MCTRL0_REFR_COUNT_MASK;
-        mctrl |= refr_count << MCTRL0_REFR_COUNT_SHIFT;
-        write_hbreg(HBIRD_MEM_CNTL0_ADDR, mctrl);
-        mctrl = read_hbreg(HBIRD_MEM_CNTL0_ADDR);
-
-        if (cpu_slowing_down && !(mctrl & MCTRL0_SREFRESH_ENAB)) {
-                unsigned long usecs;
-
-                /* We have to wait for both refresh counts (old
-                 * and new) to go to zero.
-                 */
-                usecs = (MCTRL0_REFR_CLKS_P_CNT *
-                         (refr_count + old_refr_count) *
-                         1000000UL *
-                         old_divisor) / clock_tick;
-                udelay(usecs + 1UL);
-        }
-}
-
-static void us2e_transition(unsigned long estar, unsigned long new_bits,
-                            unsigned long clock_tick,
-                            unsigned long old_divisor, unsigned long divisor)
-{
-        unsigned long flags;
-
-        local_irq_save(flags);
-
-        estar &= ~ESTAR_MODE_DIV_MASK;
-
-        /* This is based upon the state transition diagram in the IIe manual.  */
-        if (old_divisor == 2 && divisor == 1) {
-                self_refresh_ctl(0);
-                write_hbreg(HBIRD_ESTAR_MODE_ADDR, estar | new_bits);
-                frob_mem_refresh(0, clock_tick, old_divisor, divisor);
-        } else if (old_divisor == 1 && divisor == 2) {
-                frob_mem_refresh(1, clock_tick, old_divisor, divisor);
-                write_hbreg(HBIRD_ESTAR_MODE_ADDR, estar | new_bits);
-                self_refresh_ctl(1);
-        } else if (old_divisor == 1 && divisor > 2) {
-                us2e_transition(estar, ESTAR_MODE_DIV_2, clock_tick,
-                                1, 2);
-                us2e_transition(estar, new_bits, clock_tick,
-                                2, divisor);
-        } else if (old_divisor > 2 && divisor == 1) {
-                us2e_transition(estar, ESTAR_MODE_DIV_2, clock_tick,
-                                old_divisor, 2);
-                us2e_transition(estar, new_bits, clock_tick,
-                                2, divisor);
-        } else if (old_divisor < divisor) {
-                frob_mem_refresh(0, clock_tick, old_divisor, divisor);
-                write_hbreg(HBIRD_ESTAR_MODE_ADDR, estar | new_bits);
-        } else if (old_divisor > divisor) {
-                write_hbreg(HBIRD_ESTAR_MODE_ADDR, estar | new_bits);
-                frob_mem_refresh(1, clock_tick, old_divisor, divisor);
-        } else {
-                BUG();
-        }
-
-        local_irq_restore(flags);
-}
-
-static unsigned long index_to_estar_mode(unsigned int index)
-{
-        switch (index) {
-        case 0:
-                return ESTAR_MODE_DIV_1;
-
-        case 1:
-                return ESTAR_MODE_DIV_2;
-
-        case 2:
-                return ESTAR_MODE_DIV_4;
-
-        case 3:
-                return ESTAR_MODE_DIV_6;
-
-        case 4:
-                return ESTAR_MODE_DIV_8;
-
-        default:
-                BUG();
-        }
-}
-
-static unsigned long index_to_divisor(unsigned int index)
-{
-        switch (index) {
-        case 0:
-                return 1;
-
-        case 1:
-                return 2;
-
-        case 2:
-                return 4;
-
-        case 3:
-                return 6;
-
-        case 4:
-                return 8;
-
-        default:
-                BUG();
-        }
-}
-
-static unsigned long estar_to_divisor(unsigned long estar)
-{
-        unsigned long ret;
-
-        switch (estar & ESTAR_MODE_DIV_MASK) {
-        case ESTAR_MODE_DIV_1:
-                ret = 1;
-                break;
-        case ESTAR_MODE_DIV_2:
-                ret = 2;
-                break;
-        case ESTAR_MODE_DIV_4:
-                ret = 4;
-                break;
-        case ESTAR_MODE_DIV_6:
-                ret = 6;
-                break;
-        case ESTAR_MODE_DIV_8:
-                ret = 8;
-                break;
-        default:
-                BUG();
-        }
-
-        return ret;
-}
-
-static unsigned int us2e_freq_get(unsigned int cpu)
-{
-        cpumask_t cpus_allowed;
-        unsigned long clock_tick, estar;
-
-        if (!cpu_online(cpu))
-                return 0;
-
-        cpumask_copy(&cpus_allowed, tsk_cpus_allowed(current));
-        set_cpus_allowed_ptr(current, cpumask_of(cpu));
-
-        clock_tick = sparc64_get_clock_tick(cpu) / 1000;
-        estar = read_hbreg(HBIRD_ESTAR_MODE_ADDR);
-
-        set_cpus_allowed_ptr(current, &cpus_allowed);
-
-        return clock_tick / estar_to_divisor(estar);
-}
-
-static void us2e_set_cpu_divider_index(unsigned int cpu, unsigned int index)
-{
-        unsigned long new_bits, new_freq;
-        unsigned long clock_tick, divisor, old_divisor, estar;
-        cpumask_t cpus_allowed;
-        struct cpufreq_freqs freqs;
-
-        if (!cpu_online(cpu))
-                return;
-
-        cpumask_copy(&cpus_allowed, tsk_cpus_allowed(current));
-        set_cpus_allowed_ptr(current, cpumask_of(cpu));
-
-        new_freq = clock_tick = sparc64_get_clock_tick(cpu) / 1000;
-        new_bits = index_to_estar_mode(index);
-        divisor = index_to_divisor(index);
-        new_freq /= divisor;
-
-        estar = read_hbreg(HBIRD_ESTAR_MODE_ADDR);
-
-        old_divisor = estar_to_divisor(estar);
-
-        freqs.old = clock_tick / old_divisor;
-        freqs.new = new_freq;
-        freqs.cpu = cpu;
-        cpufreq_notify_transition(&freqs, CPUFREQ_PRECHANGE);
-
-        if (old_divisor != divisor)
-                us2e_transition(estar, new_bits, clock_tick * 1000,
-                                old_divisor, divisor);
-
-        cpufreq_notify_transition(&freqs, CPUFREQ_POSTCHANGE);
-
-        set_cpus_allowed_ptr(current, &cpus_allowed);
-}
-
-static int us2e_freq_target(struct cpufreq_policy *policy,
-                          unsigned int target_freq,
-                          unsigned int relation)
-{
-        unsigned int new_index = 0;
-
-        if (cpufreq_frequency_table_target(policy,
-                                           &us2e_freq_table[policy->cpu].table[0],
-                                           target_freq, relation, &new_index))
-                return -EINVAL;
-
-        us2e_set_cpu_divider_index(policy->cpu, new_index);
-
-        return 0;
-}
-
-static int us2e_freq_verify(struct cpufreq_policy *policy)
-{
-        return cpufreq_frequency_table_verify(policy,
-                                              &us2e_freq_table[policy->cpu].table[0]);
-}
-
-static int __init us2e_freq_cpu_init(struct cpufreq_policy *policy)
-{
-        unsigned int cpu = policy->cpu;
-        unsigned long clock_tick = sparc64_get_clock_tick(cpu) / 1000;
-        struct cpufreq_frequency_table *table =
-                &us2e_freq_table[cpu].table[0];
-
-        table[0].index = 0;
-        table[0].frequency = clock_tick / 1;
-        table[1].index = 1;
-        table[1].frequency = clock_tick / 2;
-        table[2].index = 2;
-        table[2].frequency = clock_tick / 4;
-        table[2].index = 3;
-        table[2].frequency = clock_tick / 6;
-        table[2].index = 4;
-        table[2].frequency = clock_tick / 8;
-        table[2].index = 5;
-        table[3].frequency = CPUFREQ_TABLE_END;
-
-        policy->cpuinfo.transition_latency = 0;
-        policy->cur = clock_tick;
-
-        return cpufreq_frequency_table_cpuinfo(policy, table);
-}
-
-static int us2e_freq_cpu_exit(struct cpufreq_policy *policy)
-{
-        if (cpufreq_us2e_driver)
-                us2e_set_cpu_divider_index(policy->cpu, 0);
-
-        return 0;
-}
-
-static int __init us2e_freq_init(void)
-{
-        unsigned long manuf, impl, ver;
-        int ret;
-
-        if (tlb_type != spitfire)
-                return -ENODEV;
-
-        __asm__("rdpr %%ver, %0" : "=r" (ver));
-        manuf = ((ver >> 48) & 0xffff);
-        impl  = ((ver >> 32) & 0xffff);
-
-        if (manuf == 0x17 && impl == 0x13) {
-                struct cpufreq_driver *driver;
-
-                ret = -ENOMEM;
-                driver = kzalloc(sizeof(struct cpufreq_driver), GFP_KERNEL);
-                if (!driver)
-                        goto err_out;
-
-                us2e_freq_table = kzalloc(
-                        (NR_CPUS * sizeof(struct us2e_freq_percpu_info)),
-                        GFP_KERNEL);
-                if (!us2e_freq_table)
-                        goto err_out;
-
-                driver->init = us2e_freq_cpu_init;
-                driver->verify = us2e_freq_verify;
-                driver->target = us2e_freq_target;
-                driver->get = us2e_freq_get;
-                driver->exit = us2e_freq_cpu_exit;
-                driver->owner = THIS_MODULE,
-                strcpy(driver->name, "UltraSPARC-IIe");
-
-                cpufreq_us2e_driver = driver;
-                ret = cpufreq_register_driver(driver);
-                if (ret)
-                        goto err_out;
-
-                return 0;
-
-err_out:
-                if (driver) {
-                        kfree(driver);
-                        cpufreq_us2e_driver = NULL;
-                }
-                kfree(us2e_freq_table);
-                us2e_freq_table = NULL;
-                return ret;
-        }
-
-        return -ENODEV;
-}
-
-static void __exit us2e_freq_exit(void)
-{
-        if (cpufreq_us2e_driver) {
-                cpufreq_unregister_driver(cpufreq_us2e_driver);
-                kfree(cpufreq_us2e_driver);
-                cpufreq_us2e_driver = NULL;
-                kfree(us2e_freq_table);
-                us2e_freq_table = NULL;
-        }
-}
-
-MODULE_AUTHOR("David S. Miller <davem@redhat.com>");
-MODULE_DESCRIPTION("cpufreq driver for UltraSPARC-IIe");
-MODULE_LICENSE("GPL");
-
-module_init(us2e_freq_init);
-module_exit(us2e_freq_exit);
diff --git a/arch/sparc/kernel/us3_cpufreq.c b/arch/sparc/kernel/us3_cpufreq.c
deleted file mode 100644
index eb1624b931d9..000000000000
--- a/arch/sparc/kernel/us3_cpufreq.c
+++ /dev/null
@@ -1,274 +0,0 @@
-/* us3_cpufreq.c: UltraSPARC-III cpu frequency support
- *
- * Copyright (C) 2003 David S. Miller (davem@redhat.com)
- *
- * Many thanks to Dominik Brodowski for fixing up the cpufreq
- * infrastructure in order to make this driver easier to implement.
- */
-
-#include <linux/kernel.h>
-#include <linux/module.h>
-#include <linux/sched.h>
-#include <linux/smp.h>
-#include <linux/cpufreq.h>
-#include <linux/threads.h>
-#include <linux/slab.h>
-#include <linux/init.h>
-
-#include <asm/head.h>
-#include <asm/timer.h>
-
-static struct cpufreq_driver *cpufreq_us3_driver;
-
-struct us3_freq_percpu_info {
-        struct cpufreq_frequency_table table[4];
-};
-
-/* Indexed by cpu number. */
-static struct us3_freq_percpu_info *us3_freq_table;
-
-/* UltraSPARC-III has three dividers: 1, 2, and 32.  These are controlled
- * in the Safari config register.
- */
-#define SAFARI_CFG_DIV_1        0x0000000000000000UL
-#define SAFARI_CFG_DIV_2        0x0000000040000000UL
-#define SAFARI_CFG_DIV_32       0x0000000080000000UL
-#define SAFARI_CFG_DIV_MASK     0x00000000C0000000UL
-
-static unsigned long read_safari_cfg(void)
-{
-        unsigned long ret;
-
-        __asm__ __volatile__("ldxa      [%%g0] %1, %0"
-                             : "=&r" (ret)
-                             : "i" (ASI_SAFARI_CONFIG));
-        return ret;
-}
-
-static void write_safari_cfg(unsigned long val)
-{
-        __asm__ __volatile__("stxa      %0, [%%g0] %1\n\t"
-                             "membar    #Sync"
-                             : /* no outputs */
-                             : "r" (val), "i" (ASI_SAFARI_CONFIG)
-                             : "memory");
-}
-
-static unsigned long get_current_freq(unsigned int cpu, unsigned long safari_cfg)
-{
-        unsigned long clock_tick = sparc64_get_clock_tick(cpu) / 1000;
-        unsigned long ret;
-
-        switch (safari_cfg & SAFARI_CFG_DIV_MASK) {
-        case SAFARI_CFG_DIV_1:
-                ret = clock_tick / 1;
-                break;
-        case SAFARI_CFG_DIV_2:
-                ret = clock_tick / 2;
-                break;
-        case SAFARI_CFG_DIV_32:
-                ret = clock_tick / 32;
-                break;
-        default:
-                BUG();
-        }
-
-        return ret;
-}
-
-static unsigned int us3_freq_get(unsigned int cpu)
-{
-        cpumask_t cpus_allowed;
-        unsigned long reg;
-        unsigned int ret;
-
-        if (!cpu_online(cpu))
-                return 0;
-
-        cpumask_copy(&cpus_allowed, tsk_cpus_allowed(current));
-        set_cpus_allowed_ptr(current, cpumask_of(cpu));
-
-        reg = read_safari_cfg();
-        ret = get_current_freq(cpu, reg);
-
-        set_cpus_allowed_ptr(current, &cpus_allowed);
-
-        return ret;
-}
-
-static void us3_set_cpu_divider_index(unsigned int cpu, unsigned int index)
-{
-        unsigned long new_bits, new_freq, reg;
-        cpumask_t cpus_allowed;
-        struct cpufreq_freqs freqs;
-
-        if (!cpu_online(cpu))
-                return;
-
-        cpumask_copy(&cpus_allowed, tsk_cpus_allowed(current));
-        set_cpus_allowed_ptr(current, cpumask_of(cpu));
-
-        new_freq = sparc64_get_clock_tick(cpu) / 1000;
-        switch (index) {
-        case 0:
-                new_bits = SAFARI_CFG_DIV_1;
-                new_freq /= 1;
-                break;
-        case 1:
-                new_bits = SAFARI_CFG_DIV_2;
-                new_freq /= 2;
-                break;
-        case 2:
-                new_bits = SAFARI_CFG_DIV_32;
-                new_freq /= 32;
-                break;
-
-        default:
-                BUG();
-        }
-
-        reg = read_safari_cfg();
-
-        freqs.old = get_current_freq(cpu, reg);
-        freqs.new = new_freq;
-        freqs.cpu = cpu;
-        cpufreq_notify_transition(&freqs, CPUFREQ_PRECHANGE);
-
-        reg &= ~SAFARI_CFG_DIV_MASK;
-        reg |= new_bits;
-        write_safari_cfg(reg);
-
-        cpufreq_notify_transition(&freqs, CPUFREQ_POSTCHANGE);
-
-        set_cpus_allowed_ptr(current, &cpus_allowed);
-}
-
-static int us3_freq_target(struct cpufreq_policy *policy,
-                          unsigned int target_freq,
-                          unsigned int relation)
-{
-        unsigned int new_index = 0;
-
-        if (cpufreq_frequency_table_target(policy,
-                                           &us3_freq_table[policy->cpu].table[0],
-                                           target_freq,
-                                           relation,
-                                           &new_index))
-                return -EINVAL;
-
-        us3_set_cpu_divider_index(policy->cpu, new_index);
-
-        return 0;
-}
-
-static int us3_freq_verify(struct cpufreq_policy *policy)
-{
-        return cpufreq_frequency_table_verify(policy,
-                                              &us3_freq_table[policy->cpu].table[0]);
-}
-
-static int __init us3_freq_cpu_init(struct cpufreq_policy *policy)
-{
-        unsigned int cpu = policy->cpu;
-        unsigned long clock_tick = sparc64_get_clock_tick(cpu) / 1000;
-        struct cpufreq_frequency_table *table =
-                &us3_freq_table[cpu].table[0];
-
-        table[0].index = 0;
-        table[0].frequency = clock_tick / 1;
-        table[1].index = 1;
-        table[1].frequency = clock_tick / 2;
-        table[2].index = 2;
-        table[2].frequency = clock_tick / 32;
-        table[3].index = 0;
-        table[3].frequency = CPUFREQ_TABLE_END;
-
-        policy->cpuinfo.transition_latency = 0;
-        policy->cur = clock_tick;
-
-        return cpufreq_frequency_table_cpuinfo(policy, table);
-}
-
-static int us3_freq_cpu_exit(struct cpufreq_policy *policy)
-{
-        if (cpufreq_us3_driver)
-                us3_set_cpu_divider_index(policy->cpu, 0);
-
-        return 0;
-}
-
-static int __init us3_freq_init(void)
-{
-        unsigned long manuf, impl, ver;
-        int ret;
-
-        if (tlb_type != cheetah && tlb_type != cheetah_plus)
-                return -ENODEV;
-
-        __asm__("rdpr %%ver, %0" : "=r" (ver));
-        manuf = ((ver >> 48) & 0xffff);
-        impl  = ((ver >> 32) & 0xffff);
-
-        if (manuf == CHEETAH_MANUF &&
-            (impl == CHEETAH_IMPL ||
-             impl == CHEETAH_PLUS_IMPL ||
-             impl == JAGUAR_IMPL ||
-             impl == PANTHER_IMPL)) {
-                struct cpufreq_driver *driver;
-
-                ret = -ENOMEM;
-                driver = kzalloc(sizeof(struct cpufreq_driver), GFP_KERNEL);
-                if (!driver)
-                        goto err_out;
-
-                us3_freq_table = kzalloc(
-                        (NR_CPUS * sizeof(struct us3_freq_percpu_info)),
-                        GFP_KERNEL);
-                if (!us3_freq_table)
-                        goto err_out;
-
-                driver->init = us3_freq_cpu_init;
-                driver->verify = us3_freq_verify;
-                driver->target = us3_freq_target;
-                driver->get = us3_freq_get;
-                driver->exit = us3_freq_cpu_exit;
-                driver->owner = THIS_MODULE,
-                strcpy(driver->name, "UltraSPARC-III");
-
-                cpufreq_us3_driver = driver;
-                ret = cpufreq_register_driver(driver);
-                if (ret)
-                        goto err_out;
-
-                return 0;
-
-err_out:
-                if (driver) {
-                        kfree(driver);
-                        cpufreq_us3_driver = NULL;
-                }
-                kfree(us3_freq_table);
-                us3_freq_table = NULL;
-                return ret;
-        }
-
-        return -ENODEV;
-}
-
-static void __exit us3_freq_exit(void)
-{
-        if (cpufreq_us3_driver) {
-                cpufreq_unregister_driver(cpufreq_us3_driver);
-                kfree(cpufreq_us3_driver);
-                cpufreq_us3_driver = NULL;
-                kfree(us3_freq_table);
-                us3_freq_table = NULL;
-        }
-}
-
-MODULE_AUTHOR("David S. Miller <davem@redhat.com>");
-MODULE_DESCRIPTION("cpufreq driver for UltraSPARC-III");
-MODULE_LICENSE("GPL");
-
-module_init(us3_freq_init);
-module_exit(us3_freq_exit);
diff --git a/arch/sparc/lib/Makefile b/arch/sparc/lib/Makefile
index 8410065f2862..dbe119b63b48 100644
--- a/arch/sparc/lib/Makefile
+++ b/arch/sparc/lib/Makefile
@@ -45,4 +45,3 @@ obj-y                 += iomap.o
 obj-$(CONFIG_SPARC32) += atomic32.o ucmpdi2.o
 obj-y                 += ksyms.o
 obj-$(CONFIG_SPARC64) += PeeCeeI.o
-obj-y                 += usercopy.o
diff --git a/arch/sparc/lib/usercopy.c b/arch/sparc/lib/usercopy.c
deleted file mode 100644
index 5c4284ce1c03..000000000000
--- a/arch/sparc/lib/usercopy.c
+++ /dev/null
@@ -1,9 +0,0 @@
-#include <linux/module.h>
-#include <linux/kernel.h>
-#include <linux/bug.h>
-
-void copy_from_user_overflow(void)
-{
-        WARN(1, "Buffer overflow detected!\n");
-}
-EXPORT_SYMBOL(copy_from_user_overflow);
diff --git a/arch/sparc/mm/init_32.c b/arch/sparc/mm/init_32.c
index 48e0c030e8f5..4490c397bb5b 100644
--- a/arch/sparc/mm/init_32.c
+++ b/arch/sparc/mm/init_32.c
@@ -282,14 +282,8 @@ static void map_high_region(unsigned long start_pfn, unsigned long end_pfn)
         printk("mapping high region %08lx - %08lx\n", start_pfn, end_pfn);
 #endif
 
-        for (tmp = start_pfn; tmp < end_pfn; tmp++) {
-                struct page *page = pfn_to_page(tmp);
-
-                ClearPageReserved(page);
-                init_page_count(page);
-                __free_page(page);
-                totalhigh_pages++;
-        }
+        for (tmp = start_pfn; tmp < end_pfn; tmp++)
+                free_highmem_page(pfn_to_page(tmp));
 }
 
 void __init mem_init(void)
@@ -347,8 +341,6 @@ void __init mem_init(void)
                 map_high_region(start_pfn, end_pfn);
         }
         
-        totalram_pages += totalhigh_pages;
-
         codepages = (((unsigned long) &_etext) - ((unsigned long)&_start));
         codepages = PAGE_ALIGN(codepages) >> PAGE_SHIFT;
         datapages = (((unsigned long) &_edata) - ((unsigned long)&_etext));
diff --git a/arch/sparc/mm/init_64.c b/arch/sparc/mm/init_64.c
index 1588d33d5492..6ac99d64a13c 100644
--- a/arch/sparc/mm/init_64.c
+++ b/arch/sparc/mm/init_64.c
@@ -2181,10 +2181,9 @@ unsigned long vmemmap_table[VMEMMAP_SIZE];
 static long __meminitdata addr_start, addr_end;
 static int __meminitdata node_start;
 
-int __meminit vmemmap_populate(struct page *start, unsigned long nr, int node)
+int __meminit vmemmap_populate(unsigned long vstart, unsigned long vend,
+                               int node)
 {
-        unsigned long vstart = (unsigned long) start;
-        unsigned long vend = (unsigned long) (start + nr);
         unsigned long phys_start = (vstart - VMEMMAP_BASE);
         unsigned long phys_end = (vend - VMEMMAP_BASE);
         unsigned long addr = phys_start & VMEMMAP_CHUNK_MASK;
@@ -2236,7 +2235,7 @@ void __meminit vmemmap_populate_print_last(void)
         }
 }
 
-void vmemmap_free(struct page *memmap, unsigned long nr_pages)
+void vmemmap_free(unsigned long start, unsigned long end)
 {
 }
 
diff --git a/arch/tile/Kconfig b/arch/tile/Kconfig
index 25877aebc685..0e5343902363 100644
--- a/arch/tile/Kconfig
+++ b/arch/tile/Kconfig
@@ -16,9 +16,9 @@ config TILE
         select GENERIC_PENDING_IRQ if SMP
         select GENERIC_IRQ_SHOW
         select HAVE_DEBUG_BUGVERBOSE
-        select HAVE_SYSCALL_WRAPPERS if TILEGX
         select VIRT_TO_BUS
         select SYS_HYPERVISOR
+        select ARCH_HAS_DEBUG_STRICT_USER_COPY_CHECKS
         select ARCH_HAVE_NMI_SAFE_CMPXCHG
         select GENERIC_CLOCKEVENTS
         select MODULES_USE_ELF_RELA
@@ -114,13 +114,6 @@ config STRICT_DEVMEM
 config SMP
         def_bool y
 
-# Allow checking for compile-time determined overflow errors in
-# copy_from_user().  There are still unprovable places in the
-# generic code as of 2.6.34, so this option is not really compatible
-# with -Werror, which is more useful in general.
-config DEBUG_COPY_FROM_USER
-        def_bool n
-
 config HVC_TILE
         depends on TTY
         select HVC_DRIVER
diff --git a/arch/tile/include/asm/hugetlb.h b/arch/tile/include/asm/hugetlb.h
index 0f885af2b621..3257733003f8 100644
--- a/arch/tile/include/asm/hugetlb.h
+++ b/arch/tile/include/asm/hugetlb.h
@@ -16,6 +16,7 @@
 #define _ASM_TILE_HUGETLB_H
 
 #include <asm/page.h>
+#include <asm-generic/hugetlb.h>
 
 
 static inline int is_hugepage_only_range(struct mm_struct *mm,
diff --git a/arch/tile/include/asm/thread_info.h b/arch/tile/include/asm/thread_info.h
index e9c670d7a7fe..ccc8ef37235c 100644
--- a/arch/tile/include/asm/thread_info.h
+++ b/arch/tile/include/asm/thread_info.h
@@ -153,8 +153,6 @@ extern void _cpu_idle(void);
 #define TS_POLLING              0x0004  /* in idle loop but not sleeping */
 #define TS_RESTORE_SIGMASK      0x0008  /* restore signal mask in do_signal */
 
-#define tsk_is_polling(t) (task_thread_info(t)->status & TS_POLLING)
-
 #ifndef __ASSEMBLY__
 #define HAVE_SET_RESTORE_SIGMASK        1
 static inline void set_restore_sigmask(void)
diff --git a/arch/tile/include/asm/uaccess.h b/arch/tile/include/asm/uaccess.h
index 9ab078a4605d..8a082bc6bca5 100644
--- a/arch/tile/include/asm/uaccess.h
+++ b/arch/tile/include/asm/uaccess.h
@@ -395,7 +395,12 @@ _copy_from_user(void *to, const void __user *from, unsigned long n)
         return n;
 }
 
-#ifdef CONFIG_DEBUG_COPY_FROM_USER
+#ifdef CONFIG_DEBUG_STRICT_USER_COPY_CHECKS
+/*
+ * There are still unprovable places in the generic code as of 2.6.34, so this
+ * option is not really compatible with -Werror, which is more useful in
+ * general.
+ */
 extern void copy_from_user_overflow(void)
         __compiletime_warning("copy_from_user() size is not provably correct");
 
diff --git a/arch/tile/kernel/compat.c b/arch/tile/kernel/compat.c
index 6ea4cdb3c6a0..ed378416b86a 100644
--- a/arch/tile/kernel/compat.c
+++ b/arch/tile/kernel/compat.c
@@ -56,12 +56,6 @@ COMPAT_SYSCALL_DEFINE6(pwrite64, unsigned int, fd, char __user *, ubuf,
         return sys_pwrite64(fd, ubuf, count, ((loff_t)high << 32) | low);
 }
 
-COMPAT_SYSCALL_DEFINE4(lookup_dcookie, u32, low, u32, high,
-                       char __user *, buf, size_t, len)
-{
-        return sys_lookup_dcookie(((loff_t)high << 32) | low, buf, len);
-}
-
 COMPAT_SYSCALL_DEFINE6(sync_file_range2, int, fd, unsigned int, flags,
                        u32, offset_lo, u32, offset_hi,
                        u32, nbytes_lo, u32, nbytes_hi)
diff --git a/arch/tile/kernel/early_printk.c b/arch/tile/kernel/early_printk.c
index afb9c9a0d887..34d72a151bf3 100644
--- a/arch/tile/kernel/early_printk.c
+++ b/arch/tile/kernel/early_printk.c
@@ -17,6 +17,7 @@
 #include <linux/init.h>
 #include <linux/string.h>
 #include <linux/irqflags.h>
+#include <linux/printk.h>
 #include <asm/setup.h>
 #include <hv/hypervisor.h>
 
@@ -33,25 +34,8 @@ static struct console early_hv_console = {
 };
 
 /* Direct interface for emergencies */
-static struct console *early_console = &early_hv_console;
-static int early_console_initialized;
 static int early_console_complete;
 
-static void early_vprintk(const char *fmt, va_list ap)
-{
-        char buf[512];
-        int n = vscnprintf(buf, sizeof(buf), fmt, ap);
-        early_console->write(early_console, buf, n);
-}
-
-void early_printk(const char *fmt, ...)
-{
-        va_list ap;
-        va_start(ap, fmt);
-        early_vprintk(fmt, ap);
-        va_end(ap);
-}
-
 void early_panic(const char *fmt, ...)
 {
         va_list ap;
@@ -69,14 +53,13 @@ static int __initdata keep_early;
 
 static int __init setup_early_printk(char *str)
 {
-        if (early_console_initialized)
+        if (early_console)
                 return 1;
 
         if (str != NULL && strncmp(str, "keep", 4) == 0)
                 keep_early = 1;
 
         early_console = &early_hv_console;
-        early_console_initialized = 1;
         register_console(early_console);
 
         return 0;
@@ -85,12 +68,12 @@ static int __init setup_early_printk(char *str)
 void __init disable_early_printk(void)
 {
         early_console_complete = 1;
-        if (!early_console_initialized || !early_console)
+        if (!early_console)
                 return;
         if (!keep_early) {
                 early_printk("disabling early console\n");
                 unregister_console(early_console);
-                early_console_initialized = 0;
+                early_console = NULL;
         } else {
                 early_printk("keeping early console\n");
         }
@@ -98,7 +81,7 @@ void __init disable_early_printk(void)
 
 void warn_early_printk(void)
 {
-        if (early_console_complete || early_console_initialized)
+        if (early_console_complete || early_console)
                 return;
         early_printk("\
 Machine shutting down before console output is fully initialized.\n\
diff --git a/arch/tile/kernel/process.c b/arch/tile/kernel/process.c
index caf93ae11793..8ac304484f98 100644
--- a/arch/tile/kernel/process.c
+++ b/arch/tile/kernel/process.c
@@ -40,13 +40,11 @@
 #include <arch/abi.h>
 #include <arch/sim_def.h>
 
-
 /*
  * Use the (x86) "idle=poll" option to prefer low latency when leaving the
  * idle loop over low power while in the idle loop, e.g. if we have
  * one thread per core and we want to get threads out of futex waits fast.
  */
-static int no_idle_nap;
 static int __init idle_setup(char *str)
 {
         if (!str)
@@ -54,64 +52,19 @@ static int __init idle_setup(char *str)
 
         if (!strcmp(str, "poll")) {
                 pr_info("using polling idle threads.\n");
-                no_idle_nap = 1;
-        } else if (!strcmp(str, "halt"))
-                no_idle_nap = 0;
-        else
-                return -1;
-
-        return 0;
+                cpu_idle_poll_ctrl(true);
+                return 0;
+        } else if (!strcmp(str, "halt")) {
+                return 0;
+        }
+        return -1;
 }
 early_param("idle", idle_setup);
 
-/*
- * The idle thread. There's no useful work to be
- * done, so just try to conserve power and have a
- * low exit latency (ie sit in a loop waiting for
- * somebody to say that they'd like to reschedule)
- */
-void cpu_idle(void)
+void arch_cpu_idle(void)
 {
-        int cpu = smp_processor_id();
-
-
-        current_thread_info()->status |= TS_POLLING;
-
-        if (no_idle_nap) {
-                while (1) {
-                        while (!need_resched())
-                                cpu_relax();
-                        schedule();
-                }
-        }
-
-        /* endless idle loop with no priority at all */
-        while (1) {
-                tick_nohz_idle_enter();
-                rcu_idle_enter();
-                while (!need_resched()) {
-                        if (cpu_is_offline(cpu))
-                                BUG();  /* no HOTPLUG_CPU */
-
-                        local_irq_disable();
-                        __get_cpu_var(irq_stat).idle_timestamp = jiffies;
-                        current_thread_info()->status &= ~TS_POLLING;
-                        /*
-                         * TS_POLLING-cleared state must be visible before we
-                         * test NEED_RESCHED:
-                         */
-                        smp_mb();
-
-                        if (!need_resched())
-                                _cpu_idle();
-                        else
-                                local_irq_enable();
-                        current_thread_info()->status |= TS_POLLING;
-                }
-                rcu_idle_exit();
-                tick_nohz_idle_exit();
-                schedule_preempt_disabled();
-        }
+        __get_cpu_var(irq_stat).idle_timestamp = jiffies;
+        _cpu_idle();
 }
 
 /*
@@ -620,8 +573,7 @@ void show_regs(struct pt_regs *regs)
         int i;
 
         pr_err("\n");
-        pr_err(" Pid: %d, comm: %20s, CPU: %d\n",
-               tsk->pid, tsk->comm, smp_processor_id());
+        show_regs_print_info(KERN_ERR);
 #ifdef __tilegx__
         for (i = 0; i < 51; i += 3)
                 pr_err(" r%-2d: "REGFMT" r%-2d: "REGFMT" r%-2d: "REGFMT"\n",
diff --git a/arch/tile/kernel/smpboot.c b/arch/tile/kernel/smpboot.c
index e686c5ac90be..44bab29bf2f3 100644
--- a/arch/tile/kernel/smpboot.c
+++ b/arch/tile/kernel/smpboot.c
@@ -207,9 +207,7 @@ void __cpuinit online_secondary(void)
         /* Set up tile-timer clock-event device on this cpu */
         setup_tile_timer();
 
-        preempt_enable();
-
-        cpu_idle();
+        cpu_startup_entry(CPUHP_ONLINE);
 }
 
 int __cpuinit __cpu_up(unsigned int cpu, struct task_struct *tidle)
diff --git a/arch/tile/lib/uaccess.c b/arch/tile/lib/uaccess.c
index f8d398c9ee7f..030abe3ee4f1 100644
--- a/arch/tile/lib/uaccess.c
+++ b/arch/tile/lib/uaccess.c
@@ -22,11 +22,3 @@ int __range_ok(unsigned long addr, unsigned long size)
                  is_arch_mappable_range(addr, size));
 }
 EXPORT_SYMBOL(__range_ok);
-
-#ifdef CONFIG_DEBUG_COPY_FROM_USER
-void copy_from_user_overflow(void)
-{
-       WARN(1, "Buffer overflow detected!\n");
-}
-EXPORT_SYMBOL(copy_from_user_overflow);
-#endif
diff --git a/arch/tile/mm/pgtable.c b/arch/tile/mm/pgtable.c
index b3b4972c2451..dfd63ce87327 100644
--- a/arch/tile/mm/pgtable.c
+++ b/arch/tile/mm/pgtable.c
@@ -592,12 +592,7 @@ void iounmap(volatile void __iomem *addr_in)
            in parallel. Reuse of the virtual address is prevented by
            leaving it in the global lists until we're done with it.
            cpa takes care of the direct mappings. */
-        read_lock(&vmlist_lock);
-        for (p = vmlist; p; p = p->next) {
-                if (p->addr == addr)
-                        break;
-        }
-        read_unlock(&vmlist_lock);
+        p = find_vm_area((void *)addr);
 
         if (!p) {
                 pr_err("iounmap: bad address %p\n", addr);
diff --git a/arch/um/drivers/chan_kern.c b/arch/um/drivers/chan_kern.c
index 80b47cb71e0a..acbe6c67afba 100644
--- a/arch/um/drivers/chan_kern.c
+++ b/arch/um/drivers/chan_kern.c
@@ -568,11 +568,7 @@ void chan_interrupt(struct line *line, int irq)
                 reactivate_fd(chan->fd, irq);
         if (err == -EIO) {
                 if (chan->primary) {
-                        struct tty_struct *tty = tty_port_tty_get(&line->port);
-                        if (tty != NULL) {
-                                tty_hangup(tty);
-                                tty_kref_put(tty);
-                        }
+                        tty_port_tty_hangup(&line->port, false);
                         if (line->chan_out != chan)
                                 close_one_chan(line->chan_out, 1);
                 }
diff --git a/arch/um/drivers/line.c b/arch/um/drivers/line.c
index be541cf69fd2..8035145f043b 100644
--- a/arch/um/drivers/line.c
+++ b/arch/um/drivers/line.c
@@ -248,7 +248,6 @@ static irqreturn_t line_write_interrupt(int irq, void *data)
 {
         struct chan *chan = data;
         struct line *line = chan->line;
-        struct tty_struct *tty;
         int err;
 
         /*
@@ -267,12 +266,7 @@ static irqreturn_t line_write_interrupt(int irq, void *data)
         }
         spin_unlock(&line->lock);
 
-        tty = tty_port_tty_get(&line->port);
-        if (tty == NULL)
-                return IRQ_NONE;
-
-        tty_wakeup(tty);
-        tty_kref_put(tty);
+        tty_port_tty_wakeup(&line->port);
 
         return IRQ_HANDLED;
 }
diff --git a/arch/um/kernel/early_printk.c b/arch/um/kernel/early_printk.c
index 49480f092456..4a0800bc37b2 100644
--- a/arch/um/kernel/early_printk.c
+++ b/arch/um/kernel/early_printk.c
@@ -16,7 +16,7 @@ static void early_console_write(struct console *con, const char *s, unsigned int
         um_early_printk(s, n);
 }
 
-static struct console early_console = {
+static struct console early_console_dev = {
         .name = "earlycon",
         .write = early_console_write,
         .flags = CON_BOOT,
@@ -25,8 +25,10 @@ static struct console early_console = {
 
 static int __init setup_early_printk(char *buf)
 {
-        register_console(&early_console);
-
+        if (!early_console) {
+                early_console = &early_console_dev;
+                register_console(&early_console_dev);
+        }
         return 0;
 }
 
diff --git a/arch/um/kernel/mem.c b/arch/um/kernel/mem.c
index 5abcbfbe7e25..9df292b270a8 100644
--- a/arch/um/kernel/mem.c
+++ b/arch/um/kernel/mem.c
@@ -42,17 +42,12 @@ static unsigned long brk_end;
 static void setup_highmem(unsigned long highmem_start,
                           unsigned long highmem_len)
 {
-        struct page *page;
         unsigned long highmem_pfn;
         int i;
 
         highmem_pfn = __pa(highmem_start) >> PAGE_SHIFT;
-        for (i = 0; i < highmem_len >> PAGE_SHIFT; i++) {
-                page = &mem_map[highmem_pfn + i];
-                ClearPageReserved(page);
-                init_page_count(page);
-                __free_page(page);
-        }
+        for (i = 0; i < highmem_len >> PAGE_SHIFT; i++)
+                free_highmem_page(&mem_map[highmem_pfn + i]);
 }
 #endif
 
@@ -73,18 +68,13 @@ void __init mem_init(void)
         totalram_pages = free_all_bootmem();
         max_low_pfn = totalram_pages;
 #ifdef CONFIG_HIGHMEM
-        totalhigh_pages = highmem >> PAGE_SHIFT;
-        totalram_pages += totalhigh_pages;
+        setup_highmem(end_iomem, highmem);
 #endif
         num_physpages = totalram_pages;
         max_pfn = totalram_pages;
         printk(KERN_INFO "Memory: %luk available\n",
                nr_free_pages() << (PAGE_SHIFT-10));
         kmalloc_ok = 1;
-
-#ifdef CONFIG_HIGHMEM
-        setup_highmem(end_iomem, highmem);
-#endif
 }
 
 /*
@@ -254,15 +244,7 @@ void free_initmem(void)
 #ifdef CONFIG_BLK_DEV_INITRD
 void free_initrd_mem(unsigned long start, unsigned long end)
 {
-        if (start < end)
-                printk(KERN_INFO "Freeing initrd memory: %ldk freed\n",
-                       (end - start) >> 10);
-        for (; start < end; start += PAGE_SIZE) {
-                ClearPageReserved(virt_to_page(start));
-                init_page_count(virt_to_page(start));
-                free_page(start);
-                totalram_pages++;
-        }
+        free_reserved_area(start, end, 0, "initrd");
 }
 #endif
 
diff --git a/arch/um/kernel/process.c b/arch/um/kernel/process.c
index b462b13c5bae..bbcef522bcb1 100644
--- a/arch/um/kernel/process.c
+++ b/arch/um/kernel/process.c
@@ -210,33 +210,14 @@ void initial_thread_cb(void (*proc)(void *), void *arg)
         kmalloc_ok = save_kmalloc_ok;
 }
 
-void default_idle(void)
+void arch_cpu_idle(void)
 {
         unsigned long long nsecs;
 
-        while (1) {
-                /* endless idle loop with no priority at all */
-
-                /*
-                 * although we are an idle CPU, we do not want to
-                 * get into the scheduler unnecessarily.
-                 */
-                if (need_resched())
-                        schedule();
-
-                tick_nohz_idle_enter();
-                rcu_idle_enter();
-                nsecs = disable_timer();
-                idle_sleep(nsecs);
-                rcu_idle_exit();
-                tick_nohz_idle_exit();
-        }
-}
-
-void cpu_idle(void)
-{
         cpu_tasks[current_thread_info()->cpu].pid = os_getpid();
-        default_idle();
+        nsecs = disable_timer();
+        idle_sleep(nsecs);
+        local_irq_enable();
 }
 
 int __cant_sleep(void) {
diff --git a/arch/um/kernel/sysrq.c b/arch/um/kernel/sysrq.c
index e562ff80409a..7d101a2a1541 100644
--- a/arch/um/kernel/sysrq.c
+++ b/arch/um/kernel/sysrq.c
@@ -35,18 +35,6 @@ void show_trace(struct task_struct *task, unsigned long * stack)
 }
 #endif
 
-/*
- * stack dumps generator - this is used by arch-independent code.
- * And this is identical to i386 currently.
- */
-void dump_stack(void)
-{
-        unsigned long stack;
-
-        show_trace(current, &stack);
-}
-EXPORT_SYMBOL(dump_stack);
-
 /*Stolen from arch/i386/kernel/traps.c */
 static const int kstack_depth_to_print = 24;
 
diff --git a/arch/um/sys-ppc/sysrq.c b/arch/um/sys-ppc/sysrq.c
index f889449f9285..1ff1ad7f27da 100644
--- a/arch/um/sys-ppc/sysrq.c
+++ b/arch/um/sys-ppc/sysrq.c
@@ -11,6 +11,8 @@
 void show_regs(struct pt_regs_subarch *regs)
 {
         printk("\n");
+        show_regs_print_info(KERN_DEFAULT);
+
         printk("show_regs(): insert regs here.\n");
 #if 0
         printk("\n");
diff --git a/arch/unicore32/kernel/Makefile b/arch/unicore32/kernel/Makefile
index fa497e0efe5a..607a72f2ae35 100644
--- a/arch/unicore32/kernel/Makefile
+++ b/arch/unicore32/kernel/Makefile
@@ -9,7 +9,6 @@ obj-y				+= setup.o signal.o sys.o stacktrace.o traps.o
 obj-$(CONFIG_MODULES)           += ksyms.o module.o
 obj-$(CONFIG_EARLY_PRINTK)      += early_printk.o
 
-obj-$(CONFIG_CPU_FREQ)          += cpu-ucv2.o
 obj-$(CONFIG_UNICORE_FPU_F64)   += fpu-ucf64.o
 
 # obj-y for architecture PKUnity v3
diff --git a/arch/unicore32/kernel/cpu-ucv2.c b/arch/unicore32/kernel/cpu-ucv2.c
deleted file mode 100644
index 4a99f62584c7..000000000000
--- a/arch/unicore32/kernel/cpu-ucv2.c
+++ /dev/null
@@ -1,93 +0,0 @@
-/*
- * linux/arch/unicore32/kernel/cpu-ucv2.c: clock scaling for the UniCore-II
- *
- * Code specific to PKUnity SoC and UniCore ISA
- *
- *      Maintained by GUAN Xue-tao <gxt@mprc.pku.edu.cn>
- *      Copyright (C) 2001-2010 Guan Xuetao
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
- */
-
-#include <linux/kernel.h>
-#include <linux/types.h>
-#include <linux/init.h>
-#include <linux/clk.h>
-#include <linux/cpufreq.h>
-
-#include <mach/hardware.h>
-
-static struct cpufreq_driver ucv2_driver;
-
-/* make sure that only the "userspace" governor is run
- * -- anything else wouldn't make sense on this platform, anyway.
- */
-int ucv2_verify_speed(struct cpufreq_policy *policy)
-{
-        if (policy->cpu)
-                return -EINVAL;
-
-        cpufreq_verify_within_limits(policy,
-                        policy->cpuinfo.min_freq, policy->cpuinfo.max_freq);
-
-        return 0;
-}
-
-static unsigned int ucv2_getspeed(unsigned int cpu)
-{
-        struct clk *mclk = clk_get(NULL, "MAIN_CLK");
-
-        if (cpu)
-                return 0;
-        return clk_get_rate(mclk)/1000;
-}
-
-static int ucv2_target(struct cpufreq_policy *policy,
-                         unsigned int target_freq,
-                         unsigned int relation)
-{
-        unsigned int cur = ucv2_getspeed(0);
-        struct cpufreq_freqs freqs;
-        struct clk *mclk = clk_get(NULL, "MAIN_CLK");
-
-        cpufreq_notify_transition(&freqs, CPUFREQ_PRECHANGE);
-
-        if (!clk_set_rate(mclk, target_freq * 1000)) {
-                freqs.old = cur;
-                freqs.new = target_freq;
-                freqs.cpu = 0;
-        }
-
-        cpufreq_notify_transition(&freqs, CPUFREQ_POSTCHANGE);
-
-        return 0;
-}
-
-static int __init ucv2_cpu_init(struct cpufreq_policy *policy)
-{
-        if (policy->cpu != 0)
-                return -EINVAL;
-        policy->cur = ucv2_getspeed(0);
-        policy->min = policy->cpuinfo.min_freq = 250000;
-        policy->max = policy->cpuinfo.max_freq = 1000000;
-        policy->cpuinfo.transition_latency = CPUFREQ_ETERNAL;
-        return 0;
-}
-
-static struct cpufreq_driver ucv2_driver = {
-        .flags          = CPUFREQ_STICKY,
-        .verify         = ucv2_verify_speed,
-        .target         = ucv2_target,
-        .get            = ucv2_getspeed,
-        .init           = ucv2_cpu_init,
-        .name           = "UniCore-II",
-};
-
-static int __init ucv2_cpufreq_init(void)
-{
-        return cpufreq_register_driver(&ucv2_driver);
-}
-
-arch_initcall(ucv2_cpufreq_init);
diff --git a/arch/unicore32/kernel/early_printk.c b/arch/unicore32/kernel/early_printk.c
index 3922255f1fa8..9be0d5d02a9a 100644
--- a/arch/unicore32/kernel/early_printk.c
+++ b/arch/unicore32/kernel/early_printk.c
@@ -33,21 +33,17 @@ static struct console early_ocd_console = {
         .index =        -1,
 };
 
-/* Direct interface for emergencies */
-static struct console *early_console = &early_ocd_console;
-
-static int __initdata keep_early;
-
 static int __init setup_early_printk(char *buf)
 {
-        if (!buf)
+        int keep_early;
+
+        if (!buf || early_console)
                 return 0;
 
         if (strstr(buf, "keep"))
                 keep_early = 1;
 
-        if (!strncmp(buf, "ocd", 3))
-                early_console = &early_ocd_console;
+        early_console = &early_ocd_console;
 
         if (keep_early)
                 early_console->flags &= ~CON_BOOT;
diff --git a/arch/unicore32/kernel/process.c b/arch/unicore32/kernel/process.c
index 872d7e22d847..c9447691bdac 100644
--- a/arch/unicore32/kernel/process.c
+++ b/arch/unicore32/kernel/process.c
@@ -45,25 +45,10 @@ static const char * const processor_modes[] = {
         "UK18", "UK19", "UK1A", "EXTN", "UK1C", "UK1D", "UK1E", "SUSR"
 };
 
-void cpu_idle(void)
+void arch_cpu_idle(void)
 {
-        /* endless idle loop with no priority at all */
-        while (1) {
-                tick_nohz_idle_enter();
-                rcu_idle_enter();
-                while (!need_resched()) {
-                        local_irq_disable();
-                        stop_critical_timings();
-                        cpu_do_idle();
-                        local_irq_enable();
-                        start_critical_timings();
-                }
-                rcu_idle_exit();
-                tick_nohz_idle_exit();
-                preempt_enable_no_resched();
-                schedule();
-                preempt_disable();
-        }
+        cpu_do_idle();
+        local_irq_enable();
 }
 
 static char reboot_mode = 'h';
@@ -159,11 +144,7 @@ void __show_regs(struct pt_regs *regs)
         unsigned long flags;
         char buf[64];
 
-        printk(KERN_DEFAULT "CPU: %d    %s  (%s %.*s)\n",
-                raw_smp_processor_id(), print_tainted(),
-                init_utsname()->release,
-                (int)strcspn(init_utsname()->version, " "),
-                init_utsname()->version);
+        show_regs_print_info(KERN_DEFAULT);
         print_symbol("PC is at %s\n", instruction_pointer(regs));
         print_symbol("LR is at %s\n", regs->UCreg_lr);
         printk(KERN_DEFAULT "pc : [<%08lx>]    lr : [<%08lx>]    psr: %08lx\n"
diff --git a/arch/unicore32/kernel/traps.c b/arch/unicore32/kernel/traps.c
index 0870b68d2ad9..c54e32410ead 100644
--- a/arch/unicore32/kernel/traps.c
+++ b/arch/unicore32/kernel/traps.c
@@ -170,12 +170,6 @@ static void dump_backtrace(struct pt_regs *regs, struct task_struct *tsk)
                 c_backtrace(fp, mode);
 }
 
-void dump_stack(void)
-{
-        dump_backtrace(NULL, NULL);
-}
-EXPORT_SYMBOL(dump_stack);
-
 void show_stack(struct task_struct *tsk, unsigned long *sp)
 {
         dump_backtrace(NULL, tsk);
diff --git a/arch/unicore32/mm/init.c b/arch/unicore32/mm/init.c
index de186bde8975..63df12d71ce3 100644
--- a/arch/unicore32/mm/init.c
+++ b/arch/unicore32/mm/init.c
@@ -66,6 +66,9 @@ void show_mem(unsigned int filter)
         printk(KERN_DEFAULT "Mem-info:\n");
         show_free_areas(filter);
 
+        if (filter & SHOW_MEM_FILTER_PAGE_COUNT)
+                return;
+
         for_each_bank(i, mi) {
                 struct membank *bank = &mi->bank[i];
                 unsigned int pfn1, pfn2;
@@ -313,24 +316,6 @@ void __init bootmem_init(void)
         max_pfn = max_high - PHYS_PFN_OFFSET;
 }
 
-static inline int free_area(unsigned long pfn, unsigned long end, char *s)
-{
-        unsigned int pages = 0, size = (end - pfn) << (PAGE_SHIFT - 10);
-
-        for (; pfn < end; pfn++) {
-                struct page *page = pfn_to_page(pfn);
-                ClearPageReserved(page);
-                init_page_count(page);
-                __free_page(page);
-                pages++;
-        }
-
-        if (size && s)
-                printk(KERN_INFO "Freeing %s memory: %dK\n", s, size);
-
-        return pages;
-}
-
 static inline void
 free_memmap(unsigned long start_pfn, unsigned long end_pfn)
 {
@@ -404,9 +389,9 @@ void __init mem_init(void)
 
         max_mapnr   = pfn_to_page(max_pfn + PHYS_PFN_OFFSET) - mem_map;
 
-        /* this will put all unused low memory onto the freelists */
         free_unused_memmap(&meminfo);
 
+        /* this will put all unused low memory onto the freelists */
         totalram_pages += free_all_bootmem();
 
         reserved_pages = free_pages = 0;
@@ -491,9 +476,7 @@ void __init mem_init(void)
 
 void free_initmem(void)
 {
-        totalram_pages += free_area(__phys_to_pfn(__pa(__init_begin)),
-                                    __phys_to_pfn(__pa(__init_end)),
-                                    "init");
+        free_initmem_default(0);
 }
 
 #ifdef CONFIG_BLK_DEV_INITRD
@@ -503,9 +486,7 @@ static int keep_initrd;
 void free_initrd_mem(unsigned long start, unsigned long end)
 {
         if (!keep_initrd)
-                totalram_pages += free_area(__phys_to_pfn(__pa(start)),
-                                            __phys_to_pfn(__pa(end)),
-                                            "initrd");
+                free_reserved_area(start, end, 0, "initrd");
 }
 
 static int __init keepinitrd_setup(char *__unused)
diff --git a/arch/unicore32/mm/ioremap.c b/arch/unicore32/mm/ioremap.c
index b7a605597b08..13068ee22f33 100644
--- a/arch/unicore32/mm/ioremap.c
+++ b/arch/unicore32/mm/ioremap.c
@@ -235,7 +235,7 @@ EXPORT_SYMBOL(__uc32_ioremap_cached);
 void __uc32_iounmap(volatile void __iomem *io_addr)
 {
         void *addr = (void *)(PAGE_MASK & (unsigned long)io_addr);
-        struct vm_struct **p, *tmp;
+        struct vm_struct *vm;
 
         /*
          * If this is a section based mapping we need to handle it
@@ -244,17 +244,10 @@ void __uc32_iounmap(volatile void __iomem *io_addr)
          * all the mappings before the area can be reclaimed
          * by someone else.
          */
-        write_lock(&vmlist_lock);
-        for (p = &vmlist ; (tmp = *p) ; p = &tmp->next) {
-                if ((tmp->flags & VM_IOREMAP) && (tmp->addr == addr)) {
-                        if (tmp->flags & VM_UNICORE_SECTION_MAPPING) {
-                                unmap_area_sections((unsigned long)tmp->addr,
-                                                    tmp->size);
-                        }
-                        break;
-                }
-        }
-        write_unlock(&vmlist_lock);
+        vm = find_vm_area(addr);
+        if (vm && (vm->flags & VM_IOREMAP) &&
+                (vm->flags & VM_UNICORE_SECTION_MAPPING))
+                unmap_area_sections((unsigned long)vm->addr, vm->size);
 
         vunmap(addr);
 }
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
index 15b5cef4aa38..5db2117ae288 100644
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@ -20,6 +20,7 @@ config X86_64
 ### Arch settings
 config X86
         def_bool y
+        select ARCH_HAS_DEBUG_STRICT_USER_COPY_CHECKS
         select HAVE_AOUT if X86_32
         select HAVE_UNSTABLE_SCHED_CLOCK
         select ARCH_SUPPORTS_NUMA_BALANCING
@@ -120,6 +121,7 @@ config X86
         select OLD_SIGSUSPEND3 if X86_32 || IA32_EMULATION
         select OLD_SIGACTION if X86_32
         select COMPAT_OLD_SIGACTION if IA32_EMULATION
+        select RTC_LIB
 
 config INSTRUCTION_DECODER
         def_bool y
@@ -188,9 +190,6 @@ config GENERIC_CALIBRATE_DELAY
 config ARCH_HAS_CPU_RELAX
         def_bool y
 
-config ARCH_HAS_DEFAULT_IDLE
-        def_bool y
-
 config ARCH_HAS_CACHE_LINE_SIZE
         def_bool y
 
@@ -389,7 +388,7 @@ config X86_NUMACHIP
 
 config X86_VSMP
         bool "ScaleMP vSMP"
-        select PARAVIRT_GUEST
+        select HYPERVISOR_GUEST
         select PARAVIRT
         depends on X86_64 && PCI
         depends on X86_EXTENDED_PLATFORM
@@ -596,44 +595,17 @@ config SCHED_OMIT_FRAME_POINTER
 
           If in doubt, say "Y".
 
-menuconfig PARAVIRT_GUEST
-        bool "Paravirtualized guest support"
-        ---help---
-          Say Y here to get to see options related to running Linux under
-          various hypervisors.  This option alone does not add any kernel code.
-
-          If you say N, all options in this submenu will be skipped and disabled.
-
-if PARAVIRT_GUEST
-
-config PARAVIRT_TIME_ACCOUNTING
-        bool "Paravirtual steal time accounting"
-        select PARAVIRT
-        default n
+menuconfig HYPERVISOR_GUEST
+        bool "Linux guest support"
         ---help---
-          Select this option to enable fine granularity task steal time
-          accounting. Time spent executing other tasks in parallel with
-          the current vCPU is discounted from the vCPU power. To account for
-          that, there can be a small performance impact.
-
-          If in doubt, say N here.
-
-source "arch/x86/xen/Kconfig"
+          Say Y here to enable options for running Linux under various hyper-
+          visors. This option enables basic hypervisor detection and platform
+          setup.
 
-config KVM_GUEST
-        bool "KVM Guest support (including kvmclock)"
-        select PARAVIRT
-        select PARAVIRT
-        select PARAVIRT_CLOCK
-        default y if PARAVIRT_GUEST
-        ---help---
-          This option enables various optimizations for running under the KVM
-          hypervisor. It includes a paravirtualized clock, so that instead
-          of relying on a PIT (or probably other) emulation by the
-          underlying device model, the host provides the guest with
-          timing infrastructure such as time of day, and system time
+          If you say N, all options in this submenu will be skipped and
+          disabled, and Linux guest support won't be built in.
 
-source "arch/x86/lguest/Kconfig"
+if HYPERVISOR_GUEST
 
 config PARAVIRT
         bool "Enable paravirtualization code"
@@ -643,6 +615,13 @@ config PARAVIRT
           over full virtualization.  However, when run without a hypervisor
           the kernel is theoretically slower and slightly larger.
 
+config PARAVIRT_DEBUG
+        bool "paravirt-ops debugging"
+        depends on PARAVIRT && DEBUG_KERNEL
+        ---help---
+          Enable to debug paravirt_ops internals.  Specifically, BUG if
+          a paravirt_op is missing when it is called.
+
 config PARAVIRT_SPINLOCKS
         bool "Paravirtualization layer for spinlocks"
         depends on PARAVIRT && SMP
@@ -656,17 +635,38 @@ config PARAVIRT_SPINLOCKS
 
           If you are unsure how to answer this question, answer N.
 
-config PARAVIRT_CLOCK
-        bool
+source "arch/x86/xen/Kconfig"
 
-endif
+config KVM_GUEST
+        bool "KVM Guest support (including kvmclock)"
+        depends on PARAVIRT
+        select PARAVIRT_CLOCK
+        default y
+        ---help---
+          This option enables various optimizations for running under the KVM
+          hypervisor. It includes a paravirtualized clock, so that instead
+          of relying on a PIT (or probably other) emulation by the
+          underlying device model, the host provides the guest with
+          timing infrastructure such as time of day, and system time
 
-config PARAVIRT_DEBUG
-        bool "paravirt-ops debugging"
-        depends on PARAVIRT && DEBUG_KERNEL
+source "arch/x86/lguest/Kconfig"
+
+config PARAVIRT_TIME_ACCOUNTING
+        bool "Paravirtual steal time accounting"
+        depends on PARAVIRT
+        default n
         ---help---
-          Enable to debug paravirt_ops internals.  Specifically, BUG if
-          a paravirt_op is missing when it is called.
+          Select this option to enable fine granularity task steal time
+          accounting. Time spent executing other tasks in parallel with
+          the current vCPU is discounted from the vCPU power. To account for
+          that, there can be a small performance impact.
+
+          If in doubt, say N here.
+
+config PARAVIRT_CLOCK
+        bool
+
+endif #HYPERVISOR_GUEST
 
 config NO_BOOTMEM
         def_bool y
diff --git a/arch/x86/Kconfig.debug b/arch/x86/Kconfig.debug
index b322f124ee3c..c198b7e13e7b 100644
--- a/arch/x86/Kconfig.debug
+++ b/arch/x86/Kconfig.debug
@@ -131,7 +131,7 @@ config DOUBLEFAULT
 
 config DEBUG_TLBFLUSH
         bool "Set upper limit of TLB entries to flush one-by-one"
-        depends on DEBUG_KERNEL && (X86_64 || X86_INVLPG)
+        depends on DEBUG_KERNEL
         ---help---
 
         X86-only for now.
@@ -292,20 +292,6 @@ config OPTIMIZE_INLINING
 
           If unsure, say N.
 
-config DEBUG_STRICT_USER_COPY_CHECKS
-        bool "Strict copy size checks"
-        depends on DEBUG_KERNEL && !TRACE_BRANCH_PROFILING
-        ---help---
-          Enabling this option turns a certain set of sanity checks for user
-          copy operations into compile time failures.
-
-          The copy_from_user() etc checks are there to help test if there
-          are sufficient security checks on the length argument of
-          the copy operation, by having gcc prove that the argument is
-          within bounds.
-
-          If unsure, or if you run an older (pre 4.4) gcc, say N.
-
 config DEBUG_NMI_SELFTEST
         bool "NMI Selftest"
         depends on DEBUG_KERNEL && X86_LOCAL_APIC
diff --git a/arch/x86/boot/compressed/head_64.S b/arch/x86/boot/compressed/head_64.S
index c1d383d1fb7e..16f24e6dad79 100644
--- a/arch/x86/boot/compressed/head_64.S
+++ b/arch/x86/boot/compressed/head_64.S
@@ -52,7 +52,7 @@ ENTRY(startup_32)
         jnz 1f
 
         cli
-        movl    $(__KERNEL_DS), %eax
+        movl    $(__BOOT_DS), %eax
         movl    %eax, %ds
         movl    %eax, %es
         movl    %eax, %ss
diff --git a/arch/x86/ia32/Makefile b/arch/x86/ia32/Makefile
index 455646e0e532..e785b422b766 100644
--- a/arch/x86/ia32/Makefile
+++ b/arch/x86/ia32/Makefile
@@ -5,9 +5,6 @@
 obj-$(CONFIG_IA32_EMULATION) := ia32entry.o sys_ia32.o ia32_signal.o
 obj-$(CONFIG_IA32_EMULATION) += nosyscall.o syscall_ia32.o
 
-sysv-$(CONFIG_SYSVIPC) := ipc32.o
-obj-$(CONFIG_IA32_EMULATION) += $(sysv-y)
-
 obj-$(CONFIG_IA32_AOUT) += ia32_aout.o
 
 audit-class-$(CONFIG_AUDIT) := audit.o
diff --git a/arch/x86/ia32/ia32_aout.c b/arch/x86/ia32/ia32_aout.c
index 03abf9b70011..81e94d972f1b 100644
--- a/arch/x86/ia32/ia32_aout.c
+++ b/arch/x86/ia32/ia32_aout.c
@@ -162,7 +162,6 @@ static int aout_core_dump(long signr, struct pt_regs *regs, struct file *file,
         fs = get_fs();
         set_fs(KERNEL_DS);
         has_dumped = 1;
-        current->flags |= PF_DUMPCORE;
         strncpy(dump.u_comm, current->comm, sizeof(current->comm));
         dump.u_ar0 = offsetof(struct user32, regs);
         dump.signal = signr;
diff --git a/arch/x86/ia32/ipc32.c b/arch/x86/ia32/ipc32.c
deleted file mode 100644
index 29cdcd02ead3..000000000000
--- a/arch/x86/ia32/ipc32.c
+++ /dev/null
@@ -1,54 +0,0 @@
-#include <linux/kernel.h>
-#include <linux/spinlock.h>
-#include <linux/list.h>
-#include <linux/syscalls.h>
-#include <linux/time.h>
-#include <linux/sem.h>
-#include <linux/msg.h>
-#include <linux/shm.h>
-#include <linux/ipc.h>
-#include <linux/compat.h>
-#include <asm/sys_ia32.h>
-
-asmlinkage long sys32_ipc(u32 call, int first, int second, int third,
-                          compat_uptr_t ptr, u32 fifth)
-{
-        int version;
-
-        version = call >> 16; /* hack for backward compatibility */
-        call &= 0xffff;
-
-        switch (call) {
-        case SEMOP:
-                /* struct sembuf is the same on 32 and 64bit :)) */
-                return sys_semtimedop(first, compat_ptr(ptr), second, NULL);
-        case SEMTIMEDOP:
-                return compat_sys_semtimedop(first, compat_ptr(ptr), second,
-                                                compat_ptr(fifth));
-        case SEMGET:
-                return sys_semget(first, second, third);
-        case SEMCTL:
-                return compat_sys_semctl(first, second, third, compat_ptr(ptr));
-
-        case MSGSND:
-                return compat_sys_msgsnd(first, second, third, compat_ptr(ptr));
-        case MSGRCV:
-                return compat_sys_msgrcv(first, second, fifth, third,
-                                         version, compat_ptr(ptr));
-        case MSGGET:
-                return sys_msgget((key_t) first, second);
-        case MSGCTL:
-                return compat_sys_msgctl(first, second, compat_ptr(ptr));
-
-        case SHMAT:
-                return compat_sys_shmat(first, second, third, version,
-                                        compat_ptr(ptr));
-        case SHMDT:
-                return sys_shmdt(compat_ptr(ptr));
-        case SHMGET:
-                return sys_shmget(first, (unsigned)second, third);
-        case SHMCTL:
-                return compat_sys_shmctl(first, second, compat_ptr(ptr));
-        }
-        return -ENOSYS;
-}
diff --git a/arch/x86/ia32/sys_ia32.c b/arch/x86/ia32/sys_ia32.c
index ad7a20cbc699..4e4907c67d92 100644
--- a/arch/x86/ia32/sys_ia32.c
+++ b/arch/x86/ia32/sys_ia32.c
@@ -166,12 +166,6 @@ asmlinkage long sys32_mmap(struct mmap_arg_struct32 __user *arg)
                                a.offset>>PAGE_SHIFT);
 }
 
-asmlinkage long sys32_mprotect(unsigned long start, size_t len,
-                               unsigned long prot)
-{
-        return sys_mprotect(start, len, prot);
-}
-
 asmlinkage long sys32_waitpid(compat_pid_t pid, unsigned int __user *stat_addr,
                               int options)
 {
@@ -194,35 +188,10 @@ asmlinkage long sys32_pwrite(unsigned int fd, const char __user *ubuf,
 }
 
 
-asmlinkage long sys32_sendfile(int out_fd, int in_fd,
-                               compat_off_t __user *offset, s32 count)
-{
-        mm_segment_t old_fs = get_fs();
-        int ret;
-        off_t of;
-
-        if (offset && get_user(of, offset))
-                return -EFAULT;
-
-        set_fs(KERNEL_DS);
-        ret = sys_sendfile(out_fd, in_fd, offset ? (off_t __user *)&of : NULL,
-                           count);
-        set_fs(old_fs);
-
-        if (offset && put_user(of, offset))
-                return -EFAULT;
-        return ret;
-}
-
 /*
  * Some system calls that need sign extended arguments. This could be
  * done by a generic wrapper.
  */
-long sys32_kill(int pid, int sig)
-{
-        return sys_kill(pid, sig);
-}
-
 long sys32_fadvise64_64(int fd, __u32 offset_low, __u32 offset_high,
                         __u32 len_low, __u32 len_high, int advice)
 {
@@ -246,12 +215,6 @@ long sys32_vm86_warning(void)
         return -ENOSYS;
 }
 
-long sys32_lookup_dcookie(u32 addr_low, u32 addr_high,
-                          char __user *buf, size_t len)
-{
-        return sys_lookup_dcookie(((u64)addr_high << 32) | addr_low, buf, len);
-}
-
 asmlinkage ssize_t sys32_readahead(int fd, unsigned off_lo, unsigned off_hi,
                                    size_t count)
 {
diff --git a/arch/x86/include/asm/bug.h b/arch/x86/include/asm/bug.h
index 11e1152222d0..2f03ff018d36 100644
--- a/arch/x86/include/asm/bug.h
+++ b/arch/x86/include/asm/bug.h
@@ -37,7 +37,4 @@ do {								\
 
 #include <asm-generic/bug.h>
 
-
-extern void show_regs_common(void);
-
 #endif /* _ASM_X86_BUG_H */
diff --git a/arch/x86/include/asm/cmpxchg.h b/arch/x86/include/asm/cmpxchg.h
index 8d871eaddb66..d47786acb016 100644
--- a/arch/x86/include/asm/cmpxchg.h
+++ b/arch/x86/include/asm/cmpxchg.h
@@ -35,7 +35,7 @@ extern void __add_wrong_size(void)
 
 /* 
  * An exchange-type operation, which takes a value and a pointer, and
- * returns a the old value.
+ * returns the old value.
  */
 #define __xchg_op(ptr, arg, op, lock)                                   \
         ({                                                              \
diff --git a/arch/x86/include/asm/context_tracking.h b/arch/x86/include/asm/context_tracking.h
index 1616562683e9..1fe49704b146 100644
--- a/arch/x86/include/asm/context_tracking.h
+++ b/arch/x86/include/asm/context_tracking.h
@@ -1,31 +1,10 @@
 #ifndef _ASM_X86_CONTEXT_TRACKING_H
 #define _ASM_X86_CONTEXT_TRACKING_H
 
-#ifndef __ASSEMBLY__
-#include <linux/context_tracking.h>
-#include <asm/ptrace.h>
-
-static inline void exception_enter(struct pt_regs *regs)
-{
-        user_exit();
-}
-
-static inline void exception_exit(struct pt_regs *regs)
-{
-#ifdef CONFIG_CONTEXT_TRACKING
-        if (user_mode(regs))
-                user_enter();
-#endif
-}
-
-#else /* __ASSEMBLY__ */
-
 #ifdef CONFIG_CONTEXT_TRACKING
 # define SCHEDULE_USER call schedule_user
 #else
 # define SCHEDULE_USER call schedule
 #endif
 
-#endif /* !__ASSEMBLY__ */
-
 #endif
diff --git a/arch/x86/include/asm/cpufeature.h b/arch/x86/include/asm/cpufeature.h
index 93fe929d1cee..8010ebc5705f 100644
--- a/arch/x86/include/asm/cpufeature.h
+++ b/arch/x86/include/asm/cpufeature.h
@@ -9,6 +9,7 @@
 #endif
 
 #define NCAPINTS        10      /* N 32-bit words worth of info */
+#define NBUGINTS        1       /* N 32-bit bug flags */
 
 /*
  * Note: If the comment begins with a quoted string, that string is used
@@ -100,6 +101,7 @@
 #define X86_FEATURE_AMD_DCM     (3*32+27) /* multi-node processor */
 #define X86_FEATURE_APERFMPERF  (3*32+28) /* APERFMPERF */
 #define X86_FEATURE_EAGER_FPU   (3*32+29) /* "eagerfpu" Non lazy FPU restore */
+#define X86_FEATURE_NONSTOP_TSC_S3 (3*32+30) /* TSC doesn't stop in S3 state */
 
 /* Intel-defined CPU features, CPUID level 0x00000001 (ecx), word 4 */
 #define X86_FEATURE_XMM3        (4*32+ 0) /* "pni" SSE-3 */
@@ -168,6 +170,7 @@
 #define X86_FEATURE_TOPOEXT     (6*32+22) /* topology extensions CPUID leafs */
 #define X86_FEATURE_PERFCTR_CORE (6*32+23) /* core performance counter extensions */
 #define X86_FEATURE_PERFCTR_NB  (6*32+24) /* NB performance counter extensions */
+#define X86_FEATURE_PERFCTR_L2  (6*32+28) /* L2 performance counter extensions */
 
 /*
  * Auxiliary flags: Linux defined - For features scattered in various
@@ -182,6 +185,7 @@
 #define X86_FEATURE_PTS         (7*32+ 6) /* Intel Package Thermal Status */
 #define X86_FEATURE_DTHERM      (7*32+ 7) /* Digital Thermal Sensor */
 #define X86_FEATURE_HW_PSTATE   (7*32+ 8) /* AMD HW-PState */
+#define X86_FEATURE_PROC_FEEDBACK (7*32+ 9) /* AMD ProcFeedbackInterface */
 
 /* Virtualization flags: Linux defined, word 8 */
 #define X86_FEATURE_TPR_SHADOW  (8*32+ 0) /* Intel TPR Shadow */
@@ -216,6 +220,17 @@
 #define X86_FEATURE_ADX         (9*32+19) /* The ADCX and ADOX instructions */
 #define X86_FEATURE_SMAP        (9*32+20) /* Supervisor Mode Access Prevention */
 
+/*
+ * BUG word(s)
+ */
+#define X86_BUG(x)              (NCAPINTS*32 + (x))
+
+#define X86_BUG_F00F            X86_BUG(0) /* Intel F00F */
+#define X86_BUG_FDIV            X86_BUG(1) /* FPU FDIV */
+#define X86_BUG_COMA            X86_BUG(2) /* Cyrix 6x86 coma */
+#define X86_BUG_AMD_TLB_MMATCH  X86_BUG(3) /* AMD Erratum 383 */
+#define X86_BUG_AMD_APIC_C1E    X86_BUG(4) /* AMD Erratum 400 */
+
 #if defined(__KERNEL__) && !defined(__ASSEMBLY__)
 
 #include <asm/asm.h>
@@ -311,6 +326,7 @@ extern const char * const x86_power_flags[32];
 #define cpu_has_pclmulqdq       boot_cpu_has(X86_FEATURE_PCLMULQDQ)
 #define cpu_has_perfctr_core    boot_cpu_has(X86_FEATURE_PERFCTR_CORE)
 #define cpu_has_perfctr_nb      boot_cpu_has(X86_FEATURE_PERFCTR_NB)
+#define cpu_has_perfctr_l2      boot_cpu_has(X86_FEATURE_PERFCTR_L2)
 #define cpu_has_cx8             boot_cpu_has(X86_FEATURE_CX8)
 #define cpu_has_cx16            boot_cpu_has(X86_FEATURE_CX16)
 #define cpu_has_eager_fpu       boot_cpu_has(X86_FEATURE_EAGER_FPU)
@@ -401,6 +417,13 @@ static __always_inline __pure bool __static_cpu_has(u16 bit)
 #define static_cpu_has(bit) boot_cpu_has(bit)
 #endif
 
+#define cpu_has_bug(c, bit)     cpu_has(c, (bit))
+#define set_cpu_bug(c, bit)     set_cpu_cap(c, (bit))
+#define clear_cpu_bug(c, bit)   clear_cpu_cap(c, (bit));
+
+#define static_cpu_has_bug(bit) static_cpu_has((bit))
+#define boot_cpu_has_bug(bit)   cpu_has_bug(&boot_cpu_data, (bit))
+
 #endif /* defined(__KERNEL__) && !defined(__ASSEMBLY__) */
 
 #endif /* _ASM_X86_CPUFEATURE_H */
diff --git a/arch/x86/include/asm/fixmap.h b/arch/x86/include/asm/fixmap.h
index a09c28571064..0dc7d9e21c34 100644
--- a/arch/x86/include/asm/fixmap.h
+++ b/arch/x86/include/asm/fixmap.h
@@ -104,12 +104,7 @@ enum fixed_addresses {
         FIX_LI_PCIA,    /* Lithium PCI Bridge A */
         FIX_LI_PCIB,    /* Lithium PCI Bridge B */
 #endif
-#ifdef CONFIG_X86_F00F_BUG
-        FIX_F00F_IDT,   /* Virtual mapping for IDT */
-#endif
-#ifdef CONFIG_X86_CYCLONE_TIMER
-        FIX_CYCLONE_TIMER, /*cyclone timer register*/
-#endif
+        FIX_RO_IDT,     /* Virtual mapping for read-only IDT */
 #ifdef CONFIG_X86_32
         FIX_KMAP_BEGIN, /* reserved pte's for temporary kernel mappings */
         FIX_KMAP_END = FIX_KMAP_BEGIN+(KM_TYPE_NR*NR_CPUS)-1,
diff --git a/arch/x86/include/asm/hugetlb.h b/arch/x86/include/asm/hugetlb.h
index bdd35dbd0605..a8091216963b 100644
--- a/arch/x86/include/asm/hugetlb.h
+++ b/arch/x86/include/asm/hugetlb.h
@@ -2,6 +2,7 @@
 #define _ASM_X86_HUGETLB_H
 
 #include <asm/page.h>
+#include <asm-generic/hugetlb.h>
 
 
 static inline int is_hugepage_only_range(struct mm_struct *mm,
diff --git a/arch/x86/include/asm/hypervisor.h b/arch/x86/include/asm/hypervisor.h
index 86095ed14135..2d4b5e6107cd 100644
--- a/arch/x86/include/asm/hypervisor.h
+++ b/arch/x86/include/asm/hypervisor.h
@@ -20,13 +20,11 @@
 #ifndef _ASM_X86_HYPERVISOR_H
 #define _ASM_X86_HYPERVISOR_H
 
+#ifdef CONFIG_HYPERVISOR_GUEST
+
 #include <asm/kvm_para.h>
 #include <asm/xen/hypervisor.h>
 
-extern void init_hypervisor(struct cpuinfo_x86 *c);
-extern void init_hypervisor_platform(void);
-extern bool hypervisor_x2apic_available(void);
-
 /*
  * x86 hypervisor information
  */
@@ -55,4 +53,12 @@ extern const struct hypervisor_x86 x86_hyper_ms_hyperv;
 extern const struct hypervisor_x86 x86_hyper_xen_hvm;
 extern const struct hypervisor_x86 x86_hyper_kvm;
 
-#endif
+extern void init_hypervisor(struct cpuinfo_x86 *c);
+extern void init_hypervisor_platform(void);
+extern bool hypervisor_x2apic_available(void);
+#else
+static inline void init_hypervisor(struct cpuinfo_x86 *c) { }
+static inline void init_hypervisor_platform(void) { }
+static inline bool hypervisor_x2apic_available(void) { return false; }
+#endif /* CONFIG_HYPERVISOR_GUEST */
+#endif /* _ASM_X86_HYPERVISOR_H */
diff --git a/arch/x86/include/asm/mce.h b/arch/x86/include/asm/mce.h
index f4076af1f4ed..fa5f71e021d5 100644
--- a/arch/x86/include/asm/mce.h
+++ b/arch/x86/include/asm/mce.h
@@ -146,13 +146,13 @@ DECLARE_PER_CPU(struct device *, mce_device);
 void mce_intel_feature_init(struct cpuinfo_x86 *c);
 void cmci_clear(void);
 void cmci_reenable(void);
-void cmci_rediscover(int dying);
+void cmci_rediscover(void);
 void cmci_recheck(void);
 #else
 static inline void mce_intel_feature_init(struct cpuinfo_x86 *c) { }
 static inline void cmci_clear(void) {}
 static inline void cmci_reenable(void) {}
-static inline void cmci_rediscover(int dying) {}
+static inline void cmci_rediscover(void) {}
 static inline void cmci_recheck(void) {}
 #endif
 
diff --git a/arch/x86/include/asm/msr.h b/arch/x86/include/asm/msr.h
index 9264802e2824..cb7502852acb 100644
--- a/arch/x86/include/asm/msr.h
+++ b/arch/x86/include/asm/msr.h
@@ -137,11 +137,11 @@ static inline unsigned long long native_read_pmc(int counter)
  * pointer indirection), this allows gcc to optimize better
  */
 
-#define rdmsr(msr, val1, val2)                                  \
+#define rdmsr(msr, low, high)                                   \
 do {                                                            \
         u64 __val = native_read_msr((msr));                     \
-        (void)((val1) = (u32)__val);                            \
-        (void)((val2) = (u32)(__val >> 32));                    \
+        (void)((low) = (u32)__val);                             \
+        (void)((high) = (u32)(__val >> 32));                    \
 } while (0)
 
 static inline void wrmsr(unsigned msr, unsigned low, unsigned high)
@@ -162,12 +162,12 @@ static inline int wrmsr_safe(unsigned msr, unsigned low, unsigned high)
 }
 
 /* rdmsr with exception handling */
-#define rdmsr_safe(msr, p1, p2)                                 \
+#define rdmsr_safe(msr, low, high)                              \
 ({                                                              \
         int __err;                                              \
         u64 __val = native_read_msr_safe((msr), &__err);        \
-        (*p1) = (u32)__val;                                     \
-        (*p2) = (u32)(__val >> 32);                             \
+        (*low) = (u32)__val;                                    \
+        (*high) = (u32)(__val >> 32);                           \
         __err;                                                  \
 })
 
@@ -208,7 +208,7 @@ do {                                                            \
 #define wrmsrl_safe(msr, val) wrmsr_safe((msr), (u32)(val),             \
                                              (u32)((val) >> 32))
 
-#define write_tsc(val1, val2) wrmsr(MSR_IA32_TSC, (val1), (val2))
+#define write_tsc(low, high) wrmsr(MSR_IA32_TSC, (low), (high))
 
 #define write_rdtscp_aux(val) wrmsr(MSR_TSC_AUX, (val), 0)
 
diff --git a/arch/x86/include/asm/page_64_types.h b/arch/x86/include/asm/page_64_types.h
index 8b491e66eaa8..6c896fbe21db 100644
--- a/arch/x86/include/asm/page_64_types.h
+++ b/arch/x86/include/asm/page_64_types.h
@@ -48,6 +48,5 @@
  * arch/x86/kernel/head_64.S), and it is mapped here:
  */
 #define KERNEL_IMAGE_SIZE       (512 * 1024 * 1024)
-#define KERNEL_IMAGE_START      _AC(0xffffffff80000000, UL)
 
 #endif /* _ASM_X86_PAGE_64_DEFS_H */
diff --git a/arch/x86/include/asm/paravirt.h b/arch/x86/include/asm/paravirt.h
index 7361e47db79f..cfdc9ee4c900 100644
--- a/arch/x86/include/asm/paravirt.h
+++ b/arch/x86/include/asm/paravirt.h
@@ -262,10 +262,6 @@ static inline void set_ldt(const void *addr, unsigned entries)
 {
         PVOP_VCALL2(pv_cpu_ops.set_ldt, addr, entries);
 }
-static inline void store_gdt(struct desc_ptr *dtr)
-{
-        PVOP_VCALL1(pv_cpu_ops.store_gdt, dtr);
-}
 static inline void store_idt(struct desc_ptr *dtr)
 {
         PVOP_VCALL1(pv_cpu_ops.store_idt, dtr);
diff --git a/arch/x86/include/asm/paravirt_types.h b/arch/x86/include/asm/paravirt_types.h
index b3b0ec1dac86..0db1fcac668c 100644
--- a/arch/x86/include/asm/paravirt_types.h
+++ b/arch/x86/include/asm/paravirt_types.h
@@ -123,7 +123,7 @@ struct pv_cpu_ops {
         void (*load_tr_desc)(void);
         void (*load_gdt)(const struct desc_ptr *);
         void (*load_idt)(const struct desc_ptr *);
-        void (*store_gdt)(struct desc_ptr *);
+        /* store_gdt has been removed. */
         void (*store_idt)(struct desc_ptr *);
         void (*set_ldt)(const void *desc, unsigned entries);
         unsigned long (*store_tr)(void);
diff --git a/arch/x86/include/asm/perf_event_p4.h b/arch/x86/include/asm/perf_event_p4.h
index 4f7e67e2345e..85e13ccf15c4 100644
--- a/arch/x86/include/asm/perf_event_p4.h
+++ b/arch/x86/include/asm/perf_event_p4.h
@@ -24,45 +24,45 @@
 #define ARCH_P4_CNTRVAL_MASK    ((1ULL << ARCH_P4_CNTRVAL_BITS) - 1)
 #define ARCH_P4_UNFLAGGED_BIT   ((1ULL) << (ARCH_P4_CNTRVAL_BITS - 1))
 
-#define P4_ESCR_EVENT_MASK      0x7e000000U
+#define P4_ESCR_EVENT_MASK      0x7e000000ULL
 #define P4_ESCR_EVENT_SHIFT     25
-#define P4_ESCR_EVENTMASK_MASK  0x01fffe00U
+#define P4_ESCR_EVENTMASK_MASK  0x01fffe00ULL
 #define P4_ESCR_EVENTMASK_SHIFT 9
-#define P4_ESCR_TAG_MASK        0x000001e0U
+#define P4_ESCR_TAG_MASK        0x000001e0ULL
 #define P4_ESCR_TAG_SHIFT       5
-#define P4_ESCR_TAG_ENABLE      0x00000010U
-#define P4_ESCR_T0_OS           0x00000008U
-#define P4_ESCR_T0_USR          0x00000004U
-#define P4_ESCR_T1_OS           0x00000002U
-#define P4_ESCR_T1_USR          0x00000001U
+#define P4_ESCR_TAG_ENABLE      0x00000010ULL
+#define P4_ESCR_T0_OS           0x00000008ULL
+#define P4_ESCR_T0_USR          0x00000004ULL
+#define P4_ESCR_T1_OS           0x00000002ULL
+#define P4_ESCR_T1_USR          0x00000001ULL
 
 #define P4_ESCR_EVENT(v)        ((v) << P4_ESCR_EVENT_SHIFT)
 #define P4_ESCR_EMASK(v)        ((v) << P4_ESCR_EVENTMASK_SHIFT)
 #define P4_ESCR_TAG(v)          ((v) << P4_ESCR_TAG_SHIFT)
 
-#define P4_CCCR_OVF                     0x80000000U
-#define P4_CCCR_CASCADE                 0x40000000U
-#define P4_CCCR_OVF_PMI_T0              0x04000000U
-#define P4_CCCR_OVF_PMI_T1              0x08000000U
-#define P4_CCCR_FORCE_OVF               0x02000000U
-#define P4_CCCR_EDGE                    0x01000000U
-#define P4_CCCR_THRESHOLD_MASK          0x00f00000U
+#define P4_CCCR_OVF                     0x80000000ULL
+#define P4_CCCR_CASCADE                 0x40000000ULL
+#define P4_CCCR_OVF_PMI_T0              0x04000000ULL
+#define P4_CCCR_OVF_PMI_T1              0x08000000ULL
+#define P4_CCCR_FORCE_OVF               0x02000000ULL
+#define P4_CCCR_EDGE                    0x01000000ULL
+#define P4_CCCR_THRESHOLD_MASK          0x00f00000ULL
 #define P4_CCCR_THRESHOLD_SHIFT         20
-#define P4_CCCR_COMPLEMENT              0x00080000U
-#define P4_CCCR_COMPARE                 0x00040000U
-#define P4_CCCR_ESCR_SELECT_MASK        0x0000e000U
+#define P4_CCCR_COMPLEMENT              0x00080000ULL
+#define P4_CCCR_COMPARE                 0x00040000ULL
+#define P4_CCCR_ESCR_SELECT_MASK        0x0000e000ULL
 #define P4_CCCR_ESCR_SELECT_SHIFT       13
-#define P4_CCCR_ENABLE                  0x00001000U
-#define P4_CCCR_THREAD_SINGLE           0x00010000U
-#define P4_CCCR_THREAD_BOTH             0x00020000U
-#define P4_CCCR_THREAD_ANY              0x00030000U
-#define P4_CCCR_RESERVED                0x00000fffU
+#define P4_CCCR_ENABLE                  0x00001000ULL
+#define P4_CCCR_THREAD_SINGLE           0x00010000ULL
+#define P4_CCCR_THREAD_BOTH             0x00020000ULL
+#define P4_CCCR_THREAD_ANY              0x00030000ULL
+#define P4_CCCR_RESERVED                0x00000fffULL
 
 #define P4_CCCR_THRESHOLD(v)            ((v) << P4_CCCR_THRESHOLD_SHIFT)
 #define P4_CCCR_ESEL(v)                 ((v) << P4_CCCR_ESCR_SELECT_SHIFT)
 
 #define P4_GEN_ESCR_EMASK(class, name, bit)     \
-        class##__##name = ((1 << bit) << P4_ESCR_EVENTMASK_SHIFT)
+        class##__##name = ((1ULL << bit) << P4_ESCR_EVENTMASK_SHIFT)
 #define P4_ESCR_EMASK_BIT(class, name)          class##__##name
 
 /*
@@ -107,7 +107,7 @@
  * P4_PEBS_CONFIG_MASK and related bits on
  * modification.)
  */
-#define P4_CONFIG_ALIASABLE             (1 << 9)
+#define P4_CONFIG_ALIASABLE             (1ULL << 9)
 
 /*
  * The bits we allow to pass for RAW events
@@ -784,17 +784,17 @@ enum P4_ESCR_EMASKS {
  * Note we have UOP and PEBS bits reserved for now
  * just in case if we will need them once
  */
-#define P4_PEBS_CONFIG_ENABLE           (1 << 7)
-#define P4_PEBS_CONFIG_UOP_TAG          (1 << 8)
-#define P4_PEBS_CONFIG_METRIC_MASK      0x3f
-#define P4_PEBS_CONFIG_MASK             0xff
+#define P4_PEBS_CONFIG_ENABLE           (1ULL << 7)
+#define P4_PEBS_CONFIG_UOP_TAG          (1ULL << 8)
+#define P4_PEBS_CONFIG_METRIC_MASK      0x3FLL
+#define P4_PEBS_CONFIG_MASK             0xFFLL
 
 /*
  * mem: Only counters MSR_IQ_COUNTER4 (16) and
  * MSR_IQ_COUNTER5 (17) are allowed for PEBS sampling
  */
-#define P4_PEBS_ENABLE                  0x02000000U
-#define P4_PEBS_ENABLE_UOP_TAG          0x01000000U
+#define P4_PEBS_ENABLE                  0x02000000ULL
+#define P4_PEBS_ENABLE_UOP_TAG          0x01000000ULL
 
 #define p4_config_unpack_metric(v)      (((u64)(v)) & P4_PEBS_CONFIG_METRIC_MASK)
 #define p4_config_unpack_pebs(v)        (((u64)(v)) & P4_PEBS_CONFIG_MASK)
diff --git a/arch/x86/include/asm/pgtable_types.h b/arch/x86/include/asm/pgtable_types.h
index 567b5d0632b2..e6423002c10b 100644
--- a/arch/x86/include/asm/pgtable_types.h
+++ b/arch/x86/include/asm/pgtable_types.h
@@ -351,7 +351,6 @@ static inline void update_page_count(int level, unsigned long pages) { }
  * as a pte too.
  */
 extern pte_t *lookup_address(unsigned long address, unsigned int *level);
-extern int __split_large_page(pte_t *kpte, unsigned long address, pte_t *pbase);
 extern phys_addr_t slow_virt_to_phys(void *__address);
 
 #endif  /* !__ASSEMBLY__ */
diff --git a/arch/x86/include/asm/processor.h b/arch/x86/include/asm/processor.h
index 3270116b1488..22224b3b43bb 100644
--- a/arch/x86/include/asm/processor.h
+++ b/arch/x86/include/asm/processor.h
@@ -91,9 +91,6 @@ struct cpuinfo_x86 {
         /* Problems on some 486Dx4's and old 386's: */
         char                    hard_math;
         char                    rfu;
-        char                    fdiv_bug;
-        char                    f00f_bug;
-        char                    coma_bug;
         char                    pad0;
 #else
         /* Number of 4K pages in DTLB/ITLB combined(in pages): */
@@ -107,7 +104,7 @@ struct cpuinfo_x86 {
         __u32                   extended_cpuid_level;
         /* Maximum supported CPUID level, -1=no CPUID: */
         int                     cpuid_level;
-        __u32                   x86_capability[NCAPINTS];
+        __u32                   x86_capability[NCAPINTS + NBUGINTS];
         char                    x86_vendor_id[16];
         char                    x86_model_id[64];
         /* in KB - valid for CPUS which support this call: */
@@ -973,26 +970,6 @@ unsigned long calc_aperfmperf_ratio(struct aperfmperf *old,
         return ratio;
 }
 
-/*
- * AMD errata checking
- */
-#ifdef CONFIG_CPU_SUP_AMD
-extern const int amd_erratum_383[];
-extern const int amd_erratum_400[];
-extern bool cpu_has_amd_erratum(const int *);
-
-#define AMD_LEGACY_ERRATUM(...)         { -1, __VA_ARGS__, 0 }
-#define AMD_OSVW_ERRATUM(osvw_id, ...)  { osvw_id, __VA_ARGS__, 0 }
-#define AMD_MODEL_RANGE(f, m_start, s_start, m_end, s_end) \
-        ((f << 24) | (m_start << 16) | (s_start << 12) | (m_end << 4) | (s_end))
-#define AMD_MODEL_RANGE_FAMILY(range)   (((range) >> 24) & 0xff)
-#define AMD_MODEL_RANGE_START(range)    (((range) >> 12) & 0xfff)
-#define AMD_MODEL_RANGE_END(range)      ((range) & 0xfff)
-
-#else
-#define cpu_has_amd_erratum(x)  (false)
-#endif /* CONFIG_CPU_SUP_AMD */
-
 extern unsigned long arch_align_stack(unsigned long sp);
 extern void free_init_pages(char *what, unsigned long begin, unsigned long end);
 
diff --git a/arch/x86/include/asm/suspend_32.h b/arch/x86/include/asm/suspend_32.h
index 487055c8c1aa..f6064b7385b0 100644
--- a/arch/x86/include/asm/suspend_32.h
+++ b/arch/x86/include/asm/suspend_32.h
@@ -15,7 +15,6 @@ struct saved_context {
         unsigned long cr0, cr2, cr3, cr4;
         u64 misc_enable;
         bool misc_enable_saved;
-        struct desc_ptr gdt;
         struct desc_ptr idt;
         u16 ldt;
         u16 tss;
diff --git a/arch/x86/include/asm/suspend_64.h b/arch/x86/include/asm/suspend_64.h
index 09b0bf104156..97b84e08a211 100644
--- a/arch/x86/include/asm/suspend_64.h
+++ b/arch/x86/include/asm/suspend_64.h
@@ -25,9 +25,6 @@ struct saved_context {
         u64 misc_enable;
         bool misc_enable_saved;
         unsigned long efer;
-        u16 gdt_pad;
-        u16 gdt_limit;
-        unsigned long gdt_base;
         u16 idt_pad;
         u16 idt_limit;
         unsigned long idt_base;
diff --git a/arch/x86/include/asm/sys_ia32.h b/arch/x86/include/asm/sys_ia32.h
index 8459efc39686..0ef202e232d6 100644
--- a/arch/x86/include/asm/sys_ia32.h
+++ b/arch/x86/include/asm/sys_ia32.h
@@ -30,23 +30,14 @@ asmlinkage long sys32_fstatat(unsigned int, const char __user *,
                               struct stat64 __user *, int);
 struct mmap_arg_struct32;
 asmlinkage long sys32_mmap(struct mmap_arg_struct32 __user *);
-asmlinkage long sys32_mprotect(unsigned long, size_t, unsigned long);
-
-asmlinkage long sys32_alarm(unsigned int);
 
 asmlinkage long sys32_waitpid(compat_pid_t, unsigned int __user *, int);
-asmlinkage long sys32_sysfs(int, u32, u32);
 
 asmlinkage long sys32_pread(unsigned int, char __user *, u32, u32, u32);
 asmlinkage long sys32_pwrite(unsigned int, const char __user *, u32, u32, u32);
 
-asmlinkage long sys32_personality(unsigned long);
-asmlinkage long sys32_sendfile(int, int, compat_off_t __user *, s32);
-
-long sys32_kill(int, int);
 long sys32_fadvise64_64(int, __u32, __u32, __u32, __u32, int);
 long sys32_vm86_warning(void);
-long sys32_lookup_dcookie(u32, u32, char __user *, size_t);
 
 asmlinkage ssize_t sys32_readahead(int, unsigned, unsigned, size_t);
 asmlinkage long sys32_sync_file_range(int, unsigned, unsigned,
@@ -59,9 +50,6 @@ asmlinkage long sys32_fallocate(int, int, unsigned,
 asmlinkage long sys32_sigreturn(void);
 asmlinkage long sys32_rt_sigreturn(void);
 
-/* ia32/ipc32.c */
-asmlinkage long sys32_ipc(u32, int, int, int, compat_uptr_t, u32);
-
 asmlinkage long sys32_fanotify_mark(int, unsigned int, u32, u32, int,
                                     const char __user *);
 
diff --git a/arch/x86/include/asm/syscalls.h b/arch/x86/include/asm/syscalls.h
index 6cf0a9cc60cd..5f87b35fd2ef 100644
--- a/arch/x86/include/asm/syscalls.h
+++ b/arch/x86/include/asm/syscalls.h
@@ -27,8 +27,8 @@ asmlinkage int sys_modify_ldt(int, void __user *, unsigned long);
 long sys_rt_sigreturn(void);
 
 /* kernel/tls.c */
-asmlinkage int sys_set_thread_area(struct user_desc __user *);
-asmlinkage int sys_get_thread_area(struct user_desc __user *);
+asmlinkage long sys_set_thread_area(struct user_desc __user *);
+asmlinkage long sys_get_thread_area(struct user_desc __user *);
 
 /* X86_32 only */
 #ifdef CONFIG_X86_32
diff --git a/arch/x86/include/asm/thread_info.h b/arch/x86/include/asm/thread_info.h
index 2cd056e3ada3..a1df6e84691f 100644
--- a/arch/x86/include/asm/thread_info.h
+++ b/arch/x86/include/asm/thread_info.h
@@ -241,8 +241,6 @@ static inline struct thread_info *current_thread_info(void)
                                            skip sending interrupt */
 #define TS_RESTORE_SIGMASK      0x0008  /* restore signal mask in do_signal() */
 
-#define tsk_is_polling(t) (task_thread_info(t)->status & TS_POLLING)
-
 #ifndef __ASSEMBLY__
 #define HAVE_SET_RESTORE_SIGMASK        1
 static inline void set_restore_sigmask(void)
diff --git a/arch/x86/include/asm/unistd.h b/arch/x86/include/asm/unistd.h
index 3d5df1c4447f..c2a48139c340 100644
--- a/arch/x86/include/asm/unistd.h
+++ b/arch/x86/include/asm/unistd.h
@@ -50,12 +50,4 @@
 # define __ARCH_WANT_SYS_VFORK
 # define __ARCH_WANT_SYS_CLONE
 
-/*
- * "Conditional" syscalls
- *
- * What we want is __attribute__((weak,alias("sys_ni_syscall"))),
- * but it doesn't work on all toolchains, so we just do it by hand
- */
-# define cond_syscall(x) asm(".weak\t" #x "\n\t.set\t" #x ",sys_ni_syscall")
-
 #endif /* _ASM_X86_UNISTD_H */
diff --git a/arch/x86/include/asm/uprobes.h b/arch/x86/include/asm/uprobes.h
index 8ff8be7835ab..6e5197910fd8 100644
--- a/arch/x86/include/asm/uprobes.h
+++ b/arch/x86/include/asm/uprobes.h
@@ -55,4 +55,5 @@ extern int  arch_uprobe_post_xol(struct arch_uprobe *aup, struct pt_regs *regs);
 extern bool arch_uprobe_xol_was_trapped(struct task_struct *tsk);
 extern int  arch_uprobe_exception_notify(struct notifier_block *self, unsigned long val, void *data);
 extern void arch_uprobe_abort_xol(struct arch_uprobe *aup, struct pt_regs *regs);
+extern unsigned long arch_uretprobe_hijack_return_addr(unsigned long trampoline_vaddr, struct pt_regs *regs);
 #endif  /* _ASM_UPROBES_H */
diff --git a/arch/x86/include/uapi/asm/msr-index.h b/arch/x86/include/uapi/asm/msr-index.h
index 7a060f4b411f..b5757885d7a4 100644
--- a/arch/x86/include/uapi/asm/msr-index.h
+++ b/arch/x86/include/uapi/asm/msr-index.h
@@ -72,6 +72,7 @@
 #define MSR_IA32_PEBS_ENABLE            0x000003f1
 #define MSR_IA32_DS_AREA                0x00000600
 #define MSR_IA32_PERF_CAPABILITIES      0x00000345
+#define MSR_PEBS_LD_LAT_THRESHOLD       0x000003f6
 
 #define MSR_MTRRfix64K_00000            0x00000250
 #define MSR_MTRRfix16K_80000            0x00000258
@@ -195,6 +196,10 @@
 #define MSR_AMD64_IBSBRTARGET           0xc001103b
 #define MSR_AMD64_IBS_REG_COUNT_MAX     8 /* includes MSR_AMD64_IBSBRTARGET */
 
+/* Fam 16h MSRs */
+#define MSR_F16H_L2I_PERF_CTL           0xc0010230
+#define MSR_F16H_L2I_PERF_CTR           0xc0010231
+
 /* Fam 15h MSRs */
 #define MSR_F15H_PERF_CTL               0xc0010200
 #define MSR_F15H_PERF_CTR               0xc0010201
diff --git a/arch/x86/kernel/acpi/sleep.c b/arch/x86/kernel/acpi/sleep.c
index 0532f5d6e4ef..b44577bc9744 100644
--- a/arch/x86/kernel/acpi/sleep.c
+++ b/arch/x86/kernel/acpi/sleep.c
@@ -46,7 +46,7 @@ int acpi_suspend_lowlevel(void)
         header->pmode_behavior = 0;
 
 #ifndef CONFIG_64BIT
-        store_gdt((struct desc_ptr *)&header->pmode_gdt);
+        native_store_gdt((struct desc_ptr *)&header->pmode_gdt);
 
         if (!rdmsr_safe(MSR_EFER,
                         &header->pmode_efer_low,
diff --git a/arch/x86/kernel/acpi/wakeup_32.S b/arch/x86/kernel/acpi/wakeup_32.S
index 13ab720573e3..d1daa66ab162 100644
--- a/arch/x86/kernel/acpi/wakeup_32.S
+++ b/arch/x86/kernel/acpi/wakeup_32.S
@@ -1,4 +1,4 @@
-        .section .text..page_aligned
+        .text
 #include <linux/linkage.h>
 #include <asm/segment.h>
 #include <asm/page_types.h>
@@ -18,7 +18,6 @@ wakeup_pmode_return:
         movw    %ax, %gs
 
         # reload the gdt, as we need the full 32 bit address
-        lgdt    saved_gdt
         lidt    saved_idt
         lldt    saved_ldt
         ljmp    $(__KERNEL_CS), $1f
@@ -44,7 +43,6 @@ bogus_magic:
 
 
 save_registers:
-        sgdt    saved_gdt
         sidt    saved_idt
         sldt    saved_ldt
         str     saved_tss
@@ -93,7 +91,6 @@ ENTRY(saved_magic)	.long	0
 ENTRY(saved_eip)        .long   0
 
 # saved registers
-saved_gdt:      .long   0,0
 saved_idt:      .long   0,0
 saved_ldt:      .long   0
 saved_tss:      .long   0
diff --git a/arch/x86/kernel/alternative.c b/arch/x86/kernel/alternative.c
index ef5ccca79a6c..c15cf9a25e27 100644
--- a/arch/x86/kernel/alternative.c
+++ b/arch/x86/kernel/alternative.c
@@ -271,7 +271,7 @@ void __init_or_module apply_alternatives(struct alt_instr *start,
                 replacement = (u8 *)&a->repl_offset + a->repl_offset;
                 BUG_ON(a->replacementlen > a->instrlen);
                 BUG_ON(a->instrlen > sizeof(insnbuf));
-                BUG_ON(a->cpuid >= NCAPINTS*32);
+                BUG_ON(a->cpuid >= (NCAPINTS + NBUGINTS) * 32);
                 if (!boot_cpu_has(a->cpuid))
                         continue;
 
diff --git a/arch/x86/kernel/amd_nb.c b/arch/x86/kernel/amd_nb.c
index aadf3359e2a7..3048ded1b598 100644
--- a/arch/x86/kernel/amd_nb.c
+++ b/arch/x86/kernel/amd_nb.c
@@ -20,12 +20,14 @@ const struct pci_device_id amd_nb_misc_ids[] = {
         { PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_10H_NB_MISC) },
         { PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_15H_NB_F3) },
         { PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_15H_M10H_F3) },
+        { PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_16H_NB_F3) },
         {}
 };
 EXPORT_SYMBOL(amd_nb_misc_ids);
 
-static struct pci_device_id amd_nb_link_ids[] = {
+static const struct pci_device_id amd_nb_link_ids[] = {
         { PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_15H_NB_F4) },
+        { PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_16H_NB_F4) },
         {}
 };
 
@@ -81,7 +83,6 @@ int amd_cache_northbridges(void)
                         next_northbridge(link, amd_nb_link_ids);
         }
 
-        /* some CPU families (e.g. family 0x11) do not support GART */
         if (boot_cpu_data.x86 == 0xf || boot_cpu_data.x86 == 0x10 ||
             boot_cpu_data.x86 == 0x15)
                 amd_northbridges.flags |= AMD_NB_GART;
diff --git a/arch/x86/kernel/aperture_64.c b/arch/x86/kernel/aperture_64.c
index d5fd66f0d4cd..fd972a3e4cbb 100644
--- a/arch/x86/kernel/aperture_64.c
+++ b/arch/x86/kernel/aperture_64.c
@@ -87,7 +87,7 @@ static u32 __init allocate_aperture(void)
          */
         addr = memblock_find_in_range(GART_MIN_ADDR, GART_MAX_ADDR,
                                       aper_size, aper_size);
-        if (!addr || addr + aper_size > GART_MAX_ADDR) {
+        if (!addr) {
                 printk(KERN_ERR
                         "Cannot allocate aperture memory hole (%lx,%uK)\n",
                                 addr, aper_size>>10);
diff --git a/arch/x86/kernel/apm_32.c b/arch/x86/kernel/apm_32.c
index 66b5faffe14a..53a4e2744846 100644
--- a/arch/x86/kernel/apm_32.c
+++ b/arch/x86/kernel/apm_32.c
@@ -373,7 +373,6 @@ static int apm_cpu_idle(struct cpuidle_device *dev,
 static struct cpuidle_driver apm_idle_driver = {
         .name = "apm_idle",
         .owner = THIS_MODULE,
-        .en_core_tk_irqen = 1,
         .states = {
                 { /* entry 0 is for polling */ },
                 { /* entry 1 is for APM idle */
diff --git a/arch/x86/kernel/cpu/Makefile b/arch/x86/kernel/cpu/Makefile
index a0e067d3d96c..b0684e4a73aa 100644
--- a/arch/x86/kernel/cpu/Makefile
+++ b/arch/x86/kernel/cpu/Makefile
@@ -14,7 +14,6 @@ CFLAGS_common.o		:= $(nostackp)
 
 obj-y                   := intel_cacheinfo.o scattered.o topology.o
 obj-y                   += proc.o capflags.o powerflags.o common.o
-obj-y                   += vmware.o hypervisor.o mshyperv.o
 obj-y                   += rdrand.o
 obj-y                   += match.o
 
@@ -31,7 +30,7 @@ obj-$(CONFIG_CPU_SUP_UMC_32)		+= umc.o
 obj-$(CONFIG_PERF_EVENTS)               += perf_event.o
 
 ifdef CONFIG_PERF_EVENTS
-obj-$(CONFIG_CPU_SUP_AMD)               += perf_event_amd.o
+obj-$(CONFIG_CPU_SUP_AMD)               += perf_event_amd.o perf_event_amd_uncore.o
 obj-$(CONFIG_CPU_SUP_INTEL)             += perf_event_p6.o perf_event_knc.o perf_event_p4.o
 obj-$(CONFIG_CPU_SUP_INTEL)             += perf_event_intel_lbr.o perf_event_intel_ds.o perf_event_intel.o
 obj-$(CONFIG_CPU_SUP_INTEL)             += perf_event_intel_uncore.o
@@ -42,11 +41,13 @@ obj-$(CONFIG_MTRR)			+= mtrr/
 
 obj-$(CONFIG_X86_LOCAL_APIC)            += perfctr-watchdog.o perf_event_amd_ibs.o
 
+obj-$(CONFIG_HYPERVISOR_GUEST)          += vmware.o hypervisor.o mshyperv.o
+
 quiet_cmd_mkcapflags = MKCAP   $@
-      cmd_mkcapflags = $(PERL) $(srctree)/$(src)/mkcapflags.pl $< $@
+      cmd_mkcapflags = $(CONFIG_SHELL) $(srctree)/$(src)/mkcapflags.sh $< $@
 
 cpufeature = $(src)/../../include/asm/cpufeature.h
 
 targets += capflags.c
-$(obj)/capflags.c: $(cpufeature) $(src)/mkcapflags.pl FORCE
+$(obj)/capflags.c: $(cpufeature) $(src)/mkcapflags.sh FORCE
         $(call if_changed,mkcapflags)
diff --git a/arch/x86/kernel/cpu/amd.c b/arch/x86/kernel/cpu/amd.c
index fa96eb0d02fb..5013a48d1aff 100644
--- a/arch/x86/kernel/cpu/amd.c
+++ b/arch/x86/kernel/cpu/amd.c
@@ -20,11 +20,11 @@
 
 static inline int rdmsrl_amd_safe(unsigned msr, unsigned long long *p)
 {
-        struct cpuinfo_x86 *c = &cpu_data(smp_processor_id());
         u32 gprs[8] = { 0 };
         int err;
 
-        WARN_ONCE((c->x86 != 0xf), "%s should only be used on K8!\n", __func__);
+        WARN_ONCE((boot_cpu_data.x86 != 0xf),
+                  "%s should only be used on K8!\n", __func__);
 
         gprs[1] = msr;
         gprs[7] = 0x9c5a203a;
@@ -38,10 +38,10 @@ static inline int rdmsrl_amd_safe(unsigned msr, unsigned long long *p)
 
 static inline int wrmsrl_amd_safe(unsigned msr, unsigned long long val)
 {
-        struct cpuinfo_x86 *c = &cpu_data(smp_processor_id());
         u32 gprs[8] = { 0 };
 
-        WARN_ONCE((c->x86 != 0xf), "%s should only be used on K8!\n", __func__);
+        WARN_ONCE((boot_cpu_data.x86 != 0xf),
+                  "%s should only be used on K8!\n", __func__);
 
         gprs[0] = (u32)val;
         gprs[1] = msr;
@@ -192,11 +192,11 @@ static void __cpuinit amd_k7_smp_check(struct cpuinfo_x86 *c)
         /* Athlon 660/661 is valid. */
         if ((c->x86_model == 6) && ((c->x86_mask == 0) ||
             (c->x86_mask == 1)))
-                goto valid_k7;
+                return;
 
         /* Duron 670 is valid */
         if ((c->x86_model == 7) && (c->x86_mask == 0))
-                goto valid_k7;
+                return;
 
         /*
          * Athlon 662, Duron 671, and Athlon >model 7 have capability
@@ -209,7 +209,7 @@ static void __cpuinit amd_k7_smp_check(struct cpuinfo_x86 *c)
             ((c->x86_model == 7) && (c->x86_mask >= 1)) ||
              (c->x86_model > 7))
                 if (cpu_has_mp)
-                        goto valid_k7;
+                        return;
 
         /* If we get here, not a certified SMP capable AMD system. */
 
@@ -220,9 +220,6 @@ static void __cpuinit amd_k7_smp_check(struct cpuinfo_x86 *c)
         WARN_ONCE(1, "WARNING: This combination of AMD"
                 " processors is not suitable for SMP.\n");
         add_taint(TAINT_UNSAFE_SMP, LOCKDEP_NOW_UNRELIABLE);
-
-valid_k7:
-        ;
 }
 
 static void __cpuinit init_amd_k7(struct cpuinfo_x86 *c)
@@ -513,6 +510,10 @@ static void __cpuinit early_init_amd(struct cpuinfo_x86 *c)
 #endif
 }
 
+static const int amd_erratum_383[];
+static const int amd_erratum_400[];
+static bool cpu_has_amd_erratum(const int *erratum);
+
 static void __cpuinit init_amd(struct cpuinfo_x86 *c)
 {
         u32 dummy;
@@ -727,8 +728,14 @@ static void __cpuinit init_amd(struct cpuinfo_x86 *c)
                 rdmsrl_safe(MSR_AMD64_BU_CFG2, &value);
                 value &= ~(1ULL << 24);
                 wrmsrl_safe(MSR_AMD64_BU_CFG2, value);
+
+                if (cpu_has_amd_erratum(amd_erratum_383))
+                        set_cpu_bug(c, X86_BUG_AMD_TLB_MMATCH);
         }
 
+        if (cpu_has_amd_erratum(amd_erratum_400))
+                set_cpu_bug(c, X86_BUG_AMD_APIC_C1E);
+
         rdmsr_safe(MSR_AMD64_PATCH_LEVEL, &c->microcode, &dummy);
 }
 
@@ -847,8 +854,7 @@ cpu_dev_register(amd_cpu_dev);
  * AMD_OSVW_ERRATUM() macros. The latter is intended for newer errata that
  * have an OSVW id assigned, which it takes as first argument. Both take a
  * variable number of family-specific model-stepping ranges created by
- * AMD_MODEL_RANGE(). Each erratum also has to be declared as extern const
- * int[] in arch/x86/include/asm/processor.h.
+ * AMD_MODEL_RANGE().
  *
  * Example:
  *
@@ -858,16 +864,22 @@ cpu_dev_register(amd_cpu_dev);
  *                         AMD_MODEL_RANGE(0x10, 0x9, 0x0, 0x9, 0x0));
  */
 
-const int amd_erratum_400[] =
+#define AMD_LEGACY_ERRATUM(...)         { -1, __VA_ARGS__, 0 }
+#define AMD_OSVW_ERRATUM(osvw_id, ...)  { osvw_id, __VA_ARGS__, 0 }
+#define AMD_MODEL_RANGE(f, m_start, s_start, m_end, s_end) \
+        ((f << 24) | (m_start << 16) | (s_start << 12) | (m_end << 4) | (s_end))
+#define AMD_MODEL_RANGE_FAMILY(range)   (((range) >> 24) & 0xff)
+#define AMD_MODEL_RANGE_START(range)    (((range) >> 12) & 0xfff)
+#define AMD_MODEL_RANGE_END(range)      ((range) & 0xfff)
+
+static const int amd_erratum_400[] =
         AMD_OSVW_ERRATUM(1, AMD_MODEL_RANGE(0xf, 0x41, 0x2, 0xff, 0xf),
                             AMD_MODEL_RANGE(0x10, 0x2, 0x1, 0xff, 0xf));
-EXPORT_SYMBOL_GPL(amd_erratum_400);
 
-const int amd_erratum_383[] =
+static const int amd_erratum_383[] =
         AMD_OSVW_ERRATUM(3, AMD_MODEL_RANGE(0x10, 0, 0, 0xff, 0xf));
-EXPORT_SYMBOL_GPL(amd_erratum_383);
 
-bool cpu_has_amd_erratum(const int *erratum)
+static bool cpu_has_amd_erratum(const int *erratum)
 {
         struct cpuinfo_x86 *cpu = __this_cpu_ptr(&cpu_info);
         int osvw_id = *erratum++;
@@ -908,5 +920,3 @@ bool cpu_has_amd_erratum(const int *erratum)
 
         return false;
 }
-
-EXPORT_SYMBOL_GPL(cpu_has_amd_erratum);
diff --git a/arch/x86/kernel/cpu/bugs.c b/arch/x86/kernel/cpu/bugs.c
index af6455e3fcc9..4112be9a4659 100644
--- a/arch/x86/kernel/cpu/bugs.c
+++ b/arch/x86/kernel/cpu/bugs.c
@@ -59,7 +59,7 @@ static void __init check_fpu(void)
          * trap_init() enabled FXSR and company _before_ testing for FP
          * problems here.
          *
-         * Test for the divl bug..
+         * Test for the divl bug: http://en.wikipedia.org/wiki/Fdiv_bug
          */
         __asm__("fninit\n\t"
                 "fldl %1\n\t"
@@ -75,26 +75,12 @@ static void __init check_fpu(void)
 
         kernel_fpu_end();
 
-        boot_cpu_data.fdiv_bug = fdiv_bug;
-        if (boot_cpu_data.fdiv_bug)
+        if (fdiv_bug) {
+                set_cpu_bug(&boot_cpu_data, X86_BUG_FDIV);
                 pr_warn("Hmm, FPU with FDIV bug\n");
+        }
 }
 
-/*
- * Check whether we are able to run this kernel safely on SMP.
- *
- * - i386 is no longer supported.
- * - In order to run on anything without a TSC, we need to be
- *   compiled for a i486.
- */
-
-static void __init check_config(void)
-{
-        if (boot_cpu_data.x86 < 4)
-                panic("Kernel requires i486+ for 'invlpg' and other features");
-}
-
-
 void __init check_bugs(void)
 {
         identify_boot_cpu();
@@ -102,7 +88,17 @@ void __init check_bugs(void)
         pr_info("CPU: ");
         print_cpu_info(&boot_cpu_data);
 #endif
-        check_config();
+
+        /*
+         * Check whether we are able to run this kernel safely on SMP.
+         *
+         * - i386 is no longer supported.
+         * - In order to run on anything without a TSC, we need to be
+         *   compiled for a i486.
+         */
+        if (boot_cpu_data.x86 < 4)
+                panic("Kernel requires i486+ for 'invlpg' and other features");
+
         init_utsname()->machine[1] =
                 '0' + (boot_cpu_data.x86 > 6 ? 6 : boot_cpu_data.x86);
         alternative_instructions();
diff --git a/arch/x86/kernel/cpu/common.c b/arch/x86/kernel/cpu/common.c
index d814772c5bed..22018f70a671 100644
--- a/arch/x86/kernel/cpu/common.c
+++ b/arch/x86/kernel/cpu/common.c
@@ -920,6 +920,10 @@ static void __cpuinit identify_cpu(struct cpuinfo_x86 *c)
                 /* AND the already accumulated flags with these */
                 for (i = 0; i < NCAPINTS; i++)
                         boot_cpu_data.x86_capability[i] &= c->x86_capability[i];
+
+                /* OR, i.e. replicate the bug flags */
+                for (i = NCAPINTS; i < NCAPINTS + NBUGINTS; i++)
+                        c->x86_capability[i] |= boot_cpu_data.x86_capability[i];
         }
 
         /* Init Machine Check Exception if available. */
diff --git a/arch/x86/kernel/cpu/cyrix.c b/arch/x86/kernel/cpu/cyrix.c
index 4fbd384fb645..d048d5ca43c1 100644
--- a/arch/x86/kernel/cpu/cyrix.c
+++ b/arch/x86/kernel/cpu/cyrix.c
@@ -249,7 +249,7 @@ static void __cpuinit init_cyrix(struct cpuinfo_x86 *c)
                 /* Emulate MTRRs using Cyrix's ARRs. */
                 set_cpu_cap(c, X86_FEATURE_CYRIX_ARR);
                 /* 6x86's contain this bug */
-                c->coma_bug = 1;
+                set_cpu_bug(c, X86_BUG_COMA);
                 break;
 
         case 4: /* MediaGX/GXm or Geode GXM/GXLV/GX1 */
@@ -317,7 +317,8 @@ static void __cpuinit init_cyrix(struct cpuinfo_x86 *c)
                         /* Enable MMX extensions (App note 108) */
                         setCx86_old(CX86_CCR7, getCx86_old(CX86_CCR7)|1);
                 } else {
-                        c->coma_bug = 1;      /* 6x86MX, it has the bug. */
+                        /* A 6x86MX - it has the bug. */
+                        set_cpu_bug(c, X86_BUG_COMA);
                 }
                 tmp = (!(dir0_lsn & 7) || dir0_lsn & 1) ? 2 : 0;
                 Cx86_cb[tmp] = cyrix_model_mult2[dir0_lsn & 7];
diff --git a/arch/x86/kernel/cpu/intel.c b/arch/x86/kernel/cpu/intel.c
index 1905ce98bee0..9b0c441c03f5 100644
--- a/arch/x86/kernel/cpu/intel.c
+++ b/arch/x86/kernel/cpu/intel.c
@@ -96,6 +96,18 @@ static void __cpuinit early_init_intel(struct cpuinfo_x86 *c)
                         sched_clock_stable = 1;
         }
 
+        /* Penwell and Cloverview have the TSC which doesn't sleep on S3 */
+        if (c->x86 == 6) {
+                switch (c->x86_model) {
+                case 0x27:      /* Penwell */
+                case 0x35:      /* Cloverview */
+                        set_cpu_cap(c, X86_FEATURE_NONSTOP_TSC_S3);
+                        break;
+                default:
+                        break;
+                }
+        }
+
         /*
          * There is a known erratum on Pentium III and Core Solo
          * and Core Duo CPUs.
@@ -164,20 +176,6 @@ int __cpuinit ppro_with_ram_bug(void)
         return 0;
 }
 
-#ifdef CONFIG_X86_F00F_BUG
-static void __cpuinit trap_init_f00f_bug(void)
-{
-        __set_fixmap(FIX_F00F_IDT, __pa_symbol(idt_table), PAGE_KERNEL_RO);
-
-        /*
-         * Update the IDT descriptor and reload the IDT so that
-         * it uses the read-only mapped virtual address.
-         */
-        idt_descr.address = fix_to_virt(FIX_F00F_IDT);
-        load_idt(&idt_descr);
-}
-#endif
-
 static void __cpuinit intel_smp_check(struct cpuinfo_x86 *c)
 {
         /* calling is from identify_secondary_cpu() ? */
@@ -206,16 +204,14 @@ static void __cpuinit intel_workarounds(struct cpuinfo_x86 *c)
         /*
          * All current models of Pentium and Pentium with MMX technology CPUs
          * have the F0 0F bug, which lets nonprivileged users lock up the
-         * system.
-         * Note that the workaround only should be initialized once...
+         * system. Announce that the fault handler will be checking for it.
          */
-        c->f00f_bug = 0;
+        clear_cpu_bug(c, X86_BUG_F00F);
         if (!paravirt_enabled() && c->x86 == 5) {
                 static int f00f_workaround_enabled;
 
-                c->f00f_bug = 1;
+                set_cpu_bug(c, X86_BUG_F00F);
                 if (!f00f_workaround_enabled) {
-                        trap_init_f00f_bug();
                         printk(KERN_NOTICE "Intel Pentium with F0 0F bug - workaround enabled.\n");
                         f00f_workaround_enabled = 1;
                 }
diff --git a/arch/x86/kernel/cpu/mcheck/mce.c b/arch/x86/kernel/cpu/mcheck/mce.c
index 7bc126346ace..9239504b41cb 100644
--- a/arch/x86/kernel/cpu/mcheck/mce.c
+++ b/arch/x86/kernel/cpu/mcheck/mce.c
@@ -2358,7 +2358,7 @@ mce_cpu_callback(struct notifier_block *nfb, unsigned long action, void *hcpu)
 
         if (action == CPU_POST_DEAD) {
                 /* intentionally ignoring frozen here */
-                cmci_rediscover(cpu);
+                cmci_rediscover();
         }
 
         return NOTIFY_OK;
diff --git a/arch/x86/kernel/cpu/mcheck/mce_amd.c b/arch/x86/kernel/cpu/mcheck/mce_amd.c
index 1ac581f38dfa..9cb52767999a 100644
--- a/arch/x86/kernel/cpu/mcheck/mce_amd.c
+++ b/arch/x86/kernel/cpu/mcheck/mce_amd.c
@@ -33,7 +33,6 @@
 #include <asm/mce.h>
 #include <asm/msr.h>
 
-#define NR_BANKS          6
 #define NR_BLOCKS         9
 #define THRESHOLD_MAX     0xFFF
 #define INT_TYPE_APIC     0x00020000
@@ -57,12 +56,7 @@ static const char * const th_names[] = {
         "execution_unit",
 };
 
-static DEFINE_PER_CPU(struct threshold_bank * [NR_BANKS], threshold_banks);
-
-static unsigned char shared_bank[NR_BANKS] = {
-        0, 0, 0, 0, 1
-};
-
+static DEFINE_PER_CPU(struct threshold_bank **, threshold_banks);
 static DEFINE_PER_CPU(unsigned char, bank_map); /* see which banks are on */
 
 static void amd_threshold_interrupt(void);
@@ -79,6 +73,12 @@ struct thresh_restart {
         u16                     old_limit;
 };
 
+static inline bool is_shared_bank(int bank)
+{
+        /* Bank 4 is for northbridge reporting and is thus shared */
+        return (bank == 4);
+}
+
 static const char * const bank4_names(struct threshold_block *b)
 {
         switch (b->address) {
@@ -214,7 +214,7 @@ void mce_amd_feature_init(struct cpuinfo_x86 *c)
         unsigned int bank, block;
         int offset = -1;
 
-        for (bank = 0; bank < NR_BANKS; ++bank) {
+        for (bank = 0; bank < mca_cfg.banks; ++bank) {
                 for (block = 0; block < NR_BLOCKS; ++block) {
                         if (block == 0)
                                 address = MSR_IA32_MC0_MISC + bank * 4;
@@ -276,7 +276,7 @@ static void amd_threshold_interrupt(void)
         mce_setup(&m);
 
         /* assume first bank caused it */
-        for (bank = 0; bank < NR_BANKS; ++bank) {
+        for (bank = 0; bank < mca_cfg.banks; ++bank) {
                 if (!(per_cpu(bank_map, m.cpu) & (1 << bank)))
                         continue;
                 for (block = 0; block < NR_BLOCKS; ++block) {
@@ -467,7 +467,7 @@ static __cpuinit int allocate_threshold_blocks(unsigned int cpu,
         u32 low, high;
         int err;
 
-        if ((bank >= NR_BANKS) || (block >= NR_BLOCKS))
+        if ((bank >= mca_cfg.banks) || (block >= NR_BLOCKS))
                 return 0;
 
         if (rdmsr_safe_on_cpu(cpu, address, &low, &high))
@@ -575,7 +575,7 @@ static __cpuinit int threshold_create_bank(unsigned int cpu, unsigned int bank)
         const char *name = th_names[bank];
         int err = 0;
 
-        if (shared_bank[bank]) {
+        if (is_shared_bank(bank)) {
                 nb = node_to_amd_nb(amd_get_nb_id(cpu));
 
                 /* threshold descriptor already initialized on this node? */
@@ -609,7 +609,7 @@ static __cpuinit int threshold_create_bank(unsigned int cpu, unsigned int bank)
 
         per_cpu(threshold_banks, cpu)[bank] = b;
 
-        if (shared_bank[bank]) {
+        if (is_shared_bank(bank)) {
                 atomic_set(&b->cpus, 1);
 
                 /* nb is already initialized, see above */
@@ -635,9 +635,17 @@ static __cpuinit int threshold_create_bank(unsigned int cpu, unsigned int bank)
 static __cpuinit int threshold_create_device(unsigned int cpu)
 {
         unsigned int bank;
+        struct threshold_bank **bp;
         int err = 0;
 
-        for (bank = 0; bank < NR_BANKS; ++bank) {
+        bp = kzalloc(sizeof(struct threshold_bank *) * mca_cfg.banks,
+                     GFP_KERNEL);
+        if (!bp)
+                return -ENOMEM;
+
+        per_cpu(threshold_banks, cpu) = bp;
+
+        for (bank = 0; bank < mca_cfg.banks; ++bank) {
                 if (!(per_cpu(bank_map, cpu) & (1 << bank)))
                         continue;
                 err = threshold_create_bank(cpu, bank);
@@ -691,7 +699,7 @@ static void threshold_remove_bank(unsigned int cpu, int bank)
         if (!b->blocks)
                 goto free_out;
 
-        if (shared_bank[bank]) {
+        if (is_shared_bank(bank)) {
                 if (!atomic_dec_and_test(&b->cpus)) {
                         __threshold_remove_blocks(b);
                         per_cpu(threshold_banks, cpu)[bank] = NULL;
@@ -719,11 +727,12 @@ static void threshold_remove_device(unsigned int cpu)
 {
         unsigned int bank;
 
-        for (bank = 0; bank < NR_BANKS; ++bank) {
+        for (bank = 0; bank < mca_cfg.banks; ++bank) {
                 if (!(per_cpu(bank_map, cpu) & (1 << bank)))
                         continue;
                 threshold_remove_bank(cpu, bank);
         }
+        kfree(per_cpu(threshold_banks, cpu));
 }
 
 /* get notified when a cpu comes on/off */
diff --git a/arch/x86/kernel/cpu/mcheck/mce_intel.c b/arch/x86/kernel/cpu/mcheck/mce_intel.c
index 402c454fbff0..ae1697c2afe3 100644
--- a/arch/x86/kernel/cpu/mcheck/mce_intel.c
+++ b/arch/x86/kernel/cpu/mcheck/mce_intel.c
@@ -285,39 +285,24 @@ void cmci_clear(void)
         raw_spin_unlock_irqrestore(&cmci_discover_lock, flags);
 }
 
-static long cmci_rediscover_work_func(void *arg)
+static void cmci_rediscover_work_func(void *arg)
 {
         int banks;
 
         /* Recheck banks in case CPUs don't all have the same */
         if (cmci_supported(&banks))
                 cmci_discover(banks);
-
-        return 0;
 }
 
-/*
- * After a CPU went down cycle through all the others and rediscover
- * Must run in process context.
- */
-void cmci_rediscover(int dying)
+/* After a CPU went down cycle through all the others and rediscover */
+void cmci_rediscover(void)
 {
-        int cpu, banks;
+        int banks;
 
         if (!cmci_supported(&banks))
                 return;
 
-        for_each_online_cpu(cpu) {
-                if (cpu == dying)
-                        continue;
-
-                if (cpu == smp_processor_id()) {
-                        cmci_rediscover_work_func(NULL);
-                        continue;
-                }
-
-                work_on_cpu(cpu, cmci_rediscover_work_func, NULL);
-        }
+        on_each_cpu(cmci_rediscover_work_func, NULL, 1);
 }
 
 /*
diff --git a/arch/x86/kernel/cpu/mkcapflags.pl b/arch/x86/kernel/cpu/mkcapflags.pl
deleted file mode 100644
index 091972ef49de..000000000000
--- a/arch/x86/kernel/cpu/mkcapflags.pl
+++ /dev/null
@@ -1,48 +0,0 @@
-#!/usr/bin/perl -w
-#
-# Generate the x86_cap_flags[] array from include/asm-x86/cpufeature.h
-#
-
-($in, $out) = @ARGV;
-
-open(IN, "< $in\0")   or die "$0: cannot open: $in: $!\n";
-open(OUT, "> $out\0") or die "$0: cannot create: $out: $!\n";
-
-print OUT "#ifndef _ASM_X86_CPUFEATURE_H\n";
-print OUT "#include <asm/cpufeature.h>\n";
-print OUT "#endif\n";
-print OUT "\n";
-print OUT "const char * const x86_cap_flags[NCAPINTS*32] = {\n";
-
-%features = ();
-$err = 0;
-
-while (defined($line = <IN>)) {
-        if ($line =~ /^\s*\#\s*define\s+(X86_FEATURE_(\S+))\s+(.*)$/) {
-                $macro = $1;
-                $feature = "\L$2";
-                $tail = $3;
-                if ($tail =~ /\/\*\s*\"([^"]*)\".*\*\//) {
-                        $feature = "\L$1";
-                }
-
-                next if ($feature eq '');
-
-                if ($features{$feature}++) {
-                        print STDERR "$in: duplicate feature name: $feature\n";
-                        $err++;
-                }
-                printf OUT "\t%-32s = \"%s\",\n", "[$macro]", $feature;
-        }
-}
-print OUT "};\n";
-
-close(IN);
-close(OUT);
-
-if ($err) {
-        unlink($out);
-        exit(1);
-}
-
-exit(0);
diff --git a/arch/x86/kernel/cpu/mkcapflags.sh b/arch/x86/kernel/cpu/mkcapflags.sh
new file mode 100644
index 000000000000..2bf616505499
--- /dev/null
+++ b/arch/x86/kernel/cpu/mkcapflags.sh
@@ -0,0 +1,41 @@
+#!/bin/sh
+#
+# Generate the x86_cap_flags[] array from include/asm/cpufeature.h
+#
+
+IN=$1
+OUT=$2
+
+TABS="$(printf '\t\t\t\t\t')"
+trap 'rm "$OUT"' EXIT
+
+(
+        echo "#ifndef _ASM_X86_CPUFEATURE_H"
+        echo "#include <asm/cpufeature.h>"
+        echo "#endif"
+        echo ""
+        echo "const char * const x86_cap_flags[NCAPINTS*32] = {"
+
+        # Iterate through any input lines starting with #define X86_FEATURE_
+        sed -n -e 's/\t/ /g' -e 's/^ *# *define *X86_FEATURE_//p' $IN |
+        while read i
+        do
+                # Name is everything up to the first whitespace
+                NAME="$(echo "$i" | sed 's/ .*//')"
+
+                # If the /* comment */ starts with a quote string, grab that.
+                VALUE="$(echo "$i" | sed -n 's@.*/\* *\("[^"]*"\).*\*/@\1@p')"
+                [ -z "$VALUE" ] && VALUE="\"$NAME\""
+                [ "$VALUE" == '""' ] && continue
+
+                # Name is uppercase, VALUE is all lowercase
+                VALUE="$(echo "$VALUE" | tr A-Z a-z)"
+
+                TABCOUNT=$(( ( 5*8 - 14 - $(echo "$NAME" | wc -c) ) / 8 ))
+                printf "\t[%s]%.*s = %s,\n" \
+                        "X86_FEATURE_$NAME" "$TABCOUNT" "$TABS" "$VALUE"
+        done
+        echo "};"
+) > $OUT
+
+trap - EXIT
diff --git a/arch/x86/kernel/cpu/perf_event.c b/arch/x86/kernel/cpu/perf_event.c
index bf0f01aea994..1025f3c99d20 100644
--- a/arch/x86/kernel/cpu/perf_event.c
+++ b/arch/x86/kernel/cpu/perf_event.c
@@ -180,8 +180,9 @@ static void release_pmc_hardware(void) {}
 
 static bool check_hw_exists(void)
 {
-        u64 val, val_new = ~0;
-        int i, reg, ret = 0;
+        u64 val, val_fail, val_new= ~0;
+        int i, reg, reg_fail, ret = 0;
+        int bios_fail = 0;
 
         /*
          * Check to see if the BIOS enabled any of the counters, if so
@@ -192,8 +193,11 @@ static bool check_hw_exists(void)
                 ret = rdmsrl_safe(reg, &val);
                 if (ret)
                         goto msr_fail;
-                if (val & ARCH_PERFMON_EVENTSEL_ENABLE)
-                        goto bios_fail;
+                if (val & ARCH_PERFMON_EVENTSEL_ENABLE) {
+                        bios_fail = 1;
+                        val_fail = val;
+                        reg_fail = reg;
+                }
         }
 
         if (x86_pmu.num_counters_fixed) {
@@ -202,8 +206,11 @@ static bool check_hw_exists(void)
                 if (ret)
                         goto msr_fail;
                 for (i = 0; i < x86_pmu.num_counters_fixed; i++) {
-                        if (val & (0x03 << i*4))
-                                goto bios_fail;
+                        if (val & (0x03 << i*4)) {
+                                bios_fail = 1;
+                                val_fail = val;
+                                reg_fail = reg;
+                        }
                 }
         }
 
@@ -221,14 +228,13 @@ static bool check_hw_exists(void)
         if (ret || val != val_new)
                 goto msr_fail;
 
-        return true;
-
-bios_fail:
         /*
          * We still allow the PMU driver to operate:
          */
-        printk(KERN_CONT "Broken BIOS detected, complain to your hardware vendor.\n");
-        printk(KERN_ERR FW_BUG "the BIOS has corrupted hw-PMU resources (MSR %x is %Lx)\n", reg, val);
+        if (bios_fail) {
+                printk(KERN_CONT "Broken BIOS detected, complain to your hardware vendor.\n");
+                printk(KERN_ERR FW_BUG "the BIOS has corrupted hw-PMU resources (MSR %x is %Lx)\n", reg_fail, val_fail);
+        }
 
         return true;
 
@@ -1316,9 +1322,16 @@ static struct attribute_group x86_pmu_format_group = {
  */
 static void __init filter_events(struct attribute **attrs)
 {
+        struct device_attribute *d;
+        struct perf_pmu_events_attr *pmu_attr;
         int i, j;
 
         for (i = 0; attrs[i]; i++) {
+                d = (struct device_attribute *)attrs[i];
+                pmu_attr = container_of(d, struct perf_pmu_events_attr, attr);
+                /* str trumps id */
+                if (pmu_attr->event_str)
+                        continue;
                 if (x86_pmu.event_map(i))
                         continue;
 
@@ -1330,22 +1343,45 @@ static void __init filter_events(struct attribute **attrs)
         }
 }
 
-static ssize_t events_sysfs_show(struct device *dev, struct device_attribute *attr,
+/* Merge two pointer arrays */
+static __init struct attribute **merge_attr(struct attribute **a, struct attribute **b)
+{
+        struct attribute **new;
+        int j, i;
+
+        for (j = 0; a[j]; j++)
+                ;
+        for (i = 0; b[i]; i++)
+                j++;
+        j++;
+
+        new = kmalloc(sizeof(struct attribute *) * j, GFP_KERNEL);
+        if (!new)
+                return NULL;
+
+        j = 0;
+        for (i = 0; a[i]; i++)
+                new[j++] = a[i];
+        for (i = 0; b[i]; i++)
+                new[j++] = b[i];
+        new[j] = NULL;
+
+        return new;
+}
+
+ssize_t events_sysfs_show(struct device *dev, struct device_attribute *attr,
                           char *page)
 {
         struct perf_pmu_events_attr *pmu_attr = \
                 container_of(attr, struct perf_pmu_events_attr, attr);
-
         u64 config = x86_pmu.event_map(pmu_attr->id);
-        return x86_pmu.events_sysfs_show(page, config);
-}
 
-#define EVENT_VAR(_id)  event_attr_##_id
-#define EVENT_PTR(_id) &event_attr_##_id.attr.attr
+        /* string trumps id */
+        if (pmu_attr->event_str)
+                return sprintf(page, "%s", pmu_attr->event_str);
 
-#define EVENT_ATTR(_name, _id)                                          \
-        PMU_EVENT_ATTR(_name, EVENT_VAR(_id), PERF_COUNT_HW_##_id,      \
-                        events_sysfs_show)
+        return x86_pmu.events_sysfs_show(page, config);
+}
 
 EVENT_ATTR(cpu-cycles,                  CPU_CYCLES              );
 EVENT_ATTR(instructions,                INSTRUCTIONS            );
@@ -1459,16 +1495,27 @@ static int __init init_hw_perf_events(void)
 
         unconstrained = (struct event_constraint)
                 __EVENT_CONSTRAINT(0, (1ULL << x86_pmu.num_counters) - 1,
-                                   0, x86_pmu.num_counters, 0);
+                                   0, x86_pmu.num_counters, 0, 0);
 
         x86_pmu.attr_rdpmc = 1; /* enable userspace RDPMC usage by default */
         x86_pmu_format_group.attrs = x86_pmu.format_attrs;
 
+        if (x86_pmu.event_attrs)
+                x86_pmu_events_group.attrs = x86_pmu.event_attrs;
+
         if (!x86_pmu.events_sysfs_show)
                 x86_pmu_events_group.attrs = &empty_attrs;
         else
                 filter_events(x86_pmu_events_group.attrs);
 
+        if (x86_pmu.cpu_events) {
+                struct attribute **tmp;
+
+                tmp = merge_attr(x86_pmu_events_group.attrs, x86_pmu.cpu_events);
+                if (!WARN_ON(!tmp))
+                        x86_pmu_events_group.attrs = tmp;
+        }
+
         pr_info("... version:                %d\n",     x86_pmu.version);
         pr_info("... bit width:              %d\n",     x86_pmu.cntval_bits);
         pr_info("... generic registers:      %d\n",     x86_pmu.num_counters);
diff --git a/arch/x86/kernel/cpu/perf_event.h b/arch/x86/kernel/cpu/perf_event.h
index 7f5c75c2afdd..ba9aadfa683b 100644
--- a/arch/x86/kernel/cpu/perf_event.h
+++ b/arch/x86/kernel/cpu/perf_event.h
@@ -46,6 +46,7 @@ enum extra_reg_type {
         EXTRA_REG_RSP_0 = 0,    /* offcore_response_0 */
         EXTRA_REG_RSP_1 = 1,    /* offcore_response_1 */
         EXTRA_REG_LBR   = 2,    /* lbr_select */
+        EXTRA_REG_LDLAT = 3,    /* ld_lat_threshold */
 
         EXTRA_REG_MAX           /* number of entries needed */
 };
@@ -59,7 +60,13 @@ struct event_constraint {
         u64     cmask;
         int     weight;
         int     overlap;
+        int     flags;
 };
+/*
+ * struct event_constraint flags
+ */
+#define PERF_X86_EVENT_PEBS_LDLAT       0x1 /* ld+ldlat data address sampling */
+#define PERF_X86_EVENT_PEBS_ST          0x2 /* st data address sampling */
 
 struct amd_nb {
         int nb_id;  /* NorthBridge id */
@@ -170,16 +177,17 @@ struct cpu_hw_events {
         void                            *kfree_on_online;
 };
 
-#define __EVENT_CONSTRAINT(c, n, m, w, o) {\
+#define __EVENT_CONSTRAINT(c, n, m, w, o, f) {\
         { .idxmsk64 = (n) },            \
         .code = (c),                    \
         .cmask = (m),                   \
         .weight = (w),                  \
         .overlap = (o),                 \
+        .flags = f,                     \
 }
 
 #define EVENT_CONSTRAINT(c, n, m)       \
-        __EVENT_CONSTRAINT(c, n, m, HWEIGHT(n), 0)
+        __EVENT_CONSTRAINT(c, n, m, HWEIGHT(n), 0, 0)
 
 /*
  * The overlap flag marks event constraints with overlapping counter
@@ -203,7 +211,7 @@ struct cpu_hw_events {
  * and its counter masks must be kept at a minimum.
  */
 #define EVENT_CONSTRAINT_OVERLAP(c, n, m)       \
-        __EVENT_CONSTRAINT(c, n, m, HWEIGHT(n), 1)
+        __EVENT_CONSTRAINT(c, n, m, HWEIGHT(n), 1, 0)
 
 /*
  * Constraint on the Event code.
@@ -231,6 +239,14 @@ struct cpu_hw_events {
 #define INTEL_UEVENT_CONSTRAINT(c, n)   \
         EVENT_CONSTRAINT(c, n, INTEL_ARCH_EVENT_MASK)
 
+#define INTEL_PLD_CONSTRAINT(c, n)      \
+        __EVENT_CONSTRAINT(c, n, INTEL_ARCH_EVENT_MASK, \
+                           HWEIGHT(n), 0, PERF_X86_EVENT_PEBS_LDLAT)
+
+#define INTEL_PST_CONSTRAINT(c, n)      \
+        __EVENT_CONSTRAINT(c, n, INTEL_ARCH_EVENT_MASK, \
+                          HWEIGHT(n), 0, PERF_X86_EVENT_PEBS_ST)
+
 #define EVENT_CONSTRAINT_END            \
         EVENT_CONSTRAINT(0, 0, 0)
 
@@ -260,12 +276,22 @@ struct extra_reg {
         .msr = (ms),            \
         .config_mask = (m),     \
         .valid_mask = (vm),     \
-        .idx = EXTRA_REG_##i    \
+        .idx = EXTRA_REG_##i,   \
         }
 
 #define INTEL_EVENT_EXTRA_REG(event, msr, vm, idx)      \
         EVENT_EXTRA_REG(event, msr, ARCH_PERFMON_EVENTSEL_EVENT, vm, idx)
 
+#define INTEL_UEVENT_EXTRA_REG(event, msr, vm, idx) \
+        EVENT_EXTRA_REG(event, msr, ARCH_PERFMON_EVENTSEL_EVENT | \
+                        ARCH_PERFMON_EVENTSEL_UMASK, vm, idx)
+
+#define INTEL_UEVENT_PEBS_LDLAT_EXTRA_REG(c) \
+        INTEL_UEVENT_EXTRA_REG(c, \
+                               MSR_PEBS_LD_LAT_THRESHOLD, \
+                               0xffff, \
+                               LDLAT)
+
 #define EVENT_EXTRA_END EVENT_EXTRA_REG(0, 0, 0, 0, RSP_0)
 
 union perf_capabilities {
@@ -355,8 +381,10 @@ struct x86_pmu {
          */
         int             attr_rdpmc;
         struct attribute **format_attrs;
+        struct attribute **event_attrs;
 
         ssize_t         (*events_sysfs_show)(char *page, u64 config);
+        struct attribute **cpu_events;
 
         /*
          * CPU Hotplug hooks
@@ -421,6 +449,23 @@ do {									\
 #define ERF_NO_HT_SHARING       1
 #define ERF_HAS_RSP_1           2
 
+#define EVENT_VAR(_id)  event_attr_##_id
+#define EVENT_PTR(_id) &event_attr_##_id.attr.attr
+
+#define EVENT_ATTR(_name, _id)                                          \
+static struct perf_pmu_events_attr EVENT_VAR(_id) = {                   \
+        .attr           = __ATTR(_name, 0444, events_sysfs_show, NULL), \
+        .id             = PERF_COUNT_HW_##_id,                          \
+        .event_str      = NULL,                                         \
+};
+
+#define EVENT_ATTR_STR(_name, v, str)                                   \
+static struct perf_pmu_events_attr event_attr_##v = {                   \
+        .attr           = __ATTR(_name, 0444, events_sysfs_show, NULL), \
+        .id             = 0,                                            \
+        .event_str      = str,                                          \
+};
+
 extern struct x86_pmu x86_pmu __read_mostly;
 
 DECLARE_PER_CPU(struct cpu_hw_events, cpu_hw_events);
@@ -628,6 +673,9 @@ int p6_pmu_init(void);
 
 int knc_pmu_init(void);
 
+ssize_t events_sysfs_show(struct device *dev, struct device_attribute *attr,
+                          char *page);
+
 #else /* CONFIG_CPU_SUP_INTEL */
 
 static inline void reserve_ds_buffers(void)
diff --git a/arch/x86/kernel/cpu/perf_event_amd.c b/arch/x86/kernel/cpu/perf_event_amd.c
index dfdab42aed27..7e28d9467bb4 100644
--- a/arch/x86/kernel/cpu/perf_event_amd.c
+++ b/arch/x86/kernel/cpu/perf_event_amd.c
@@ -132,14 +132,11 @@ static u64 amd_pmu_event_map(int hw_event)
         return amd_perfmon_event_map[hw_event];
 }
 
-static struct event_constraint *amd_nb_event_constraint;
-
 /*
  * Previously calculated offsets
  */
 static unsigned int event_offsets[X86_PMC_IDX_MAX] __read_mostly;
 static unsigned int count_offsets[X86_PMC_IDX_MAX] __read_mostly;
-static unsigned int rdpmc_indexes[X86_PMC_IDX_MAX] __read_mostly;
 
 /*
  * Legacy CPUs:
@@ -147,14 +144,10 @@ static unsigned int rdpmc_indexes[X86_PMC_IDX_MAX] __read_mostly;
  *
  * CPUs with core performance counter extensions:
  *   6 counters starting at 0xc0010200 each offset by 2
- *
- * CPUs with north bridge performance counter extensions:
- *   4 additional counters starting at 0xc0010240 each offset by 2
- *   (indexed right above either one of the above core counters)
  */
 static inline int amd_pmu_addr_offset(int index, bool eventsel)
 {
-        int offset, first, base;
+        int offset;
 
         if (!index)
                 return index;
@@ -167,23 +160,7 @@ static inline int amd_pmu_addr_offset(int index, bool eventsel)
         if (offset)
                 return offset;
 
-        if (amd_nb_event_constraint &&
-            test_bit(index, amd_nb_event_constraint->idxmsk)) {
-                /*
-                 * calculate the offset of NB counters with respect to
-                 * base eventsel or perfctr
-                 */
-
-                first = find_first_bit(amd_nb_event_constraint->idxmsk,
-                                       X86_PMC_IDX_MAX);
-
-                if (eventsel)
-                        base = MSR_F15H_NB_PERF_CTL - x86_pmu.eventsel;
-                else
-                        base = MSR_F15H_NB_PERF_CTR - x86_pmu.perfctr;
-
-                offset = base + ((index - first) << 1);
-        } else if (!cpu_has_perfctr_core)
+        if (!cpu_has_perfctr_core)
                 offset = index;
         else
                 offset = index << 1;
@@ -196,36 +173,6 @@ static inline int amd_pmu_addr_offset(int index, bool eventsel)
         return offset;
 }
 
-static inline int amd_pmu_rdpmc_index(int index)
-{
-        int ret, first;
-
-        if (!index)
-                return index;
-
-        ret = rdpmc_indexes[index];
-
-        if (ret)
-                return ret;
-
-        if (amd_nb_event_constraint &&
-            test_bit(index, amd_nb_event_constraint->idxmsk)) {
-                /*
-                 * according to the mnual, ECX value of the NB counters is
-                 * the index of the NB counter (0, 1, 2 or 3) plus 6
-                 */
-
-                first = find_first_bit(amd_nb_event_constraint->idxmsk,
-                                       X86_PMC_IDX_MAX);
-                ret = index - first + 6;
-        } else
-                ret = index;
-
-        rdpmc_indexes[index] = ret;
-
-        return ret;
-}
-
 static int amd_core_hw_config(struct perf_event *event)
 {
         if (event->attr.exclude_host && event->attr.exclude_guest)
@@ -245,34 +192,6 @@ static int amd_core_hw_config(struct perf_event *event)
 }
 
 /*
- * NB counters do not support the following event select bits:
- *   Host/Guest only
- *   Counter mask
- *   Invert counter mask
- *   Edge detect
- *   OS/User mode
- */
-static int amd_nb_hw_config(struct perf_event *event)
-{
-        /* for NB, we only allow system wide counting mode */
-        if (is_sampling_event(event) || event->attach_state & PERF_ATTACH_TASK)
-                return -EINVAL;
-
-        if (event->attr.exclude_user || event->attr.exclude_kernel ||
-            event->attr.exclude_host || event->attr.exclude_guest)
-                return -EINVAL;
-
-        event->hw.config &= ~(ARCH_PERFMON_EVENTSEL_USR |
-                              ARCH_PERFMON_EVENTSEL_OS);
-
-        if (event->hw.config & ~(AMD64_RAW_EVENT_MASK_NB |
-                                 ARCH_PERFMON_EVENTSEL_INT))
-                return -EINVAL;
-
-        return 0;
-}
-
-/*
  * AMD64 events are detected based on their event codes.
  */
 static inline unsigned int amd_get_event_code(struct hw_perf_event *hwc)
@@ -285,11 +204,6 @@ static inline int amd_is_nb_event(struct hw_perf_event *hwc)
         return (hwc->config & 0xe0) == 0xe0;
 }
 
-static inline int amd_is_perfctr_nb_event(struct hw_perf_event *hwc)
-{
-        return amd_nb_event_constraint && amd_is_nb_event(hwc);
-}
-
 static inline int amd_has_nb(struct cpu_hw_events *cpuc)
 {
         struct amd_nb *nb = cpuc->amd_nb;
@@ -315,9 +229,6 @@ static int amd_pmu_hw_config(struct perf_event *event)
         if (event->attr.type == PERF_TYPE_RAW)
                 event->hw.config |= event->attr.config & AMD64_RAW_EVENT_MASK;
 
-        if (amd_is_perfctr_nb_event(&event->hw))
-                return amd_nb_hw_config(event);
-
         return amd_core_hw_config(event);
 }
 
@@ -341,19 +252,6 @@ static void __amd_put_nb_event_constraints(struct cpu_hw_events *cpuc,
         }
 }
 
-static void amd_nb_interrupt_hw_config(struct hw_perf_event *hwc)
-{
-        int core_id = cpu_data(smp_processor_id()).cpu_core_id;
-
-        /* deliver interrupts only to this core */
-        if (hwc->config & ARCH_PERFMON_EVENTSEL_INT) {
-                hwc->config |= AMD64_EVENTSEL_INT_CORE_ENABLE;
-                hwc->config &= ~AMD64_EVENTSEL_INT_CORE_SEL_MASK;
-                hwc->config |= (u64)(core_id) <<
-                        AMD64_EVENTSEL_INT_CORE_SEL_SHIFT;
-        }
-}
-
  /*
   * AMD64 NorthBridge events need special treatment because
   * counter access needs to be synchronized across all cores
@@ -441,9 +339,6 @@ __amd_get_nb_event_constraints(struct cpu_hw_events *cpuc, struct perf_event *ev
         if (new == -1)
                 return &emptyconstraint;
 
-        if (amd_is_perfctr_nb_event(hwc))
-                amd_nb_interrupt_hw_config(hwc);
-
         return &nb->event_constraints[new];
 }
 
@@ -543,8 +438,7 @@ amd_get_event_constraints(struct cpu_hw_events *cpuc, struct perf_event *event)
         if (!(amd_has_nb(cpuc) && amd_is_nb_event(&event->hw)))
                 return &unconstrained;
 
-        return __amd_get_nb_event_constraints(cpuc, event,
-                                              amd_nb_event_constraint);
+        return __amd_get_nb_event_constraints(cpuc, event, NULL);
 }
 
 static void amd_put_event_constraints(struct cpu_hw_events *cpuc,
@@ -643,9 +537,6 @@ static struct event_constraint amd_f15_PMC30 = EVENT_CONSTRAINT_OVERLAP(0, 0x09,
 static struct event_constraint amd_f15_PMC50 = EVENT_CONSTRAINT(0, 0x3F, 0);
 static struct event_constraint amd_f15_PMC53 = EVENT_CONSTRAINT(0, 0x38, 0);
 
-static struct event_constraint amd_NBPMC96 = EVENT_CONSTRAINT(0, 0x3C0, 0);
-static struct event_constraint amd_NBPMC74 = EVENT_CONSTRAINT(0, 0xF0, 0);
-
 static struct event_constraint *
 amd_get_event_constraints_f15h(struct cpu_hw_events *cpuc, struct perf_event *event)
 {
@@ -711,8 +602,8 @@ amd_get_event_constraints_f15h(struct cpu_hw_events *cpuc, struct perf_event *ev
                         return &amd_f15_PMC20;
                 }
         case AMD_EVENT_NB:
-                return __amd_get_nb_event_constraints(cpuc, event,
-                                                      amd_nb_event_constraint);
+                /* moved to perf_event_amd_uncore.c */
+                return &emptyconstraint;
         default:
                 return &emptyconstraint;
         }
@@ -738,7 +629,6 @@ static __initconst const struct x86_pmu amd_pmu = {
         .eventsel               = MSR_K7_EVNTSEL0,
         .perfctr                = MSR_K7_PERFCTR0,
         .addr_offset            = amd_pmu_addr_offset,
-        .rdpmc_index            = amd_pmu_rdpmc_index,
         .event_map              = amd_pmu_event_map,
         .max_events             = ARRAY_SIZE(amd_perfmon_event_map),
         .num_counters           = AMD64_NUM_COUNTERS,
@@ -790,23 +680,6 @@ static int setup_perfctr_core(void)
         return 0;
 }
 
-static int setup_perfctr_nb(void)
-{
-        if (!cpu_has_perfctr_nb)
-                return -ENODEV;
-
-        x86_pmu.num_counters += AMD64_NUM_COUNTERS_NB;
-
-        if (cpu_has_perfctr_core)
-                amd_nb_event_constraint = &amd_NBPMC96;
-        else
-                amd_nb_event_constraint = &amd_NBPMC74;
-
-        printk(KERN_INFO "perf: AMD northbridge performance counters detected\n");
-
-        return 0;
-}
-
 __init int amd_pmu_init(void)
 {
         /* Performance-monitoring supported from K7 and later: */
@@ -817,7 +690,6 @@ __init int amd_pmu_init(void)
 
         setup_event_constraints();
         setup_perfctr_core();
-        setup_perfctr_nb();
 
         /* Events are common for all AMDs */
         memcpy(hw_cache_event_ids, amd_hw_cache_event_ids,
diff --git a/arch/x86/kernel/cpu/perf_event_amd_uncore.c b/arch/x86/kernel/cpu/perf_event_amd_uncore.c
new file mode 100644
index 000000000000..c0c661adf03e
--- /dev/null
+++ b/arch/x86/kernel/cpu/perf_event_amd_uncore.c
@@ -0,0 +1,547 @@
+/*
+ * Copyright (C) 2013 Advanced Micro Devices, Inc.
+ *
+ * Author: Jacob Shin <jacob.shin@amd.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ */
+
+#include <linux/perf_event.h>
+#include <linux/percpu.h>
+#include <linux/types.h>
+#include <linux/slab.h>
+#include <linux/init.h>
+#include <linux/cpu.h>
+#include <linux/cpumask.h>
+
+#include <asm/cpufeature.h>
+#include <asm/perf_event.h>
+#include <asm/msr.h>
+
+#define NUM_COUNTERS_NB         4
+#define NUM_COUNTERS_L2         4
+#define MAX_COUNTERS            NUM_COUNTERS_NB
+
+#define RDPMC_BASE_NB           6
+#define RDPMC_BASE_L2           10
+
+#define COUNTER_SHIFT           16
+
+struct amd_uncore {
+        int id;
+        int refcnt;
+        int cpu;
+        int num_counters;
+        int rdpmc_base;
+        u32 msr_base;
+        cpumask_t *active_mask;
+        struct pmu *pmu;
+        struct perf_event *events[MAX_COUNTERS];
+        struct amd_uncore *free_when_cpu_online;
+};
+
+static struct amd_uncore * __percpu *amd_uncore_nb;
+static struct amd_uncore * __percpu *amd_uncore_l2;
+
+static struct pmu amd_nb_pmu;
+static struct pmu amd_l2_pmu;
+
+static cpumask_t amd_nb_active_mask;
+static cpumask_t amd_l2_active_mask;
+
+static bool is_nb_event(struct perf_event *event)
+{
+        return event->pmu->type == amd_nb_pmu.type;
+}
+
+static bool is_l2_event(struct perf_event *event)
+{
+        return event->pmu->type == amd_l2_pmu.type;
+}
+
+static struct amd_uncore *event_to_amd_uncore(struct perf_event *event)
+{
+        if (is_nb_event(event) && amd_uncore_nb)
+                return *per_cpu_ptr(amd_uncore_nb, event->cpu);
+        else if (is_l2_event(event) && amd_uncore_l2)
+                return *per_cpu_ptr(amd_uncore_l2, event->cpu);
+
+        return NULL;
+}
+
+static void amd_uncore_read(struct perf_event *event)
+{
+        struct hw_perf_event *hwc = &event->hw;
+        u64 prev, new;
+        s64 delta;
+
+        /*
+         * since we do not enable counter overflow interrupts,
+         * we do not have to worry about prev_count changing on us
+         */
+
+        prev = local64_read(&hwc->prev_count);
+        rdpmcl(hwc->event_base_rdpmc, new);
+        local64_set(&hwc->prev_count, new);
+        delta = (new << COUNTER_SHIFT) - (prev << COUNTER_SHIFT);
+        delta >>= COUNTER_SHIFT;
+        local64_add(delta, &event->count);
+}
+
+static void amd_uncore_start(struct perf_event *event, int flags)
+{
+        struct hw_perf_event *hwc = &event->hw;
+
+        if (flags & PERF_EF_RELOAD)
+                wrmsrl(hwc->event_base, (u64)local64_read(&hwc->prev_count));
+
+        hwc->state = 0;
+        wrmsrl(hwc->config_base, (hwc->config | ARCH_PERFMON_EVENTSEL_ENABLE));
+        perf_event_update_userpage(event);
+}
+
+static void amd_uncore_stop(struct perf_event *event, int flags)
+{
+        struct hw_perf_event *hwc = &event->hw;
+
+        wrmsrl(hwc->config_base, hwc->config);
+        hwc->state |= PERF_HES_STOPPED;
+
+        if ((flags & PERF_EF_UPDATE) && !(hwc->state & PERF_HES_UPTODATE)) {
+                amd_uncore_read(event);
+                hwc->state |= PERF_HES_UPTODATE;
+        }
+}
+
+static int amd_uncore_add(struct perf_event *event, int flags)
+{
+        int i;
+        struct amd_uncore *uncore = event_to_amd_uncore(event);
+        struct hw_perf_event *hwc = &event->hw;
+
+        /* are we already assigned? */
+        if (hwc->idx != -1 && uncore->events[hwc->idx] == event)
+                goto out;
+
+        for (i = 0; i < uncore->num_counters; i++) {
+                if (uncore->events[i] == event) {
+                        hwc->idx = i;
+                        goto out;
+                }
+        }
+
+        /* if not, take the first available counter */
+        hwc->idx = -1;
+        for (i = 0; i < uncore->num_counters; i++) {
+                if (cmpxchg(&uncore->events[i], NULL, event) == NULL) {
+                        hwc->idx = i;
+                        break;
+                }
+        }
+
+out:
+        if (hwc->idx == -1)
+                return -EBUSY;
+
+        hwc->config_base = uncore->msr_base + (2 * hwc->idx);
+        hwc->event_base = uncore->msr_base + 1 + (2 * hwc->idx);
+        hwc->event_base_rdpmc = uncore->rdpmc_base + hwc->idx;
+        hwc->state = PERF_HES_UPTODATE | PERF_HES_STOPPED;
+
+        if (flags & PERF_EF_START)
+                amd_uncore_start(event, PERF_EF_RELOAD);
+
+        return 0;
+}
+
+static void amd_uncore_del(struct perf_event *event, int flags)
+{
+        int i;
+        struct amd_uncore *uncore = event_to_amd_uncore(event);
+        struct hw_perf_event *hwc = &event->hw;
+
+        amd_uncore_stop(event, PERF_EF_UPDATE);
+
+        for (i = 0; i < uncore->num_counters; i++) {
+                if (cmpxchg(&uncore->events[i], event, NULL) == event)
+                        break;
+        }
+
+        hwc->idx = -1;
+}
+
+static int amd_uncore_event_init(struct perf_event *event)
+{
+        struct amd_uncore *uncore;
+        struct hw_perf_event *hwc = &event->hw;
+
+        if (event->attr.type != event->pmu->type)
+                return -ENOENT;
+
+        /*
+         * NB and L2 counters (MSRs) are shared across all cores that share the
+         * same NB / L2 cache. Interrupts can be directed to a single target
+         * core, however, event counts generated by processes running on other
+         * cores cannot be masked out. So we do not support sampling and
+         * per-thread events.
+         */
+        if (is_sampling_event(event) || event->attach_state & PERF_ATTACH_TASK)
+                return -EINVAL;
+
+        /* NB and L2 counters do not have usr/os/guest/host bits */
+        if (event->attr.exclude_user || event->attr.exclude_kernel ||
+            event->attr.exclude_host || event->attr.exclude_guest)
+                return -EINVAL;
+
+        /* and we do not enable counter overflow interrupts */
+        hwc->config = event->attr.config & AMD64_RAW_EVENT_MASK_NB;
+        hwc->idx = -1;
+
+        if (event->cpu < 0)
+                return -EINVAL;
+
+        uncore = event_to_amd_uncore(event);
+        if (!uncore)
+                return -ENODEV;
+
+        /*
+         * since request can come in to any of the shared cores, we will remap
+         * to a single common cpu.
+         */
+        event->cpu = uncore->cpu;
+
+        return 0;
+}
+
+static ssize_t amd_uncore_attr_show_cpumask(struct device *dev,
+                                            struct device_attribute *attr,
+                                            char *buf)
+{
+        int n;
+        cpumask_t *active_mask;
+        struct pmu *pmu = dev_get_drvdata(dev);
+
+        if (pmu->type == amd_nb_pmu.type)
+                active_mask = &amd_nb_active_mask;
+        else if (pmu->type == amd_l2_pmu.type)
+                active_mask = &amd_l2_active_mask;
+        else
+                return 0;
+
+        n = cpulist_scnprintf(buf, PAGE_SIZE - 2, active_mask);
+        buf[n++] = '\n';
+        buf[n] = '\0';
+        return n;
+}
+static DEVICE_ATTR(cpumask, S_IRUGO, amd_uncore_attr_show_cpumask, NULL);
+
+static struct attribute *amd_uncore_attrs[] = {
+        &dev_attr_cpumask.attr,
+        NULL,
+};
+
+static struct attribute_group amd_uncore_attr_group = {
+        .attrs = amd_uncore_attrs,
+};
+
+PMU_FORMAT_ATTR(event, "config:0-7,32-35");
+PMU_FORMAT_ATTR(umask, "config:8-15");
+
+static struct attribute *amd_uncore_format_attr[] = {
+        &format_attr_event.attr,
+        &format_attr_umask.attr,
+        NULL,
+};
+
+static struct attribute_group amd_uncore_format_group = {
+        .name = "format",
+        .attrs = amd_uncore_format_attr,
+};
+
+static const struct attribute_group *amd_uncore_attr_groups[] = {
+        &amd_uncore_attr_group,
+        &amd_uncore_format_group,
+        NULL,
+};
+
+static struct pmu amd_nb_pmu = {
+        .attr_groups    = amd_uncore_attr_groups,
+        .name           = "amd_nb",
+        .event_init     = amd_uncore_event_init,
+        .add            = amd_uncore_add,
+        .del            = amd_uncore_del,
+        .start          = amd_uncore_start,
+        .stop           = amd_uncore_stop,
+        .read           = amd_uncore_read,
+};
+
+static struct pmu amd_l2_pmu = {
+        .attr_groups    = amd_uncore_attr_groups,
+        .name           = "amd_l2",
+        .event_init     = amd_uncore_event_init,
+        .add            = amd_uncore_add,
+        .del            = amd_uncore_del,
+        .start          = amd_uncore_start,
+        .stop           = amd_uncore_stop,
+        .read           = amd_uncore_read,
+};
+
+static struct amd_uncore * __cpuinit amd_uncore_alloc(unsigned int cpu)
+{
+        return kzalloc_node(sizeof(struct amd_uncore), GFP_KERNEL,
+                        cpu_to_node(cpu));
+}
+
+static void __cpuinit amd_uncore_cpu_up_prepare(unsigned int cpu)
+{
+        struct amd_uncore *uncore;
+
+        if (amd_uncore_nb) {
+                uncore = amd_uncore_alloc(cpu);
+                uncore->cpu = cpu;
+                uncore->num_counters = NUM_COUNTERS_NB;
+                uncore->rdpmc_base = RDPMC_BASE_NB;
+                uncore->msr_base = MSR_F15H_NB_PERF_CTL;
+                uncore->active_mask = &amd_nb_active_mask;
+                uncore->pmu = &amd_nb_pmu;
+                *per_cpu_ptr(amd_uncore_nb, cpu) = uncore;
+        }
+
+        if (amd_uncore_l2) {
+                uncore = amd_uncore_alloc(cpu);
+                uncore->cpu = cpu;
+                uncore->num_counters = NUM_COUNTERS_L2;
+                uncore->rdpmc_base = RDPMC_BASE_L2;
+                uncore->msr_base = MSR_F16H_L2I_PERF_CTL;
+                uncore->active_mask = &amd_l2_active_mask;
+                uncore->pmu = &amd_l2_pmu;
+                *per_cpu_ptr(amd_uncore_l2, cpu) = uncore;
+        }
+}
+
+static struct amd_uncore *
+__cpuinit amd_uncore_find_online_sibling(struct amd_uncore *this,
+                                         struct amd_uncore * __percpu *uncores)
+{
+        unsigned int cpu;
+        struct amd_uncore *that;
+
+        for_each_online_cpu(cpu) {
+                that = *per_cpu_ptr(uncores, cpu);
+
+                if (!that)
+                        continue;
+
+                if (this == that)
+                        continue;
+
+                if (this->id == that->id) {
+                        that->free_when_cpu_online = this;
+                        this = that;
+                        break;
+                }
+        }
+
+        this->refcnt++;
+        return this;
+}
+
+static void __cpuinit amd_uncore_cpu_starting(unsigned int cpu)
+{
+        unsigned int eax, ebx, ecx, edx;
+        struct amd_uncore *uncore;
+
+        if (amd_uncore_nb) {
+                uncore = *per_cpu_ptr(amd_uncore_nb, cpu);
+                cpuid(0x8000001e, &eax, &ebx, &ecx, &edx);
+                uncore->id = ecx & 0xff;
+
+                uncore = amd_uncore_find_online_sibling(uncore, amd_uncore_nb);
+                *per_cpu_ptr(amd_uncore_nb, cpu) = uncore;
+        }
+
+        if (amd_uncore_l2) {
+                unsigned int apicid = cpu_data(cpu).apicid;
+                unsigned int nshared;
+
+                uncore = *per_cpu_ptr(amd_uncore_l2, cpu);
+                cpuid_count(0x8000001d, 2, &eax, &ebx, &ecx, &edx);
+                nshared = ((eax >> 14) & 0xfff) + 1;
+                uncore->id = apicid - (apicid % nshared);
+
+                uncore = amd_uncore_find_online_sibling(uncore, amd_uncore_l2);
+                *per_cpu_ptr(amd_uncore_l2, cpu) = uncore;
+        }
+}
+
+static void __cpuinit uncore_online(unsigned int cpu,
+                                    struct amd_uncore * __percpu *uncores)
+{
+        struct amd_uncore *uncore = *per_cpu_ptr(uncores, cpu);
+
+        kfree(uncore->free_when_cpu_online);
+        uncore->free_when_cpu_online = NULL;
+
+        if (cpu == uncore->cpu)
+                cpumask_set_cpu(cpu, uncore->active_mask);
+}
+
+static void __cpuinit amd_uncore_cpu_online(unsigned int cpu)
+{
+        if (amd_uncore_nb)
+                uncore_online(cpu, amd_uncore_nb);
+
+        if (amd_uncore_l2)
+                uncore_online(cpu, amd_uncore_l2);
+}
+
+static void __cpuinit uncore_down_prepare(unsigned int cpu,
+                                          struct amd_uncore * __percpu *uncores)
+{
+        unsigned int i;
+        struct amd_uncore *this = *per_cpu_ptr(uncores, cpu);
+
+        if (this->cpu != cpu)
+                return;
+
+        /* this cpu is going down, migrate to a shared sibling if possible */
+        for_each_online_cpu(i) {
+                struct amd_uncore *that = *per_cpu_ptr(uncores, i);
+
+                if (cpu == i)
+                        continue;
+
+                if (this == that) {
+                        perf_pmu_migrate_context(this->pmu, cpu, i);
+                        cpumask_clear_cpu(cpu, that->active_mask);
+                        cpumask_set_cpu(i, that->active_mask);
+                        that->cpu = i;
+                        break;
+                }
+        }
+}
+
+static void __cpuinit amd_uncore_cpu_down_prepare(unsigned int cpu)
+{
+        if (amd_uncore_nb)
+                uncore_down_prepare(cpu, amd_uncore_nb);
+
+        if (amd_uncore_l2)
+                uncore_down_prepare(cpu, amd_uncore_l2);
+}
+
+static void __cpuinit uncore_dead(unsigned int cpu,
+                                  struct amd_uncore * __percpu *uncores)
+{
+        struct amd_uncore *uncore = *per_cpu_ptr(uncores, cpu);
+
+        if (cpu == uncore->cpu)
+                cpumask_clear_cpu(cpu, uncore->active_mask);
+
+        if (!--uncore->refcnt)
+                kfree(uncore);
+        *per_cpu_ptr(amd_uncore_nb, cpu) = NULL;
+}
+
+static void __cpuinit amd_uncore_cpu_dead(unsigned int cpu)
+{
+        if (amd_uncore_nb)
+                uncore_dead(cpu, amd_uncore_nb);
+
+        if (amd_uncore_l2)
+                uncore_dead(cpu, amd_uncore_l2);
+}
+
+static int __cpuinit
+amd_uncore_cpu_notifier(struct notifier_block *self, unsigned long action,
+                        void *hcpu)
+{
+        unsigned int cpu = (long)hcpu;
+
+        switch (action & ~CPU_TASKS_FROZEN) {
+        case CPU_UP_PREPARE:
+                amd_uncore_cpu_up_prepare(cpu);
+                break;
+
+        case CPU_STARTING:
+                amd_uncore_cpu_starting(cpu);
+                break;
+
+        case CPU_ONLINE:
+                amd_uncore_cpu_online(cpu);
+                break;
+
+        case CPU_DOWN_PREPARE:
+                amd_uncore_cpu_down_prepare(cpu);
+                break;
+
+        case CPU_UP_CANCELED:
+        case CPU_DEAD:
+                amd_uncore_cpu_dead(cpu);
+                break;
+
+        default:
+                break;
+        }
+
+        return NOTIFY_OK;
+}
+
+static struct notifier_block amd_uncore_cpu_notifier_block __cpuinitdata = {
+        .notifier_call  = amd_uncore_cpu_notifier,
+        .priority       = CPU_PRI_PERF + 1,
+};
+
+static void __init init_cpu_already_online(void *dummy)
+{
+        unsigned int cpu = smp_processor_id();
+
+        amd_uncore_cpu_starting(cpu);
+        amd_uncore_cpu_online(cpu);
+}
+
+static int __init amd_uncore_init(void)
+{
+        unsigned int cpu;
+        int ret = -ENODEV;
+
+        if (boot_cpu_data.x86_vendor != X86_VENDOR_AMD)
+                return -ENODEV;
+
+        if (!cpu_has_topoext)
+                return -ENODEV;
+
+        if (cpu_has_perfctr_nb) {
+                amd_uncore_nb = alloc_percpu(struct amd_uncore *);
+                perf_pmu_register(&amd_nb_pmu, amd_nb_pmu.name, -1);
+
+                printk(KERN_INFO "perf: AMD NB counters detected\n");
+                ret = 0;
+        }
+
+        if (cpu_has_perfctr_l2) {
+                amd_uncore_l2 = alloc_percpu(struct amd_uncore *);
+                perf_pmu_register(&amd_l2_pmu, amd_l2_pmu.name, -1);
+
+                printk(KERN_INFO "perf: AMD L2I counters detected\n");
+                ret = 0;
+        }
+
+        if (ret)
+                return -ENODEV;
+
+        get_online_cpus();
+        /* init cpus already online before registering for hotplug notifier */
+        for_each_online_cpu(cpu) {
+                amd_uncore_cpu_up_prepare(cpu);
+                smp_call_function_single(cpu, init_cpu_already_online, NULL, 1);
+        }
+
+        register_cpu_notifier(&amd_uncore_cpu_notifier_block);
+        put_online_cpus();
+
+        return 0;
+}
+device_initcall(amd_uncore_init);
diff --git a/arch/x86/kernel/cpu/perf_event_intel.c b/arch/x86/kernel/cpu/perf_event_intel.c
index cc45deb791b0..ffd6050a1de4 100644
--- a/arch/x86/kernel/cpu/perf_event_intel.c
+++ b/arch/x86/kernel/cpu/perf_event_intel.c
@@ -81,6 +81,7 @@ static struct event_constraint intel_nehalem_event_constraints[] __read_mostly =
 static struct extra_reg intel_nehalem_extra_regs[] __read_mostly =
 {
         INTEL_EVENT_EXTRA_REG(0xb7, MSR_OFFCORE_RSP_0, 0xffff, RSP_0),
+        INTEL_UEVENT_PEBS_LDLAT_EXTRA_REG(0x100b),
         EVENT_EXTRA_END
 };
 
@@ -108,6 +109,8 @@ static struct event_constraint intel_snb_event_constraints[] __read_mostly =
         INTEL_EVENT_CONSTRAINT(0x48, 0x4), /* L1D_PEND_MISS.PENDING */
         INTEL_UEVENT_CONSTRAINT(0x01c0, 0x2), /* INST_RETIRED.PREC_DIST */
         INTEL_EVENT_CONSTRAINT(0xcd, 0x8), /* MEM_TRANS_RETIRED.LOAD_LATENCY */
+        INTEL_UEVENT_CONSTRAINT(0x04a3, 0xf), /* CYCLE_ACTIVITY.CYCLES_NO_DISPATCH */
+        INTEL_UEVENT_CONSTRAINT(0x02a3, 0x4), /* CYCLE_ACTIVITY.CYCLES_L1D_PENDING */
         EVENT_CONSTRAINT_END
 };
 
@@ -136,6 +139,7 @@ static struct extra_reg intel_westmere_extra_regs[] __read_mostly =
 {
         INTEL_EVENT_EXTRA_REG(0xb7, MSR_OFFCORE_RSP_0, 0xffff, RSP_0),
         INTEL_EVENT_EXTRA_REG(0xbb, MSR_OFFCORE_RSP_1, 0xffff, RSP_1),
+        INTEL_UEVENT_PEBS_LDLAT_EXTRA_REG(0x100b),
         EVENT_EXTRA_END
 };
 
@@ -155,6 +159,8 @@ static struct event_constraint intel_gen_event_constraints[] __read_mostly =
 static struct extra_reg intel_snb_extra_regs[] __read_mostly = {
         INTEL_EVENT_EXTRA_REG(0xb7, MSR_OFFCORE_RSP_0, 0x3f807f8fffull, RSP_0),
         INTEL_EVENT_EXTRA_REG(0xbb, MSR_OFFCORE_RSP_1, 0x3f807f8fffull, RSP_1),
+        INTEL_UEVENT_PEBS_LDLAT_EXTRA_REG(0x01cd),
+        INTEL_UEVENT_PEBS_LDLAT_EXTRA_REG(0x01cd),
         EVENT_EXTRA_END
 };
 
@@ -164,6 +170,21 @@ static struct extra_reg intel_snbep_extra_regs[] __read_mostly = {
         EVENT_EXTRA_END
 };
 
+EVENT_ATTR_STR(mem-loads, mem_ld_nhm, "event=0x0b,umask=0x10,ldlat=3");
+EVENT_ATTR_STR(mem-loads, mem_ld_snb, "event=0xcd,umask=0x1,ldlat=3");
+EVENT_ATTR_STR(mem-stores, mem_st_snb, "event=0xcd,umask=0x2");
+
+struct attribute *nhm_events_attrs[] = {
+        EVENT_PTR(mem_ld_nhm),
+        NULL,
+};
+
+struct attribute *snb_events_attrs[] = {
+        EVENT_PTR(mem_ld_snb),
+        EVENT_PTR(mem_st_snb),
+        NULL,
+};
+
 static u64 intel_pmu_event_map(int hw_event)
 {
         return intel_perfmon_event_map[hw_event];
@@ -1398,8 +1419,11 @@ x86_get_event_constraints(struct cpu_hw_events *cpuc, struct perf_event *event)
 
         if (x86_pmu.event_constraints) {
                 for_each_event_constraint(c, x86_pmu.event_constraints) {
-                        if ((event->hw.config & c->cmask) == c->code)
+                        if ((event->hw.config & c->cmask) == c->code) {
+                                /* hw.flags zeroed at initialization */
+                                event->hw.flags |= c->flags;
                                 return c;
+                        }
                 }
         }
 
@@ -1444,6 +1468,7 @@ intel_put_shared_regs_event_constraints(struct cpu_hw_events *cpuc,
 static void intel_put_event_constraints(struct cpu_hw_events *cpuc,
                                         struct perf_event *event)
 {
+        event->hw.flags = 0;
         intel_put_shared_regs_event_constraints(cpuc, event);
 }
 
@@ -1767,6 +1792,8 @@ static void intel_pmu_flush_branch_stack(void)
 
 PMU_FORMAT_ATTR(offcore_rsp, "config1:0-63");
 
+PMU_FORMAT_ATTR(ldlat, "config1:0-15");
+
 static struct attribute *intel_arch3_formats_attr[] = {
         &format_attr_event.attr,
         &format_attr_umask.attr,
@@ -1777,6 +1804,7 @@ static struct attribute *intel_arch3_formats_attr[] = {
         &format_attr_cmask.attr,
 
         &format_attr_offcore_rsp.attr, /* XXX do NHM/WSM + SNB breakout */
+        &format_attr_ldlat.attr, /* PEBS load latency */
         NULL,
 };
 
@@ -2037,6 +2065,8 @@ __init int intel_pmu_init(void)
                 x86_pmu.enable_all = intel_pmu_nhm_enable_all;
                 x86_pmu.extra_regs = intel_nehalem_extra_regs;
 
+                x86_pmu.cpu_events = nhm_events_attrs;
+
                 /* UOPS_ISSUED.STALLED_CYCLES */
                 intel_perfmon_event_map[PERF_COUNT_HW_STALLED_CYCLES_FRONTEND] =
                         X86_CONFIG(.event=0x0e, .umask=0x01, .inv=1, .cmask=1);
@@ -2080,6 +2110,8 @@ __init int intel_pmu_init(void)
                 x86_pmu.extra_regs = intel_westmere_extra_regs;
                 x86_pmu.er_flags |= ERF_HAS_RSP_1;
 
+                x86_pmu.cpu_events = nhm_events_attrs;
+
                 /* UOPS_ISSUED.STALLED_CYCLES */
                 intel_perfmon_event_map[PERF_COUNT_HW_STALLED_CYCLES_FRONTEND] =
                         X86_CONFIG(.event=0x0e, .umask=0x01, .inv=1, .cmask=1);
@@ -2111,6 +2143,8 @@ __init int intel_pmu_init(void)
                 x86_pmu.er_flags |= ERF_HAS_RSP_1;
                 x86_pmu.er_flags |= ERF_NO_HT_SHARING;
 
+                x86_pmu.cpu_events = snb_events_attrs;
+
                 /* UOPS_ISSUED.ANY,c=1,i=1 to count stall cycles */
                 intel_perfmon_event_map[PERF_COUNT_HW_STALLED_CYCLES_FRONTEND] =
                         X86_CONFIG(.event=0x0e, .umask=0x01, .inv=1, .cmask=1);
@@ -2140,6 +2174,8 @@ __init int intel_pmu_init(void)
                 x86_pmu.er_flags |= ERF_HAS_RSP_1;
                 x86_pmu.er_flags |= ERF_NO_HT_SHARING;
 
+                x86_pmu.cpu_events = snb_events_attrs;
+
                 /* UOPS_ISSUED.ANY,c=1,i=1 to count stall cycles */
                 intel_perfmon_event_map[PERF_COUNT_HW_STALLED_CYCLES_FRONTEND] =
                         X86_CONFIG(.event=0x0e, .umask=0x01, .inv=1, .cmask=1);
diff --git a/arch/x86/kernel/cpu/perf_event_intel_ds.c b/arch/x86/kernel/cpu/perf_event_intel_ds.c
index 26830f3af0df..60250f687052 100644
--- a/arch/x86/kernel/cpu/perf_event_intel_ds.c
+++ b/arch/x86/kernel/cpu/perf_event_intel_ds.c
@@ -24,6 +24,130 @@ struct pebs_record_32 {
 
  */
 
+union intel_x86_pebs_dse {
+        u64 val;
+        struct {
+                unsigned int ld_dse:4;
+                unsigned int ld_stlb_miss:1;
+                unsigned int ld_locked:1;
+                unsigned int ld_reserved:26;
+        };
+        struct {
+                unsigned int st_l1d_hit:1;
+                unsigned int st_reserved1:3;
+                unsigned int st_stlb_miss:1;
+                unsigned int st_locked:1;
+                unsigned int st_reserved2:26;
+        };
+};
+
+
+/*
+ * Map PEBS Load Latency Data Source encodings to generic
+ * memory data source information
+ */
+#define P(a, b) PERF_MEM_S(a, b)
+#define OP_LH (P(OP, LOAD) | P(LVL, HIT))
+#define SNOOP_NONE_MISS (P(SNOOP, NONE) | P(SNOOP, MISS))
+
+static const u64 pebs_data_source[] = {
+        P(OP, LOAD) | P(LVL, MISS) | P(LVL, L3) | P(SNOOP, NA),/* 0x00:ukn L3 */
+        OP_LH | P(LVL, L1)  | P(SNOOP, NONE),   /* 0x01: L1 local */
+        OP_LH | P(LVL, LFB) | P(SNOOP, NONE),   /* 0x02: LFB hit */
+        OP_LH | P(LVL, L2)  | P(SNOOP, NONE),   /* 0x03: L2 hit */
+        OP_LH | P(LVL, L3)  | P(SNOOP, NONE),   /* 0x04: L3 hit */
+        OP_LH | P(LVL, L3)  | P(SNOOP, MISS),   /* 0x05: L3 hit, snoop miss */
+        OP_LH | P(LVL, L3)  | P(SNOOP, HIT),    /* 0x06: L3 hit, snoop hit */
+        OP_LH | P(LVL, L3)  | P(SNOOP, HITM),   /* 0x07: L3 hit, snoop hitm */
+        OP_LH | P(LVL, REM_CCE1) | P(SNOOP, HIT),  /* 0x08: L3 miss snoop hit */
+        OP_LH | P(LVL, REM_CCE1) | P(SNOOP, HITM), /* 0x09: L3 miss snoop hitm*/
+        OP_LH | P(LVL, LOC_RAM)  | P(SNOOP, HIT),  /* 0x0a: L3 miss, shared */
+        OP_LH | P(LVL, REM_RAM1) | P(SNOOP, HIT),  /* 0x0b: L3 miss, shared */
+        OP_LH | P(LVL, LOC_RAM)  | SNOOP_NONE_MISS,/* 0x0c: L3 miss, excl */
+        OP_LH | P(LVL, REM_RAM1) | SNOOP_NONE_MISS,/* 0x0d: L3 miss, excl */
+        OP_LH | P(LVL, IO)  | P(SNOOP, NONE), /* 0x0e: I/O */
+        OP_LH | P(LVL, UNC) | P(SNOOP, NONE), /* 0x0f: uncached */
+};
+
+static u64 precise_store_data(u64 status)
+{
+        union intel_x86_pebs_dse dse;
+        u64 val = P(OP, STORE) | P(SNOOP, NA) | P(LVL, L1) | P(TLB, L2);
+
+        dse.val = status;
+
+        /*
+         * bit 4: TLB access
+         * 1 = stored missed 2nd level TLB
+         *
+         * so it either hit the walker or the OS
+         * otherwise hit 2nd level TLB
+         */
+        if (dse.st_stlb_miss)
+                val |= P(TLB, MISS);
+        else
+                val |= P(TLB, HIT);
+
+        /*
+         * bit 0: hit L1 data cache
+         * if not set, then all we know is that
+         * it missed L1D
+         */
+        if (dse.st_l1d_hit)
+                val |= P(LVL, HIT);
+        else
+                val |= P(LVL, MISS);
+
+        /*
+         * bit 5: Locked prefix
+         */
+        if (dse.st_locked)
+                val |= P(LOCK, LOCKED);
+
+        return val;
+}
+
+static u64 load_latency_data(u64 status)
+{
+        union intel_x86_pebs_dse dse;
+        u64 val;
+        int model = boot_cpu_data.x86_model;
+        int fam = boot_cpu_data.x86;
+
+        dse.val = status;
+
+        /*
+         * use the mapping table for bit 0-3
+         */
+        val = pebs_data_source[dse.ld_dse];
+
+        /*
+         * Nehalem models do not support TLB, Lock infos
+         */
+        if (fam == 0x6 && (model == 26 || model == 30
+            || model == 31 || model == 46)) {
+                val |= P(TLB, NA) | P(LOCK, NA);
+                return val;
+        }
+        /*
+         * bit 4: TLB access
+         * 0 = did not miss 2nd level TLB
+         * 1 = missed 2nd level TLB
+         */
+        if (dse.ld_stlb_miss)
+                val |= P(TLB, MISS) | P(TLB, L2);
+        else
+                val |= P(TLB, HIT) | P(TLB, L1) | P(TLB, L2);
+
+        /*
+         * bit 5: locked prefix
+         */
+        if (dse.ld_locked)
+                val |= P(LOCK, LOCKED);
+
+        return val;
+}
+
 struct pebs_record_core {
         u64 flags, ip;
         u64 ax, bx, cx, dx;
@@ -365,7 +489,7 @@ struct event_constraint intel_atom_pebs_event_constraints[] = {
 };
 
 struct event_constraint intel_nehalem_pebs_event_constraints[] = {
-        INTEL_EVENT_CONSTRAINT(0x0b, 0xf),    /* MEM_INST_RETIRED.* */
+        INTEL_PLD_CONSTRAINT(0x100b, 0xf),      /* MEM_INST_RETIRED.* */
         INTEL_EVENT_CONSTRAINT(0x0f, 0xf),    /* MEM_UNCORE_RETIRED.* */
         INTEL_UEVENT_CONSTRAINT(0x010c, 0xf), /* MEM_STORE_RETIRED.DTLB_MISS */
         INTEL_EVENT_CONSTRAINT(0xc0, 0xf),    /* INST_RETIRED.ANY */
@@ -380,7 +504,7 @@ struct event_constraint intel_nehalem_pebs_event_constraints[] = {
 };
 
 struct event_constraint intel_westmere_pebs_event_constraints[] = {
-        INTEL_EVENT_CONSTRAINT(0x0b, 0xf),    /* MEM_INST_RETIRED.* */
+        INTEL_PLD_CONSTRAINT(0x100b, 0xf),      /* MEM_INST_RETIRED.* */
         INTEL_EVENT_CONSTRAINT(0x0f, 0xf),    /* MEM_UNCORE_RETIRED.* */
         INTEL_UEVENT_CONSTRAINT(0x010c, 0xf), /* MEM_STORE_RETIRED.DTLB_MISS */
         INTEL_EVENT_CONSTRAINT(0xc0, 0xf),    /* INSTR_RETIRED.* */
@@ -400,7 +524,8 @@ struct event_constraint intel_snb_pebs_event_constraints[] = {
         INTEL_UEVENT_CONSTRAINT(0x02c2, 0xf), /* UOPS_RETIRED.RETIRE_SLOTS */
         INTEL_EVENT_CONSTRAINT(0xc4, 0xf),    /* BR_INST_RETIRED.* */
         INTEL_EVENT_CONSTRAINT(0xc5, 0xf),    /* BR_MISP_RETIRED.* */
-        INTEL_EVENT_CONSTRAINT(0xcd, 0x8),    /* MEM_TRANS_RETIRED.* */
+        INTEL_PLD_CONSTRAINT(0x01cd, 0x8),    /* MEM_TRANS_RETIRED.LAT_ABOVE_THR */
+        INTEL_PST_CONSTRAINT(0x02cd, 0x8),    /* MEM_TRANS_RETIRED.PRECISE_STORES */
         INTEL_EVENT_CONSTRAINT(0xd0, 0xf),    /* MEM_UOP_RETIRED.* */
         INTEL_EVENT_CONSTRAINT(0xd1, 0xf),    /* MEM_LOAD_UOPS_RETIRED.* */
         INTEL_EVENT_CONSTRAINT(0xd2, 0xf),    /* MEM_LOAD_UOPS_LLC_HIT_RETIRED.* */
@@ -414,7 +539,8 @@ struct event_constraint intel_ivb_pebs_event_constraints[] = {
         INTEL_UEVENT_CONSTRAINT(0x02c2, 0xf), /* UOPS_RETIRED.RETIRE_SLOTS */
         INTEL_EVENT_CONSTRAINT(0xc4, 0xf),    /* BR_INST_RETIRED.* */
         INTEL_EVENT_CONSTRAINT(0xc5, 0xf),    /* BR_MISP_RETIRED.* */
-        INTEL_EVENT_CONSTRAINT(0xcd, 0x8),    /* MEM_TRANS_RETIRED.* */
+        INTEL_PLD_CONSTRAINT(0x01cd, 0x8),    /* MEM_TRANS_RETIRED.LAT_ABOVE_THR */
+        INTEL_PST_CONSTRAINT(0x02cd, 0x8),    /* MEM_TRANS_RETIRED.PRECISE_STORES */
         INTEL_EVENT_CONSTRAINT(0xd0, 0xf),    /* MEM_UOP_RETIRED.* */
         INTEL_EVENT_CONSTRAINT(0xd1, 0xf),    /* MEM_LOAD_UOPS_RETIRED.* */
         INTEL_EVENT_CONSTRAINT(0xd2, 0xf),    /* MEM_LOAD_UOPS_LLC_HIT_RETIRED.* */
@@ -431,8 +557,10 @@ struct event_constraint *intel_pebs_constraints(struct perf_event *event)
 
         if (x86_pmu.pebs_constraints) {
                 for_each_event_constraint(c, x86_pmu.pebs_constraints) {
-                        if ((event->hw.config & c->cmask) == c->code)
+                        if ((event->hw.config & c->cmask) == c->code) {
+                                event->hw.flags |= c->flags;
                                 return c;
+                        }
                 }
         }
 
@@ -447,6 +575,11 @@ void intel_pmu_pebs_enable(struct perf_event *event)
         hwc->config &= ~ARCH_PERFMON_EVENTSEL_INT;
 
         cpuc->pebs_enabled |= 1ULL << hwc->idx;
+
+        if (event->hw.flags & PERF_X86_EVENT_PEBS_LDLAT)
+                cpuc->pebs_enabled |= 1ULL << (hwc->idx + 32);
+        else if (event->hw.flags & PERF_X86_EVENT_PEBS_ST)
+                cpuc->pebs_enabled |= 1ULL << 63;
 }
 
 void intel_pmu_pebs_disable(struct perf_event *event)
@@ -559,20 +692,51 @@ static void __intel_pmu_pebs_event(struct perf_event *event,
                                    struct pt_regs *iregs, void *__pebs)
 {
         /*
-         * We cast to pebs_record_core since that is a subset of
-         * both formats and we don't use the other fields in this
-         * routine.
+         * We cast to pebs_record_nhm to get the load latency data
+         * if extra_reg MSR_PEBS_LD_LAT_THRESHOLD used
          */
         struct cpu_hw_events *cpuc = &__get_cpu_var(cpu_hw_events);
-        struct pebs_record_core *pebs = __pebs;
+        struct pebs_record_nhm *pebs = __pebs;
         struct perf_sample_data data;
         struct pt_regs regs;
+        u64 sample_type;
+        int fll, fst;
 
         if (!intel_pmu_save_and_restart(event))
                 return;
 
+        fll = event->hw.flags & PERF_X86_EVENT_PEBS_LDLAT;
+        fst = event->hw.flags & PERF_X86_EVENT_PEBS_ST;
+
         perf_sample_data_init(&data, 0, event->hw.last_period);
 
+        data.period = event->hw.last_period;
+        sample_type = event->attr.sample_type;
+
+        /*
+         * if PEBS-LL or PreciseStore
+         */
+        if (fll || fst) {
+                if (sample_type & PERF_SAMPLE_ADDR)
+                        data.addr = pebs->dla;
+
+                /*
+                 * Use latency for weight (only avail with PEBS-LL)
+                 */
+                if (fll && (sample_type & PERF_SAMPLE_WEIGHT))
+                        data.weight = pebs->lat;
+
+                /*
+                 * data.data_src encodes the data source
+                 */
+                if (sample_type & PERF_SAMPLE_DATA_SRC) {
+                        if (fll)
+                                data.data_src.val = load_latency_data(pebs->dse);
+                        else
+                                data.data_src.val = precise_store_data(pebs->dse);
+                }
+        }
+
         /*
          * We use the interrupt regs as a base because the PEBS record
          * does not contain a full regs set, specifically it seems to
diff --git a/arch/x86/kernel/cpu/perf_event_intel_uncore.c b/arch/x86/kernel/cpu/perf_event_intel_uncore.c
index b43200dbfe7e..d0f9e5aa2151 100644
--- a/arch/x86/kernel/cpu/perf_event_intel_uncore.c
+++ b/arch/x86/kernel/cpu/perf_event_intel_uncore.c
@@ -17,6 +17,9 @@ static struct event_constraint constraint_fixed =
 static struct event_constraint constraint_empty =
         EVENT_CONSTRAINT(0, 0, 0);
 
+#define __BITS_VALUE(x, i, n)  ((typeof(x))(((x) >> ((i) * (n))) & \
+                                ((1ULL << (n)) - 1)))
+
 DEFINE_UNCORE_FORMAT_ATTR(event, event, "config:0-7");
 DEFINE_UNCORE_FORMAT_ATTR(event_ext, event, "config:0-7,21");
 DEFINE_UNCORE_FORMAT_ATTR(umask, umask, "config:8-15");
@@ -31,9 +34,13 @@ DEFINE_UNCORE_FORMAT_ATTR(occ_sel, occ_sel, "config:14-15");
 DEFINE_UNCORE_FORMAT_ATTR(occ_invert, occ_invert, "config:30");
 DEFINE_UNCORE_FORMAT_ATTR(occ_edge, occ_edge, "config:14-51");
 DEFINE_UNCORE_FORMAT_ATTR(filter_tid, filter_tid, "config1:0-4");
+DEFINE_UNCORE_FORMAT_ATTR(filter_link, filter_link, "config1:5-8");
 DEFINE_UNCORE_FORMAT_ATTR(filter_nid, filter_nid, "config1:10-17");
+DEFINE_UNCORE_FORMAT_ATTR(filter_nid2, filter_nid, "config1:32-47");
 DEFINE_UNCORE_FORMAT_ATTR(filter_state, filter_state, "config1:18-22");
+DEFINE_UNCORE_FORMAT_ATTR(filter_state2, filter_state, "config1:17-22");
 DEFINE_UNCORE_FORMAT_ATTR(filter_opc, filter_opc, "config1:23-31");
+DEFINE_UNCORE_FORMAT_ATTR(filter_opc2, filter_opc, "config1:52-60");
 DEFINE_UNCORE_FORMAT_ATTR(filter_band0, filter_band0, "config1:0-7");
 DEFINE_UNCORE_FORMAT_ATTR(filter_band1, filter_band1, "config1:8-15");
 DEFINE_UNCORE_FORMAT_ATTR(filter_band2, filter_band2, "config1:16-23");
@@ -110,6 +117,21 @@ static void uncore_put_constraint(struct intel_uncore_box *box, struct perf_even
         reg1->alloc = 0;
 }
 
+static u64 uncore_shared_reg_config(struct intel_uncore_box *box, int idx)
+{
+        struct intel_uncore_extra_reg *er;
+        unsigned long flags;
+        u64 config;
+
+        er = &box->shared_regs[idx];
+
+        raw_spin_lock_irqsave(&er->lock, flags);
+        config = er->config;
+        raw_spin_unlock_irqrestore(&er->lock, flags);
+
+        return config;
+}
+
 /* Sandy Bridge-EP uncore support */
 static struct intel_uncore_type snbep_uncore_cbox;
 static struct intel_uncore_type snbep_uncore_pcu;
@@ -205,7 +227,7 @@ static void snbep_uncore_msr_enable_event(struct intel_uncore_box *box, struct p
         struct hw_perf_event_extra *reg1 = &hwc->extra_reg;
 
         if (reg1->idx != EXTRA_REG_NONE)
-                wrmsrl(reg1->reg, reg1->config);
+                wrmsrl(reg1->reg, uncore_shared_reg_config(box, 0));
 
         wrmsrl(hwc->config_base, hwc->config | SNBEP_PMON_CTL_EN);
 }
@@ -226,29 +248,6 @@ static void snbep_uncore_msr_init_box(struct intel_uncore_box *box)
                 wrmsrl(msr, SNBEP_PMON_BOX_CTL_INT);
 }
 
-static int snbep_uncore_hw_config(struct intel_uncore_box *box, struct perf_event *event)
-{
-        struct hw_perf_event *hwc = &event->hw;
-        struct hw_perf_event_extra *reg1 = &hwc->extra_reg;
-
-        if (box->pmu->type == &snbep_uncore_cbox) {
-                reg1->reg = SNBEP_C0_MSR_PMON_BOX_FILTER +
-                        SNBEP_CBO_MSR_OFFSET * box->pmu->pmu_idx;
-                reg1->config = event->attr.config1 &
-                        SNBEP_CB0_MSR_PMON_BOX_FILTER_MASK;
-        } else {
-                if (box->pmu->type == &snbep_uncore_pcu) {
-                        reg1->reg = SNBEP_PCU_MSR_PMON_BOX_FILTER;
-                        reg1->config = event->attr.config1 & SNBEP_PCU_MSR_PMON_BOX_FILTER_MASK;
-                } else {
-                        return 0;
-                }
-        }
-        reg1->idx = 0;
-
-        return 0;
-}
-
 static struct attribute *snbep_uncore_formats_attr[] = {
         &format_attr_event.attr,
         &format_attr_umask.attr,
@@ -345,16 +344,16 @@ static struct attribute_group snbep_uncore_qpi_format_group = {
         .attrs = snbep_uncore_qpi_formats_attr,
 };
 
+#define SNBEP_UNCORE_MSR_OPS_COMMON_INIT()                      \
+        .init_box       = snbep_uncore_msr_init_box,            \
+        .disable_box    = snbep_uncore_msr_disable_box,         \
+        .enable_box     = snbep_uncore_msr_enable_box,          \
+        .disable_event  = snbep_uncore_msr_disable_event,       \
+        .enable_event   = snbep_uncore_msr_enable_event,        \
+        .read_counter   = uncore_msr_read_counter
+
 static struct intel_uncore_ops snbep_uncore_msr_ops = {
-        .init_box       = snbep_uncore_msr_init_box,
-        .disable_box    = snbep_uncore_msr_disable_box,
-        .enable_box     = snbep_uncore_msr_enable_box,
-        .disable_event  = snbep_uncore_msr_disable_event,
-        .enable_event   = snbep_uncore_msr_enable_event,
-        .read_counter   = uncore_msr_read_counter,
-        .get_constraint = uncore_get_constraint,
-        .put_constraint = uncore_put_constraint,
-        .hw_config      = snbep_uncore_hw_config,
+        SNBEP_UNCORE_MSR_OPS_COMMON_INIT(),
 };
 
 static struct intel_uncore_ops snbep_uncore_pci_ops = {
@@ -372,6 +371,7 @@ static struct event_constraint snbep_uncore_cbox_constraints[] = {
         UNCORE_EVENT_CONSTRAINT(0x04, 0x3),
         UNCORE_EVENT_CONSTRAINT(0x05, 0x3),
         UNCORE_EVENT_CONSTRAINT(0x07, 0x3),
+        UNCORE_EVENT_CONSTRAINT(0x09, 0x3),
         UNCORE_EVENT_CONSTRAINT(0x11, 0x1),
         UNCORE_EVENT_CONSTRAINT(0x12, 0x3),
         UNCORE_EVENT_CONSTRAINT(0x13, 0x3),
@@ -421,6 +421,14 @@ static struct event_constraint snbep_uncore_r3qpi_constraints[] = {
         UNCORE_EVENT_CONSTRAINT(0x24, 0x3),
         UNCORE_EVENT_CONSTRAINT(0x25, 0x3),
         UNCORE_EVENT_CONSTRAINT(0x26, 0x3),
+        UNCORE_EVENT_CONSTRAINT(0x28, 0x3),
+        UNCORE_EVENT_CONSTRAINT(0x29, 0x3),
+        UNCORE_EVENT_CONSTRAINT(0x2a, 0x3),
+        UNCORE_EVENT_CONSTRAINT(0x2b, 0x3),
+        UNCORE_EVENT_CONSTRAINT(0x2c, 0x3),
+        UNCORE_EVENT_CONSTRAINT(0x2d, 0x3),
+        UNCORE_EVENT_CONSTRAINT(0x2e, 0x3),
+        UNCORE_EVENT_CONSTRAINT(0x2f, 0x3),
         UNCORE_EVENT_CONSTRAINT(0x30, 0x3),
         UNCORE_EVENT_CONSTRAINT(0x31, 0x3),
         UNCORE_EVENT_CONSTRAINT(0x32, 0x3),
@@ -428,6 +436,8 @@ static struct event_constraint snbep_uncore_r3qpi_constraints[] = {
         UNCORE_EVENT_CONSTRAINT(0x34, 0x3),
         UNCORE_EVENT_CONSTRAINT(0x36, 0x3),
         UNCORE_EVENT_CONSTRAINT(0x37, 0x3),
+        UNCORE_EVENT_CONSTRAINT(0x38, 0x3),
+        UNCORE_EVENT_CONSTRAINT(0x39, 0x3),
         EVENT_CONSTRAINT_END
 };
 
@@ -446,6 +456,145 @@ static struct intel_uncore_type snbep_uncore_ubox = {
         .format_group   = &snbep_uncore_ubox_format_group,
 };
 
+static struct extra_reg snbep_uncore_cbox_extra_regs[] = {
+        SNBEP_CBO_EVENT_EXTRA_REG(SNBEP_CBO_PMON_CTL_TID_EN,
+                                  SNBEP_CBO_PMON_CTL_TID_EN, 0x1),
+        SNBEP_CBO_EVENT_EXTRA_REG(0x0334, 0xffff, 0x4),
+        SNBEP_CBO_EVENT_EXTRA_REG(0x0534, 0xffff, 0x4),
+        SNBEP_CBO_EVENT_EXTRA_REG(0x0934, 0xffff, 0x4),
+        SNBEP_CBO_EVENT_EXTRA_REG(0x4134, 0xffff, 0x6),
+        SNBEP_CBO_EVENT_EXTRA_REG(0x0135, 0xffff, 0x8),
+        SNBEP_CBO_EVENT_EXTRA_REG(0x0335, 0xffff, 0x8),
+        SNBEP_CBO_EVENT_EXTRA_REG(0x4135, 0xffff, 0xc),
+        SNBEP_CBO_EVENT_EXTRA_REG(0x4335, 0xffff, 0xc),
+        SNBEP_CBO_EVENT_EXTRA_REG(0x4435, 0xffff, 0x2),
+        SNBEP_CBO_EVENT_EXTRA_REG(0x4835, 0xffff, 0x2),
+        SNBEP_CBO_EVENT_EXTRA_REG(0x4a35, 0xffff, 0x2),
+        SNBEP_CBO_EVENT_EXTRA_REG(0x5035, 0xffff, 0x2),
+        SNBEP_CBO_EVENT_EXTRA_REG(0x0136, 0xffff, 0x8),
+        SNBEP_CBO_EVENT_EXTRA_REG(0x0336, 0xffff, 0x8),
+        SNBEP_CBO_EVENT_EXTRA_REG(0x4136, 0xffff, 0xc),
+        SNBEP_CBO_EVENT_EXTRA_REG(0x4336, 0xffff, 0xc),
+        SNBEP_CBO_EVENT_EXTRA_REG(0x4436, 0xffff, 0x2),
+        SNBEP_CBO_EVENT_EXTRA_REG(0x4836, 0xffff, 0x2),
+        SNBEP_CBO_EVENT_EXTRA_REG(0x4a36, 0xffff, 0x2),
+        SNBEP_CBO_EVENT_EXTRA_REG(0x4037, 0x40ff, 0x2),
+        EVENT_EXTRA_END
+};
+
+static void snbep_cbox_put_constraint(struct intel_uncore_box *box, struct perf_event *event)
+{
+        struct hw_perf_event_extra *reg1 = &event->hw.extra_reg;
+        struct intel_uncore_extra_reg *er = &box->shared_regs[0];
+        int i;
+
+        if (uncore_box_is_fake(box))
+                return;
+
+        for (i = 0; i < 5; i++) {
+                if (reg1->alloc & (0x1 << i))
+                        atomic_sub(1 << (i * 6), &er->ref);
+        }
+        reg1->alloc = 0;
+}
+
+static struct event_constraint *
+__snbep_cbox_get_constraint(struct intel_uncore_box *box, struct perf_event *event,
+                            u64 (*cbox_filter_mask)(int fields))
+{
+        struct hw_perf_event_extra *reg1 = &event->hw.extra_reg;
+        struct intel_uncore_extra_reg *er = &box->shared_regs[0];
+        int i, alloc = 0;
+        unsigned long flags;
+        u64 mask;
+
+        if (reg1->idx == EXTRA_REG_NONE)
+                return NULL;
+
+        raw_spin_lock_irqsave(&er->lock, flags);
+        for (i = 0; i < 5; i++) {
+                if (!(reg1->idx & (0x1 << i)))
+                        continue;
+                if (!uncore_box_is_fake(box) && (reg1->alloc & (0x1 << i)))
+                        continue;
+
+                mask = cbox_filter_mask(0x1 << i);
+                if (!__BITS_VALUE(atomic_read(&er->ref), i, 6) ||
+                    !((reg1->config ^ er->config) & mask)) {
+                        atomic_add(1 << (i * 6), &er->ref);
+                        er->config &= ~mask;
+                        er->config |= reg1->config & mask;
+                        alloc |= (0x1 << i);
+                } else {
+                        break;
+                }
+        }
+        raw_spin_unlock_irqrestore(&er->lock, flags);
+        if (i < 5)
+                goto fail;
+
+        if (!uncore_box_is_fake(box))
+                reg1->alloc |= alloc;
+
+        return 0;
+fail:
+        for (; i >= 0; i--) {
+                if (alloc & (0x1 << i))
+                        atomic_sub(1 << (i * 6), &er->ref);
+        }
+        return &constraint_empty;
+}
+
+static u64 snbep_cbox_filter_mask(int fields)
+{
+        u64 mask = 0;
+
+        if (fields & 0x1)
+                mask |= SNBEP_CB0_MSR_PMON_BOX_FILTER_TID;
+        if (fields & 0x2)
+                mask |= SNBEP_CB0_MSR_PMON_BOX_FILTER_NID;
+        if (fields & 0x4)
+                mask |= SNBEP_CB0_MSR_PMON_BOX_FILTER_STATE;
+        if (fields & 0x8)
+                mask |= SNBEP_CB0_MSR_PMON_BOX_FILTER_OPC;
+
+        return mask;
+}
+
+static struct event_constraint *
+snbep_cbox_get_constraint(struct intel_uncore_box *box, struct perf_event *event)
+{
+        return __snbep_cbox_get_constraint(box, event, snbep_cbox_filter_mask);
+}
+
+static int snbep_cbox_hw_config(struct intel_uncore_box *box, struct perf_event *event)
+{
+        struct hw_perf_event_extra *reg1 = &event->hw.extra_reg;
+        struct extra_reg *er;
+        int idx = 0;
+
+        for (er = snbep_uncore_cbox_extra_regs; er->msr; er++) {
+                if (er->event != (event->hw.config & er->config_mask))
+                        continue;
+                idx |= er->idx;
+        }
+
+        if (idx) {
+                reg1->reg = SNBEP_C0_MSR_PMON_BOX_FILTER +
+                        SNBEP_CBO_MSR_OFFSET * box->pmu->pmu_idx;
+                reg1->config = event->attr.config1 & snbep_cbox_filter_mask(idx);
+                reg1->idx = idx;
+        }
+        return 0;
+}
+
+static struct intel_uncore_ops snbep_uncore_cbox_ops = {
+        SNBEP_UNCORE_MSR_OPS_COMMON_INIT(),
+        .hw_config              = snbep_cbox_hw_config,
+        .get_constraint         = snbep_cbox_get_constraint,
+        .put_constraint         = snbep_cbox_put_constraint,
+};
+
 static struct intel_uncore_type snbep_uncore_cbox = {
         .name                   = "cbox",
         .num_counters           = 4,
@@ -458,10 +607,104 @@ static struct intel_uncore_type snbep_uncore_cbox = {
         .msr_offset             = SNBEP_CBO_MSR_OFFSET,
         .num_shared_regs        = 1,
         .constraints            = snbep_uncore_cbox_constraints,
-        .ops                    = &snbep_uncore_msr_ops,
+        .ops                    = &snbep_uncore_cbox_ops,
         .format_group           = &snbep_uncore_cbox_format_group,
 };
 
+static u64 snbep_pcu_alter_er(struct perf_event *event, int new_idx, bool modify)
+{
+        struct hw_perf_event *hwc = &event->hw;
+        struct hw_perf_event_extra *reg1 = &hwc->extra_reg;
+        u64 config = reg1->config;
+
+        if (new_idx > reg1->idx)
+                config <<= 8 * (new_idx - reg1->idx);
+        else
+                config >>= 8 * (reg1->idx - new_idx);
+
+        if (modify) {
+                hwc->config += new_idx - reg1->idx;
+                reg1->config = config;
+                reg1->idx = new_idx;
+        }
+        return config;
+}
+
+static struct event_constraint *
+snbep_pcu_get_constraint(struct intel_uncore_box *box, struct perf_event *event)
+{
+        struct hw_perf_event_extra *reg1 = &event->hw.extra_reg;
+        struct intel_uncore_extra_reg *er = &box->shared_regs[0];
+        unsigned long flags;
+        int idx = reg1->idx;
+        u64 mask, config1 = reg1->config;
+        bool ok = false;
+
+        if (reg1->idx == EXTRA_REG_NONE ||
+            (!uncore_box_is_fake(box) && reg1->alloc))
+                return NULL;
+again:
+        mask = 0xff << (idx * 8);
+        raw_spin_lock_irqsave(&er->lock, flags);
+        if (!__BITS_VALUE(atomic_read(&er->ref), idx, 8) ||
+            !((config1 ^ er->config) & mask)) {
+                atomic_add(1 << (idx * 8), &er->ref);
+                er->config &= ~mask;
+                er->config |= config1 & mask;
+                ok = true;
+        }
+        raw_spin_unlock_irqrestore(&er->lock, flags);
+
+        if (!ok) {
+                idx = (idx + 1) % 4;
+                if (idx != reg1->idx) {
+                        config1 = snbep_pcu_alter_er(event, idx, false);
+                        goto again;
+                }
+                return &constraint_empty;
+        }
+
+        if (!uncore_box_is_fake(box)) {
+                if (idx != reg1->idx)
+                        snbep_pcu_alter_er(event, idx, true);
+                reg1->alloc = 1;
+        }
+        return NULL;
+}
+
+static void snbep_pcu_put_constraint(struct intel_uncore_box *box, struct perf_event *event)
+{
+        struct hw_perf_event_extra *reg1 = &event->hw.extra_reg;
+        struct intel_uncore_extra_reg *er = &box->shared_regs[0];
+
+        if (uncore_box_is_fake(box) || !reg1->alloc)
+                return;
+
+        atomic_sub(1 << (reg1->idx * 8), &er->ref);
+        reg1->alloc = 0;
+}
+
+static int snbep_pcu_hw_config(struct intel_uncore_box *box, struct perf_event *event)
+{
+        struct hw_perf_event *hwc = &event->hw;
+        struct hw_perf_event_extra *reg1 = &hwc->extra_reg;
+        int ev_sel = hwc->config & SNBEP_PMON_CTL_EV_SEL_MASK;
+
+        if (ev_sel >= 0xb && ev_sel <= 0xe) {
+                reg1->reg = SNBEP_PCU_MSR_PMON_BOX_FILTER;
+                reg1->idx = ev_sel - 0xb;
+                reg1->config = event->attr.config1 & (0xff << reg1->idx);
+        }
+        return 0;
+}
+
+static struct intel_uncore_ops snbep_uncore_pcu_ops = {
+        SNBEP_UNCORE_MSR_OPS_COMMON_INIT(),
+        .hw_config              = snbep_pcu_hw_config,
+        .get_constraint         = snbep_pcu_get_constraint,
+        .put_constraint         = snbep_pcu_put_constraint,
+};
+
 static struct intel_uncore_type snbep_uncore_pcu = {
         .name                   = "pcu",
         .num_counters           = 4,
@@ -472,7 +715,7 @@ static struct intel_uncore_type snbep_uncore_pcu = {
         .event_mask             = SNBEP_PCU_MSR_PMON_RAW_EVENT_MASK,
         .box_ctl                = SNBEP_PCU_MSR_PMON_BOX_CTL,
         .num_shared_regs        = 1,
-        .ops                    = &snbep_uncore_msr_ops,
+        .ops                    = &snbep_uncore_pcu_ops,
         .format_group           = &snbep_uncore_pcu_format_group,
 };
 
@@ -544,55 +787,63 @@ static struct intel_uncore_type snbep_uncore_r3qpi = {
         SNBEP_UNCORE_PCI_COMMON_INIT(),
 };
 
+enum {
+        SNBEP_PCI_UNCORE_HA,
+        SNBEP_PCI_UNCORE_IMC,
+        SNBEP_PCI_UNCORE_QPI,
+        SNBEP_PCI_UNCORE_R2PCIE,
+        SNBEP_PCI_UNCORE_R3QPI,
+};
+
 static struct intel_uncore_type *snbep_pci_uncores[] = {
-        &snbep_uncore_ha,
-        &snbep_uncore_imc,
-        &snbep_uncore_qpi,
-        &snbep_uncore_r2pcie,
-        &snbep_uncore_r3qpi,
+        [SNBEP_PCI_UNCORE_HA]           = &snbep_uncore_ha,
+        [SNBEP_PCI_UNCORE_IMC]          = &snbep_uncore_imc,
+        [SNBEP_PCI_UNCORE_QPI]          = &snbep_uncore_qpi,
+        [SNBEP_PCI_UNCORE_R2PCIE]       = &snbep_uncore_r2pcie,
+        [SNBEP_PCI_UNCORE_R3QPI]        = &snbep_uncore_r3qpi,
         NULL,
 };
 
 static DEFINE_PCI_DEVICE_TABLE(snbep_uncore_pci_ids) = {
         { /* Home Agent */
                 PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_UNC_HA),
-                .driver_data = (unsigned long)&snbep_uncore_ha,
+                .driver_data = SNBEP_PCI_UNCORE_HA,
         },
         { /* MC Channel 0 */
                 PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_UNC_IMC0),
-                .driver_data = (unsigned long)&snbep_uncore_imc,
+                .driver_data = SNBEP_PCI_UNCORE_IMC,
         },
         { /* MC Channel 1 */
                 PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_UNC_IMC1),
-                .driver_data = (unsigned long)&snbep_uncore_imc,
+                .driver_data = SNBEP_PCI_UNCORE_IMC,
         },
         { /* MC Channel 2 */
                 PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_UNC_IMC2),
-                .driver_data = (unsigned long)&snbep_uncore_imc,
+                .driver_data = SNBEP_PCI_UNCORE_IMC,
         },
         { /* MC Channel 3 */
                 PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_UNC_IMC3),
-                .driver_data = (unsigned long)&snbep_uncore_imc,
+                .driver_data = SNBEP_PCI_UNCORE_IMC,
         },
         { /* QPI Port 0 */
                 PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_UNC_QPI0),
-                .driver_data = (unsigned long)&snbep_uncore_qpi,
+                .driver_data = SNBEP_PCI_UNCORE_QPI,
         },
         { /* QPI Port 1 */
                 PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_UNC_QPI1),
-                .driver_data = (unsigned long)&snbep_uncore_qpi,
+                .driver_data = SNBEP_PCI_UNCORE_QPI,
         },
-        { /* P2PCIe */
+        { /* R2PCIe */
                 PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_UNC_R2PCIE),
-                .driver_data = (unsigned long)&snbep_uncore_r2pcie,
+                .driver_data = SNBEP_PCI_UNCORE_R2PCIE,
         },
         { /* R3QPI Link 0 */
                 PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_UNC_R3QPI0),
-                .driver_data = (unsigned long)&snbep_uncore_r3qpi,
+                .driver_data = SNBEP_PCI_UNCORE_R3QPI,
         },
         { /* R3QPI Link 1 */
                 PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_UNC_R3QPI1),
-                .driver_data = (unsigned long)&snbep_uncore_r3qpi,
+                .driver_data = SNBEP_PCI_UNCORE_R3QPI,
         },
         { /* end: all zeroes */ }
 };
@@ -605,7 +856,7 @@ static struct pci_driver snbep_uncore_pci_driver = {
 /*
  * build pci bus to socket mapping
  */
-static int snbep_pci2phy_map_init(void)
+static int snbep_pci2phy_map_init(int devid)
 {
         struct pci_dev *ubox_dev = NULL;
         int i, bus, nodeid;
@@ -614,9 +865,7 @@ static int snbep_pci2phy_map_init(void)
 
         while (1) {
                 /* find the UBOX device */
-                ubox_dev = pci_get_device(PCI_VENDOR_ID_INTEL,
-                                        PCI_DEVICE_ID_INTEL_JAKETOWN_UBOX,
-                                        ubox_dev);
+                ubox_dev = pci_get_device(PCI_VENDOR_ID_INTEL, devid, ubox_dev);
                 if (!ubox_dev)
                         break;
                 bus = ubox_dev->bus->number;
@@ -639,7 +888,7 @@ static int snbep_pci2phy_map_init(void)
                                 break;
                         }
                 }
-        };
+        }
 
         if (ubox_dev)
                 pci_dev_put(ubox_dev);
@@ -648,6 +897,440 @@ static int snbep_pci2phy_map_init(void)
 }
 /* end of Sandy Bridge-EP uncore support */
 
+/* IvyTown uncore support */
+static void ivt_uncore_msr_init_box(struct intel_uncore_box *box)
+{
+        unsigned msr = uncore_msr_box_ctl(box);
+        if (msr)
+                wrmsrl(msr, IVT_PMON_BOX_CTL_INT);
+}
+
+static void ivt_uncore_pci_init_box(struct intel_uncore_box *box)
+{
+        struct pci_dev *pdev = box->pci_dev;
+
+        pci_write_config_dword(pdev, SNBEP_PCI_PMON_BOX_CTL, IVT_PMON_BOX_CTL_INT);
+}
+
+#define IVT_UNCORE_MSR_OPS_COMMON_INIT()                        \
+        .init_box       = ivt_uncore_msr_init_box,              \
+        .disable_box    = snbep_uncore_msr_disable_box,         \
+        .enable_box     = snbep_uncore_msr_enable_box,          \
+        .disable_event  = snbep_uncore_msr_disable_event,       \
+        .enable_event   = snbep_uncore_msr_enable_event,        \
+        .read_counter   = uncore_msr_read_counter
+
+static struct intel_uncore_ops ivt_uncore_msr_ops = {
+        IVT_UNCORE_MSR_OPS_COMMON_INIT(),
+};
+
+static struct intel_uncore_ops ivt_uncore_pci_ops = {
+        .init_box       = ivt_uncore_pci_init_box,
+        .disable_box    = snbep_uncore_pci_disable_box,
+        .enable_box     = snbep_uncore_pci_enable_box,
+        .disable_event  = snbep_uncore_pci_disable_event,
+        .enable_event   = snbep_uncore_pci_enable_event,
+        .read_counter   = snbep_uncore_pci_read_counter,
+};
+
+#define IVT_UNCORE_PCI_COMMON_INIT()                            \
+        .perf_ctr       = SNBEP_PCI_PMON_CTR0,                  \
+        .event_ctl      = SNBEP_PCI_PMON_CTL0,                  \
+        .event_mask     = IVT_PMON_RAW_EVENT_MASK,              \
+        .box_ctl        = SNBEP_PCI_PMON_BOX_CTL,               \
+        .ops            = &ivt_uncore_pci_ops,                  \
+        .format_group   = &ivt_uncore_format_group
+
+static struct attribute *ivt_uncore_formats_attr[] = {
+        &format_attr_event.attr,
+        &format_attr_umask.attr,
+        &format_attr_edge.attr,
+        &format_attr_inv.attr,
+        &format_attr_thresh8.attr,
+        NULL,
+};
+
+static struct attribute *ivt_uncore_ubox_formats_attr[] = {
+        &format_attr_event.attr,
+        &format_attr_umask.attr,
+        &format_attr_edge.attr,
+        &format_attr_inv.attr,
+        &format_attr_thresh5.attr,
+        NULL,
+};
+
+static struct attribute *ivt_uncore_cbox_formats_attr[] = {
+        &format_attr_event.attr,
+        &format_attr_umask.attr,
+        &format_attr_edge.attr,
+        &format_attr_tid_en.attr,
+        &format_attr_thresh8.attr,
+        &format_attr_filter_tid.attr,
+        &format_attr_filter_link.attr,
+        &format_attr_filter_state2.attr,
+        &format_attr_filter_nid2.attr,
+        &format_attr_filter_opc2.attr,
+        NULL,
+};
+
+static struct attribute *ivt_uncore_pcu_formats_attr[] = {
+        &format_attr_event_ext.attr,
+        &format_attr_occ_sel.attr,
+        &format_attr_edge.attr,
+        &format_attr_thresh5.attr,
+        &format_attr_occ_invert.attr,
+        &format_attr_occ_edge.attr,
+        &format_attr_filter_band0.attr,
+        &format_attr_filter_band1.attr,
+        &format_attr_filter_band2.attr,
+        &format_attr_filter_band3.attr,
+        NULL,
+};
+
+static struct attribute *ivt_uncore_qpi_formats_attr[] = {
+        &format_attr_event_ext.attr,
+        &format_attr_umask.attr,
+        &format_attr_edge.attr,
+        &format_attr_thresh8.attr,
+        NULL,
+};
+
+static struct attribute_group ivt_uncore_format_group = {
+        .name = "format",
+        .attrs = ivt_uncore_formats_attr,
+};
+
+static struct attribute_group ivt_uncore_ubox_format_group = {
+        .name = "format",
+        .attrs = ivt_uncore_ubox_formats_attr,
+};
+
+static struct attribute_group ivt_uncore_cbox_format_group = {
+        .name = "format",
+        .attrs = ivt_uncore_cbox_formats_attr,
+};
+
+static struct attribute_group ivt_uncore_pcu_format_group = {
+        .name = "format",
+        .attrs = ivt_uncore_pcu_formats_attr,
+};
+
+static struct attribute_group ivt_uncore_qpi_format_group = {
+        .name = "format",
+        .attrs = ivt_uncore_qpi_formats_attr,
+};
+
+static struct intel_uncore_type ivt_uncore_ubox = {
+        .name           = "ubox",
+        .num_counters   = 2,
+        .num_boxes      = 1,
+        .perf_ctr_bits  = 44,
+        .fixed_ctr_bits = 48,
+        .perf_ctr       = SNBEP_U_MSR_PMON_CTR0,
+        .event_ctl      = SNBEP_U_MSR_PMON_CTL0,
+        .event_mask     = IVT_U_MSR_PMON_RAW_EVENT_MASK,
+        .fixed_ctr      = SNBEP_U_MSR_PMON_UCLK_FIXED_CTR,
+        .fixed_ctl      = SNBEP_U_MSR_PMON_UCLK_FIXED_CTL,
+        .ops            = &ivt_uncore_msr_ops,
+        .format_group   = &ivt_uncore_ubox_format_group,
+};
+
+static struct extra_reg ivt_uncore_cbox_extra_regs[] = {
+        SNBEP_CBO_EVENT_EXTRA_REG(SNBEP_CBO_PMON_CTL_TID_EN,
+                                  SNBEP_CBO_PMON_CTL_TID_EN, 0x1),
+        SNBEP_CBO_EVENT_EXTRA_REG(0x1031, 0x10ff, 0x2),
+        SNBEP_CBO_EVENT_EXTRA_REG(0x0334, 0xffff, 0x4),
+        SNBEP_CBO_EVENT_EXTRA_REG(0x0534, 0xffff, 0x4),
+        SNBEP_CBO_EVENT_EXTRA_REG(0x0934, 0xffff, 0x4),
+        SNBEP_CBO_EVENT_EXTRA_REG(0x4134, 0xffff, 0xc),
+        SNBEP_CBO_EVENT_EXTRA_REG(0x0135, 0xffff, 0x10),
+        SNBEP_CBO_EVENT_EXTRA_REG(0x0335, 0xffff, 0x10),
+        SNBEP_CBO_EVENT_EXTRA_REG(0x2135, 0xffff, 0x10),
+        SNBEP_CBO_EVENT_EXTRA_REG(0x2335, 0xffff, 0x10),
+        SNBEP_CBO_EVENT_EXTRA_REG(0x4135, 0xffff, 0x18),
+        SNBEP_CBO_EVENT_EXTRA_REG(0x4335, 0xffff, 0x18),
+        SNBEP_CBO_EVENT_EXTRA_REG(0x4435, 0xffff, 0x8),
+        SNBEP_CBO_EVENT_EXTRA_REG(0x4835, 0xffff, 0x8),
+        SNBEP_CBO_EVENT_EXTRA_REG(0x4a35, 0xffff, 0x8),
+        SNBEP_CBO_EVENT_EXTRA_REG(0x5035, 0xffff, 0x8),
+        SNBEP_CBO_EVENT_EXTRA_REG(0x8135, 0xffff, 0x10),
+        SNBEP_CBO_EVENT_EXTRA_REG(0x8335, 0xffff, 0x10),
+        SNBEP_CBO_EVENT_EXTRA_REG(0x0136, 0xffff, 0x10),
+        SNBEP_CBO_EVENT_EXTRA_REG(0x0336, 0xffff, 0x10),
+        SNBEP_CBO_EVENT_EXTRA_REG(0x2336, 0xffff, 0x10),
+        SNBEP_CBO_EVENT_EXTRA_REG(0x2336, 0xffff, 0x10),
+        SNBEP_CBO_EVENT_EXTRA_REG(0x4136, 0xffff, 0x18),
+        SNBEP_CBO_EVENT_EXTRA_REG(0x4336, 0xffff, 0x18),
+        SNBEP_CBO_EVENT_EXTRA_REG(0x4436, 0xffff, 0x8),
+        SNBEP_CBO_EVENT_EXTRA_REG(0x4836, 0xffff, 0x8),
+        SNBEP_CBO_EVENT_EXTRA_REG(0x4a36, 0xffff, 0x8),
+        SNBEP_CBO_EVENT_EXTRA_REG(0x5036, 0xffff, 0x8),
+        SNBEP_CBO_EVENT_EXTRA_REG(0x8136, 0xffff, 0x10),
+        SNBEP_CBO_EVENT_EXTRA_REG(0x8336, 0xffff, 0x10),
+        SNBEP_CBO_EVENT_EXTRA_REG(0x4037, 0x40ff, 0x8),
+        EVENT_EXTRA_END
+};
+
+static u64 ivt_cbox_filter_mask(int fields)
+{
+        u64 mask = 0;
+
+        if (fields & 0x1)
+                mask |= IVT_CB0_MSR_PMON_BOX_FILTER_TID;
+        if (fields & 0x2)
+                mask |= IVT_CB0_MSR_PMON_BOX_FILTER_LINK;
+        if (fields & 0x4)
+                mask |= IVT_CB0_MSR_PMON_BOX_FILTER_STATE;
+        if (fields & 0x8)
+                mask |= IVT_CB0_MSR_PMON_BOX_FILTER_NID;
+        if (fields & 0x10)
+                mask |= IVT_CB0_MSR_PMON_BOX_FILTER_OPC;
+
+        return mask;
+}
+
+static struct event_constraint *
+ivt_cbox_get_constraint(struct intel_uncore_box *box, struct perf_event *event)
+{
+        return __snbep_cbox_get_constraint(box, event, ivt_cbox_filter_mask);
+}
+
+static int ivt_cbox_hw_config(struct intel_uncore_box *box, struct perf_event *event)
+{
+        struct hw_perf_event_extra *reg1 = &event->hw.extra_reg;
+        struct extra_reg *er;
+        int idx = 0;
+
+        for (er = ivt_uncore_cbox_extra_regs; er->msr; er++) {
+                if (er->event != (event->hw.config & er->config_mask))
+                        continue;
+                idx |= er->idx;
+        }
+
+        if (idx) {
+                reg1->reg = SNBEP_C0_MSR_PMON_BOX_FILTER +
+                        SNBEP_CBO_MSR_OFFSET * box->pmu->pmu_idx;
+                reg1->config = event->attr.config1 & ivt_cbox_filter_mask(idx);
+                reg1->idx = idx;
+        }
+        return 0;
+}
+
+static void ivt_cbox_enable_event(struct intel_uncore_box *box, struct perf_event *event)
+{
+        struct hw_perf_event *hwc = &event->hw;
+        struct hw_perf_event_extra *reg1 = &hwc->extra_reg;
+
+        if (reg1->idx != EXTRA_REG_NONE) {
+                u64 filter = uncore_shared_reg_config(box, 0);
+                wrmsrl(reg1->reg, filter & 0xffffffff);
+                wrmsrl(reg1->reg + 6, filter >> 32);
+        }
+
+        wrmsrl(hwc->config_base, hwc->config | SNBEP_PMON_CTL_EN);
+}
+
+static struct intel_uncore_ops ivt_uncore_cbox_ops = {
+        .init_box               = ivt_uncore_msr_init_box,
+        .disable_box            = snbep_uncore_msr_disable_box,
+        .enable_box             = snbep_uncore_msr_enable_box,
+        .disable_event          = snbep_uncore_msr_disable_event,
+        .enable_event           = ivt_cbox_enable_event,
+        .read_counter           = uncore_msr_read_counter,
+        .hw_config              = ivt_cbox_hw_config,
+        .get_constraint         = ivt_cbox_get_constraint,
+        .put_constraint         = snbep_cbox_put_constraint,
+};
+
+static struct intel_uncore_type ivt_uncore_cbox = {
+        .name                   = "cbox",
+        .num_counters           = 4,
+        .num_boxes              = 15,
+        .perf_ctr_bits          = 44,
+        .event_ctl              = SNBEP_C0_MSR_PMON_CTL0,
+        .perf_ctr               = SNBEP_C0_MSR_PMON_CTR0,
+        .event_mask             = IVT_CBO_MSR_PMON_RAW_EVENT_MASK,
+        .box_ctl                = SNBEP_C0_MSR_PMON_BOX_CTL,
+        .msr_offset             = SNBEP_CBO_MSR_OFFSET,
+        .num_shared_regs        = 1,
+        .constraints            = snbep_uncore_cbox_constraints,
+        .ops                    = &ivt_uncore_cbox_ops,
+        .format_group           = &ivt_uncore_cbox_format_group,
+};
+
+static struct intel_uncore_ops ivt_uncore_pcu_ops = {
+        IVT_UNCORE_MSR_OPS_COMMON_INIT(),
+        .hw_config              = snbep_pcu_hw_config,
+        .get_constraint         = snbep_pcu_get_constraint,
+        .put_constraint         = snbep_pcu_put_constraint,
+};
+
+static struct intel_uncore_type ivt_uncore_pcu = {
+        .name                   = "pcu",
+        .num_counters           = 4,
+        .num_boxes              = 1,
+        .perf_ctr_bits          = 48,
+        .perf_ctr               = SNBEP_PCU_MSR_PMON_CTR0,
+        .event_ctl              = SNBEP_PCU_MSR_PMON_CTL0,
+        .event_mask             = IVT_PCU_MSR_PMON_RAW_EVENT_MASK,
+        .box_ctl                = SNBEP_PCU_MSR_PMON_BOX_CTL,
+        .num_shared_regs        = 1,
+        .ops                    = &ivt_uncore_pcu_ops,
+        .format_group           = &ivt_uncore_pcu_format_group,
+};
+
+static struct intel_uncore_type *ivt_msr_uncores[] = {
+        &ivt_uncore_ubox,
+        &ivt_uncore_cbox,
+        &ivt_uncore_pcu,
+        NULL,
+};
+
+static struct intel_uncore_type ivt_uncore_ha = {
+        .name           = "ha",
+        .num_counters   = 4,
+        .num_boxes      = 2,
+        .perf_ctr_bits  = 48,
+        IVT_UNCORE_PCI_COMMON_INIT(),
+};
+
+static struct intel_uncore_type ivt_uncore_imc = {
+        .name           = "imc",
+        .num_counters   = 4,
+        .num_boxes      = 8,
+        .perf_ctr_bits  = 48,
+        .fixed_ctr_bits = 48,
+        .fixed_ctr      = SNBEP_MC_CHy_PCI_PMON_FIXED_CTR,
+        .fixed_ctl      = SNBEP_MC_CHy_PCI_PMON_FIXED_CTL,
+        IVT_UNCORE_PCI_COMMON_INIT(),
+};
+
+static struct intel_uncore_type ivt_uncore_qpi = {
+        .name           = "qpi",
+        .num_counters   = 4,
+        .num_boxes      = 3,
+        .perf_ctr_bits  = 48,
+        .perf_ctr       = SNBEP_PCI_PMON_CTR0,
+        .event_ctl      = SNBEP_PCI_PMON_CTL0,
+        .event_mask     = IVT_QPI_PCI_PMON_RAW_EVENT_MASK,
+        .box_ctl        = SNBEP_PCI_PMON_BOX_CTL,
+        .ops            = &ivt_uncore_pci_ops,
+        .format_group   = &ivt_uncore_qpi_format_group,
+};
+
+static struct intel_uncore_type ivt_uncore_r2pcie = {
+        .name           = "r2pcie",
+        .num_counters   = 4,
+        .num_boxes      = 1,
+        .perf_ctr_bits  = 44,
+        .constraints    = snbep_uncore_r2pcie_constraints,
+        IVT_UNCORE_PCI_COMMON_INIT(),
+};
+
+static struct intel_uncore_type ivt_uncore_r3qpi = {
+        .name           = "r3qpi",
+        .num_counters   = 3,
+        .num_boxes      = 2,
+        .perf_ctr_bits  = 44,
+        .constraints    = snbep_uncore_r3qpi_constraints,
+        IVT_UNCORE_PCI_COMMON_INIT(),
+};
+
+enum {
+        IVT_PCI_UNCORE_HA,
+        IVT_PCI_UNCORE_IMC,
+        IVT_PCI_UNCORE_QPI,
+        IVT_PCI_UNCORE_R2PCIE,
+        IVT_PCI_UNCORE_R3QPI,
+};
+
+static struct intel_uncore_type *ivt_pci_uncores[] = {
+        [IVT_PCI_UNCORE_HA]     = &ivt_uncore_ha,
+        [IVT_PCI_UNCORE_IMC]    = &ivt_uncore_imc,
+        [IVT_PCI_UNCORE_QPI]    = &ivt_uncore_qpi,
+        [IVT_PCI_UNCORE_R2PCIE] = &ivt_uncore_r2pcie,
+        [IVT_PCI_UNCORE_R3QPI]  = &ivt_uncore_r3qpi,
+        NULL,
+};
+
+static DEFINE_PCI_DEVICE_TABLE(ivt_uncore_pci_ids) = {
+        { /* Home Agent 0 */
+                PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0xe30),
+                .driver_data = IVT_PCI_UNCORE_HA,
+        },
+        { /* Home Agent 1 */
+                PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0xe38),
+                .driver_data = IVT_PCI_UNCORE_HA,
+        },
+        { /* MC0 Channel 0 */
+                PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0xeb4),
+                .driver_data = IVT_PCI_UNCORE_IMC,
+        },
+        { /* MC0 Channel 1 */
+                PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0xeb5),
+                .driver_data = IVT_PCI_UNCORE_IMC,
+        },
+        { /* MC0 Channel 3 */
+                PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0xeb0),
+                .driver_data = IVT_PCI_UNCORE_IMC,
+        },
+        { /* MC0 Channel 4 */
+                PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0xeb1),
+                .driver_data = IVT_PCI_UNCORE_IMC,
+        },
+        { /* MC1 Channel 0 */
+                PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0xef4),
+                .driver_data = IVT_PCI_UNCORE_IMC,
+        },
+        { /* MC1 Channel 1 */
+                PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0xef5),
+                .driver_data = IVT_PCI_UNCORE_IMC,
+        },
+        { /* MC1 Channel 3 */
+                PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0xef0),
+                .driver_data = IVT_PCI_UNCORE_IMC,
+        },
+        { /* MC1 Channel 4 */
+                PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0xef1),
+                .driver_data = IVT_PCI_UNCORE_IMC,
+        },
+        { /* QPI0 Port 0 */
+                PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0xe32),
+                .driver_data = IVT_PCI_UNCORE_QPI,
+        },
+        { /* QPI0 Port 1 */
+                PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0xe33),
+                .driver_data = IVT_PCI_UNCORE_QPI,
+        },
+        { /* QPI1 Port 2 */
+                PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0xe3a),
+                .driver_data = IVT_PCI_UNCORE_QPI,
+        },
+        { /* R2PCIe */
+                PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0xe34),
+                .driver_data = IVT_PCI_UNCORE_R2PCIE,
+        },
+        { /* R3QPI0 Link 0 */
+                PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0xe36),
+                .driver_data = IVT_PCI_UNCORE_R3QPI,
+        },
+        { /* R3QPI0 Link 1 */
+                PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0xe37),
+                .driver_data = IVT_PCI_UNCORE_R3QPI,
+        },
+        { /* R3QPI1 Link 2 */
+                PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0xe3e),
+                .driver_data = IVT_PCI_UNCORE_R3QPI,
+        },
+        { /* end: all zeroes */ }
+};
+
+static struct pci_driver ivt_uncore_pci_driver = {
+        .name           = "ivt_uncore",
+        .id_table       = ivt_uncore_pci_ids,
+};
+/* end of IvyTown uncore support */
+
 /* Sandy Bridge uncore support */
 static void snb_uncore_msr_enable_event(struct intel_uncore_box *box, struct perf_event *event)
 {
@@ -808,9 +1491,6 @@ static struct intel_uncore_type *nhm_msr_uncores[] = {
 /* end of Nehalem uncore support */
 
 /* Nehalem-EX uncore support */
-#define __BITS_VALUE(x, i, n)  ((typeof(x))(((x) >> ((i) * (n))) & \
-                                ((1ULL << (n)) - 1)))
-
 DEFINE_UNCORE_FORMAT_ATTR(event5, event, "config:1-5");
 DEFINE_UNCORE_FORMAT_ATTR(counter, counter, "config:6-7");
 DEFINE_UNCORE_FORMAT_ATTR(match, match, "config1:0-63");
@@ -1161,7 +1841,7 @@ static struct extra_reg nhmex_uncore_mbox_extra_regs[] = {
 };
 
 /* Nehalem-EX or Westmere-EX ? */
-bool uncore_nhmex;
+static bool uncore_nhmex;
 
 static bool nhmex_mbox_get_shared_reg(struct intel_uncore_box *box, int idx, u64 config)
 {
@@ -1239,7 +1919,7 @@ static void nhmex_mbox_put_shared_reg(struct intel_uncore_box *box, int idx)
         atomic_sub(1 << (idx * 8), &er->ref);
 }
 
-u64 nhmex_mbox_alter_er(struct perf_event *event, int new_idx, bool modify)
+static u64 nhmex_mbox_alter_er(struct perf_event *event, int new_idx, bool modify)
 {
         struct hw_perf_event *hwc = &event->hw;
         struct hw_perf_event_extra *reg1 = &hwc->extra_reg;
@@ -1554,7 +2234,7 @@ static struct intel_uncore_type nhmex_uncore_mbox = {
         .format_group           = &nhmex_uncore_mbox_format_group,
 };
 
-void nhmex_rbox_alter_er(struct intel_uncore_box *box, struct perf_event *event)
+static void nhmex_rbox_alter_er(struct intel_uncore_box *box, struct perf_event *event)
 {
         struct hw_perf_event *hwc = &event->hw;
         struct hw_perf_event_extra *reg1 = &hwc->extra_reg;
@@ -1724,21 +2404,6 @@ static int nhmex_rbox_hw_config(struct intel_uncore_box *box, struct perf_event
         return 0;
 }
 
-static u64 nhmex_rbox_shared_reg_config(struct intel_uncore_box *box, int idx)
-{
-        struct intel_uncore_extra_reg *er;
-        unsigned long flags;
-        u64 config;
-
-        er = &box->shared_regs[idx];
-
-        raw_spin_lock_irqsave(&er->lock, flags);
-        config = er->config;
-        raw_spin_unlock_irqrestore(&er->lock, flags);
-
-        return config;
-}
-
 static void nhmex_rbox_msr_enable_event(struct intel_uncore_box *box, struct perf_event *event)
 {
         struct hw_perf_event *hwc = &event->hw;
@@ -1759,7 +2424,7 @@ static void nhmex_rbox_msr_enable_event(struct intel_uncore_box *box, struct per
         case 2:
         case 3:
                 wrmsrl(NHMEX_R_MSR_PORTN_QLX_CFG(port),
-                        nhmex_rbox_shared_reg_config(box, 2 + (idx / 6) * 5));
+                        uncore_shared_reg_config(box, 2 + (idx / 6) * 5));
                 break;
         case 4:
                 wrmsrl(NHMEX_R_MSR_PORTN_XBR_SET1_MM_CFG(port),
@@ -2285,7 +2950,7 @@ out:
         return ret;
 }
 
-int uncore_pmu_event_init(struct perf_event *event)
+static int uncore_pmu_event_init(struct perf_event *event)
 {
         struct intel_uncore_pmu *pmu;
         struct intel_uncore_box *box;
@@ -2438,7 +3103,7 @@ static int __init uncore_type_init(struct intel_uncore_type *type)
 
         type->unconstrainted = (struct event_constraint)
                 __EVENT_CONSTRAINT(0, (1ULL << type->num_counters) - 1,
-                                0, type->num_counters, 0);
+                                0, type->num_counters, 0, 0);
 
         for (i = 0; i < type->num_boxes; i++) {
                 pmus[i].func_id = -1;
@@ -2556,6 +3221,8 @@ static void uncore_pci_remove(struct pci_dev *pdev)
         if (WARN_ON_ONCE(phys_id != box->phys_id))
                 return;
 
+        pci_set_drvdata(pdev, NULL);
+
         raw_spin_lock(&uncore_box_lock);
         list_del(&box->list);
         raw_spin_unlock(&uncore_box_lock);
@@ -2574,11 +3241,7 @@ static void uncore_pci_remove(struct pci_dev *pdev)
 static int uncore_pci_probe(struct pci_dev *pdev,
                             const struct pci_device_id *id)
 {
-        struct intel_uncore_type *type;
-
-        type = (struct intel_uncore_type *)id->driver_data;
-
-        return uncore_pci_add(type, pdev);
+        return uncore_pci_add(pci_uncores[id->driver_data], pdev);
 }
 
 static int __init uncore_pci_init(void)
@@ -2587,12 +3250,19 @@ static int __init uncore_pci_init(void)
 
         switch (boot_cpu_data.x86_model) {
         case 45: /* Sandy Bridge-EP */
-                ret = snbep_pci2phy_map_init();
+                ret = snbep_pci2phy_map_init(0x3ce0);
                 if (ret)
                         return ret;
                 pci_uncores = snbep_pci_uncores;
                 uncore_pci_driver = &snbep_uncore_pci_driver;
                 break;
+        case 62: /* IvyTown */
+                ret = snbep_pci2phy_map_init(0x0e1e);
+                if (ret)
+                        return ret;
+                pci_uncores = ivt_pci_uncores;
+                uncore_pci_driver = &ivt_uncore_pci_driver;
+                break;
         default:
                 return 0;
         }
@@ -2622,6 +3292,21 @@ static void __init uncore_pci_exit(void)
         }
 }
 
+/* CPU hot plug/unplug are serialized by cpu_add_remove_lock mutex */
+static LIST_HEAD(boxes_to_free);
+
+static void __cpuinit uncore_kfree_boxes(void)
+{
+        struct intel_uncore_box *box;
+
+        while (!list_empty(&boxes_to_free)) {
+                box = list_entry(boxes_to_free.next,
+                                 struct intel_uncore_box, list);
+                list_del(&box->list);
+                kfree(box);
+        }
+}
+
 static void __cpuinit uncore_cpu_dying(int cpu)
 {
         struct intel_uncore_type *type;
@@ -2636,7 +3321,7 @@ static void __cpuinit uncore_cpu_dying(int cpu)
                         box = *per_cpu_ptr(pmu->box, cpu);
                         *per_cpu_ptr(pmu->box, cpu) = NULL;
                         if (box && atomic_dec_and_test(&box->refcnt))
-                                kfree(box);
+                                list_add(&box->list, &boxes_to_free);
                 }
         }
 }
@@ -2666,8 +3351,11 @@ static int __cpuinit uncore_cpu_starting(int cpu)
                                 if (exist && exist->phys_id == phys_id) {
                                         atomic_inc(&exist->refcnt);
                                         *per_cpu_ptr(pmu->box, cpu) = exist;
-                                        kfree(box);
-                                        box = NULL;
+                                        if (box) {
+                                                list_add(&box->list,
+                                                         &boxes_to_free);
+                                                box = NULL;
+                                        }
                                         break;
                                 }
                         }
@@ -2806,6 +3494,10 @@ static int
         case CPU_DYING:
                 uncore_cpu_dying(cpu);
                 break;
+        case CPU_ONLINE:
+        case CPU_DEAD:
+                uncore_kfree_boxes();
+                break;
         default:
                 break;
         }
@@ -2871,6 +3563,12 @@ static int __init uncore_cpu_init(void)
                         nhmex_uncore_cbox.num_boxes = max_cores;
                 msr_uncores = nhmex_msr_uncores;
                 break;
+        case 62: /* IvyTown */
+                if (ivt_uncore_cbox.num_boxes > max_cores)
+                        ivt_uncore_cbox.num_boxes = max_cores;
+                msr_uncores = ivt_msr_uncores;
+                break;
+
         default:
                 return 0;
         }
diff --git a/arch/x86/kernel/cpu/perf_event_intel_uncore.h b/arch/x86/kernel/cpu/perf_event_intel_uncore.h
index e68a4550e952..f9528917f6e8 100644
--- a/arch/x86/kernel/cpu/perf_event_intel_uncore.h
+++ b/arch/x86/kernel/cpu/perf_event_intel_uncore.h
@@ -76,7 +76,7 @@
 #define SNBEP_PMON_CTL_UMASK_MASK       0x0000ff00
 #define SNBEP_PMON_CTL_RST              (1 << 17)
 #define SNBEP_PMON_CTL_EDGE_DET         (1 << 18)
-#define SNBEP_PMON_CTL_EV_SEL_EXT       (1 << 21)       /* only for QPI */
+#define SNBEP_PMON_CTL_EV_SEL_EXT       (1 << 21)
 #define SNBEP_PMON_CTL_EN               (1 << 22)
 #define SNBEP_PMON_CTL_INVERT           (1 << 23)
 #define SNBEP_PMON_CTL_TRESH_MASK       0xff000000
@@ -148,9 +148,20 @@
 #define SNBEP_C0_MSR_PMON_CTL0                  0xd10
 #define SNBEP_C0_MSR_PMON_BOX_CTL               0xd04
 #define SNBEP_C0_MSR_PMON_BOX_FILTER            0xd14
-#define SNBEP_CB0_MSR_PMON_BOX_FILTER_MASK      0xfffffc1f
 #define SNBEP_CBO_MSR_OFFSET                    0x20
 
+#define SNBEP_CB0_MSR_PMON_BOX_FILTER_TID       0x1f
+#define SNBEP_CB0_MSR_PMON_BOX_FILTER_NID       0x3fc00
+#define SNBEP_CB0_MSR_PMON_BOX_FILTER_STATE     0x7c0000
+#define SNBEP_CB0_MSR_PMON_BOX_FILTER_OPC       0xff800000
+
+#define SNBEP_CBO_EVENT_EXTRA_REG(e, m, i) {    \
+        .event = (e),                           \
+        .msr = SNBEP_C0_MSR_PMON_BOX_FILTER,    \
+        .config_mask = (m),                     \
+        .idx = (i)                              \
+}
+
 /* SNB-EP PCU register */
 #define SNBEP_PCU_MSR_PMON_CTR0                 0xc36
 #define SNBEP_PCU_MSR_PMON_CTL0                 0xc30
@@ -160,6 +171,55 @@
 #define SNBEP_PCU_MSR_CORE_C3_CTR               0x3fc
 #define SNBEP_PCU_MSR_CORE_C6_CTR               0x3fd
 
+/* IVT event control */
+#define IVT_PMON_BOX_CTL_INT            (SNBEP_PMON_BOX_CTL_RST_CTRL | \
+                                         SNBEP_PMON_BOX_CTL_RST_CTRS)
+#define IVT_PMON_RAW_EVENT_MASK         (SNBEP_PMON_CTL_EV_SEL_MASK | \
+                                         SNBEP_PMON_CTL_UMASK_MASK | \
+                                         SNBEP_PMON_CTL_EDGE_DET | \
+                                         SNBEP_PMON_CTL_TRESH_MASK)
+/* IVT Ubox */
+#define IVT_U_MSR_PMON_GLOBAL_CTL               0xc00
+#define IVT_U_PMON_GLOBAL_FRZ_ALL               (1 << 31)
+#define IVT_U_PMON_GLOBAL_UNFRZ_ALL             (1 << 29)
+
+#define IVT_U_MSR_PMON_RAW_EVENT_MASK   \
+                                (SNBEP_PMON_CTL_EV_SEL_MASK | \
+                                 SNBEP_PMON_CTL_UMASK_MASK | \
+                                 SNBEP_PMON_CTL_EDGE_DET | \
+                                 SNBEP_U_MSR_PMON_CTL_TRESH_MASK)
+/* IVT Cbo */
+#define IVT_CBO_MSR_PMON_RAW_EVENT_MASK         (IVT_PMON_RAW_EVENT_MASK | \
+                                                 SNBEP_CBO_PMON_CTL_TID_EN)
+
+#define IVT_CB0_MSR_PMON_BOX_FILTER_TID         (0x1fULL << 0)
+#define IVT_CB0_MSR_PMON_BOX_FILTER_LINK        (0xfULL << 5)
+#define IVT_CB0_MSR_PMON_BOX_FILTER_STATE       (0x3fULL << 17)
+#define IVT_CB0_MSR_PMON_BOX_FILTER_NID         (0xffffULL << 32)
+#define IVT_CB0_MSR_PMON_BOX_FILTER_OPC         (0x1ffULL << 52)
+#define IVT_CB0_MSR_PMON_BOX_FILTER_C6          (0x1ULL << 61)
+#define IVT_CB0_MSR_PMON_BOX_FILTER_NC          (0x1ULL << 62)
+#define IVT_CB0_MSR_PMON_BOX_FILTER_IOSC        (0x1ULL << 63)
+
+/* IVT home agent */
+#define IVT_HA_PCI_PMON_CTL_Q_OCC_RST           (1 << 16)
+#define IVT_HA_PCI_PMON_RAW_EVENT_MASK          \
+                                (IVT_PMON_RAW_EVENT_MASK | \
+                                 IVT_HA_PCI_PMON_CTL_Q_OCC_RST)
+/* IVT PCU */
+#define IVT_PCU_MSR_PMON_RAW_EVENT_MASK \
+                                (SNBEP_PMON_CTL_EV_SEL_MASK | \
+                                 SNBEP_PMON_CTL_EV_SEL_EXT | \
+                                 SNBEP_PCU_MSR_PMON_CTL_OCC_SEL_MASK | \
+                                 SNBEP_PMON_CTL_EDGE_DET | \
+                                 SNBEP_PCU_MSR_PMON_CTL_TRESH_MASK | \
+                                 SNBEP_PCU_MSR_PMON_CTL_OCC_INVERT | \
+                                 SNBEP_PCU_MSR_PMON_CTL_OCC_EDGE_DET)
+/* IVT QPI */
+#define IVT_QPI_PCI_PMON_RAW_EVENT_MASK \
+                                (IVT_PMON_RAW_EVENT_MASK | \
+                                 SNBEP_PMON_CTL_EV_SEL_EXT)
+
 /* NHM-EX event control */
 #define NHMEX_PMON_CTL_EV_SEL_MASK      0x000000ff
 #define NHMEX_PMON_CTL_UMASK_MASK       0x0000ff00
diff --git a/arch/x86/kernel/cpu/perf_event_knc.c b/arch/x86/kernel/cpu/perf_event_knc.c
index 4b7731bf23a8..838fa8772c62 100644
--- a/arch/x86/kernel/cpu/perf_event_knc.c
+++ b/arch/x86/kernel/cpu/perf_event_knc.c
@@ -17,7 +17,7 @@ static const u64 knc_perfmon_event_map[] =
   [PERF_COUNT_HW_BRANCH_MISSES]         = 0x002b,
 };
 
-static __initconst u64 knc_hw_cache_event_ids
+static const u64 __initconst knc_hw_cache_event_ids
                                 [PERF_COUNT_HW_CACHE_MAX]
                                 [PERF_COUNT_HW_CACHE_OP_MAX]
                                 [PERF_COUNT_HW_CACHE_RESULT_MAX] =
@@ -284,7 +284,7 @@ static struct attribute *intel_knc_formats_attr[] = {
         NULL,
 };
 
-static __initconst struct x86_pmu knc_pmu = {
+static const struct x86_pmu knc_pmu __initconst = {
         .name                   = "knc",
         .handle_irq             = knc_pmu_handle_irq,
         .disable_all            = knc_pmu_disable_all,
diff --git a/arch/x86/kernel/cpu/perf_event_p4.c b/arch/x86/kernel/cpu/perf_event_p4.c
index 92c7e39a079f..3486e6660357 100644
--- a/arch/x86/kernel/cpu/perf_event_p4.c
+++ b/arch/x86/kernel/cpu/perf_event_p4.c
@@ -895,8 +895,8 @@ static void p4_pmu_disable_pebs(void)
          * So at moment let leave metrics turned on forever -- it's
          * ok for now but need to be revisited!
          *
-         * (void)wrmsrl_safe(MSR_IA32_PEBS_ENABLE, (u64)0);
-         * (void)wrmsrl_safe(MSR_P4_PEBS_MATRIX_VERT, (u64)0);
+         * (void)wrmsrl_safe(MSR_IA32_PEBS_ENABLE, 0);
+         * (void)wrmsrl_safe(MSR_P4_PEBS_MATRIX_VERT, 0);
          */
 }
 
@@ -910,8 +910,7 @@ static inline void p4_pmu_disable_event(struct perf_event *event)
          * asserted again and again
          */
         (void)wrmsrl_safe(hwc->config_base,
-                (u64)(p4_config_unpack_cccr(hwc->config)) &
-                        ~P4_CCCR_ENABLE & ~P4_CCCR_OVF & ~P4_CCCR_RESERVED);
+                p4_config_unpack_cccr(hwc->config) & ~P4_CCCR_ENABLE & ~P4_CCCR_OVF & ~P4_CCCR_RESERVED);
 }
 
 static void p4_pmu_disable_all(void)
@@ -957,7 +956,7 @@ static void p4_pmu_enable_event(struct perf_event *event)
         u64 escr_addr, cccr;
 
         bind = &p4_event_bind_map[idx];
-        escr_addr = (u64)bind->escr_msr[thread];
+        escr_addr = bind->escr_msr[thread];
 
         /*
          * - we dont support cascaded counters yet
diff --git a/arch/x86/kernel/cpu/perf_event_p6.c b/arch/x86/kernel/cpu/perf_event_p6.c
index 4820c232a0b9..b1e2fe115323 100644
--- a/arch/x86/kernel/cpu/perf_event_p6.c
+++ b/arch/x86/kernel/cpu/perf_event_p6.c
@@ -19,7 +19,7 @@ static const u64 p6_perfmon_event_map[] =
 
 };
 
-static u64 p6_hw_cache_event_ids
+static const u64 __initconst p6_hw_cache_event_ids
                                 [PERF_COUNT_HW_CACHE_MAX]
                                 [PERF_COUNT_HW_CACHE_OP_MAX]
                                 [PERF_COUNT_HW_CACHE_RESULT_MAX] =
diff --git a/arch/x86/kernel/cpu/proc.c b/arch/x86/kernel/cpu/proc.c
index e280253f6f94..37a198bd48c8 100644
--- a/arch/x86/kernel/cpu/proc.c
+++ b/arch/x86/kernel/cpu/proc.c
@@ -34,9 +34,9 @@ static void show_cpuinfo_misc(struct seq_file *m, struct cpuinfo_x86 *c)
                    "fpu_exception\t: %s\n"
                    "cpuid level\t: %d\n"
                    "wp\t\t: %s\n",
-                   c->fdiv_bug ? "yes" : "no",
-                   c->f00f_bug ? "yes" : "no",
-                   c->coma_bug ? "yes" : "no",
+                   static_cpu_has_bug(X86_BUG_FDIV) ? "yes" : "no",
+                   static_cpu_has_bug(X86_BUG_F00F) ? "yes" : "no",
+                   static_cpu_has_bug(X86_BUG_COMA) ? "yes" : "no",
                    c->hard_math ? "yes" : "no",
                    c->hard_math ? "yes" : "no",
                    c->cpuid_level,
diff --git a/arch/x86/kernel/cpu/scattered.c b/arch/x86/kernel/cpu/scattered.c
index ee8e9abc859f..d92b5dad15dd 100644
--- a/arch/x86/kernel/cpu/scattered.c
+++ b/arch/x86/kernel/cpu/scattered.c
@@ -39,8 +39,9 @@ void __cpuinit init_scattered_cpuid_features(struct cpuinfo_x86 *c)
                 { X86_FEATURE_APERFMPERF,       CR_ECX, 0, 0x00000006, 0 },
                 { X86_FEATURE_EPB,              CR_ECX, 3, 0x00000006, 0 },
                 { X86_FEATURE_XSAVEOPT,         CR_EAX, 0, 0x0000000d, 1 },
-                { X86_FEATURE_CPB,              CR_EDX, 9, 0x80000007, 0 },
                 { X86_FEATURE_HW_PSTATE,        CR_EDX, 7, 0x80000007, 0 },
+                { X86_FEATURE_CPB,              CR_EDX, 9, 0x80000007, 0 },
+                { X86_FEATURE_PROC_FEEDBACK,    CR_EDX,11, 0x80000007, 0 },
                 { X86_FEATURE_NPT,              CR_EDX, 0, 0x8000000a, 0 },
                 { X86_FEATURE_LBRV,             CR_EDX, 1, 0x8000000a, 0 },
                 { X86_FEATURE_SVML,             CR_EDX, 2, 0x8000000a, 0 },
diff --git a/arch/x86/kernel/doublefault_32.c b/arch/x86/kernel/doublefault_32.c
index 37250fe490b1..155a13f33ed8 100644
--- a/arch/x86/kernel/doublefault_32.c
+++ b/arch/x86/kernel/doublefault_32.c
@@ -20,7 +20,7 @@ static void doublefault_fn(void)
         struct desc_ptr gdt_desc = {0, 0};
         unsigned long gdt, tss;
 
-        store_gdt(&gdt_desc);
+        native_store_gdt(&gdt_desc);
         gdt = gdt_desc.address;
 
         printk(KERN_EMERG "PANIC: double fault, gdt at %08lx [%d bytes]\n", gdt, gdt_desc.size);
diff --git a/arch/x86/kernel/dumpstack.c b/arch/x86/kernel/dumpstack.c
index c8797d55b245..deb6421c9e69 100644
--- a/arch/x86/kernel/dumpstack.c
+++ b/arch/x86/kernel/dumpstack.c
@@ -176,26 +176,20 @@ void show_trace(struct task_struct *task, struct pt_regs *regs,
 
 void show_stack(struct task_struct *task, unsigned long *sp)
 {
-        show_stack_log_lvl(task, NULL, sp, 0, "");
-}
-
-/*
- * The architecture-independent dump_stack generator
- */
-void dump_stack(void)
-{
-        unsigned long bp;
+        unsigned long bp = 0;
         unsigned long stack;
 
-        bp = stack_frame(current, NULL);
-        printk("Pid: %d, comm: %.20s %s %s %.*s\n",
-                current->pid, current->comm, print_tainted(),
-                init_utsname()->release,
-                (int)strcspn(init_utsname()->version, " "),
-                init_utsname()->version);
-        show_trace(NULL, NULL, &stack, bp);
+        /*
+         * Stack frames below this one aren't interesting.  Don't show them
+         * if we're printing for %current.
+         */
+        if (!sp && (!task || task == current)) {
+                sp = &stack;
+                bp = stack_frame(current, NULL);
+        }
+
+        show_stack_log_lvl(task, NULL, sp, bp, "");
 }
-EXPORT_SYMBOL(dump_stack);
 
 static arch_spinlock_t die_lock = __ARCH_SPIN_LOCK_UNLOCKED;
 static int die_owner = -1;
diff --git a/arch/x86/kernel/dumpstack_32.c b/arch/x86/kernel/dumpstack_32.c
index 1038a417ea53..f2a1770ca176 100644
--- a/arch/x86/kernel/dumpstack_32.c
+++ b/arch/x86/kernel/dumpstack_32.c
@@ -86,11 +86,9 @@ void show_regs(struct pt_regs *regs)
 {
         int i;
 
+        show_regs_print_info(KERN_EMERG);
         __show_regs(regs, !user_mode_vm(regs));
 
-        pr_emerg("Process %.*s (pid: %d, ti=%p task=%p task.ti=%p)\n",
-                 TASK_COMM_LEN, current->comm, task_pid_nr(current),
-                 current_thread_info(), current, task_thread_info(current));
         /*
          * When in-kernel, we also print out the stack and code at the
          * time of the fault..
diff --git a/arch/x86/kernel/dumpstack_64.c b/arch/x86/kernel/dumpstack_64.c
index b653675d5288..addb207dab92 100644
--- a/arch/x86/kernel/dumpstack_64.c
+++ b/arch/x86/kernel/dumpstack_64.c
@@ -249,14 +249,10 @@ void show_regs(struct pt_regs *regs)
 {
         int i;
         unsigned long sp;
-        const int cpu = smp_processor_id();
-        struct task_struct *cur = current;
 
         sp = regs->sp;
-        printk("CPU %d ", cpu);
+        show_regs_print_info(KERN_DEFAULT);
         __show_regs(regs, 1);
-        printk(KERN_DEFAULT "Process %s (pid: %d, threadinfo %p, task %p)\n",
-               cur->comm, cur->pid, task_thread_info(cur), cur);
 
         /*
          * When in-kernel, we also print out the stack and code at the
diff --git a/arch/x86/kernel/early_printk.c b/arch/x86/kernel/early_printk.c
index 9b9f18b49918..d15f575a861b 100644
--- a/arch/x86/kernel/early_printk.c
+++ b/arch/x86/kernel/early_printk.c
@@ -169,25 +169,9 @@ static struct console early_serial_console = {
         .index =        -1,
 };
 
-/* Direct interface for emergencies */
-static struct console *early_console = &early_vga_console;
-static int __initdata early_console_initialized;
-
-asmlinkage void early_printk(const char *fmt, ...)
-{
-        char buf[512];
-        int n;
-        va_list ap;
-
-        va_start(ap, fmt);
-        n = vscnprintf(buf, sizeof(buf), fmt, ap);
-        early_console->write(early_console, buf, n);
-        va_end(ap);
-}
-
 static inline void early_console_register(struct console *con, int keep_early)
 {
-        if (early_console->index != -1) {
+        if (con->index != -1) {
                 printk(KERN_CRIT "ERROR: earlyprintk= %s already used\n",
                        con->name);
                 return;
@@ -207,9 +191,8 @@ static int __init setup_early_printk(char *buf)
         if (!buf)
                 return 0;
 
-        if (early_console_initialized)
+        if (early_console)
                 return 0;
-        early_console_initialized = 1;
 
         keep = (strstr(buf, "keep") != NULL);
 
diff --git a/arch/x86/kernel/head64.c b/arch/x86/kernel/head64.c
index c5e403f6d869..101ac1a9263e 100644
--- a/arch/x86/kernel/head64.c
+++ b/arch/x86/kernel/head64.c
@@ -144,10 +144,10 @@ void __init x86_64_start_kernel(char * real_mode_data)
          * Build-time sanity checks on the kernel image and module
          * area mappings. (these are purely build-time and produce no code)
          */
-        BUILD_BUG_ON(MODULES_VADDR < KERNEL_IMAGE_START);
-        BUILD_BUG_ON(MODULES_VADDR-KERNEL_IMAGE_START < KERNEL_IMAGE_SIZE);
+        BUILD_BUG_ON(MODULES_VADDR < __START_KERNEL_map);
+        BUILD_BUG_ON(MODULES_VADDR - __START_KERNEL_map < KERNEL_IMAGE_SIZE);
         BUILD_BUG_ON(MODULES_LEN + KERNEL_IMAGE_SIZE > 2*PUD_SIZE);
-        BUILD_BUG_ON((KERNEL_IMAGE_START & ~PMD_MASK) != 0);
+        BUILD_BUG_ON((__START_KERNEL_map & ~PMD_MASK) != 0);
         BUILD_BUG_ON((MODULES_VADDR & ~PMD_MASK) != 0);
         BUILD_BUG_ON(!(MODULES_VADDR > __START_KERNEL));
         BUILD_BUG_ON(!(((MODULES_END - 1) & PGDIR_MASK) ==
diff --git a/arch/x86/kernel/kprobes/core.c b/arch/x86/kernel/kprobes/core.c
index 7bfe318d3d8a..9895a9a41380 100644
--- a/arch/x86/kernel/kprobes/core.c
+++ b/arch/x86/kernel/kprobes/core.c
@@ -353,7 +353,11 @@ int __kprobes __copy_instruction(u8 *dest, u8 *src)
                  * have given.
                  */
                 newdisp = (u8 *) src + (s64) insn.displacement.value - (u8 *) dest;
-                BUG_ON((s64) (s32) newdisp != newdisp); /* Sanity check.  */
+                if ((s64) (s32) newdisp != newdisp) {
+                        pr_err("Kprobes error: new displacement does not fit into s32 (%llx)\n", newdisp);
+                        pr_err("\tSrc: %p, Dest: %p, old disp: %x\n", src, dest, insn.displacement.value);
+                        return 0;
+                }
                 disp = (u8 *) dest + insn_offset_displacement(&insn);
                 *(s32 *) disp = (s32) newdisp;
         }
diff --git a/arch/x86/kernel/kvm.c b/arch/x86/kernel/kvm.c
index b686a904d7c3..cd6d9a5a42f6 100644
--- a/arch/x86/kernel/kvm.c
+++ b/arch/x86/kernel/kvm.c
@@ -20,6 +20,7 @@
  *   Authors: Anthony Liguori <aliguori@us.ibm.com>
  */
 
+#include <linux/context_tracking.h>
 #include <linux/module.h>
 #include <linux/kernel.h>
 #include <linux/kvm_para.h>
@@ -43,7 +44,6 @@
 #include <asm/apicdef.h>
 #include <asm/hypervisor.h>
 #include <asm/kvm_guest.h>
-#include <asm/context_tracking.h>
 
 static int kvmapf = 1;
 
@@ -254,16 +254,18 @@ EXPORT_SYMBOL_GPL(kvm_read_and_reset_pf_reason);
 dotraplinkage void __kprobes
 do_async_page_fault(struct pt_regs *regs, unsigned long error_code)
 {
+        enum ctx_state prev_state;
+
         switch (kvm_read_and_reset_pf_reason()) {
         default:
                 do_page_fault(regs, error_code);
                 break;
         case KVM_PV_REASON_PAGE_NOT_PRESENT:
                 /* page is swapped out by the host. */
-                exception_enter(regs);
+                prev_state = exception_enter();
                 exit_idle();
                 kvm_async_pf_task_wait((u32)read_cr2());
-                exception_exit(regs);
+                exception_exit(prev_state);
                 break;
         case KVM_PV_REASON_PAGE_READY:
                 rcu_irq_enter();
diff --git a/arch/x86/kernel/paravirt.c b/arch/x86/kernel/paravirt.c
index 8bfb335f74bb..cd6de64cc480 100644
--- a/arch/x86/kernel/paravirt.c
+++ b/arch/x86/kernel/paravirt.c
@@ -360,7 +360,6 @@ struct pv_cpu_ops pv_cpu_ops = {
         .set_ldt = native_set_ldt,
         .load_gdt = native_load_gdt,
         .load_idt = native_load_idt,
-        .store_gdt = native_store_gdt,
         .store_idt = native_store_idt,
         .store_tr = native_store_tr,
         .load_tls = native_load_tls,
diff --git a/arch/x86/kernel/process.c b/arch/x86/kernel/process.c
index 14ae10031ff0..607af0d4d5ef 100644
--- a/arch/x86/kernel/process.c
+++ b/arch/x86/kernel/process.c
@@ -121,30 +121,6 @@ void exit_thread(void)
         drop_fpu(me);
 }
 
-void show_regs_common(void)
-{
-        const char *vendor, *product, *board;
-
-        vendor = dmi_get_system_info(DMI_SYS_VENDOR);
-        if (!vendor)
-                vendor = "";
-        product = dmi_get_system_info(DMI_PRODUCT_NAME);
-        if (!product)
-                product = "";
-
-        /* Board Name is optional */
-        board = dmi_get_system_info(DMI_BOARD_NAME);
-
-        printk(KERN_DEFAULT "Pid: %d, comm: %.20s %s %s %.*s %s %s%s%s\n",
-               current->pid, current->comm, print_tainted(),
-               init_utsname()->release,
-               (int)strcspn(init_utsname()->version, " "),
-               init_utsname()->version,
-               vendor, product,
-               board ? "/" : "",
-               board ? board : "");
-}
-
 void flush_thread(void)
 {
         struct task_struct *tsk = current;
@@ -301,13 +277,7 @@ void exit_idle(void)
 }
 #endif
 
-/*
- * The idle thread. There's no useful work to be
- * done, so just try to conserve power and have a
- * low exit latency (ie sit in a loop waiting for
- * somebody to say that they'd like to reschedule)
- */
-void cpu_idle(void)
+void arch_cpu_idle_prepare(void)
 {
         /*
          * If we're the non-boot CPU, nothing set the stack canary up
@@ -317,71 +287,40 @@ void cpu_idle(void)
          * canaries already on the stack wont ever trigger).
          */
         boot_init_stack_canary();
-        current_thread_info()->status |= TS_POLLING;
-
-        while (1) {
-                tick_nohz_idle_enter();
-
-                while (!need_resched()) {
-                        rmb();
-
-                        if (cpu_is_offline(smp_processor_id()))
-                                play_dead();
-
-                        /*
-                         * Idle routines should keep interrupts disabled
-                         * from here on, until they go to idle.
-                         * Otherwise, idle callbacks can misfire.
-                         */
-                        local_touch_nmi();
-                        local_irq_disable();
-
-                        enter_idle();
-
-                        /* Don't trace irqs off for idle */
-                        stop_critical_timings();
-
-                        /* enter_idle() needs rcu for notifiers */
-                        rcu_idle_enter();
+}
 
-                        if (cpuidle_idle_call())
-                                x86_idle();
+void arch_cpu_idle_enter(void)
+{
+        local_touch_nmi();
+        enter_idle();
+}
 
-                        rcu_idle_exit();
-                        start_critical_timings();
+void arch_cpu_idle_exit(void)
+{
+        __exit_idle();
+}
 
-                        /* In many cases the interrupt that ended idle
-                           has already called exit_idle. But some idle
-                           loops can be woken up without interrupt. */
-                        __exit_idle();
-                }
+void arch_cpu_idle_dead(void)
+{
+        play_dead();
+}
 
-                tick_nohz_idle_exit();
-                preempt_enable_no_resched();
-                schedule();
-                preempt_disable();
-        }
+/*
+ * Called from the generic idle code.
+ */
+void arch_cpu_idle(void)
+{
+        if (cpuidle_idle_call())
+                x86_idle();
 }
 
 /*
- * We use this if we don't have any better
- * idle routine..
+ * We use this if we don't have any better idle routine..
  */
 void default_idle(void)
 {
         trace_cpu_idle_rcuidle(1, smp_processor_id());
-        current_thread_info()->status &= ~TS_POLLING;
-        /*
-         * TS_POLLING-cleared state must be visible before we
-         * test NEED_RESCHED:
-         */
-        smp_mb();
-
-        if (!need_resched())
-                safe_halt();    /* enables interrupts racelessly */
-        else
-                local_irq_enable();
-        current_thread_info()->status |= TS_POLLING;
+        safe_halt();
         trace_cpu_idle_rcuidle(PWR_EVENT_EXIT, smp_processor_id());
 }
 #ifdef CONFIG_APM_MODULE
@@ -411,20 +350,6 @@ void stop_this_cpu(void *dummy)
                 halt();
 }
 
-/*
- * On SMP it's slightly faster (but much more power-consuming!)
- * to poll the ->work.need_resched flag instead of waiting for the
- * cross-CPU IPI to arrive. Use this option with caution.
- */
-static void poll_idle(void)
-{
-        trace_cpu_idle_rcuidle(0, smp_processor_id());
-        local_irq_enable();
-        while (!need_resched())
-                cpu_relax();
-        trace_cpu_idle_rcuidle(PWR_EVENT_EXIT, smp_processor_id());
-}
-
 bool amd_e400_c1e_detected;
 EXPORT_SYMBOL(amd_e400_c1e_detected);
 
@@ -489,13 +414,13 @@ static void amd_e400_idle(void)
 void __cpuinit select_idle_routine(const struct cpuinfo_x86 *c)
 {
 #ifdef CONFIG_SMP
-        if (x86_idle == poll_idle && smp_num_siblings > 1)
+        if (boot_option_idle_override == IDLE_POLL && smp_num_siblings > 1)
                 pr_warn_once("WARNING: polling idle and HT enabled, performance may degrade\n");
 #endif
-        if (x86_idle)
+        if (x86_idle || boot_option_idle_override == IDLE_POLL)
                 return;
 
-        if (cpu_has_amd_erratum(amd_erratum_400)) {
+        if (cpu_has_bug(c, X86_BUG_AMD_APIC_C1E)) {
                 /* E400: APIC timer interrupt does not wake up CPU from C1e */
                 pr_info("using AMD E400 aware idle routine\n");
                 x86_idle = amd_e400_idle;
@@ -517,8 +442,8 @@ static int __init idle_setup(char *str)
 
         if (!strcmp(str, "poll")) {
                 pr_info("using polling idle threads\n");
-                x86_idle = poll_idle;
                 boot_option_idle_override = IDLE_POLL;
+                cpu_idle_poll_ctrl(true);
         } else if (!strcmp(str, "halt")) {
                 /*
                  * When the boot option of idle=halt is added, halt is
diff --git a/arch/x86/kernel/process_32.c b/arch/x86/kernel/process_32.c
index b5a8905785e6..7305f7dfc7ab 100644
--- a/arch/x86/kernel/process_32.c
+++ b/arch/x86/kernel/process_32.c
@@ -84,8 +84,6 @@ void __show_regs(struct pt_regs *regs, int all)
                 savesegment(gs, gs);
         }
 
-        show_regs_common();
-
         printk(KERN_DEFAULT "EIP: %04x:[<%08lx>] EFLAGS: %08lx CPU: %d\n",
                         (u16)regs->cs, regs->ip, regs->flags,
                         smp_processor_id());
diff --git a/arch/x86/kernel/process_64.c b/arch/x86/kernel/process_64.c
index 0f49677da51e..355ae06dbf94 100644
--- a/arch/x86/kernel/process_64.c
+++ b/arch/x86/kernel/process_64.c
@@ -62,7 +62,6 @@ void __show_regs(struct pt_regs *regs, int all)
         unsigned int fsindex, gsindex;
         unsigned int ds, cs, es;
 
-        show_regs_common();
         printk(KERN_DEFAULT "RIP: %04lx:[<%016lx>] ", regs->cs & 0xffff, regs->ip);
         printk_address(regs->ip, 1);
         printk(KERN_DEFAULT "RSP: %04lx:%016lx  EFLAGS: %08lx\n", regs->ss,
diff --git a/arch/x86/kernel/quirks.c b/arch/x86/kernel/quirks.c
index 26ee48a33dc4..04ee1e2e4c02 100644
--- a/arch/x86/kernel/quirks.c
+++ b/arch/x86/kernel/quirks.c
@@ -354,18 +354,22 @@ static void ati_force_hpet_resume(void)
 
 static u32 ati_ixp4x0_rev(struct pci_dev *dev)
 {
-        u32 d;
-        u8  b;
+        int err = 0;
+        u32 d = 0;
+        u8  b = 0;
 
-        pci_read_config_byte(dev, 0xac, &b);
+        err = pci_read_config_byte(dev, 0xac, &b);
         b &= ~(1<<5);
-        pci_write_config_byte(dev, 0xac, b);
-        pci_read_config_dword(dev, 0x70, &d);
+        err |= pci_write_config_byte(dev, 0xac, b);
+        err |= pci_read_config_dword(dev, 0x70, &d);
         d |= 1<<8;
-        pci_write_config_dword(dev, 0x70, d);
-        pci_read_config_dword(dev, 0x8, &d);
+        err |= pci_write_config_dword(dev, 0x70, d);
+        err |= pci_read_config_dword(dev, 0x8, &d);
         d &= 0xff;
         dev_printk(KERN_DEBUG, &dev->dev, "SB4X0 revision 0x%x\n", d);
+
+        WARN_ON_ONCE(err);
+
         return d;
 }
 
diff --git a/arch/x86/kernel/rtc.c b/arch/x86/kernel/rtc.c
index 2e8f3d3b5641..198eb201ed3b 100644
--- a/arch/x86/kernel/rtc.c
+++ b/arch/x86/kernel/rtc.c
@@ -13,6 +13,7 @@
 #include <asm/x86_init.h>
 #include <asm/time.h>
 #include <asm/mrst.h>
+#include <asm/rtc.h>
 
 #ifdef CONFIG_X86_32
 /*
@@ -36,70 +37,24 @@ EXPORT_SYMBOL(rtc_lock);
  * nowtime is written into the registers of the CMOS clock, it will
  * jump to the next second precisely 500 ms later. Check the Motorola
  * MC146818A or Dallas DS12887 data sheet for details.
- *
- * BUG: This routine does not handle hour overflow properly; it just
- *      sets the minutes. Usually you'll only notice that after reboot!
  */
 int mach_set_rtc_mmss(unsigned long nowtime)
 {
-        int real_seconds, real_minutes, cmos_minutes;
-        unsigned char save_control, save_freq_select;
-        unsigned long flags;
+        struct rtc_time tm;
         int retval = 0;
 
-        spin_lock_irqsave(&rtc_lock, flags);
-
-         /* tell the clock it's being set */
-        save_control = CMOS_READ(RTC_CONTROL);
-        CMOS_WRITE((save_control|RTC_SET), RTC_CONTROL);
-
-        /* stop and reset prescaler */
-        save_freq_select = CMOS_READ(RTC_FREQ_SELECT);
-        CMOS_WRITE((save_freq_select|RTC_DIV_RESET2), RTC_FREQ_SELECT);
-
-        cmos_minutes = CMOS_READ(RTC_MINUTES);
-        if (!(save_control & RTC_DM_BINARY) || RTC_ALWAYS_BCD)
-                cmos_minutes = bcd2bin(cmos_minutes);
-
-        /*
-         * since we're only adjusting minutes and seconds,
-         * don't interfere with hour overflow. This avoids
-         * messing with unknown time zones but requires your
-         * RTC not to be off by more than 15 minutes
-         */
-        real_seconds = nowtime % 60;
-        real_minutes = nowtime / 60;
-        /* correct for half hour time zone */
-        if (((abs(real_minutes - cmos_minutes) + 15)/30) & 1)
-                real_minutes += 30;
-        real_minutes %= 60;
-
-        if (abs(real_minutes - cmos_minutes) < 30) {
-                if (!(save_control & RTC_DM_BINARY) || RTC_ALWAYS_BCD) {
-                        real_seconds = bin2bcd(real_seconds);
-                        real_minutes = bin2bcd(real_minutes);
-                }
-                CMOS_WRITE(real_seconds, RTC_SECONDS);
-                CMOS_WRITE(real_minutes, RTC_MINUTES);
+        rtc_time_to_tm(nowtime, &tm);
+        if (!rtc_valid_tm(&tm)) {
+                retval = set_rtc_time(&tm);
+                if (retval)
+                        printk(KERN_ERR "%s: RTC write failed with error %d\n",
+                               __FUNCTION__, retval);
         } else {
-                printk_once(KERN_NOTICE
-                       "set_rtc_mmss: can't update from %d to %d\n",
-                       cmos_minutes, real_minutes);
-                retval = -1;
+                printk(KERN_ERR
+                       "%s: Invalid RTC value: write of %lx to RTC failed\n",
+                        __FUNCTION__, nowtime);
+                retval = -EINVAL;
         }
-
-        /* The following flags have to be released exactly in this order,
-         * otherwise the DS12887 (popular MC146818A clone with integrated
-         * battery and quartz) will not reset the oscillator and will not
-         * update precisely 500 ms later. You won't find this mentioned in
-         * the Dallas Semiconductor data sheets, but who believes data
-         * sheets anyway ...                           -- Markus Kuhn
-         */
-        CMOS_WRITE(save_control, RTC_CONTROL);
-        CMOS_WRITE(save_freq_select, RTC_FREQ_SELECT);
-
-        spin_unlock_irqrestore(&rtc_lock, flags);
-
         return retval;
 }
 
diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c
index fae9134a2de9..56f7fcfe7fa2 100644
--- a/arch/x86/kernel/setup.c
+++ b/arch/x86/kernel/setup.c
@@ -82,7 +82,6 @@
 #include <asm/timer.h>
 #include <asm/i8259.h>
 #include <asm/sections.h>
-#include <asm/dmi.h>
 #include <asm/io_apic.h>
 #include <asm/ist.h>
 #include <asm/setup_arch.h>
@@ -173,12 +172,10 @@ static struct resource bss_resource = {
 /* cpu data as detected by the assembly code in head.S */
 struct cpuinfo_x86 new_cpu_data __cpuinitdata = {
         .wp_works_ok = -1,
-        .fdiv_bug = -1,
 };
 /* common cpu data for all cpus */
 struct cpuinfo_x86 boot_cpu_data __read_mostly = {
         .wp_works_ok = -1,
-        .fdiv_bug = -1,
 };
 EXPORT_SYMBOL(boot_cpu_data);
 
@@ -999,6 +996,7 @@ void __init setup_arch(char **cmdline_p)
                 efi_init();
 
         dmi_scan_machine();
+        dmi_set_dump_stack_arch_desc();
 
         /*
          * VMware detection requires dmi to be available, so this
diff --git a/arch/x86/kernel/smpboot.c b/arch/x86/kernel/smpboot.c
index 9f190a2a00e9..9c73b51817e4 100644
--- a/arch/x86/kernel/smpboot.c
+++ b/arch/x86/kernel/smpboot.c
@@ -284,7 +284,7 @@ notrace static void __cpuinit start_secondary(void *unused)
         x86_cpuinit.setup_percpu_clockev();
 
         wmb();
-        cpu_idle();
+        cpu_startup_entry(CPUHP_ONLINE);
 }
 
 void __init smp_store_boot_cpu_info(void)
diff --git a/arch/x86/kernel/tls.c b/arch/x86/kernel/tls.c
index 9d9d2f9e77a5..f7fec09e3e3a 100644
--- a/arch/x86/kernel/tls.c
+++ b/arch/x86/kernel/tls.c
@@ -3,13 +3,13 @@
 #include <linux/sched.h>
 #include <linux/user.h>
 #include <linux/regset.h>
+#include <linux/syscalls.h>
 
 #include <asm/uaccess.h>
 #include <asm/desc.h>
 #include <asm/ldt.h>
 #include <asm/processor.h>
 #include <asm/proto.h>
-#include <asm/syscalls.h>
 
 #include "tls.h"
 
@@ -89,11 +89,9 @@ int do_set_thread_area(struct task_struct *p, int idx,
         return 0;
 }
 
-asmlinkage int sys_set_thread_area(struct user_desc __user *u_info)
+SYSCALL_DEFINE1(set_thread_area, struct user_desc __user *, u_info)
 {
-        int ret = do_set_thread_area(current, -1, u_info, 1);
-        asmlinkage_protect(1, ret, u_info);
-        return ret;
+        return do_set_thread_area(current, -1, u_info, 1);
 }
 
 
@@ -139,11 +137,9 @@ int do_get_thread_area(struct task_struct *p, int idx,
         return 0;
 }
 
-asmlinkage int sys_get_thread_area(struct user_desc __user *u_info)
+SYSCALL_DEFINE1(get_thread_area, struct user_desc __user *, u_info)
 {
-        int ret = do_get_thread_area(current, -1, u_info);
-        asmlinkage_protect(1, ret, u_info);
-        return ret;
+        return do_get_thread_area(current, -1, u_info);
 }
 
 int regset_tls_active(struct task_struct *target,
diff --git a/arch/x86/kernel/traps.c b/arch/x86/kernel/traps.c
index 68bda7a84159..772e2a846dec 100644
--- a/arch/x86/kernel/traps.c
+++ b/arch/x86/kernel/traps.c
@@ -12,6 +12,7 @@
 
 #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
 
+#include <linux/context_tracking.h>
 #include <linux/interrupt.h>
 #include <linux/kallsyms.h>
 #include <linux/spinlock.h>
@@ -55,8 +56,7 @@
 #include <asm/i387.h>
 #include <asm/fpu-internal.h>
 #include <asm/mce.h>
-#include <asm/context_tracking.h>
-
+#include <asm/fixmap.h>
 #include <asm/mach_traps.h>
 
 #ifdef CONFIG_X86_64
@@ -176,34 +176,38 @@ do_trap(int trapnr, int signr, char *str, struct pt_regs *regs,
 #define DO_ERROR(trapnr, signr, str, name)                              \
 dotraplinkage void do_##name(struct pt_regs *regs, long error_code)     \
 {                                                                       \
-        exception_enter(regs);                                          \
+        enum ctx_state prev_state;                                      \
+                                                                        \
+        prev_state = exception_enter();                                 \
         if (notify_die(DIE_TRAP, str, regs, error_code,                 \
                         trapnr, signr) == NOTIFY_STOP) {                \
-                exception_exit(regs);                                   \
+                exception_exit(prev_state);                             \
                 return;                                                 \
         }                                                               \
         conditional_sti(regs);                                          \
         do_trap(trapnr, signr, str, regs, error_code, NULL);            \
-        exception_exit(regs);                                           \
+        exception_exit(prev_state);                                     \
 }
 
 #define DO_ERROR_INFO(trapnr, signr, str, name, sicode, siaddr)         \
 dotraplinkage void do_##name(struct pt_regs *regs, long error_code)     \
 {                                                                       \
         siginfo_t info;                                                 \
+        enum ctx_state prev_state;                                      \
+                                                                        \
         info.si_signo = signr;                                          \
         info.si_errno = 0;                                              \
         info.si_code = sicode;                                          \
         info.si_addr = (void __user *)siaddr;                           \
-        exception_enter(regs);                                          \
+        prev_state = exception_enter();                                 \
         if (notify_die(DIE_TRAP, str, regs, error_code,                 \
                         trapnr, signr) == NOTIFY_STOP) {                \
-                exception_exit(regs);                                   \
+                exception_exit(prev_state);                             \
                 return;                                                 \
         }                                                               \
         conditional_sti(regs);                                          \
         do_trap(trapnr, signr, str, regs, error_code, &info);           \
-        exception_exit(regs);                                           \
+        exception_exit(prev_state);                                     \
 }
 
 DO_ERROR_INFO(X86_TRAP_DE, SIGFPE, "divide error", divide_error, FPE_INTDIV,
@@ -226,14 +230,16 @@ DO_ERROR_INFO(X86_TRAP_AC, SIGBUS, "alignment check", alignment_check,
 /* Runs on IST stack */
 dotraplinkage void do_stack_segment(struct pt_regs *regs, long error_code)
 {
-        exception_enter(regs);
+        enum ctx_state prev_state;
+
+        prev_state = exception_enter();
         if (notify_die(DIE_TRAP, "stack segment", regs, error_code,
                        X86_TRAP_SS, SIGBUS) != NOTIFY_STOP) {
                 preempt_conditional_sti(regs);
                 do_trap(X86_TRAP_SS, SIGBUS, "stack segment", regs, error_code, NULL);
                 preempt_conditional_cli(regs);
         }
-        exception_exit(regs);
+        exception_exit(prev_state);
 }
 
 dotraplinkage void do_double_fault(struct pt_regs *regs, long error_code)
@@ -241,7 +247,7 @@ dotraplinkage void do_double_fault(struct pt_regs *regs, long error_code)
         static const char str[] = "double fault";
         struct task_struct *tsk = current;
 
-        exception_enter(regs);
+        exception_enter();
         /* Return not checked because double check cannot be ignored */
         notify_die(DIE_TRAP, str, regs, error_code, X86_TRAP_DF, SIGSEGV);
 
@@ -261,8 +267,9 @@ dotraplinkage void __kprobes
 do_general_protection(struct pt_regs *regs, long error_code)
 {
         struct task_struct *tsk;
+        enum ctx_state prev_state;
 
-        exception_enter(regs);
+        prev_state = exception_enter();
         conditional_sti(regs);
 
 #ifdef CONFIG_X86_32
@@ -300,12 +307,14 @@ do_general_protection(struct pt_regs *regs, long error_code)
 
         force_sig(SIGSEGV, tsk);
 exit:
-        exception_exit(regs);
+        exception_exit(prev_state);
 }
 
 /* May run on IST stack. */
 dotraplinkage void __kprobes notrace do_int3(struct pt_regs *regs, long error_code)
 {
+        enum ctx_state prev_state;
+
 #ifdef CONFIG_DYNAMIC_FTRACE
         /*
          * ftrace must be first, everything else may cause a recursive crash.
@@ -315,7 +324,7 @@ dotraplinkage void __kprobes notrace do_int3(struct pt_regs *regs, long error_co
             ftrace_int3_handler(regs))
                 return;
 #endif
-        exception_enter(regs);
+        prev_state = exception_enter();
 #ifdef CONFIG_KGDB_LOW_LEVEL_TRAP
         if (kgdb_ll_trap(DIE_INT3, "int3", regs, error_code, X86_TRAP_BP,
                                 SIGTRAP) == NOTIFY_STOP)
@@ -336,7 +345,7 @@ dotraplinkage void __kprobes notrace do_int3(struct pt_regs *regs, long error_co
         preempt_conditional_cli(regs);
         debug_stack_usage_dec();
 exit:
-        exception_exit(regs);
+        exception_exit(prev_state);
 }
 
 #ifdef CONFIG_X86_64
@@ -393,11 +402,12 @@ asmlinkage __kprobes struct pt_regs *sync_regs(struct pt_regs *eregs)
 dotraplinkage void __kprobes do_debug(struct pt_regs *regs, long error_code)
 {
         struct task_struct *tsk = current;
+        enum ctx_state prev_state;
         int user_icebp = 0;
         unsigned long dr6;
         int si_code;
 
-        exception_enter(regs);
+        prev_state = exception_enter();
 
         get_debugreg(dr6, 6);
 
@@ -467,7 +477,7 @@ dotraplinkage void __kprobes do_debug(struct pt_regs *regs, long error_code)
         debug_stack_usage_dec();
 
 exit:
-        exception_exit(regs);
+        exception_exit(prev_state);
 }
 
 /*
@@ -561,17 +571,21 @@ void math_error(struct pt_regs *regs, int error_code, int trapnr)
 
 dotraplinkage void do_coprocessor_error(struct pt_regs *regs, long error_code)
 {
-        exception_enter(regs);
+        enum ctx_state prev_state;
+
+        prev_state = exception_enter();
         math_error(regs, error_code, X86_TRAP_MF);
-        exception_exit(regs);
+        exception_exit(prev_state);
 }
 
 dotraplinkage void
 do_simd_coprocessor_error(struct pt_regs *regs, long error_code)
 {
-        exception_enter(regs);
+        enum ctx_state prev_state;
+
+        prev_state = exception_enter();
         math_error(regs, error_code, X86_TRAP_XF);
-        exception_exit(regs);
+        exception_exit(prev_state);
 }
 
 dotraplinkage void
@@ -639,7 +653,9 @@ EXPORT_SYMBOL_GPL(math_state_restore);
 dotraplinkage void __kprobes
 do_device_not_available(struct pt_regs *regs, long error_code)
 {
-        exception_enter(regs);
+        enum ctx_state prev_state;
+
+        prev_state = exception_enter();
         BUG_ON(use_eager_fpu());
 
 #ifdef CONFIG_MATH_EMULATION
@@ -650,7 +666,7 @@ do_device_not_available(struct pt_regs *regs, long error_code)
 
                 info.regs = regs;
                 math_emulate(&info);
-                exception_exit(regs);
+                exception_exit(prev_state);
                 return;
         }
 #endif
@@ -658,15 +674,16 @@ do_device_not_available(struct pt_regs *regs, long error_code)
 #ifdef CONFIG_X86_32
         conditional_sti(regs);
 #endif
-        exception_exit(regs);
+        exception_exit(prev_state);
 }
 
 #ifdef CONFIG_X86_32
 dotraplinkage void do_iret_error(struct pt_regs *regs, long error_code)
 {
         siginfo_t info;
+        enum ctx_state prev_state;
 
-        exception_enter(regs);
+        prev_state = exception_enter();
         local_irq_enable();
 
         info.si_signo = SIGILL;
@@ -678,7 +695,7 @@ dotraplinkage void do_iret_error(struct pt_regs *regs, long error_code)
                 do_trap(X86_TRAP_IRET, SIGILL, "iret exception", regs, error_code,
                         &info);
         }
-        exception_exit(regs);
+        exception_exit(prev_state);
 }
 #endif
 
@@ -753,6 +770,14 @@ void __init trap_init(void)
 #endif
 
         /*
+         * Set the IDT descriptor to a fixed read-only location, so that the
+         * "sidt" instruction will not leak the location of the kernel, and
+         * to defend the IDT against arbitrary memory write vulnerabilities.
+         * It will be reloaded in cpu_init() */
+        __set_fixmap(FIX_RO_IDT, __pa_symbol(idt_table), PAGE_KERNEL_RO);
+        idt_descr.address = fix_to_virt(FIX_RO_IDT);
+
+        /*
          * Should be a barrier for any external CPU state:
          */
         cpu_init();
diff --git a/arch/x86/kernel/tsc.c b/arch/x86/kernel/tsc.c
index 4b9ea101fe3b..098b3cfda72e 100644
--- a/arch/x86/kernel/tsc.c
+++ b/arch/x86/kernel/tsc.c
@@ -768,7 +768,8 @@ static cycle_t read_tsc(struct clocksource *cs)
 
 static void resume_tsc(struct clocksource *cs)
 {
-        clocksource_tsc.cycle_last = 0;
+        if (!boot_cpu_has(X86_FEATURE_NONSTOP_TSC_S3))
+                clocksource_tsc.cycle_last = 0;
 }
 
 static struct clocksource clocksource_tsc = {
@@ -939,6 +940,9 @@ static int __init init_tsc_clocksource(void)
                 clocksource_tsc.flags &= ~CLOCK_SOURCE_IS_CONTINUOUS;
         }
 
+        if (boot_cpu_has(X86_FEATURE_NONSTOP_TSC_S3))
+                clocksource_tsc.flags |= CLOCK_SOURCE_SUSPEND_NONSTOP;
+
         /*
          * Trust the results of the earlier calibration on systems
          * exporting a reliable TSC.
diff --git a/arch/x86/kernel/uprobes.c b/arch/x86/kernel/uprobes.c
index 0ba4cfb4f412..2ed845928b5f 100644
--- a/arch/x86/kernel/uprobes.c
+++ b/arch/x86/kernel/uprobes.c
@@ -697,3 +697,32 @@ bool arch_uprobe_skip_sstep(struct arch_uprobe *auprobe, struct pt_regs *regs)
                 send_sig(SIGTRAP, current, 0);
         return ret;
 }
+
+unsigned long
+arch_uretprobe_hijack_return_addr(unsigned long trampoline_vaddr, struct pt_regs *regs)
+{
+        int rasize, ncopied;
+        unsigned long orig_ret_vaddr = 0; /* clear high bits for 32-bit apps */
+
+        rasize = is_ia32_task() ? 4 : 8;
+        ncopied = copy_from_user(&orig_ret_vaddr, (void __user *)regs->sp, rasize);
+        if (unlikely(ncopied))
+                return -1;
+
+        /* check whether address has been already hijacked */
+        if (orig_ret_vaddr == trampoline_vaddr)
+                return orig_ret_vaddr;
+
+        ncopied = copy_to_user((void __user *)regs->sp, &trampoline_vaddr, rasize);
+        if (likely(!ncopied))
+                return orig_ret_vaddr;
+
+        if (ncopied != rasize) {
+                pr_err("uprobe: return address clobbered: pid=%d, %%sp=%#lx, "
+                        "%%ip=%#lx\n", current->pid, regs->sp, regs->ip);
+
+                force_sig_info(SIGSEGV, SEND_SIG_FORCED, current);
+        }
+
+        return -1;
+}
diff --git a/arch/x86/kernel/vmlinux.lds.S b/arch/x86/kernel/vmlinux.lds.S
index 22a1530146a8..10c4f3006afd 100644
--- a/arch/x86/kernel/vmlinux.lds.S
+++ b/arch/x86/kernel/vmlinux.lds.S
@@ -94,10 +94,6 @@ SECTIONS
                 _text = .;
                 /* bootstrapping code */
                 HEAD_TEXT
-#ifdef CONFIG_X86_32
-                . = ALIGN(PAGE_SIZE);
-                *(.text..page_aligned)
-#endif
                 . = ALIGN(8);
                 _stext = .;
                 TEXT_TEXT
diff --git a/arch/x86/kvm/svm.c b/arch/x86/kvm/svm.c
index e1b1ce21bc00..7d39d70647e3 100644
--- a/arch/x86/kvm/svm.c
+++ b/arch/x86/kvm/svm.c
@@ -555,7 +555,7 @@ static void svm_init_erratum_383(void)
         int err;
         u64 val;
 
-        if (!cpu_has_amd_erratum(amd_erratum_383))
+        if (!static_cpu_has_bug(X86_BUG_AMD_TLB_MMATCH))
                 return;
 
         /* Use _safe variants to not break nested virtualization */
diff --git a/arch/x86/kvm/vmx.c b/arch/x86/kvm/vmx.c
index 6667042714cc..867b81037f96 100644
--- a/arch/x86/kvm/vmx.c
+++ b/arch/x86/kvm/vmx.c
@@ -2459,7 +2459,7 @@ static int hardware_enable(void *garbage)
                 ept_sync_global();
         }
 
-        store_gdt(&__get_cpu_var(host_gdt));
+        native_store_gdt(&__get_cpu_var(host_gdt));
 
         return 0;
 }
diff --git a/arch/x86/lguest/Kconfig b/arch/x86/lguest/Kconfig
index 29043d2048a0..4a0890f815c4 100644
--- a/arch/x86/lguest/Kconfig
+++ b/arch/x86/lguest/Kconfig
@@ -1,7 +1,6 @@
 config LGUEST_GUEST
         bool "Lguest guest support"
-        select PARAVIRT
-        depends on X86_32
+        depends on X86_32 && PARAVIRT
         select TTY
         select VIRTUALIZATION
         select VIRTIO
diff --git a/arch/x86/lib/checksum_32.S b/arch/x86/lib/checksum_32.S
index 2af5df3ade7c..e78b8eee6615 100644
--- a/arch/x86/lib/checksum_32.S
+++ b/arch/x86/lib/checksum_32.S
@@ -61,7 +61,7 @@ ENTRY(csum_partial)
         testl $3, %esi          # Check alignment.
         jz 2f                   # Jump if alignment is ok.
         testl $1, %esi          # Check alignment.
-        jz 10f                  # Jump if alignment is boundary of 2bytes.
+        jz 10f                  # Jump if alignment is boundary of 2 bytes.
 
         # buf is odd
         dec %ecx
diff --git a/arch/x86/lib/memcpy_32.c b/arch/x86/lib/memcpy_32.c
index b908a59eccf5..e78761d6b7f8 100644
--- a/arch/x86/lib/memcpy_32.c
+++ b/arch/x86/lib/memcpy_32.c
@@ -26,7 +26,7 @@ void *memmove(void *dest, const void *src, size_t n)
         char *ret = dest;
 
         __asm__ __volatile__(
-                /* Handle more 16bytes in loop */
+                /* Handle more 16 bytes in loop */
                 "cmp $0x10, %0\n\t"
                 "jb     1f\n\t"
 
@@ -51,7 +51,7 @@ void *memmove(void *dest, const void *src, size_t n)
                 "sub $0x10, %0\n\t"
 
                 /*
-                 * We gobble 16byts forward in each loop.
+                 * We gobble 16 bytes forward in each loop.
                  */
                 "3:\n\t"
                 "sub $0x10, %0\n\t"
@@ -117,7 +117,7 @@ void *memmove(void *dest, const void *src, size_t n)
                 "sub $0x10, %0\n\t"
 
                 /*
-                 * We gobble 16byts backward in each loop.
+                 * We gobble 16 bytes backward in each loop.
                  */
                 "7:\n\t"
                 "sub $0x10, %0\n\t"
diff --git a/arch/x86/lib/memcpy_64.S b/arch/x86/lib/memcpy_64.S
index 1c273be7c97e..56313a326188 100644
--- a/arch/x86/lib/memcpy_64.S
+++ b/arch/x86/lib/memcpy_64.S
@@ -98,7 +98,7 @@ ENTRY(memcpy)
         subq $0x20,     %rdx
         /*
          * At most 3 ALU operations in one cycle,
-         * so append NOPS in the same 16bytes trunk.
+         * so append NOPS in the same 16 bytes trunk.
          */
         .p2align 4
 .Lcopy_backward_loop:
diff --git a/arch/x86/lib/memmove_64.S b/arch/x86/lib/memmove_64.S
index ee164610ec46..65268a6104f4 100644
--- a/arch/x86/lib/memmove_64.S
+++ b/arch/x86/lib/memmove_64.S
@@ -27,7 +27,7 @@
 ENTRY(memmove)
         CFI_STARTPROC
 
-        /* Handle more 32bytes in loop */
+        /* Handle more 32 bytes in loop */
         mov %rdi, %rax
         cmp $0x20, %rdx
         jb      1f
@@ -56,7 +56,7 @@ ENTRY(memmove)
 3:
         sub $0x20, %rdx
         /*
-         * We gobble 32byts forward in each loop.
+         * We gobble 32 bytes forward in each loop.
          */
 5:
         sub $0x20, %rdx
@@ -122,7 +122,7 @@ ENTRY(memmove)
         addq %rdx, %rdi
         subq $0x20, %rdx
         /*
-         * We gobble 32byts backward in each loop.
+         * We gobble 32 bytes backward in each loop.
          */
 8:
         subq $0x20, %rdx
diff --git a/arch/x86/lib/usercopy_32.c b/arch/x86/lib/usercopy_32.c
index f0312d746402..3eb18acd0e40 100644
--- a/arch/x86/lib/usercopy_32.c
+++ b/arch/x86/lib/usercopy_32.c
@@ -689,9 +689,3 @@ _copy_from_user(void *to, const void __user *from, unsigned long n)
         return n;
 }
 EXPORT_SYMBOL(_copy_from_user);
-
-void copy_from_user_overflow(void)
-{
-        WARN(1, "Buffer overflow detected!\n");
-}
-EXPORT_SYMBOL(copy_from_user_overflow);
diff --git a/arch/x86/mm/amdtopology.c b/arch/x86/mm/amdtopology.c
index 5247d01329ca..2ca15b59fb3f 100644
--- a/arch/x86/mm/amdtopology.c
+++ b/arch/x86/mm/amdtopology.c
@@ -130,9 +130,8 @@ int __init amd_numa_init(void)
                 }
 
                 limit >>= 16;
-                limit <<= 24;
-                limit |= (1<<24)-1;
                 limit++;
+                limit <<= 24;
 
                 if (limit > end)
                         limit = end;
diff --git a/arch/x86/mm/fault.c b/arch/x86/mm/fault.c
index 0e883364abb5..654be4ae3047 100644
--- a/arch/x86/mm/fault.c
+++ b/arch/x86/mm/fault.c
@@ -13,12 +13,12 @@
 #include <linux/perf_event.h>           /* perf_sw_event                */
 #include <linux/hugetlb.h>              /* hstate_index_to_shift        */
 #include <linux/prefetch.h>             /* prefetchw                    */
+#include <linux/context_tracking.h>     /* exception_enter(), ...       */
 
 #include <asm/traps.h>                  /* dotraplinkage, ...           */
 #include <asm/pgalloc.h>                /* pgd_*(), ...                 */
 #include <asm/kmemcheck.h>              /* kmemcheck_*(), ...           */
 #include <asm/fixmap.h>                 /* VSYSCALL_START               */
-#include <asm/context_tracking.h>       /* exception_enter(), ...       */
 
 /*
  * Page fault error code bits:
@@ -557,7 +557,7 @@ static int is_f00f_bug(struct pt_regs *regs, unsigned long address)
         /*
          * Pentium F0 0F C7 C8 bug workaround:
          */
-        if (boot_cpu_data.f00f_bug) {
+        if (boot_cpu_has_bug(X86_BUG_F00F)) {
                 nr = (address - idt_descr.address) >> 3;
 
                 if (nr == 6) {
@@ -1224,7 +1224,9 @@ good_area:
 dotraplinkage void __kprobes
 do_page_fault(struct pt_regs *regs, unsigned long error_code)
 {
-        exception_enter(regs);
+        enum ctx_state prev_state;
+
+        prev_state = exception_enter();
         __do_page_fault(regs, error_code);
-        exception_exit(regs);
+        exception_exit(prev_state);
 }
diff --git a/arch/x86/mm/highmem_32.c b/arch/x86/mm/highmem_32.c
index 6f31ee56c008..252b8f5489ba 100644
--- a/arch/x86/mm/highmem_32.c
+++ b/arch/x86/mm/highmem_32.c
@@ -137,5 +137,4 @@ void __init set_highmem_pages_init(void)
                 add_highpages_with_active_regions(nid, zone_start_pfn,
                                  zone_end_pfn);
         }
-        totalram_pages += totalhigh_pages;
 }
diff --git a/arch/x86/mm/init.c b/arch/x86/mm/init.c
index 59b7fc453277..fdc5dca14fb3 100644
--- a/arch/x86/mm/init.c
+++ b/arch/x86/mm/init.c
@@ -515,11 +515,8 @@ void free_init_pages(char *what, unsigned long begin, unsigned long end)
         printk(KERN_INFO "Freeing %s: %luk freed\n", what, (end - begin) >> 10);
 
         for (; addr < end; addr += PAGE_SIZE) {
-                ClearPageReserved(virt_to_page(addr));
-                init_page_count(virt_to_page(addr));
                 memset((void *)addr, POISON_FREE_INITMEM, PAGE_SIZE);
-                free_page(addr);
-                totalram_pages++;
+                free_reserved_page(virt_to_page(addr));
         }
 #endif
 }
diff --git a/arch/x86/mm/init_32.c b/arch/x86/mm/init_32.c
index 2d19001151d5..3ac7e319918d 100644
--- a/arch/x86/mm/init_32.c
+++ b/arch/x86/mm/init_32.c
@@ -427,14 +427,6 @@ static void __init permanent_kmaps_init(pgd_t *pgd_base)
         pkmap_page_table = pte;
 }
 
-static void __init add_one_highpage_init(struct page *page)
-{
-        ClearPageReserved(page);
-        init_page_count(page);
-        __free_page(page);
-        totalhigh_pages++;
-}
-
 void __init add_highpages_with_active_regions(int nid,
                          unsigned long start_pfn, unsigned long end_pfn)
 {
@@ -448,7 +440,7 @@ void __init add_highpages_with_active_regions(int nid,
                                               start_pfn, end_pfn);
                 for ( ; pfn < e_pfn; pfn++)
                         if (pfn_valid(pfn))
-                                add_one_highpage_init(pfn_to_page(pfn));
+                                free_highmem_page(pfn_to_page(pfn));
         }
 }
 #else
diff --git a/arch/x86/mm/init_64.c b/arch/x86/mm/init_64.c
index 474e28f10815..caad9a0ee19f 100644
--- a/arch/x86/mm/init_64.c
+++ b/arch/x86/mm/init_64.c
@@ -1011,14 +1011,12 @@ remove_pagetable(unsigned long start, unsigned long end, bool direct)
         flush_tlb_all();
 }
 
-void __ref vmemmap_free(struct page *memmap, unsigned long nr_pages)
+void __ref vmemmap_free(unsigned long start, unsigned long end)
 {
-        unsigned long start = (unsigned long)memmap;
-        unsigned long end = (unsigned long)(memmap + nr_pages);
-
         remove_pagetable(start, end, false);
 }
 
+#ifdef CONFIG_MEMORY_HOTREMOVE
 static void __meminit
 kernel_physical_mapping_remove(unsigned long start, unsigned long end)
 {
@@ -1028,7 +1026,6 @@ kernel_physical_mapping_remove(unsigned long start, unsigned long end)
         remove_pagetable(start, end, true);
 }
 
-#ifdef CONFIG_MEMORY_HOTREMOVE
 int __ref arch_remove_memory(u64 start, u64 size)
 {
         unsigned long start_pfn = start >> PAGE_SHIFT;
@@ -1067,10 +1064,9 @@ void __init mem_init(void)
 
         /* clear_bss() already clear the empty_zero_page */
 
-        reservedpages = 0;
-
-        /* this will put all low memory onto the freelists */
         register_page_bootmem_info();
+
+        /* this will put all memory onto the freelists */
         totalram_pages = free_all_bootmem();
 
         absent_pages = absent_pages_in_range(0, max_pfn);
@@ -1285,18 +1281,17 @@ static long __meminitdata addr_start, addr_end;
 static void __meminitdata *p_start, *p_end;
 static int __meminitdata node_start;
 
-int __meminit
-vmemmap_populate(struct page *start_page, unsigned long size, int node)
+static int __meminit vmemmap_populate_hugepages(unsigned long start,
+                                                unsigned long end, int node)
 {
-        unsigned long addr = (unsigned long)start_page;
-        unsigned long end = (unsigned long)(start_page + size);
+        unsigned long addr;
         unsigned long next;
         pgd_t *pgd;
         pud_t *pud;
         pmd_t *pmd;
 
-        for (; addr < end; addr = next) {
-                void *p = NULL;
+        for (addr = start; addr < end; addr = next) {
+                next = pmd_addr_end(addr, end);
 
                 pgd = vmemmap_pgd_populate(addr, node);
                 if (!pgd)
@@ -1306,31 +1301,14 @@ vmemmap_populate(struct page *start_page, unsigned long size, int node)
                 if (!pud)
                         return -ENOMEM;
 
-                if (!cpu_has_pse) {
-                        next = (addr + PAGE_SIZE) & PAGE_MASK;
-                        pmd = vmemmap_pmd_populate(pud, addr, node);
-
-                        if (!pmd)
-                                return -ENOMEM;
-
-                        p = vmemmap_pte_populate(pmd, addr, node);
+                pmd = pmd_offset(pud, addr);
+                if (pmd_none(*pmd)) {
+                        void *p;
 
-                        if (!p)
-                                return -ENOMEM;
-
-                        addr_end = addr + PAGE_SIZE;
-                        p_end = p + PAGE_SIZE;
-                } else {
-                        next = pmd_addr_end(addr, end);
-
-                        pmd = pmd_offset(pud, addr);
-                        if (pmd_none(*pmd)) {
+                        p = vmemmap_alloc_block_buf(PMD_SIZE, node);
+                        if (p) {
                                 pte_t entry;
 
-                                p = vmemmap_alloc_block_buf(PMD_SIZE, node);
-                                if (!p)
-                                        return -ENOMEM;
-
                                 entry = pfn_pte(__pa(p) >> PAGE_SHIFT,
                                                 PAGE_KERNEL_LARGE);
                                 set_pmd(pmd, __pmd(pte_val(entry)));
@@ -1347,15 +1325,32 @@ vmemmap_populate(struct page *start_page, unsigned long size, int node)
 
                                 addr_end = addr + PMD_SIZE;
                                 p_end = p + PMD_SIZE;
-                        } else
-                                vmemmap_verify((pte_t *)pmd, node, addr, next);
+                                continue;
+                        }
+                } else if (pmd_large(*pmd)) {
+                        vmemmap_verify((pte_t *)pmd, node, addr, next);
+                        continue;
                 }
-
+                pr_warn_once("vmemmap: falling back to regular page backing\n");
+                if (vmemmap_populate_basepages(addr, next, node))
+                        return -ENOMEM;
         }
-        sync_global_pgds((unsigned long)start_page, end - 1);
         return 0;
 }
 
+int __meminit vmemmap_populate(unsigned long start, unsigned long end, int node)
+{
+        int err;
+
+        if (cpu_has_pse)
+                err = vmemmap_populate_hugepages(start, end, node);
+        else
+                err = vmemmap_populate_basepages(start, end, node);
+        if (!err)
+                sync_global_pgds(start, end - 1);
+        return err;
+}
+
 #if defined(CONFIG_MEMORY_HOTPLUG_SPARSE) && defined(CONFIG_HAVE_BOOTMEM_INFO_NODE)
 void register_page_bootmem_memmap(unsigned long section_nr,
                                   struct page *start_page, unsigned long size)
diff --git a/arch/x86/mm/ioremap.c b/arch/x86/mm/ioremap.c
index 78fe3f1ac49f..9a1e6583910c 100644
--- a/arch/x86/mm/ioremap.c
+++ b/arch/x86/mm/ioremap.c
@@ -282,12 +282,7 @@ void iounmap(volatile void __iomem *addr)
            in parallel. Reuse of the virtual address is prevented by
            leaving it in the global lists until we're done with it.
            cpa takes care of the direct mappings. */
-        read_lock(&vmlist_lock);
-        for (p = vmlist; p; p = p->next) {
-                if (p->addr == (void __force *)addr)
-                        break;
-        }
-        read_unlock(&vmlist_lock);
+        p = find_vm_area((void __force *)addr);
 
         if (!p) {
                 printk(KERN_ERR "iounmap: bad address %p\n", addr);
diff --git a/arch/x86/mm/numa.c b/arch/x86/mm/numa.c
index 72fe01e9e414..a71c4e207679 100644
--- a/arch/x86/mm/numa.c
+++ b/arch/x86/mm/numa.c
@@ -114,14 +114,11 @@ void numa_clear_node(int cpu)
  */
 void __init setup_node_to_cpumask_map(void)
 {
-        unsigned int node, num = 0;
+        unsigned int node;
 
         /* setup nr_node_ids if not done yet */
-        if (nr_node_ids == MAX_NUMNODES) {
-                for_each_node_mask(node, node_possible_map)
-                        num = node;
-                nr_node_ids = num + 1;
-        }
+        if (nr_node_ids == MAX_NUMNODES)
+                setup_nr_node_ids();
 
         /* allocate the map */
         for (node = 0; node < nr_node_ids; node++)
diff --git a/arch/x86/mm/pageattr-test.c b/arch/x86/mm/pageattr-test.c
index 0e38951e65eb..d0b1773d9d2e 100644
--- a/arch/x86/mm/pageattr-test.c
+++ b/arch/x86/mm/pageattr-test.c
@@ -130,13 +130,12 @@ static int pageattr_test(void)
         }
 
         failed += print_split(&sa);
-        srandom32(100);
 
         for (i = 0; i < NTEST; i++) {
-                unsigned long pfn = random32() % max_pfn_mapped;
+                unsigned long pfn = prandom_u32() % max_pfn_mapped;
 
                 addr[i] = (unsigned long)__va(pfn << PAGE_SHIFT);
-                len[i] = random32() % 100;
+                len[i] = prandom_u32() % 100;
                 len[i] = min_t(unsigned long, len[i], max_pfn_mapped - pfn - 1);
 
                 if (len[i] == 0)
diff --git a/arch/x86/mm/pageattr.c b/arch/x86/mm/pageattr.c
index fb4e73ec24d8..bb32480c2d71 100644
--- a/arch/x86/mm/pageattr.c
+++ b/arch/x86/mm/pageattr.c
@@ -542,13 +542,14 @@ out_unlock:
         return do_split;
 }
 
-int __split_large_page(pte_t *kpte, unsigned long address, pte_t *pbase)
+static int
+__split_large_page(pte_t *kpte, unsigned long address, struct page *base)
 {
+        pte_t *pbase = (pte_t *)page_address(base);
         unsigned long pfn, pfninc = 1;
         unsigned int i, level;
         pte_t *tmp;
         pgprot_t ref_prot;
-        struct page *base = virt_to_page(pbase);
 
         spin_lock(&pgd_lock);
         /*
@@ -633,7 +634,6 @@ int __split_large_page(pte_t *kpte, unsigned long address, pte_t *pbase)
 
 static int split_large_page(pte_t *kpte, unsigned long address)
 {
-        pte_t *pbase;
         struct page *base;
 
         if (!debug_pagealloc)
@@ -644,8 +644,7 @@ static int split_large_page(pte_t *kpte, unsigned long address)
         if (!base)
                 return -ENOMEM;
 
-        pbase = (pte_t *)page_address(base);
-        if (__split_large_page(kpte, address, pbase))
+        if (__split_large_page(kpte, address, base))
                 __free_page(base);
 
         return 0;
diff --git a/arch/x86/pci/common.c b/arch/x86/pci/common.c
index 901177d75ff5..305c68b8d538 100644
--- a/arch/x86/pci/common.c
+++ b/arch/x86/pci/common.c
@@ -6,6 +6,7 @@
 
 #include <linux/sched.h>
 #include <linux/pci.h>
+#include <linux/pci-acpi.h>
 #include <linux/ioport.h>
 #include <linux/init.h>
 #include <linux/dmi.h>
@@ -170,6 +171,16 @@ void pcibios_fixup_bus(struct pci_bus *b)
                 pcibios_fixup_device_resources(dev);
 }
 
+void pcibios_add_bus(struct pci_bus *bus)
+{
+        acpi_pci_add_bus(bus);
+}
+
+void pcibios_remove_bus(struct pci_bus *bus)
+{
+        acpi_pci_remove_bus(bus);
+}
+
 /*
  * Only use DMI information to set this if nothing was passed
  * on the kernel command line (which was parsed earlier).
diff --git a/arch/x86/pci/xen.c b/arch/x86/pci/xen.c
index 94e76620460f..4a9be6ddf054 100644
--- a/arch/x86/pci/xen.c
+++ b/arch/x86/pci/xen.c
@@ -177,7 +177,7 @@ static int xen_setup_msi_irqs(struct pci_dev *dev, int nvec, int type)
                 goto error;
         i = 0;
         list_for_each_entry(msidesc, &dev->msi_list, list) {
-                irq = xen_bind_pirq_msi_to_irq(dev, msidesc, v[i], 0,
+                irq = xen_bind_pirq_msi_to_irq(dev, msidesc, v[i],
                                                (type == PCI_CAP_ID_MSIX) ?
                                                "pcifront-msi-x" :
                                                "pcifront-msi",
@@ -244,7 +244,7 @@ static int xen_hvm_setup_msi_irqs(struct pci_dev *dev, int nvec, int type)
                         dev_dbg(&dev->dev,
                                 "xen: msi already bound to pirq=%d\n", pirq);
                 }
-                irq = xen_bind_pirq_msi_to_irq(dev, msidesc, pirq, 0,
+                irq = xen_bind_pirq_msi_to_irq(dev, msidesc, pirq,
                                                (type == PCI_CAP_ID_MSIX) ?
                                                "msi-x" : "msi",
                                                DOMID_SELF);
@@ -326,7 +326,7 @@ static int xen_initdom_setup_msi_irqs(struct pci_dev *dev, int nvec, int type)
                 }
 
                 ret = xen_bind_pirq_msi_to_irq(dev, msidesc,
-                                               map_irq.pirq, map_irq.index,
+                                               map_irq.pirq,
                                                (type == PCI_CAP_ID_MSIX) ?
                                                "msi-x" : "msi",
                                                 domid);
diff --git a/arch/x86/platform/efi/efi.c b/arch/x86/platform/efi/efi.c
index e4a86a677ce1..b55d174e5034 100644
--- a/arch/x86/platform/efi/efi.c
+++ b/arch/x86/platform/efi/efi.c
@@ -49,6 +49,7 @@
 #include <asm/cacheflush.h>
 #include <asm/tlbflush.h>
 #include <asm/x86_init.h>
+#include <asm/rtc.h>
 
 #define EFI_DEBUG       1
 
@@ -352,10 +353,10 @@ static efi_status_t __init phys_efi_get_time(efi_time_t *tm,
 
 int efi_set_rtc_mmss(unsigned long nowtime)
 {
-        int real_seconds, real_minutes;
         efi_status_t    status;
         efi_time_t      eft;
         efi_time_cap_t  cap;
+        struct rtc_time tm;
 
         status = efi.get_time(&eft, &cap);
         if (status != EFI_SUCCESS) {
@@ -363,13 +364,20 @@ int efi_set_rtc_mmss(unsigned long nowtime)
                 return -1;
         }
 
-        real_seconds = nowtime % 60;
-        real_minutes = nowtime / 60;
-        if (((abs(real_minutes - eft.minute) + 15)/30) & 1)
-                real_minutes += 30;
-        real_minutes %= 60;
-        eft.minute = real_minutes;
-        eft.second = real_seconds;
+        rtc_time_to_tm(nowtime, &tm);
+        if (!rtc_valid_tm(&tm)) {
+                eft.year = tm.tm_year + 1900;
+                eft.month = tm.tm_mon + 1;
+                eft.day = tm.tm_mday;
+                eft.minute = tm.tm_min;
+                eft.second = tm.tm_sec;
+                eft.nanosecond = 0;
+        } else {
+                printk(KERN_ERR
+                       "%s: Invalid EFI RTC value: write of %lx to EFI RTC failed\n",
+                       __FUNCTION__, nowtime);
+                return -1;
+        }
 
         status = efi.set_time(&eft);
         if (status != EFI_SUCCESS) {
diff --git a/arch/x86/platform/mrst/mrst.c b/arch/x86/platform/mrst/mrst.c
index e31bcd8f2eee..a0a0a4389bbd 100644
--- a/arch/x86/platform/mrst/mrst.c
+++ b/arch/x86/platform/mrst/mrst.c
@@ -356,8 +356,7 @@ static int __init sfi_parse_gpio(struct sfi_table_header *table)
         num = SFI_GET_NUM_ENTRIES(sb, struct sfi_gpio_table_entry);
         pentry = (struct sfi_gpio_table_entry *)sb->pentry;
 
-        gpio_table = (struct sfi_gpio_table_entry *)
-                                kmalloc(num * sizeof(*pentry), GFP_KERNEL);
+        gpio_table = kmalloc(num * sizeof(*pentry), GFP_KERNEL);
         if (!gpio_table)
                 return -1;
         memcpy(gpio_table, pentry, num * sizeof(*pentry));
diff --git a/arch/x86/platform/mrst/vrtc.c b/arch/x86/platform/mrst/vrtc.c
index 225bd0f0f675..d62b0a3b5c14 100644
--- a/arch/x86/platform/mrst/vrtc.c
+++ b/arch/x86/platform/mrst/vrtc.c
@@ -85,27 +85,35 @@ unsigned long vrtc_get_time(void)
         return mktime(year, mon, mday, hour, min, sec);
 }
 
-/* Only care about the minutes and seconds */
 int vrtc_set_mmss(unsigned long nowtime)
 {
-        int real_sec, real_min;
         unsigned long flags;
-        int vrtc_min;
-
-        spin_lock_irqsave(&rtc_lock, flags);
-        vrtc_min = vrtc_cmos_read(RTC_MINUTES);
-
-        real_sec = nowtime % 60;
-        real_min = nowtime / 60;
-        if (((abs(real_min - vrtc_min) + 15)/30) & 1)
-                real_min += 30;
-        real_min %= 60;
-
-        vrtc_cmos_write(real_sec, RTC_SECONDS);
-        vrtc_cmos_write(real_min, RTC_MINUTES);
-        spin_unlock_irqrestore(&rtc_lock, flags);
-
-        return 0;
+        struct rtc_time tm;
+        int year;
+        int retval = 0;
+
+        rtc_time_to_tm(nowtime, &tm);
+        if (!rtc_valid_tm(&tm) && tm.tm_year >= 72) {
+                /*
+                 * tm.year is the number of years since 1900, and the
+                 * vrtc need the years since 1972.
+                 */
+                year = tm.tm_year - 72;
+                spin_lock_irqsave(&rtc_lock, flags);
+                vrtc_cmos_write(year, RTC_YEAR);
+                vrtc_cmos_write(tm.tm_mon, RTC_MONTH);
+                vrtc_cmos_write(tm.tm_mday, RTC_DAY_OF_MONTH);
+                vrtc_cmos_write(tm.tm_hour, RTC_HOURS);
+                vrtc_cmos_write(tm.tm_min, RTC_MINUTES);
+                vrtc_cmos_write(tm.tm_sec, RTC_SECONDS);
+                spin_unlock_irqrestore(&rtc_lock, flags);
+        } else {
+                printk(KERN_ERR
+                       "%s: Invalid vRTC value: write of %lx to vRTC failed\n",
+                        __FUNCTION__, nowtime);
+                retval = -EINVAL;
+        }
+        return retval;
 }
 
 void __init mrst_rtc_init(void)
diff --git a/arch/x86/platform/olpc/olpc-xo1-sci.c b/arch/x86/platform/olpc/olpc-xo1-sci.c
index 74704be7b1fe..9a2e590dd202 100644
--- a/arch/x86/platform/olpc/olpc-xo1-sci.c
+++ b/arch/x86/platform/olpc/olpc-xo1-sci.c
@@ -460,7 +460,6 @@ static int setup_power_button(struct platform_device *pdev)
 static void free_power_button(void)
 {
         input_unregister_device(power_button_idev);
-        input_free_device(power_button_idev);
 }
 
 static int setup_ebook_switch(struct platform_device *pdev)
@@ -491,7 +490,6 @@ static int setup_ebook_switch(struct platform_device *pdev)
 static void free_ebook_switch(void)
 {
         input_unregister_device(ebook_switch_idev);
-        input_free_device(ebook_switch_idev);
 }
 
 static int setup_lid_switch(struct platform_device *pdev)
@@ -526,6 +524,7 @@ static int setup_lid_switch(struct platform_device *pdev)
 
 err_create_attr:
         input_unregister_device(lid_switch_idev);
+        lid_switch_idev = NULL;
 err_register:
         input_free_device(lid_switch_idev);
         return r;
@@ -535,7 +534,6 @@ static void free_lid_switch(void)
 {
         device_remove_file(&lid_switch_idev->dev, &dev_attr_lid_wake_mode);
         input_unregister_device(lid_switch_idev);
-        input_free_device(lid_switch_idev);
 }
 
 static int xo1_sci_probe(struct platform_device *pdev)
diff --git a/arch/x86/platform/uv/uv_time.c b/arch/x86/platform/uv/uv_time.c
index 98718f604eb6..5c86786bbfd2 100644
--- a/arch/x86/platform/uv/uv_time.c
+++ b/arch/x86/platform/uv/uv_time.c
@@ -159,10 +159,9 @@ static __init int uv_rtc_allocate_timers(void)
 {
         int cpu;
 
-        blade_info = kmalloc(uv_possible_blades * sizeof(void *), GFP_KERNEL);
+        blade_info = kzalloc(uv_possible_blades * sizeof(void *), GFP_KERNEL);
         if (!blade_info)
                 return -ENOMEM;
-        memset(blade_info, 0, uv_possible_blades * sizeof(void *));
 
         for_each_present_cpu(cpu) {
                 int nid = cpu_to_node(cpu);
diff --git a/arch/x86/power/cpu.c b/arch/x86/power/cpu.c
index 3c68768d7a75..6d6e907cee46 100644
--- a/arch/x86/power/cpu.c
+++ b/arch/x86/power/cpu.c
@@ -62,11 +62,9 @@ static void __save_processor_state(struct saved_context *ctxt)
          * descriptor tables
          */
 #ifdef CONFIG_X86_32
-        store_gdt(&ctxt->gdt);
         store_idt(&ctxt->idt);
 #else
 /* CONFIG_X86_64 */
-        store_gdt((struct desc_ptr *)&ctxt->gdt_limit);
         store_idt((struct desc_ptr *)&ctxt->idt_limit);
 #endif
         store_tr(ctxt->tr);
@@ -135,7 +133,10 @@ static void fix_processor_context(void)
 {
         int cpu = smp_processor_id();
         struct tss_struct *t = &per_cpu(init_tss, cpu);
-
+#ifdef CONFIG_X86_64
+        struct desc_struct *desc = get_cpu_gdt_table(cpu);
+        tss_desc tss;
+#endif
         set_tss_desc(cpu, t);   /*
                                  * This just modifies memory; should not be
                                  * necessary. But... This is necessary, because
@@ -144,7 +145,9 @@ static void fix_processor_context(void)
                                  */
 
 #ifdef CONFIG_X86_64
-        get_cpu_gdt_table(cpu)[GDT_ENTRY_TSS].type = 9;
+        memcpy(&tss, &desc[GDT_ENTRY_TSS], sizeof(tss_desc));
+        tss.type = 0x9; /* The available 64-bit TSS (see AMD vol 2, pg 91 */
+        write_gdt_entry(desc, GDT_ENTRY_TSS, &tss, DESC_TSS);
 
         syscall_init();                         /* This sets MSR_*STAR and related */
 #endif
@@ -183,11 +186,9 @@ static void __restore_processor_state(struct saved_context *ctxt)
          * ltr is done i fix_processor_context().
          */
 #ifdef CONFIG_X86_32
-        load_gdt(&ctxt->gdt);
         load_idt(&ctxt->idt);
 #else
 /* CONFIG_X86_64 */
-        load_gdt((const struct desc_ptr *)&ctxt->gdt_limit);
         load_idt((const struct desc_ptr *)&ctxt->idt_limit);
 #endif
 
diff --git a/arch/x86/syscalls/syscall_32.tbl b/arch/x86/syscalls/syscall_32.tbl
index e6d55f0064df..d0d59bfbccce 100644
--- a/arch/x86/syscalls/syscall_32.tbl
+++ b/arch/x86/syscalls/syscall_32.tbl
@@ -43,7 +43,7 @@
 34      i386    nice                    sys_nice
 35      i386    ftime
 36      i386    sync                    sys_sync
-37      i386    kill                    sys_kill                        sys32_kill
+37      i386    kill                    sys_kill
 38      i386    rename                  sys_rename
 39      i386    mkdir                   sys_mkdir
 40      i386    rmdir                   sys_rmdir
@@ -123,7 +123,7 @@
 114     i386    wait4                   sys_wait4                       compat_sys_wait4
 115     i386    swapoff                 sys_swapoff
 116     i386    sysinfo                 sys_sysinfo                     compat_sys_sysinfo
-117     i386    ipc                     sys_ipc                         sys32_ipc
+117     i386    ipc                     sys_ipc                         compat_sys_ipc
 118     i386    fsync                   sys_fsync
 119     i386    sigreturn               sys_sigreturn                   stub32_sigreturn
 120     i386    clone                   sys_clone                       stub32_clone
@@ -131,7 +131,7 @@
 122     i386    uname                   sys_newuname
 123     i386    modify_ldt              sys_modify_ldt
 124     i386    adjtimex                sys_adjtimex                    compat_sys_adjtimex
-125     i386    mprotect                sys_mprotect                    sys32_mprotect
+125     i386    mprotect                sys_mprotect
 126     i386    sigprocmask             sys_sigprocmask                 compat_sys_sigprocmask
 127     i386    create_module
 128     i386    init_module             sys_init_module
@@ -193,7 +193,7 @@
 184     i386    capget                  sys_capget
 185     i386    capset                  sys_capset
 186     i386    sigaltstack             sys_sigaltstack                 compat_sys_sigaltstack
-187     i386    sendfile                sys_sendfile                    sys32_sendfile
+187     i386    sendfile                sys_sendfile                    compat_sys_sendfile
 188     i386    getpmsg
 189     i386    putpmsg
 190     i386    vfork                   sys_vfork                       stub32_vfork
@@ -259,7 +259,7 @@
 250     i386    fadvise64               sys_fadvise64                   sys32_fadvise64
 # 251 is available for reuse (was briefly sys_set_zone_reclaim)
 252     i386    exit_group              sys_exit_group
-253     i386    lookup_dcookie          sys_lookup_dcookie              sys32_lookup_dcookie
+253     i386    lookup_dcookie          sys_lookup_dcookie              compat_sys_lookup_dcookie
 254     i386    epoll_create            sys_epoll_create
 255     i386    epoll_ctl               sys_epoll_ctl
 256     i386    epoll_wait              sys_epoll_wait
diff --git a/arch/x86/tools/Makefile b/arch/x86/tools/Makefile
index bae601f900ef..e8120346903b 100644
--- a/arch/x86/tools/Makefile
+++ b/arch/x86/tools/Makefile
@@ -39,4 +39,5 @@ $(obj)/insn_sanity.o: $(srctree)/arch/x86/lib/insn.c $(srctree)/arch/x86/lib/ina
 
 HOST_EXTRACFLAGS += -I$(srctree)/tools/include
 hostprogs-y     += relocs
+relocs-objs     := relocs_32.o relocs_64.o relocs_common.o
 relocs: $(obj)/relocs
diff --git a/arch/x86/tools/relocs.c b/arch/x86/tools/relocs.c
index 79d67bd507fa..590be1090892 100644
--- a/arch/x86/tools/relocs.c
+++ b/arch/x86/tools/relocs.c
@@ -1,43 +1,36 @@
-#include <stdio.h>
-#include <stdarg.h>
-#include <stdlib.h>
-#include <stdint.h>
-#include <string.h>
-#include <errno.h>
-#include <unistd.h>
-#include <elf.h>
-#include <byteswap.h>
-#define USE_BSD
-#include <endian.h>
-#include <regex.h>
-#include <tools/le_byteshift.h>
-
-static void die(char *fmt, ...);
-
-#define ARRAY_SIZE(x) (sizeof(x) / sizeof((x)[0]))
-static Elf32_Ehdr ehdr;
-static unsigned long reloc_count, reloc_idx;
-static unsigned long *relocs;
-static unsigned long reloc16_count, reloc16_idx;
-static unsigned long *relocs16;
+/* This is included from relocs_32/64.c */
+
+#define ElfW(type)              _ElfW(ELF_BITS, type)
+#define _ElfW(bits, type)       __ElfW(bits, type)
+#define __ElfW(bits, type)      Elf##bits##_##type
+
+#define Elf_Addr                ElfW(Addr)
+#define Elf_Ehdr                ElfW(Ehdr)
+#define Elf_Phdr                ElfW(Phdr)
+#define Elf_Shdr                ElfW(Shdr)
+#define Elf_Sym                 ElfW(Sym)
+
+static Elf_Ehdr ehdr;
+
+struct relocs {
+        uint32_t        *offset;
+        unsigned long   count;
+        unsigned long   size;
+};
+
+static struct relocs relocs16;
+static struct relocs relocs32;
+static struct relocs relocs64;
 
 struct section {
-        Elf32_Shdr     shdr;
+        Elf_Shdr       shdr;
         struct section *link;
-        Elf32_Sym      *symtab;
-        Elf32_Rel      *reltab;
+        Elf_Sym        *symtab;
+        Elf_Rel        *reltab;
         char           *strtab;
 };
 static struct section *secs;
 
-enum symtype {
-        S_ABS,
-        S_REL,
-        S_SEG,
-        S_LIN,
-        S_NSYMTYPES
-};
-
 static const char * const sym_regex_kernel[S_NSYMTYPES] = {
 /*
  * Following symbols have been audited. There values are constant and do
@@ -49,6 +42,9 @@ static const char * const sym_regex_kernel[S_NSYMTYPES] = {
         "^(xen_irq_disable_direct_reloc$|"
         "xen_save_fl_direct_reloc$|"
         "VDSO|"
+#if ELF_BITS == 64
+        "__vvar_page|"
+#endif
         "__crc_)",
 
 /*
@@ -72,6 +68,11 @@ static const char * const sym_regex_kernel[S_NSYMTYPES] = {
         "__end_rodata|"
         "__initramfs_start|"
         "(jiffies|jiffies_64)|"
+#if ELF_BITS == 64
+        "__per_cpu_load|"
+        "init_per_cpu__.*|"
+        "__end_rodata_hpage_align|"
+#endif
         "_end)$"
 };
 
@@ -132,15 +133,6 @@ static void regex_init(int use_real_mode)
         }
 }
 
-static void die(char *fmt, ...)
-{
-        va_list ap;
-        va_start(ap, fmt);
-        vfprintf(stderr, fmt, ap);
-        va_end(ap);
-        exit(1);
-}
-
 static const char *sym_type(unsigned type)
 {
         static const char *type_name[] = {
@@ -198,6 +190,24 @@ static const char *rel_type(unsigned type)
 {
         static const char *type_name[] = {
 #define REL_TYPE(X) [X] = #X
+#if ELF_BITS == 64
+                REL_TYPE(R_X86_64_NONE),
+                REL_TYPE(R_X86_64_64),
+                REL_TYPE(R_X86_64_PC32),
+                REL_TYPE(R_X86_64_GOT32),
+                REL_TYPE(R_X86_64_PLT32),
+                REL_TYPE(R_X86_64_COPY),
+                REL_TYPE(R_X86_64_GLOB_DAT),
+                REL_TYPE(R_X86_64_JUMP_SLOT),
+                REL_TYPE(R_X86_64_RELATIVE),
+                REL_TYPE(R_X86_64_GOTPCREL),
+                REL_TYPE(R_X86_64_32),
+                REL_TYPE(R_X86_64_32S),
+                REL_TYPE(R_X86_64_16),
+                REL_TYPE(R_X86_64_PC16),
+                REL_TYPE(R_X86_64_8),
+                REL_TYPE(R_X86_64_PC8),
+#else
                 REL_TYPE(R_386_NONE),
                 REL_TYPE(R_386_32),
                 REL_TYPE(R_386_PC32),
@@ -213,6 +223,7 @@ static const char *rel_type(unsigned type)
                 REL_TYPE(R_386_PC8),
                 REL_TYPE(R_386_16),
                 REL_TYPE(R_386_PC16),
+#endif
 #undef REL_TYPE
         };
         const char *name = "unknown type rel type name";
@@ -240,7 +251,7 @@ static const char *sec_name(unsigned shndx)
         return name;
 }
 
-static const char *sym_name(const char *sym_strtab, Elf32_Sym *sym)
+static const char *sym_name(const char *sym_strtab, Elf_Sym *sym)
 {
         const char *name;
         name = "<noname>";
@@ -253,15 +264,42 @@ static const char *sym_name(const char *sym_strtab, Elf32_Sym *sym)
         return name;
 }
 
+static Elf_Sym *sym_lookup(const char *symname)
+{
+        int i;
+        for (i = 0; i < ehdr.e_shnum; i++) {
+                struct section *sec = &secs[i];
+                long nsyms;
+                char *strtab;
+                Elf_Sym *symtab;
+                Elf_Sym *sym;
+
+                if (sec->shdr.sh_type != SHT_SYMTAB)
+                        continue;
 
+                nsyms = sec->shdr.sh_size/sizeof(Elf_Sym);
+                symtab = sec->symtab;
+                strtab = sec->link->strtab;
+
+                for (sym = symtab; --nsyms >= 0; sym++) {
+                        if (!sym->st_name)
+                                continue;
+                        if (strcmp(symname, strtab + sym->st_name) == 0)
+                                return sym;
+                }
+        }
+        return 0;
+}
 
 #if BYTE_ORDER == LITTLE_ENDIAN
 #define le16_to_cpu(val) (val)
 #define le32_to_cpu(val) (val)
+#define le64_to_cpu(val) (val)
 #endif
 #if BYTE_ORDER == BIG_ENDIAN
 #define le16_to_cpu(val) bswap_16(val)
 #define le32_to_cpu(val) bswap_32(val)
+#define le64_to_cpu(val) bswap_64(val)
 #endif
 
 static uint16_t elf16_to_cpu(uint16_t val)
@@ -274,6 +312,23 @@ static uint32_t elf32_to_cpu(uint32_t val)
         return le32_to_cpu(val);
 }
 
+#define elf_half_to_cpu(x)      elf16_to_cpu(x)
+#define elf_word_to_cpu(x)      elf32_to_cpu(x)
+
+#if ELF_BITS == 64
+static uint64_t elf64_to_cpu(uint64_t val)
+{
+        return le64_to_cpu(val);
+}
+#define elf_addr_to_cpu(x)      elf64_to_cpu(x)
+#define elf_off_to_cpu(x)       elf64_to_cpu(x)
+#define elf_xword_to_cpu(x)     elf64_to_cpu(x)
+#else
+#define elf_addr_to_cpu(x)      elf32_to_cpu(x)
+#define elf_off_to_cpu(x)       elf32_to_cpu(x)
+#define elf_xword_to_cpu(x)     elf32_to_cpu(x)
+#endif
+
 static void read_ehdr(FILE *fp)
 {
         if (fread(&ehdr, sizeof(ehdr), 1, fp) != 1) {
@@ -283,8 +338,8 @@ static void read_ehdr(FILE *fp)
         if (memcmp(ehdr.e_ident, ELFMAG, SELFMAG) != 0) {
                 die("No ELF magic\n");
         }
-        if (ehdr.e_ident[EI_CLASS] != ELFCLASS32) {
-                die("Not a 32 bit executable\n");
+        if (ehdr.e_ident[EI_CLASS] != ELF_CLASS) {
+                die("Not a %d bit executable\n", ELF_BITS);
         }
         if (ehdr.e_ident[EI_DATA] != ELFDATA2LSB) {
                 die("Not a LSB ELF executable\n");
@@ -293,36 +348,36 @@ static void read_ehdr(FILE *fp)
                 die("Unknown ELF version\n");
         }
         /* Convert the fields to native endian */
-        ehdr.e_type      = elf16_to_cpu(ehdr.e_type);
-        ehdr.e_machine   = elf16_to_cpu(ehdr.e_machine);
-        ehdr.e_version   = elf32_to_cpu(ehdr.e_version);
-        ehdr.e_entry     = elf32_to_cpu(ehdr.e_entry);
-        ehdr.e_phoff     = elf32_to_cpu(ehdr.e_phoff);
-        ehdr.e_shoff     = elf32_to_cpu(ehdr.e_shoff);
-        ehdr.e_flags     = elf32_to_cpu(ehdr.e_flags);
-        ehdr.e_ehsize    = elf16_to_cpu(ehdr.e_ehsize);
-        ehdr.e_phentsize = elf16_to_cpu(ehdr.e_phentsize);
-        ehdr.e_phnum     = elf16_to_cpu(ehdr.e_phnum);
-        ehdr.e_shentsize = elf16_to_cpu(ehdr.e_shentsize);
-        ehdr.e_shnum     = elf16_to_cpu(ehdr.e_shnum);
-        ehdr.e_shstrndx  = elf16_to_cpu(ehdr.e_shstrndx);
+        ehdr.e_type      = elf_half_to_cpu(ehdr.e_type);
+        ehdr.e_machine   = elf_half_to_cpu(ehdr.e_machine);
+        ehdr.e_version   = elf_word_to_cpu(ehdr.e_version);
+        ehdr.e_entry     = elf_addr_to_cpu(ehdr.e_entry);
+        ehdr.e_phoff     = elf_off_to_cpu(ehdr.e_phoff);
+        ehdr.e_shoff     = elf_off_to_cpu(ehdr.e_shoff);
+        ehdr.e_flags     = elf_word_to_cpu(ehdr.e_flags);
+        ehdr.e_ehsize    = elf_half_to_cpu(ehdr.e_ehsize);
+        ehdr.e_phentsize = elf_half_to_cpu(ehdr.e_phentsize);
+        ehdr.e_phnum     = elf_half_to_cpu(ehdr.e_phnum);
+        ehdr.e_shentsize = elf_half_to_cpu(ehdr.e_shentsize);
+        ehdr.e_shnum     = elf_half_to_cpu(ehdr.e_shnum);
+        ehdr.e_shstrndx  = elf_half_to_cpu(ehdr.e_shstrndx);
 
         if ((ehdr.e_type != ET_EXEC) && (ehdr.e_type != ET_DYN)) {
                 die("Unsupported ELF header type\n");
         }
-        if (ehdr.e_machine != EM_386) {
-                die("Not for x86\n");
+        if (ehdr.e_machine != ELF_MACHINE) {
+                die("Not for %s\n", ELF_MACHINE_NAME);
         }
         if (ehdr.e_version != EV_CURRENT) {
                 die("Unknown ELF version\n");
         }
-        if (ehdr.e_ehsize != sizeof(Elf32_Ehdr)) {
+        if (ehdr.e_ehsize != sizeof(Elf_Ehdr)) {
                 die("Bad Elf header size\n");
         }
-        if (ehdr.e_phentsize != sizeof(Elf32_Phdr)) {
+        if (ehdr.e_phentsize != sizeof(Elf_Phdr)) {
                 die("Bad program header entry\n");
         }
-        if (ehdr.e_shentsize != sizeof(Elf32_Shdr)) {
+        if (ehdr.e_shentsize != sizeof(Elf_Shdr)) {
                 die("Bad section header entry\n");
         }
         if (ehdr.e_shstrndx >= ehdr.e_shnum) {
@@ -333,7 +388,7 @@ static void read_ehdr(FILE *fp)
 static void read_shdrs(FILE *fp)
 {
         int i;
-        Elf32_Shdr shdr;
+        Elf_Shdr shdr;
 
         secs = calloc(ehdr.e_shnum, sizeof(struct section));
         if (!secs) {
@@ -349,16 +404,16 @@ static void read_shdrs(FILE *fp)
                 if (fread(&shdr, sizeof shdr, 1, fp) != 1)
                         die("Cannot read ELF section headers %d/%d: %s\n",
                             i, ehdr.e_shnum, strerror(errno));
-                sec->shdr.sh_name      = elf32_to_cpu(shdr.sh_name);
-                sec->shdr.sh_type      = elf32_to_cpu(shdr.sh_type);
-                sec->shdr.sh_flags     = elf32_to_cpu(shdr.sh_flags);
-                sec->shdr.sh_addr      = elf32_to_cpu(shdr.sh_addr);
-                sec->shdr.sh_offset    = elf32_to_cpu(shdr.sh_offset);
-                sec->shdr.sh_size      = elf32_to_cpu(shdr.sh_size);
-                sec->shdr.sh_link      = elf32_to_cpu(shdr.sh_link);
-                sec->shdr.sh_info      = elf32_to_cpu(shdr.sh_info);
-                sec->shdr.sh_addralign = elf32_to_cpu(shdr.sh_addralign);
-                sec->shdr.sh_entsize   = elf32_to_cpu(shdr.sh_entsize);
+                sec->shdr.sh_name      = elf_word_to_cpu(shdr.sh_name);
+                sec->shdr.sh_type      = elf_word_to_cpu(shdr.sh_type);
+                sec->shdr.sh_flags     = elf_xword_to_cpu(shdr.sh_flags);
+                sec->shdr.sh_addr      = elf_addr_to_cpu(shdr.sh_addr);
+                sec->shdr.sh_offset    = elf_off_to_cpu(shdr.sh_offset);
+                sec->shdr.sh_size      = elf_xword_to_cpu(shdr.sh_size);
+                sec->shdr.sh_link      = elf_word_to_cpu(shdr.sh_link);
+                sec->shdr.sh_info      = elf_word_to_cpu(shdr.sh_info);
+                sec->shdr.sh_addralign = elf_xword_to_cpu(shdr.sh_addralign);
+                sec->shdr.sh_entsize   = elf_xword_to_cpu(shdr.sh_entsize);
                 if (sec->shdr.sh_link < ehdr.e_shnum)
                         sec->link = &secs[sec->shdr.sh_link];
         }
@@ -412,12 +467,12 @@ static void read_symtabs(FILE *fp)
                         die("Cannot read symbol table: %s\n",
                                 strerror(errno));
                 }
-                for (j = 0; j < sec->shdr.sh_size/sizeof(Elf32_Sym); j++) {
-                        Elf32_Sym *sym = &sec->symtab[j];
-                        sym->st_name  = elf32_to_cpu(sym->st_name);
-                        sym->st_value = elf32_to_cpu(sym->st_value);
-                        sym->st_size  = elf32_to_cpu(sym->st_size);
-                        sym->st_shndx = elf16_to_cpu(sym->st_shndx);
+                for (j = 0; j < sec->shdr.sh_size/sizeof(Elf_Sym); j++) {
+                        Elf_Sym *sym = &sec->symtab[j];
+                        sym->st_name  = elf_word_to_cpu(sym->st_name);
+                        sym->st_value = elf_addr_to_cpu(sym->st_value);
+                        sym->st_size  = elf_xword_to_cpu(sym->st_size);
+                        sym->st_shndx = elf_half_to_cpu(sym->st_shndx);
                 }
         }
 }
@@ -428,7 +483,7 @@ static void read_relocs(FILE *fp)
         int i,j;
         for (i = 0; i < ehdr.e_shnum; i++) {
                 struct section *sec = &secs[i];
-                if (sec->shdr.sh_type != SHT_REL) {
+                if (sec->shdr.sh_type != SHT_REL_TYPE) {
                         continue;
                 }
                 sec->reltab = malloc(sec->shdr.sh_size);
@@ -445,10 +500,13 @@ static void read_relocs(FILE *fp)
                         die("Cannot read symbol table: %s\n",
                                 strerror(errno));
                 }
-                for (j = 0; j < sec->shdr.sh_size/sizeof(Elf32_Rel); j++) {
-                        Elf32_Rel *rel = &sec->reltab[j];
-                        rel->r_offset = elf32_to_cpu(rel->r_offset);
-                        rel->r_info   = elf32_to_cpu(rel->r_info);
+                for (j = 0; j < sec->shdr.sh_size/sizeof(Elf_Rel); j++) {
+                        Elf_Rel *rel = &sec->reltab[j];
+                        rel->r_offset = elf_addr_to_cpu(rel->r_offset);
+                        rel->r_info   = elf_xword_to_cpu(rel->r_info);
+#if (SHT_REL_TYPE == SHT_RELA)
+                        rel->r_addend = elf_xword_to_cpu(rel->r_addend);
+#endif
                 }
         }
 }
@@ -457,6 +515,13 @@ static void read_relocs(FILE *fp)
 static void print_absolute_symbols(void)
 {
         int i;
+        const char *format;
+
+        if (ELF_BITS == 64)
+                format = "%5d %016"PRIx64" %5"PRId64" %10s %10s %12s %s\n";
+        else
+                format = "%5d %08"PRIx32"  %5"PRId32" %10s %10s %12s %s\n";
+
         printf("Absolute symbols\n");
         printf(" Num:    Value Size  Type       Bind        Visibility  Name\n");
         for (i = 0; i < ehdr.e_shnum; i++) {
@@ -468,19 +533,19 @@ static void print_absolute_symbols(void)
                         continue;
                 }
                 sym_strtab = sec->link->strtab;
-                for (j = 0; j < sec->shdr.sh_size/sizeof(Elf32_Sym); j++) {
-                        Elf32_Sym *sym;
+                for (j = 0; j < sec->shdr.sh_size/sizeof(Elf_Sym); j++) {
+                        Elf_Sym *sym;
                         const char *name;
                         sym = &sec->symtab[j];
                         name = sym_name(sym_strtab, sym);
                         if (sym->st_shndx != SHN_ABS) {
                                 continue;
                         }
-                        printf("%5d %08x %5d %10s %10s %12s %s\n",
+                        printf(format,
                                 j, sym->st_value, sym->st_size,
-                                sym_type(ELF32_ST_TYPE(sym->st_info)),
-                                sym_bind(ELF32_ST_BIND(sym->st_info)),
-                                sym_visibility(ELF32_ST_VISIBILITY(sym->st_other)),
+                                sym_type(ELF_ST_TYPE(sym->st_info)),
+                                sym_bind(ELF_ST_BIND(sym->st_info)),
+                                sym_visibility(ELF_ST_VISIBILITY(sym->st_other)),
                                 name);
                 }
         }
@@ -490,14 +555,20 @@ static void print_absolute_symbols(void)
 static void print_absolute_relocs(void)
 {
         int i, printed = 0;
+        const char *format;
+
+        if (ELF_BITS == 64)
+                format = "%016"PRIx64" %016"PRIx64" %10s %016"PRIx64"  %s\n";
+        else
+                format = "%08"PRIx32" %08"PRIx32" %10s %08"PRIx32"  %s\n";
 
         for (i = 0; i < ehdr.e_shnum; i++) {
                 struct section *sec = &secs[i];
                 struct section *sec_applies, *sec_symtab;
                 char *sym_strtab;
-                Elf32_Sym *sh_symtab;
+                Elf_Sym *sh_symtab;
                 int j;
-                if (sec->shdr.sh_type != SHT_REL) {
+                if (sec->shdr.sh_type != SHT_REL_TYPE) {
                         continue;
                 }
                 sec_symtab  = sec->link;
@@ -507,12 +578,12 @@ static void print_absolute_relocs(void)
                 }
                 sh_symtab  = sec_symtab->symtab;
                 sym_strtab = sec_symtab->link->strtab;
-                for (j = 0; j < sec->shdr.sh_size/sizeof(Elf32_Rel); j++) {
-                        Elf32_Rel *rel;
-                        Elf32_Sym *sym;
+                for (j = 0; j < sec->shdr.sh_size/sizeof(Elf_Rel); j++) {
+                        Elf_Rel *rel;
+                        Elf_Sym *sym;
                         const char *name;
                         rel = &sec->reltab[j];
-                        sym = &sh_symtab[ELF32_R_SYM(rel->r_info)];
+                        sym = &sh_symtab[ELF_R_SYM(rel->r_info)];
                         name = sym_name(sym_strtab, sym);
                         if (sym->st_shndx != SHN_ABS) {
                                 continue;
@@ -542,10 +613,10 @@ static void print_absolute_relocs(void)
                                 printed = 1;
                         }
 
-                        printf("%08x %08x %10s %08x  %s\n",
+                        printf(format,
                                 rel->r_offset,
                                 rel->r_info,
-                                rel_type(ELF32_R_TYPE(rel->r_info)),
+                                rel_type(ELF_R_TYPE(rel->r_info)),
                                 sym->st_value,
                                 name);
                 }
@@ -555,19 +626,34 @@ static void print_absolute_relocs(void)
                 printf("\n");
 }
 
-static void walk_relocs(void (*visit)(Elf32_Rel *rel, Elf32_Sym *sym),
-                        int use_real_mode)
+static void add_reloc(struct relocs *r, uint32_t offset)
+{
+        if (r->count == r->size) {
+                unsigned long newsize = r->size + 50000;
+                void *mem = realloc(r->offset, newsize * sizeof(r->offset[0]));
+
+                if (!mem)
+                        die("realloc of %ld entries for relocs failed\n",
+                                newsize);
+                r->offset = mem;
+                r->size = newsize;
+        }
+        r->offset[r->count++] = offset;
+}
+
+static void walk_relocs(int (*process)(struct section *sec, Elf_Rel *rel,
+                        Elf_Sym *sym, const char *symname))
 {
         int i;
         /* Walk through the relocations */
         for (i = 0; i < ehdr.e_shnum; i++) {
                 char *sym_strtab;
-                Elf32_Sym *sh_symtab;
+                Elf_Sym *sh_symtab;
                 struct section *sec_applies, *sec_symtab;
                 int j;
                 struct section *sec = &secs[i];
 
-                if (sec->shdr.sh_type != SHT_REL) {
+                if (sec->shdr.sh_type != SHT_REL_TYPE) {
                         continue;
                 }
                 sec_symtab  = sec->link;
@@ -577,101 +663,281 @@ static void walk_relocs(void (*visit)(Elf32_Rel *rel, Elf32_Sym *sym),
                 }
                 sh_symtab = sec_symtab->symtab;
                 sym_strtab = sec_symtab->link->strtab;
-                for (j = 0; j < sec->shdr.sh_size/sizeof(Elf32_Rel); j++) {
-                        Elf32_Rel *rel;
-                        Elf32_Sym *sym;
-                        unsigned r_type;
-                        const char *symname;
-                        int shn_abs;
+                for (j = 0; j < sec->shdr.sh_size/sizeof(Elf_Rel); j++) {
+                        Elf_Rel *rel = &sec->reltab[j];
+                        Elf_Sym *sym = &sh_symtab[ELF_R_SYM(rel->r_info)];
+                        const char *symname = sym_name(sym_strtab, sym);
 
-                        rel = &sec->reltab[j];
-                        sym = &sh_symtab[ELF32_R_SYM(rel->r_info)];
-                        r_type = ELF32_R_TYPE(rel->r_info);
-
-                        shn_abs = sym->st_shndx == SHN_ABS;
-
-                        switch (r_type) {
-                        case R_386_NONE:
-                        case R_386_PC32:
-                        case R_386_PC16:
-                        case R_386_PC8:
-                                /*
-                                 * NONE can be ignored and and PC relative
-                                 * relocations don't need to be adjusted.
-                                 */
-                                break;
+                        process(sec, rel, sym, symname);
+                }
+        }
+}
 
-                        case R_386_16:
-                                symname = sym_name(sym_strtab, sym);
-                                if (!use_real_mode)
-                                        goto bad;
-                                if (shn_abs) {
-                                        if (is_reloc(S_ABS, symname))
-                                                break;
-                                        else if (!is_reloc(S_SEG, symname))
-                                                goto bad;
-                                } else {
-                                        if (is_reloc(S_LIN, symname))
-                                                goto bad;
-                                        else
-                                                break;
-                                }
-                                visit(rel, sym);
-                                break;
+/*
+ * The .data..percpu section is a special case for x86_64 SMP kernels.
+ * It is used to initialize the actual per_cpu areas and to provide
+ * definitions for the per_cpu variables that correspond to their offsets
+ * within the percpu area. Since the values of all of the symbols need
+ * to be offsets from the start of the per_cpu area the virtual address
+ * (sh_addr) of .data..percpu is 0 in SMP kernels.
+ *
+ * This means that:
+ *
+ *      Relocations that reference symbols in the per_cpu area do not
+ *      need further relocation (since the value is an offset relative
+ *      to the start of the per_cpu area that does not change).
+ *
+ *      Relocations that apply to the per_cpu area need to have their
+ *      offset adjusted by by the value of __per_cpu_load to make them
+ *      point to the correct place in the loaded image (because the
+ *      virtual address of .data..percpu is 0).
+ *
+ * For non SMP kernels .data..percpu is linked as part of the normal
+ * kernel data and does not require special treatment.
+ *
+ */
+static int per_cpu_shndx        = -1;
+Elf_Addr per_cpu_load_addr;
 
-                        case R_386_32:
-                                symname = sym_name(sym_strtab, sym);
-                                if (shn_abs) {
-                                        if (is_reloc(S_ABS, symname))
-                                                break;
-                                        else if (!is_reloc(S_REL, symname))
-                                                goto bad;
-                                } else {
-                                        if (use_real_mode &&
-                                            !is_reloc(S_LIN, symname))
-                                                break;
-                                }
-                                visit(rel, sym);
-                                break;
-                        default:
-                                die("Unsupported relocation type: %s (%d)\n",
-                                    rel_type(r_type), r_type);
+static void percpu_init(void)
+{
+        int i;
+        for (i = 0; i < ehdr.e_shnum; i++) {
+                ElfW(Sym) *sym;
+                if (strcmp(sec_name(i), ".data..percpu"))
+                        continue;
+
+                if (secs[i].shdr.sh_addr != 0)  /* non SMP kernel */
+                        return;
+
+                sym = sym_lookup("__per_cpu_load");
+                if (!sym)
+                        die("can't find __per_cpu_load\n");
+
+                per_cpu_shndx = i;
+                per_cpu_load_addr = sym->st_value;
+                return;
+        }
+}
+
+#if ELF_BITS == 64
+
+/*
+ * Check to see if a symbol lies in the .data..percpu section.
+ * For some as yet not understood reason the "__init_begin"
+ * symbol which immediately preceeds the .data..percpu section
+ * also shows up as it it were part of it so we do an explict
+ * check for that symbol name and ignore it.
+ */
+static int is_percpu_sym(ElfW(Sym) *sym, const char *symname)
+{
+        return (sym->st_shndx == per_cpu_shndx) &&
+                strcmp(symname, "__init_begin");
+}
+
+
+static int do_reloc64(struct section *sec, Elf_Rel *rel, ElfW(Sym) *sym,
+                      const char *symname)
+{
+        unsigned r_type = ELF64_R_TYPE(rel->r_info);
+        ElfW(Addr) offset = rel->r_offset;
+        int shn_abs = (sym->st_shndx == SHN_ABS) && !is_reloc(S_REL, symname);
+
+        if (sym->st_shndx == SHN_UNDEF)
+                return 0;
+
+        /*
+         * Adjust the offset if this reloc applies to the percpu section.
+         */
+        if (sec->shdr.sh_info == per_cpu_shndx)
+                offset += per_cpu_load_addr;
+
+        switch (r_type) {
+        case R_X86_64_NONE:
+        case R_X86_64_PC32:
+                /*
+                 * NONE can be ignored and PC relative relocations don't
+                 * need to be adjusted.
+                 */
+                break;
+
+        case R_X86_64_32:
+        case R_X86_64_32S:
+        case R_X86_64_64:
+                /*
+                 * References to the percpu area don't need to be adjusted.
+                 */
+                if (is_percpu_sym(sym, symname))
+                        break;
+
+                if (shn_abs) {
+                        /*
+                         * Whitelisted absolute symbols do not require
+                         * relocation.
+                         */
+                        if (is_reloc(S_ABS, symname))
                                 break;
-                        bad:
-                                symname = sym_name(sym_strtab, sym);
-                                die("Invalid %s %s relocation: %s\n",
-                                    shn_abs ? "absolute" : "relative",
-                                    rel_type(r_type), symname);
-                        }
+
+                        die("Invalid absolute %s relocation: %s\n",
+                            rel_type(r_type), symname);
+                        break;
                 }
+
+                /*
+                 * Relocation offsets for 64 bit kernels are output
+                 * as 32 bits and sign extended back to 64 bits when
+                 * the relocations are processed.
+                 * Make sure that the offset will fit.
+                 */
+                if ((int32_t)offset != (int64_t)offset)
+                        die("Relocation offset doesn't fit in 32 bits\n");
+
+                if (r_type == R_X86_64_64)
+                        add_reloc(&relocs64, offset);
+                else
+                        add_reloc(&relocs32, offset);
+                break;
+
+        default:
+                die("Unsupported relocation type: %s (%d)\n",
+                    rel_type(r_type), r_type);
+                break;
         }
+
+        return 0;
 }
 
-static void count_reloc(Elf32_Rel *rel, Elf32_Sym *sym)
+#else
+
+static int do_reloc32(struct section *sec, Elf_Rel *rel, Elf_Sym *sym,
+                      const char *symname)
 {
-        if (ELF32_R_TYPE(rel->r_info) == R_386_16)
-                reloc16_count++;
-        else
-                reloc_count++;
+        unsigned r_type = ELF32_R_TYPE(rel->r_info);
+        int shn_abs = (sym->st_shndx == SHN_ABS) && !is_reloc(S_REL, symname);
+
+        switch (r_type) {
+        case R_386_NONE:
+        case R_386_PC32:
+        case R_386_PC16:
+        case R_386_PC8:
+                /*
+                 * NONE can be ignored and PC relative relocations don't
+                 * need to be adjusted.
+                 */
+                break;
+
+        case R_386_32:
+                if (shn_abs) {
+                        /*
+                         * Whitelisted absolute symbols do not require
+                         * relocation.
+                         */
+                        if (is_reloc(S_ABS, symname))
+                                break;
+
+                        die("Invalid absolute %s relocation: %s\n",
+                            rel_type(r_type), symname);
+                        break;
+                }
+
+                add_reloc(&relocs32, rel->r_offset);
+                break;
+
+        default:
+                die("Unsupported relocation type: %s (%d)\n",
+                    rel_type(r_type), r_type);
+                break;
+        }
+
+        return 0;
 }
 
-static void collect_reloc(Elf32_Rel *rel, Elf32_Sym *sym)
+static int do_reloc_real(struct section *sec, Elf_Rel *rel, Elf_Sym *sym,
+                         const char *symname)
 {
-        /* Remember the address that needs to be adjusted. */
-        if (ELF32_R_TYPE(rel->r_info) == R_386_16)
-                relocs16[reloc16_idx++] = rel->r_offset;
-        else
-                relocs[reloc_idx++] = rel->r_offset;
+        unsigned r_type = ELF32_R_TYPE(rel->r_info);
+        int shn_abs = (sym->st_shndx == SHN_ABS) && !is_reloc(S_REL, symname);
+
+        switch (r_type) {
+        case R_386_NONE:
+        case R_386_PC32:
+        case R_386_PC16:
+        case R_386_PC8:
+                /*
+                 * NONE can be ignored and PC relative relocations don't
+                 * need to be adjusted.
+                 */
+                break;
+
+        case R_386_16:
+                if (shn_abs) {
+                        /*
+                         * Whitelisted absolute symbols do not require
+                         * relocation.
+                         */
+                        if (is_reloc(S_ABS, symname))
+                                break;
+
+                        if (is_reloc(S_SEG, symname)) {
+                                add_reloc(&relocs16, rel->r_offset);
+                                break;
+                        }
+                } else {
+                        if (!is_reloc(S_LIN, symname))
+                                break;
+                }
+                die("Invalid %s %s relocation: %s\n",
+                    shn_abs ? "absolute" : "relative",
+                    rel_type(r_type), symname);
+                break;
+
+        case R_386_32:
+                if (shn_abs) {
+                        /*
+                         * Whitelisted absolute symbols do not require
+                         * relocation.
+                         */
+                        if (is_reloc(S_ABS, symname))
+                                break;
+
+                        if (is_reloc(S_REL, symname)) {
+                                add_reloc(&relocs32, rel->r_offset);
+                                break;
+                        }
+                } else {
+                        if (is_reloc(S_LIN, symname))
+                                add_reloc(&relocs32, rel->r_offset);
+                        break;
+                }
+                die("Invalid %s %s relocation: %s\n",
+                    shn_abs ? "absolute" : "relative",
+                    rel_type(r_type), symname);
+                break;
+
+        default:
+                die("Unsupported relocation type: %s (%d)\n",
+                    rel_type(r_type), r_type);
+                break;
+        }
+
+        return 0;
 }
 
+#endif
+
 static int cmp_relocs(const void *va, const void *vb)
 {
-        const unsigned long *a, *b;
+        const uint32_t *a, *b;
         a = va; b = vb;
         return (*a == *b)? 0 : (*a > *b)? 1 : -1;
 }
 
-static int write32(unsigned int v, FILE *f)
+static void sort_relocs(struct relocs *r)
+{
+        qsort(r->offset, r->count, sizeof(r->offset[0]), cmp_relocs);
+}
+
+static int write32(uint32_t v, FILE *f)
 {
         unsigned char buf[4];
 
@@ -679,33 +945,40 @@ static int write32(unsigned int v, FILE *f)
         return fwrite(buf, 1, 4, f) == 4 ? 0 : -1;
 }
 
+static int write32_as_text(uint32_t v, FILE *f)
+{
+        return fprintf(f, "\t.long 0x%08"PRIx32"\n", v) > 0 ? 0 : -1;
+}
+
 static void emit_relocs(int as_text, int use_real_mode)
 {
         int i;
-        /* Count how many relocations I have and allocate space for them. */
-        reloc_count = 0;
-        walk_relocs(count_reloc, use_real_mode);
-        relocs = malloc(reloc_count * sizeof(relocs[0]));
-        if (!relocs) {
-                die("malloc of %d entries for relocs failed\n",
-                        reloc_count);
-        }
+        int (*write_reloc)(uint32_t, FILE *) = write32;
+        int (*do_reloc)(struct section *sec, Elf_Rel *rel, Elf_Sym *sym,
+                        const char *symname);
+
+#if ELF_BITS == 64
+        if (!use_real_mode)
+                do_reloc = do_reloc64;
+        else
+                die("--realmode not valid for a 64-bit ELF file");
+#else
+        if (!use_real_mode)
+                do_reloc = do_reloc32;
+        else
+                do_reloc = do_reloc_real;
+#endif
 
-        relocs16 = malloc(reloc16_count * sizeof(relocs[0]));
-        if (!relocs16) {
-                die("malloc of %d entries for relocs16 failed\n",
-                        reloc16_count);
-        }
         /* Collect up the relocations */
-        reloc_idx = 0;
-        walk_relocs(collect_reloc, use_real_mode);
+        walk_relocs(do_reloc);
 
-        if (reloc16_count && !use_real_mode)
+        if (relocs16.count && !use_real_mode)
                 die("Segment relocations found but --realmode not specified\n");
 
         /* Order the relocations for more efficient processing */
-        qsort(relocs, reloc_count, sizeof(relocs[0]), cmp_relocs);
-        qsort(relocs16, reloc16_count, sizeof(relocs16[0]), cmp_relocs);
+        sort_relocs(&relocs16);
+        sort_relocs(&relocs32);
+        sort_relocs(&relocs64);
 
         /* Print the relocations */
         if (as_text) {
@@ -714,114 +987,60 @@ static void emit_relocs(int as_text, int use_real_mode)
                  */
                 printf(".section \".data.reloc\",\"a\"\n");
                 printf(".balign 4\n");
-                if (use_real_mode) {
-                        printf("\t.long %lu\n", reloc16_count);
-                        for (i = 0; i < reloc16_count; i++)
-                                printf("\t.long 0x%08lx\n", relocs16[i]);
-                        printf("\t.long %lu\n", reloc_count);
-                        for (i = 0; i < reloc_count; i++) {
-                                printf("\t.long 0x%08lx\n", relocs[i]);
-                        }
-                } else {
-                        /* Print a stop */
-                        printf("\t.long 0x%08lx\n", (unsigned long)0);
-                        for (i = 0; i < reloc_count; i++) {
-                                printf("\t.long 0x%08lx\n", relocs[i]);
-                        }
-                }
-
-                printf("\n");
+                write_reloc = write32_as_text;
         }
-        else {
-                if (use_real_mode) {
-                        write32(reloc16_count, stdout);
-                        for (i = 0; i < reloc16_count; i++)
-                                write32(relocs16[i], stdout);
-                        write32(reloc_count, stdout);
 
-                        /* Now print each relocation */
-                        for (i = 0; i < reloc_count; i++)
-                                write32(relocs[i], stdout);
-                } else {
+        if (use_real_mode) {
+                write_reloc(relocs16.count, stdout);
+                for (i = 0; i < relocs16.count; i++)
+                        write_reloc(relocs16.offset[i], stdout);
+
+                write_reloc(relocs32.count, stdout);
+                for (i = 0; i < relocs32.count; i++)
+                        write_reloc(relocs32.offset[i], stdout);
+        } else {
+                if (ELF_BITS == 64) {
                         /* Print a stop */
-                        write32(0, stdout);
+                        write_reloc(0, stdout);
 
                         /* Now print each relocation */
-                        for (i = 0; i < reloc_count; i++) {
-                                write32(relocs[i], stdout);
-                        }
+                        for (i = 0; i < relocs64.count; i++)
+                                write_reloc(relocs64.offset[i], stdout);
                 }
+
+                /* Print a stop */
+                write_reloc(0, stdout);
+
+                /* Now print each relocation */
+                for (i = 0; i < relocs32.count; i++)
+                        write_reloc(relocs32.offset[i], stdout);
         }
 }
 
-static void usage(void)
-{
-        die("relocs [--abs-syms|--abs-relocs|--text|--realmode] vmlinux\n");
-}
+#if ELF_BITS == 64
+# define process process_64
+#else
+# define process process_32
+#endif
 
-int main(int argc, char **argv)
+void process(FILE *fp, int use_real_mode, int as_text,
+             int show_absolute_syms, int show_absolute_relocs)
 {
-        int show_absolute_syms, show_absolute_relocs;
-        int as_text, use_real_mode;
-        const char *fname;
-        FILE *fp;
-        int i;
-
-        show_absolute_syms = 0;
-        show_absolute_relocs = 0;
-        as_text = 0;
-        use_real_mode = 0;
-        fname = NULL;
-        for (i = 1; i < argc; i++) {
-                char *arg = argv[i];
-                if (*arg == '-') {
-                        if (strcmp(arg, "--abs-syms") == 0) {
-                                show_absolute_syms = 1;
-                                continue;
-                        }
-                        if (strcmp(arg, "--abs-relocs") == 0) {
-                                show_absolute_relocs = 1;
-                                continue;
-                        }
-                        if (strcmp(arg, "--text") == 0) {
-                                as_text = 1;
-                                continue;
-                        }
-                        if (strcmp(arg, "--realmode") == 0) {
-                                use_real_mode = 1;
-                                continue;
-                        }
-                }
-                else if (!fname) {
-                        fname = arg;
-                        continue;
-                }
-                usage();
-        }
-        if (!fname) {
-                usage();
-        }
         regex_init(use_real_mode);
-        fp = fopen(fname, "r");
-        if (!fp) {
-                die("Cannot open %s: %s\n",
-                        fname, strerror(errno));
-        }
         read_ehdr(fp);
         read_shdrs(fp);
         read_strtabs(fp);
         read_symtabs(fp);
         read_relocs(fp);
+        if (ELF_BITS == 64)
+                percpu_init();
         if (show_absolute_syms) {
                 print_absolute_symbols();
-                goto out;
+                return;
         }
         if (show_absolute_relocs) {
                 print_absolute_relocs();
-                goto out;
+                return;
         }
         emit_relocs(as_text, use_real_mode);
-out:
-        fclose(fp);
-        return 0;
 }
diff --git a/arch/x86/tools/relocs.h b/arch/x86/tools/relocs.h
new file mode 100644
index 000000000000..07cdb1eca4fa
--- /dev/null
+++ b/arch/x86/tools/relocs.h
@@ -0,0 +1,36 @@
+#ifndef RELOCS_H
+#define RELOCS_H
+
+#include <stdio.h>
+#include <stdarg.h>
+#include <stdlib.h>
+#include <stdint.h>
+#include <inttypes.h>
+#include <string.h>
+#include <errno.h>
+#include <unistd.h>
+#include <elf.h>
+#include <byteswap.h>
+#define USE_BSD
+#include <endian.h>
+#include <regex.h>
+#include <tools/le_byteshift.h>
+
+void die(char *fmt, ...);
+
+#define ARRAY_SIZE(x) (sizeof(x) / sizeof((x)[0]))
+
+enum symtype {
+        S_ABS,
+        S_REL,
+        S_SEG,
+        S_LIN,
+        S_NSYMTYPES
+};
+
+void process_32(FILE *fp, int use_real_mode, int as_text,
+                int show_absolute_syms, int show_absolute_relocs);
+void process_64(FILE *fp, int use_real_mode, int as_text,
+                int show_absolute_syms, int show_absolute_relocs);
+
+#endif /* RELOCS_H */
diff --git a/arch/x86/tools/relocs_32.c b/arch/x86/tools/relocs_32.c
new file mode 100644
index 000000000000..b2ade2bb4162
--- /dev/null
+++ b/arch/x86/tools/relocs_32.c
@@ -0,0 +1,17 @@
+#include "relocs.h"
+
+#define ELF_BITS 32
+
+#define ELF_MACHINE             EM_386
+#define ELF_MACHINE_NAME        "i386"
+#define SHT_REL_TYPE            SHT_REL
+#define Elf_Rel                 ElfW(Rel)
+
+#define ELF_CLASS               ELFCLASS32
+#define ELF_R_SYM(val)          ELF32_R_SYM(val)
+#define ELF_R_TYPE(val)         ELF32_R_TYPE(val)
+#define ELF_ST_TYPE(o)          ELF32_ST_TYPE(o)
+#define ELF_ST_BIND(o)          ELF32_ST_BIND(o)
+#define ELF_ST_VISIBILITY(o)    ELF32_ST_VISIBILITY(o)
+
+#include "relocs.c"
diff --git a/arch/x86/tools/relocs_64.c b/arch/x86/tools/relocs_64.c
new file mode 100644
index 000000000000..56b61b743c4c
--- /dev/null
+++ b/arch/x86/tools/relocs_64.c
@@ -0,0 +1,17 @@
+#include "relocs.h"
+
+#define ELF_BITS 64
+
+#define ELF_MACHINE             EM_X86_64
+#define ELF_MACHINE_NAME        "x86_64"
+#define SHT_REL_TYPE            SHT_RELA
+#define Elf_Rel                 Elf64_Rela
+
+#define ELF_CLASS               ELFCLASS64
+#define ELF_R_SYM(val)          ELF64_R_SYM(val)
+#define ELF_R_TYPE(val)         ELF64_R_TYPE(val)
+#define ELF_ST_TYPE(o)          ELF64_ST_TYPE(o)
+#define ELF_ST_BIND(o)          ELF64_ST_BIND(o)
+#define ELF_ST_VISIBILITY(o)    ELF64_ST_VISIBILITY(o)
+
+#include "relocs.c"
diff --git a/arch/x86/tools/relocs_common.c b/arch/x86/tools/relocs_common.c
new file mode 100644
index 000000000000..44d396823a53
--- /dev/null
+++ b/arch/x86/tools/relocs_common.c
@@ -0,0 +1,76 @@
+#include "relocs.h"
+
+void die(char *fmt, ...)
+{
+        va_list ap;
+        va_start(ap, fmt);
+        vfprintf(stderr, fmt, ap);
+        va_end(ap);
+        exit(1);
+}
+
+static void usage(void)
+{
+        die("relocs [--abs-syms|--abs-relocs|--text|--realmode] vmlinux\n");
+}
+
+int main(int argc, char **argv)
+{
+        int show_absolute_syms, show_absolute_relocs;
+        int as_text, use_real_mode;
+        const char *fname;
+        FILE *fp;
+        int i;
+        unsigned char e_ident[EI_NIDENT];
+
+        show_absolute_syms = 0;
+        show_absolute_relocs = 0;
+        as_text = 0;
+        use_real_mode = 0;
+        fname = NULL;
+        for (i = 1; i < argc; i++) {
+                char *arg = argv[i];
+                if (*arg == '-') {
+                        if (strcmp(arg, "--abs-syms") == 0) {
+                                show_absolute_syms = 1;
+                                continue;
+                        }
+                        if (strcmp(arg, "--abs-relocs") == 0) {
+                                show_absolute_relocs = 1;
+                                continue;
+                        }
+                        if (strcmp(arg, "--text") == 0) {
+                                as_text = 1;
+                                continue;
+                        }
+                        if (strcmp(arg, "--realmode") == 0) {
+                                use_real_mode = 1;
+                                continue;
+                        }
+                }
+                else if (!fname) {
+                        fname = arg;
+                        continue;
+                }
+                usage();
+        }
+        if (!fname) {
+                usage();
+        }
+        fp = fopen(fname, "r");
+        if (!fp) {
+                die("Cannot open %s: %s\n", fname, strerror(errno));
+        }
+        if (fread(&e_ident, 1, EI_NIDENT, fp) != EI_NIDENT) {
+                die("Cannot read %s: %s", fname, strerror(errno));
+        }
+        rewind(fp);
+        if (e_ident[EI_CLASS] == ELFCLASS64)
+                process_64(fp, use_real_mode, as_text,
+                           show_absolute_syms, show_absolute_relocs);
+        else
+                process_32(fp, use_real_mode, as_text,
+                           show_absolute_syms, show_absolute_relocs);
+        fclose(fp);
+        return 0;
+}
diff --git a/arch/x86/um/tls_32.c b/arch/x86/um/tls_32.c
index 5f5feff3d24c..80ffa5b9982d 100644
--- a/arch/x86/um/tls_32.c
+++ b/arch/x86/um/tls_32.c
@@ -5,6 +5,7 @@
 
 #include <linux/percpu.h>
 #include <linux/sched.h>
+#include <linux/syscalls.h>
 #include <asm/uaccess.h>
 #include <os.h>
 #include <skas.h>
@@ -274,7 +275,7 @@ clear:
         goto out;
 }
 
-int sys_set_thread_area(struct user_desc __user *user_desc)
+SYSCALL_DEFINE1(set_thread_area, struct user_desc __user *, user_desc)
 {
         struct user_desc info;
         int idx, ret;
@@ -322,7 +323,7 @@ int ptrace_set_thread_area(struct task_struct *child, int idx,
         return set_tls_entry(child, &info, idx, 0);
 }
 
-int sys_get_thread_area(struct user_desc __user *user_desc)
+SYSCALL_DEFINE1(get_thread_area, struct user_desc __user *, user_desc)
 {
         struct user_desc info;
         int idx, ret;
diff --git a/arch/x86/xen/Kconfig b/arch/x86/xen/Kconfig
index 131dacd2748a..1a3c76505649 100644
--- a/arch/x86/xen/Kconfig
+++ b/arch/x86/xen/Kconfig
@@ -4,7 +4,7 @@
 
 config XEN
         bool "Xen guest support"
-        select PARAVIRT
+        depends on PARAVIRT
         select PARAVIRT_CLOCK
         select XEN_HAVE_PVMMU
         depends on X86_64 || (X86_32 && X86_PAE && !X86_VISWS)
diff --git a/arch/x86/xen/enlighten.c b/arch/x86/xen/enlighten.c
index c8e1c7b95c3b..53d4f680c9b5 100644
--- a/arch/x86/xen/enlighten.c
+++ b/arch/x86/xen/enlighten.c
@@ -31,6 +31,7 @@
 #include <linux/pci.h>
 #include <linux/gfp.h>
 #include <linux/memblock.h>
+#include <linux/edd.h>
 
 #include <xen/xen.h>
 #include <xen/events.h>
@@ -1220,7 +1221,6 @@ static const struct pv_cpu_ops xen_cpu_ops __initconst = {
         .alloc_ldt = xen_alloc_ldt,
         .free_ldt = xen_free_ldt,
 
-        .store_gdt = native_store_gdt,
         .store_idt = native_store_idt,
         .store_tr = xen_store_tr,
 
@@ -1306,6 +1306,55 @@ static const struct machine_ops xen_machine_ops __initconst = {
         .emergency_restart = xen_emergency_restart,
 };
 
+static void __init xen_boot_params_init_edd(void)
+{
+#if IS_ENABLED(CONFIG_EDD)
+        struct xen_platform_op op;
+        struct edd_info *edd_info;
+        u32 *mbr_signature;
+        unsigned nr;
+        int ret;
+
+        edd_info = boot_params.eddbuf;
+        mbr_signature = boot_params.edd_mbr_sig_buffer;
+
+        op.cmd = XENPF_firmware_info;
+
+        op.u.firmware_info.type = XEN_FW_DISK_INFO;
+        for (nr = 0; nr < EDDMAXNR; nr++) {
+                struct edd_info *info = edd_info + nr;
+
+                op.u.firmware_info.index = nr;
+                info->params.length = sizeof(info->params);
+                set_xen_guest_handle(op.u.firmware_info.u.disk_info.edd_params,
+                                     &info->params);
+                ret = HYPERVISOR_dom0_op(&op);
+                if (ret)
+                        break;
+
+#define C(x) info->x = op.u.firmware_info.u.disk_info.x
+                C(device);
+                C(version);
+                C(interface_support);
+                C(legacy_max_cylinder);
+                C(legacy_max_head);
+                C(legacy_sectors_per_track);
+#undef C
+        }
+        boot_params.eddbuf_entries = nr;
+
+        op.u.firmware_info.type = XEN_FW_DISK_MBR_SIGNATURE;
+        for (nr = 0; nr < EDD_MBR_SIG_MAX; nr++) {
+                op.u.firmware_info.index = nr;
+                ret = HYPERVISOR_dom0_op(&op);
+                if (ret)
+                        break;
+                mbr_signature[nr] = op.u.firmware_info.u.disk_mbr_signature.mbr_signature;
+        }
+        boot_params.edd_mbr_sig_buf_entries = nr;
+#endif
+}
+
 /*
  * Set up the GDT and segment registers for -fstack-protector.  Until
  * we do this, we have to be careful not to call any stack-protected
@@ -1508,6 +1557,8 @@ asmlinkage void __init xen_start_kernel(void)
                 /* Avoid searching for BIOS MP tables */
                 x86_init.mpparse.find_smp_config = x86_init_noop;
                 x86_init.mpparse.get_smp_config = x86_init_uint_noop;
+
+                xen_boot_params_init_edd();
         }
 #ifdef CONFIG_PCI
         /* PCI BIOS service won't work from a PV guest. */
@@ -1589,8 +1640,11 @@ static int __cpuinit xen_hvm_cpu_notify(struct notifier_block *self,
         switch (action) {
         case CPU_UP_PREPARE:
                 xen_vcpu_setup(cpu);
-                if (xen_have_vector_callback)
+                if (xen_have_vector_callback) {
                         xen_init_lock_cpu(cpu);
+                        if (xen_feature(XENFEAT_hvm_safe_pvclock))
+                                xen_setup_timer(cpu);
+                }
                 break;
         default:
                 break;
diff --git a/arch/x86/xen/mmu.c b/arch/x86/xen/mmu.c
index e006c18d288a..fdc3ba28ca38 100644
--- a/arch/x86/xen/mmu.c
+++ b/arch/x86/xen/mmu.c
@@ -2043,9 +2043,7 @@ static void xen_set_fixmap(unsigned idx, phys_addr_t phys, pgprot_t prot)
 
         switch (idx) {
         case FIX_BTMAP_END ... FIX_BTMAP_BEGIN:
-#ifdef CONFIG_X86_F00F_BUG
-        case FIX_F00F_IDT:
-#endif
+        case FIX_RO_IDT:
 #ifdef CONFIG_X86_32
         case FIX_WP_TEST:
         case FIX_VDSO:
diff --git a/arch/x86/xen/smp.c b/arch/x86/xen/smp.c
index 09ea61d2e02f..8ff37995d54e 100644
--- a/arch/x86/xen/smp.c
+++ b/arch/x86/xen/smp.c
@@ -95,7 +95,7 @@ static void __cpuinit cpu_bringup(void)
 static void __cpuinit cpu_bringup_and_idle(void)
 {
         cpu_bringup();
-        cpu_idle();
+        cpu_startup_entry(CPUHP_ONLINE);
 }
 
 static int xen_smp_intr_init(unsigned int cpu)
@@ -144,6 +144,13 @@ static int xen_smp_intr_init(unsigned int cpu)
                 goto fail;
         per_cpu(xen_callfuncsingle_irq, cpu) = rc;
 
+        /*
+         * The IRQ worker on PVHVM goes through the native path and uses the
+         * IPI mechanism.
+         */
+        if (xen_hvm_domain())
+                return 0;
+
         callfunc_name = kasprintf(GFP_KERNEL, "irqwork%d", cpu);
         rc = bind_ipi_to_irqhandler(XEN_IRQ_WORK_VECTOR,
                                     cpu,
@@ -167,6 +174,9 @@ static int xen_smp_intr_init(unsigned int cpu)
         if (per_cpu(xen_callfuncsingle_irq, cpu) >= 0)
                 unbind_from_irqhandler(per_cpu(xen_callfuncsingle_irq, cpu),
                                        NULL);
+        if (xen_hvm_domain())
+                return rc;
+
         if (per_cpu(xen_irq_work, cpu) >= 0)
                 unbind_from_irqhandler(per_cpu(xen_irq_work, cpu), NULL);
 
@@ -418,7 +428,7 @@ static int xen_cpu_disable(void)
 
 static void xen_cpu_die(unsigned int cpu)
 {
-        while (HYPERVISOR_vcpu_op(VCPUOP_is_up, cpu, NULL)) {
+        while (xen_pv_domain() && HYPERVISOR_vcpu_op(VCPUOP_is_up, cpu, NULL)) {
                 current->state = TASK_UNINTERRUPTIBLE;
                 schedule_timeout(HZ/10);
         }
@@ -426,7 +436,8 @@ static void xen_cpu_die(unsigned int cpu)
         unbind_from_irqhandler(per_cpu(xen_callfunc_irq, cpu), NULL);
         unbind_from_irqhandler(per_cpu(xen_debug_irq, cpu), NULL);
         unbind_from_irqhandler(per_cpu(xen_callfuncsingle_irq, cpu), NULL);
-        unbind_from_irqhandler(per_cpu(xen_irq_work, cpu), NULL);
+        if (!xen_hvm_domain())
+                unbind_from_irqhandler(per_cpu(xen_irq_work, cpu), NULL);
         xen_uninit_lock_cpu(cpu);
         xen_teardown_timer(cpu);
 }
@@ -657,11 +668,7 @@ static int __cpuinit xen_hvm_cpu_up(unsigned int cpu, struct task_struct *tidle)
 
 static void xen_hvm_cpu_die(unsigned int cpu)
 {
-        unbind_from_irqhandler(per_cpu(xen_resched_irq, cpu), NULL);
-        unbind_from_irqhandler(per_cpu(xen_callfunc_irq, cpu), NULL);
-        unbind_from_irqhandler(per_cpu(xen_debug_irq, cpu), NULL);
-        unbind_from_irqhandler(per_cpu(xen_callfuncsingle_irq, cpu), NULL);
-        unbind_from_irqhandler(per_cpu(xen_irq_work, cpu), NULL);
+        xen_cpu_die(cpu);
         native_cpu_die(cpu);
 }
 
diff --git a/arch/x86/xen/spinlock.c b/arch/x86/xen/spinlock.c
index f7a080ef0354..8b54603ce816 100644
--- a/arch/x86/xen/spinlock.c
+++ b/arch/x86/xen/spinlock.c
@@ -364,6 +364,16 @@ void __cpuinit xen_init_lock_cpu(int cpu)
         int irq;
         const char *name;
 
+        WARN(per_cpu(lock_kicker_irq, cpu) > 0, "spinlock on CPU%d exists on IRQ%d!\n",
+             cpu, per_cpu(lock_kicker_irq, cpu));
+
+        /*
+         * See git commit f10cd522c5fbfec9ae3cc01967868c9c2401ed23
+         * (xen: disable PV spinlocks on HVM)
+         */
+        if (xen_hvm_domain())
+                return;
+
         name = kasprintf(GFP_KERNEL, "spinlock%d", cpu);
         irq = bind_ipi_to_irqhandler(XEN_SPIN_UNLOCK_VECTOR,
                                      cpu,
@@ -382,11 +392,26 @@ void __cpuinit xen_init_lock_cpu(int cpu)
 
 void xen_uninit_lock_cpu(int cpu)
 {
+        /*
+         * See git commit f10cd522c5fbfec9ae3cc01967868c9c2401ed23
+         * (xen: disable PV spinlocks on HVM)
+         */
+        if (xen_hvm_domain())
+                return;
+
         unbind_from_irqhandler(per_cpu(lock_kicker_irq, cpu), NULL);
+        per_cpu(lock_kicker_irq, cpu) = -1;
 }
 
 void __init xen_init_spinlocks(void)
 {
+        /*
+         * See git commit f10cd522c5fbfec9ae3cc01967868c9c2401ed23
+         * (xen: disable PV spinlocks on HVM)
+         */
+        if (xen_hvm_domain())
+                return;
+
         BUILD_BUG_ON(sizeof(struct xen_spinlock) > sizeof(arch_spinlock_t));
 
         pv_lock_ops.spin_is_locked = xen_spin_is_locked;
diff --git a/arch/x86/xen/time.c b/arch/x86/xen/time.c
index 0296a9522501..3d88bfdf9e1c 100644
--- a/arch/x86/xen/time.c
+++ b/arch/x86/xen/time.c
@@ -377,7 +377,7 @@ static const struct clock_event_device xen_vcpuop_clockevent = {
 
 static const struct clock_event_device *xen_clockevent =
         &xen_timerop_clockevent;
-static DEFINE_PER_CPU(struct clock_event_device, xen_clock_events);
+static DEFINE_PER_CPU(struct clock_event_device, xen_clock_events) = { .irq = -1 };
 
 static irqreturn_t xen_timer_interrupt(int irq, void *dev_id)
 {
@@ -401,6 +401,9 @@ void xen_setup_timer(int cpu)
         struct clock_event_device *evt;
         int irq;
 
+        evt = &per_cpu(xen_clock_events, cpu);
+        WARN(evt->irq >= 0, "IRQ%d for CPU%d is already allocated\n", evt->irq, cpu);
+
         printk(KERN_INFO "installing Xen timer for CPU %d\n", cpu);
 
         name = kasprintf(GFP_KERNEL, "timer%d", cpu);
@@ -413,7 +416,6 @@ void xen_setup_timer(int cpu)
                                       IRQF_FORCE_RESUME,
                                       name, NULL);
 
-        evt = &per_cpu(xen_clock_events, cpu);
         memcpy(evt, xen_clockevent, sizeof(*evt));
 
         evt->cpumask = cpumask_of(cpu);
@@ -426,6 +428,7 @@ void xen_teardown_timer(int cpu)
         BUG_ON(cpu == 0);
         evt = &per_cpu(xen_clock_events, cpu);
         unbind_from_irqhandler(evt->irq, NULL);
+        evt->irq = -1;
 }
 
 void xen_setup_cpu_clockevents(void)
@@ -497,7 +500,11 @@ static void xen_hvm_setup_cpu_clockevents(void)
 {
         int cpu = smp_processor_id();
         xen_setup_runstate_info(cpu);
-        xen_setup_timer(cpu);
+        /*
+         * xen_setup_timer(cpu) - snprintf is bad in atomic context. Hence
+         * doing it xen_hvm_cpu_notify (which gets called by smp_init during
+         * early bootup and also during CPU hotplug events).
+         */
         xen_setup_cpu_clockevents();
 }
 
diff --git a/arch/xtensa/include/asm/unistd.h b/arch/xtensa/include/asm/unistd.h
index c38834de9ac7..cb4c2ce8d447 100644
--- a/arch/xtensa/include/asm/unistd.h
+++ b/arch/xtensa/include/asm/unistd.h
@@ -4,14 +4,6 @@
 #define __ARCH_WANT_SYS_CLONE
 #include <uapi/asm/unistd.h>
 
-/*
- * "Conditional" syscalls
- *
- * What we want is __attribute__((weak,alias("sys_ni_syscall"))),
- * but it doesn't work on all toolchains, so we just do it by hand
- */
-#define cond_syscall(x) asm(".weak\t" #x "\n\t.set\t" #x ",sys_ni_syscall");
-
 #define __ARCH_WANT_STAT64
 #define __ARCH_WANT_SYS_UTIME
 #define __ARCH_WANT_SYS_LLSEEK
diff --git a/arch/xtensa/kernel/process.c b/arch/xtensa/kernel/process.c
index 5cd82e9f601c..1c85323f01d7 100644
--- a/arch/xtensa/kernel/process.c
+++ b/arch/xtensa/kernel/process.c
@@ -105,19 +105,9 @@ void coprocessor_flush_all(struct thread_info *ti)
 /*
  * Powermanagement idle function, if any is provided by the platform.
  */
-
-void cpu_idle(void)
+void arch_cpu_idle(void)
 {
-        local_irq_enable();
-
-        /* endless idle loop with no priority at all */
-        while (1) {
-                rcu_idle_enter();
-                while (!need_resched())
-                        platform_idle();
-                rcu_idle_exit();
-                schedule_preempt_disabled();
-        }
+        platform_idle();
 }
 
 /*
diff --git a/arch/xtensa/kernel/traps.c b/arch/xtensa/kernel/traps.c
index 923db5c15278..458186dab5dc 100644
--- a/arch/xtensa/kernel/traps.c
+++ b/arch/xtensa/kernel/traps.c
@@ -383,6 +383,8 @@ void show_regs(struct pt_regs * regs)
 {
         int i, wmask;
 
+        show_regs_print_info(KERN_DEFAULT);
+
         wmask = regs->wmask & ~1;
 
         for (i = 0; i < 16; i++) {
@@ -481,14 +483,6 @@ void show_stack(struct task_struct *task, unsigned long *sp)
         show_trace(task, stack);
 }
 
-void dump_stack(void)
-{
-        show_stack(current, NULL);
-}
-
-EXPORT_SYMBOL(dump_stack);
-
-
 void show_code(unsigned int *pc)
 {
         long i;
diff --git a/arch/xtensa/mm/init.c b/arch/xtensa/mm/init.c
index 7a5156ffebb6..bba125b4bb06 100644
--- a/arch/xtensa/mm/init.c
+++ b/arch/xtensa/mm/init.c
@@ -208,32 +208,17 @@ void __init mem_init(void)
                highmemsize >> 10);
 }
 
-void
-free_reserved_mem(void *start, void *end)
-{
-        for (; start < end; start += PAGE_SIZE) {
-                ClearPageReserved(virt_to_page(start));
-                init_page_count(virt_to_page(start));
-                free_page((unsigned long)start);
-                totalram_pages++;
-        }
-}
-
 #ifdef CONFIG_BLK_DEV_INITRD
 extern int initrd_is_mapped;
 
 void free_initrd_mem(unsigned long start, unsigned long end)
 {
-        if (initrd_is_mapped) {
-                free_reserved_mem((void*)start, (void*)end);
-                printk ("Freeing initrd memory: %ldk freed\n",(end-start)>>10);
-        }
+        if (initrd_is_mapped)
+                free_reserved_area(start, end, 0, "initrd");
 }
 #endif
 
 void free_initmem(void)
 {
-        free_reserved_mem(__init_begin, __init_end);
-        printk("Freeing unused kernel memory: %zuk freed\n",
-               (__init_end - __init_begin) >> 10);
+        free_initmem_default(0);
 }