150 files changed, 3294 insertions, 642 deletions
diff --git a/arch/arm/kernel/sys_arm.c b/arch/arm/kernel/sys_arm.c
index 4d25e49a14f7..9bd1870d980e 100644
--- a/arch/arm/kernel/sys_arm.c
+++ b/arch/arm/kernel/sys_arm.c
@@ -26,9 +26,9 @@
 #include <linux/fs.h>
 #include <linux/file.h>
 #include <linux/utsname.h>
+#include <linux/ipc.h>
 #include <asm/uaccess.h>
-#include <asm/ipc.h>
 extern unsigned long do_mremap(unsigned long addr, unsigned long old_len,
                               unsigned long new_len, unsigned long flags,
diff --git a/arch/arm/kernel/sys_oabi-compat.c b/arch/arm/kernel/sys_oabi-compat.c
index 8e2f9bc3368b..e8b98046895b 100644
--- a/arch/arm/kernel/sys_oabi-compat.c
+++ b/arch/arm/kernel/sys_oabi-compat.c
@@ -80,7 +80,7 @@
 #include <linux/sem.h>
 #include <linux/socket.h>
 #include <linux/net.h>
-#include <asm/ipc.h>
+#include <linux/ipc.h>
 #include <asm/uaccess.h>
 struct oldabi_stat64 {
diff --git a/arch/arm/mach-footbridge/cats-hw.c b/arch/arm/mach-footbridge/cats-hw.c
index ef6ccc8993e9..c261472208cb 100644
--- a/arch/arm/mach-footbridge/cats-hw.c
+++ b/arch/arm/mach-footbridge/cats-hw.c
@@ -78,9 +78,9 @@ static void __init
 fixup_cats(struct machine_desc *desc, struct tag *tags,
           char **cmdline, struct meminfo *mi)
 {
-        ORIG_VIDEO_LINES  = 25;
+        screen_info.orig_video_lines  = 25;
-        ORIG_VIDEO_POINTS = 16;
+        screen_info.orig_video_points = 16;
-        ORIG_Y = 24;
+        screen_info.orig_y = 24;
 }
 MACHINE_START(CATS, "Chalice-CATS")
diff --git a/arch/arm/plat-s3c24xx/dma.c b/arch/arm/plat-s3c24xx/dma.c
index 992ca435a922..29696e46ed65 100644
--- a/arch/arm/plat-s3c24xx/dma.c
+++ b/arch/arm/plat-s3c24xx/dma.c
@@ -1272,7 +1272,7 @@ struct sysdev_class dma_sysclass = {
 /* kmem cache implementation */
-static void s3c2410_dma_cache_ctor(void *p, struct kmem_cache *c, unsigned long f)
+static void s3c2410_dma_cache_ctor(struct kmem_cache *c, void *p)
 {
        memset(p, 0, sizeof(struct s3c2410_dma_buf));
 }
diff --git a/arch/avr32/mm/dma-coherent.c b/arch/avr32/mm/dma-coherent.c
index 099212d4567c..177fea8f7b71 100644
--- a/arch/avr32/mm/dma-coherent.c
+++ b/arch/avr32/mm/dma-coherent.c
@@ -21,13 +21,13 @@ void dma_cache_sync(struct device *dev, void *vaddr, size_t size, int direction)
        switch (direction) {
        case DMA_FROM_DEVICE:           /* invalidate only */
-                dma_cache_inv(vaddr, size);
+                invalidate_dcache_region(vaddr, size);
                break;
        case DMA_TO_DEVICE:             /* writeback only */
-                dma_cache_wback(vaddr, size);
+                clean_dcache_region(vaddr, size);
                break;
        case DMA_BIDIRECTIONAL:         /* writeback and invalidate */
-                dma_cache_wback_inv(vaddr, size);
+                flush_dcache_region(vaddr, size);
                break;
        default:
                BUG();
diff --git a/arch/cris/kernel/sys_cris.c b/arch/cris/kernel/sys_cris.c
index 0aa0e0ebb3a9..514359b8122e 100644
--- a/arch/cris/kernel/sys_cris.c
+++ b/arch/cris/kernel/sys_cris.c
@@ -21,9 +21,9 @@
 #include <linux/stat.h>
 #include <linux/mman.h>
 #include <linux/file.h>
+#include <linux/ipc.h>
 #include <asm/uaccess.h>
-#include <asm/ipc.h>
 #include <asm/segment.h>
 /*
diff --git a/arch/frv/kernel/sys_frv.c b/arch/frv/kernel/sys_frv.c
index 6fbe2665c577..04c6b1677ccf 100644
--- a/arch/frv/kernel/sys_frv.c
+++ b/arch/frv/kernel/sys_frv.c
@@ -23,10 +23,10 @@
 #include <linux/file.h>
 #include <linux/utsname.h>
 #include <linux/syscalls.h>
+#include <linux/ipc.h>
 #include <asm/setup.h>
 #include <asm/uaccess.h>
-#include <asm/ipc.h>
 /*
 * sys_pipe() is the normal C calling standard for creating
diff --git a/arch/h8300/kernel/sys_h8300.c b/arch/h8300/kernel/sys_h8300.c
index ddc62727dc9f..00608be6d567 100644
--- a/arch/h8300/kernel/sys_h8300.c
+++ b/arch/h8300/kernel/sys_h8300.c
@@ -19,12 +19,12 @@
 #include <linux/file.h>
 #include <linux/utsname.h>
 #include <linux/fs.h>
+#include <linux/ipc.h>
 #include <asm/setup.h>
 #include <asm/uaccess.h>
 #include <asm/cachectl.h>
 #include <asm/traps.h>
-#include <asm/ipc.h>
 #include <asm/unistd.h>
 /*
diff --git a/arch/i386/Kconfig b/arch/i386/Kconfig
index bf9aafad4978..7a95c58947e4 100644
--- a/arch/i386/Kconfig
+++ b/arch/i386/Kconfig
@@ -831,12 +831,13 @@ config CRASH_DUMP
        depends on HIGHMEM
        help
          Generate crash dump after being started by kexec.
-          This should be normally only set in special crash dump kernels
+          This should be normally only set in special crash dump kernels
          which are loaded in the main kernel with kexec-tools into
          a specially reserved region and then later executed after
          a crash by kdump/kexec. The crash dump kernel must be compiled
-          to a memory address not used by the main kernel or BIOS using
+          to a memory address not used by the main kernel or BIOS using
-          PHYSICAL_START.
+          PHYSICAL_START, or it must be built as a relocatable image
+          (CONFIG_RELOCATABLE=y).
          For more details see Documentation/kdump/kdump.txt
 config PHYSICAL_START
@@ -882,17 +883,17 @@ config PHYSICAL_START
          Don't change this unless you know what you are doing.
 config RELOCATABLE
-        bool "Build a relocatable kernel(EXPERIMENTAL)"
+        bool "Build a relocatable kernel (EXPERIMENTAL)"
        depends on EXPERIMENTAL
        help
          This builds a kernel image that retains relocation information
-          so it can be loaded someplace besides the default 1MB.
+          so it can be loaded someplace besides the default 1MB.
          The relocations tend to make the kernel binary about 10% larger,
-          but are discarded at runtime.
+          but are discarded at runtime.
          One use is for the kexec on panic case where the recovery kernel
-          must live at a different physical address than the primary
+          must live at a different physical address than the primary
-          kernel.
+          kernel.
 config PHYSICAL_ALIGN
        hex "Alignment value to which kernel should be aligned"
@@ -1256,7 +1257,6 @@ source "fs/Kconfig"
 menuconfig INSTRUMENTATION
        bool "Instrumentation Support"
-        depends on EXPERIMENTAL
        default y
        ---help---
          Say Y here to get to see options related to performance measurement,
diff --git a/arch/ia64/Kconfig b/arch/ia64/Kconfig
index 59b91ac861ac..c60532d93c54 100644
--- a/arch/ia64/Kconfig
+++ b/arch/ia64/Kconfig
@@ -593,7 +593,6 @@ config IRQ_PER_CPU
 source "arch/ia64/hp/sim/Kconfig"
 menu "Instrumentation Support"
-        depends on EXPERIMENTAL
 source "arch/ia64/oprofile/Kconfig"
diff --git a/arch/ia64/ia32/binfmt_elf32.c b/arch/ia64/ia32/binfmt_elf32.c
index 1cfab326fb7e..f6ae3ec93810 100644
--- a/arch/ia64/ia32/binfmt_elf32.c
+++ b/arch/ia64/ia32/binfmt_elf32.c
@@ -240,7 +240,7 @@ static int __init check_elf32_binfmt(void)
 {
        if (cpu_uses_ia32el()) {
                printk("Please use IA-32 EL for executing IA-32 binaries\n");
-                return unregister_binfmt(&elf_format);
+                unregister_binfmt(&elf_format);
        }
        return 0;
 }
diff --git a/arch/ia64/ia32/elfcore32.h b/arch/ia64/ia32/elfcore32.h
index a47f63b204fb..446c9aac924d 100644
--- a/arch/ia64/ia32/elfcore32.h
+++ b/arch/ia64/ia32/elfcore32.h
@@ -117,6 +117,7 @@ elf_core_copy_task_fpregs(struct task_struct *tsk, struct pt_regs *regs, elf_fpr
 }
 #define ELF_CORE_COPY_XFPREGS 1
+#define ELF_CORE_XFPREG_TYPE NT_PRXFPREG
 static inline int
 elf_core_copy_task_xfpregs(struct task_struct *tsk, elf_fpxregset_t *xfpu)
 {
diff --git a/arch/ia64/kernel/machine_kexec.c b/arch/ia64/kernel/machine_kexec.c
index 58e943a5d95c..0dd3b2394cdd 100644
--- a/arch/ia64/kernel/machine_kexec.c
+++ b/arch/ia64/kernel/machine_kexec.c
@@ -15,10 +15,13 @@
 #include <linux/cpu.h>
 #include <linux/irq.h>
 #include <linux/efi.h>
+#include <linux/numa.h>
+#include <linux/mmzone.h>
 #include <asm/mmu_context.h>
 #include <asm/setup.h>
 #include <asm/delay.h>
 #include <asm/meminit.h>
+#include <asm/processor.h>
 typedef NORET_TYPE void (*relocate_new_kernel_t)(
                                        unsigned long indirection_page,
@@ -121,3 +124,28 @@ void machine_kexec(struct kimage *image)
        unw_init_running(ia64_machine_kexec, image);
        for(;;);
 }
+void arch_crash_save_vmcoreinfo(void)
+{
+#ifdef CONFIG_ARCH_DISCONTIGMEM_ENABLE
+        VMCOREINFO_SYMBOL(pgdat_list);
+        VMCOREINFO_LENGTH(pgdat_list, MAX_NUMNODES);
+        VMCOREINFO_SYMBOL(node_memblk);
+        VMCOREINFO_LENGTH(node_memblk, NR_NODE_MEMBLKS);
+        VMCOREINFO_SIZE(node_memblk_s);
+        VMCOREINFO_OFFSET(node_memblk_s, start_paddr);
+        VMCOREINFO_OFFSET(node_memblk_s, size);
+#endif
+#ifdef CONFIG_PGTABLE_3
+        VMCOREINFO_CONFIG(PGTABLE_3);
+#elif  CONFIG_PGTABLE_4
+        VMCOREINFO_CONFIG(PGTABLE_4);
+#endif
+}
+unsigned long paddr_vmcoreinfo_note(void)
+{
+        return ia64_tpa((unsigned long)(char *)&vmcoreinfo_note);
+}
diff --git a/arch/ia64/mm/discontig.c b/arch/ia64/mm/discontig.c
index 5628067a74d2..0b567398f38e 100644
--- a/arch/ia64/mm/discontig.c
+++ b/arch/ia64/mm/discontig.c
@@ -48,7 +48,7 @@ struct early_node_data {
 static struct early_node_data mem_data[MAX_NUMNODES] __initdata;
 static nodemask_t memory_less_mask __initdata;
-static pg_data_t *pgdat_list[MAX_NUMNODES];
+pg_data_t *pgdat_list[MAX_NUMNODES];
 /*
 * To prevent cache aliasing effects, align per-node structures so that they
diff --git a/arch/m32r/kernel/sys_m32r.c b/arch/m32r/kernel/sys_m32r.c
index b13dbbeaeafa..0fc2efec18f6 100644
--- a/arch/m32r/kernel/sys_m32r.c
+++ b/arch/m32r/kernel/sys_m32r.c
@@ -20,11 +20,11 @@
 #include <linux/mman.h>
 #include <linux/file.h>
 #include <linux/utsname.h>
+#include <linux/ipc.h>
 #include <asm/uaccess.h>
 #include <asm/cachectl.h>
 #include <asm/cacheflush.h>
-#include <asm/ipc.h>
 #include <asm/syscall.h>
 #include <asm/unistd.h>
diff --git a/arch/m68k/kernel/sys_m68k.c b/arch/m68k/kernel/sys_m68k.c
index 36d78cf1a7bc..e892f17ba3fa 100644
--- a/arch/m68k/kernel/sys_m68k.c
+++ b/arch/m68k/kernel/sys_m68k.c
@@ -21,12 +21,12 @@
 #include <linux/mman.h>
 #include <linux/file.h>
 #include <linux/utsname.h>
+#include <linux/ipc.h>
 #include <asm/setup.h>
 #include <asm/uaccess.h>
 #include <asm/cachectl.h>
 #include <asm/traps.h>
-#include <asm/ipc.h>
 #include <asm/page.h>
 #include <asm/unistd.h>
diff --git a/arch/m68knommu/kernel/sys_m68k.c b/arch/m68knommu/kernel/sys_m68k.c
index 15d62c5279a9..65f7a95f056e 100644
--- a/arch/m68knommu/kernel/sys_m68k.c
+++ b/arch/m68knommu/kernel/sys_m68k.c
@@ -18,13 +18,13 @@
 #include <linux/mman.h>
 #include <linux/file.h>
 #include <linux/utsname.h>
+#include <linux/ipc.h>
 #include <linux/fs.h>
 #include <asm/setup.h>
 #include <asm/uaccess.h>
 #include <asm/cachectl.h>
 #include <asm/traps.h>
-#include <asm/ipc.h>
 #include <asm/cacheflush.h>
 #include <asm/unistd.h>
diff --git a/arch/mips/Makefile b/arch/mips/Makefile
index 6b663bec4752..14164c2b8791 100644
--- a/arch/mips/Makefile
+++ b/arch/mips/Makefile
@@ -279,7 +279,6 @@ core-$(CONFIG_MACH_DECSTATION)	+= arch/mips/dec/
 cflags-$(CONFIG_MACH_DECSTATION)+= -Iinclude/asm-mips/mach-dec
 libs-$(CONFIG_MACH_DECSTATION)  += arch/mips/dec/prom/
 load-$(CONFIG_MACH_DECSTATION)  += 0xffffffff80040000
-CLEAN_FILES                     += drivers/tc/lk201-map.c
 #
 # Wind River PPMC Board (4KC + GT64120)
diff --git a/arch/mips/kernel/irixelf.c b/arch/mips/kernel/irixelf.c
index 8ef5cf4cc423..b997af713eb3 100644
--- a/arch/mips/kernel/irixelf.c
+++ b/arch/mips/kernel/irixelf.c
@@ -44,11 +44,14 @@
 static int load_irix_binary(struct linux_binprm * bprm, struct pt_regs * regs);
 static int load_irix_library(struct file *);
 static int irix_core_dump(long signr, struct pt_regs * regs,
-                          struct file *file);
+                          struct file *file, unsigned long limit);
 static struct linux_binfmt irix_format = {
-        NULL, THIS_MODULE, load_irix_binary, load_irix_library,
+        .module         = THIS_MODULE,
-        irix_core_dump, PAGE_SIZE
+        .load_binary    = load_irix_binary,
+        .load_shlib     = load_irix_library,
+        .core_dump      = irix_core_dump,
+        .min_coredump   = PAGE_SIZE,
 };
 /* Debugging routines. */
@@ -1088,7 +1091,7 @@ end_coredump:
 * and then they are actually written out.  If we run out of core limit
 * we just truncate.
 */
-static int irix_core_dump(long signr, struct pt_regs * regs, struct file *file)
+static int irix_core_dump(long signr, struct pt_regs *regs, struct file *file, unsigned long limit)
 {
        int has_dumped = 0;
        mm_segment_t fs;
@@ -1098,7 +1101,6 @@ static int irix_core_dump(long signr, struct pt_regs * regs, struct file *file)
        struct vm_area_struct *vma;
        struct elfhdr elf;
        off_t offset = 0, dataoff;
-        int limit = current->signal->rlim[RLIMIT_CORE].rlim_cur;
        int numnote = 3;
        struct memelfnote notes[3];
        struct elf_prstatus prstatus;   /* NT_PRSTATUS */
diff --git a/arch/mips/kernel/linux32.c b/arch/mips/kernel/linux32.c
index d6e01215fb2b..2b8ec1102e86 100644
--- a/arch/mips/kernel/linux32.c
+++ b/arch/mips/kernel/linux32.c
@@ -35,12 +35,12 @@
 #include <linux/security.h>
 #include <linux/compat.h>
 #include <linux/vfs.h>
+#include <linux/ipc.h>
 #include <net/sock.h>
 #include <net/scm.h>
 #include <asm/compat-signal.h>
-#include <asm/ipc.h>
 #include <asm/sim.h>
 #include <asm/uaccess.h>
 #include <asm/mmu_context.h>
diff --git a/arch/mips/kernel/syscall.c b/arch/mips/kernel/syscall.c
index 17c4374d2209..b95fe93dd646 100644
--- a/arch/mips/kernel/syscall.c
+++ b/arch/mips/kernel/syscall.c
@@ -28,11 +28,11 @@
 #include <linux/shm.h>
 #include <linux/compiler.h>
 #include <linux/module.h>
+#include <linux/ipc.h>
 #include <asm/branch.h>
 #include <asm/cachectl.h>
 #include <asm/cacheflush.h>
-#include <asm/ipc.h>
 #include <asm/asm-offsets.h>
 #include <asm/signal.h>
 #include <asm/sim.h>
diff --git a/arch/mips/mm/cache.c b/arch/mips/mm/cache.c
index 43dde874f414..81f30ac2bff9 100644
--- a/arch/mips/mm/cache.c
+++ b/arch/mips/mm/cache.c
@@ -47,8 +47,6 @@ void (*_dma_cache_wback)(unsigned long start, unsigned long size);
 void (*_dma_cache_inv)(unsigned long start, unsigned long size);
 EXPORT_SYMBOL(_dma_cache_wback_inv);
-EXPORT_SYMBOL(_dma_cache_wback);
-EXPORT_SYMBOL(_dma_cache_inv);
 #endif /* CONFIG_DMA_NONCOHERENT */
diff --git a/arch/mips/pci/ops-pmcmsp.c b/arch/mips/pci/ops-pmcmsp.c
index 09fa007c1d1b..059eade96f2e 100644
--- a/arch/mips/pci/ops-pmcmsp.c
+++ b/arch/mips/pci/ops-pmcmsp.c
@@ -206,7 +206,7 @@ static void pci_proc_init(void)
 }
 #endif /* CONFIG_PROC_FS && PCI_COUNTERS */
-spinlock_t bpci_lock = SPIN_LOCK_UNLOCKED;
+DEFINE_SPINLOCK(bpci_lock);
 /*****************************************************************************
 *
diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig
index 5e001ad588a7..3763f681ce4c 100644
--- a/arch/powerpc/Kconfig
+++ b/arch/powerpc/Kconfig
@@ -670,7 +670,6 @@ source "arch/powerpc/sysdev/qe_lib/Kconfig"
 source "lib/Kconfig"
 menu "Instrumentation Support"
-        depends on EXPERIMENTAL
 source "arch/powerpc/oprofile/Kconfig"
@@ -699,3 +698,7 @@ source "crypto/Kconfig"
 config PPC_CLOCK
        bool
        default n
+config PPC_LIB_RHEAP
+        bool
diff --git a/arch/powerpc/boot/dts/lite5200b.dts b/arch/powerpc/boot/dts/lite5200b.dts
index a6bb1d0558ef..6582c9a39b27 100644
--- a/arch/powerpc/boot/dts/lite5200b.dts
+++ b/arch/powerpc/boot/dts/lite5200b.dts
@@ -277,10 +277,26 @@
                ethernet@3000 {
                        device_type = "network";
                        compatible = "mpc5200b-fec","mpc5200-fec";
-                        reg = <3000 800>;
+                        reg = <3000 400>;
                        mac-address = [ 02 03 04 05 06 07 ]; // Bad!
                        interrupts = <2 5 0>;
                        interrupt-parent = <&mpc5200_pic>;
+                        phy-handle = <&phy0>;
+                };
+                mdio@3000 {
+                        #address-cells = <1>;
+                        #size-cells = <0>;
+                        device_type = "mdio";
+                        compatible = "mpc5200b-fec-phy";
+                        reg = <3000 400>;       // fec range, since we need to setup fec interrupts
+                        interrupts = <2 5 0>;   // these are for "mii command finished", not link changes & co.
+                        interrupt-parent = <&mpc5200_pic>;
+                        phy0:ethernet-phy@0 {
+                                device_type = "ethernet-phy";
+                                reg = <0>;
+                        };
                };
                ata@3a00 {
diff --git a/arch/powerpc/configs/bamboo_defconfig b/arch/powerpc/configs/bamboo_defconfig
index b592dec4640f..d22fed6d2cd9 100644
--- a/arch/powerpc/configs/bamboo_defconfig
+++ b/arch/powerpc/configs/bamboo_defconfig
@@ -91,8 +91,9 @@ CONFIG_TIMERFD=y
 CONFIG_EVENTFD=y
 CONFIG_SHMEM=y
 CONFIG_VM_EVENT_COUNTERS=y
-CONFIG_SLAB=y
+CONFIG_SLUB_DEBUG=y
-# CONFIG_SLUB is not set
+# CONFIG_SLAB is not set
+CONFIG_SLUB=y
 # CONFIG_SLOB is not set
 CONFIG_RT_MUTEXES=y
 # CONFIG_TINY_SHMEM is not set
@@ -695,7 +696,7 @@ CONFIG_DETECT_SOFTLOCKUP=y
 CONFIG_SCHED_DEBUG=y
 # CONFIG_SCHEDSTATS is not set
 # CONFIG_TIMER_STATS is not set
-# CONFIG_DEBUG_SLAB is not set
+# CONFIG_SLUB_DEBUG_ON is not set
 # CONFIG_DEBUG_RT_MUTEXES is not set
 # CONFIG_RT_MUTEX_TESTER is not set
 # CONFIG_DEBUG_SPINLOCK is not set
diff --git a/arch/powerpc/configs/celleb_defconfig b/arch/powerpc/configs/celleb_defconfig
index b4ac498c3cce..2c5969801bd6 100644
--- a/arch/powerpc/configs/celleb_defconfig
+++ b/arch/powerpc/configs/celleb_defconfig
@@ -92,8 +92,9 @@ CONFIG_TIMERFD=y
 CONFIG_EVENTFD=y
 CONFIG_SHMEM=y
 CONFIG_VM_EVENT_COUNTERS=y
-CONFIG_SLAB=y
+CONFIG_SLUB_DEBUG=y
-# CONFIG_SLUB is not set
+# CONFIG_SLAB is not set
+CONFIG_SLUB=y
 # CONFIG_SLOB is not set
 CONFIG_RT_MUTEXES=y
 # CONFIG_TINY_SHMEM is not set
@@ -1218,7 +1219,7 @@ CONFIG_DETECT_SOFTLOCKUP=y
 CONFIG_SCHED_DEBUG=y
 # CONFIG_SCHEDSTATS is not set
 # CONFIG_TIMER_STATS is not set
-# CONFIG_DEBUG_SLAB is not set
+# CONFIG_SLUB_DEBUG_ON is not set
 # CONFIG_DEBUG_RT_MUTEXES is not set
 # CONFIG_RT_MUTEX_TESTER is not set
 # CONFIG_DEBUG_SPINLOCK is not set
diff --git a/arch/powerpc/configs/chrp32_defconfig b/arch/powerpc/configs/chrp32_defconfig
index c3977e334b3b..6f27e57331d5 100644
--- a/arch/powerpc/configs/chrp32_defconfig
+++ b/arch/powerpc/configs/chrp32_defconfig
@@ -92,8 +92,9 @@ CONFIG_TIMERFD=y
 CONFIG_EVENTFD=y
 CONFIG_SHMEM=y
 CONFIG_VM_EVENT_COUNTERS=y
-CONFIG_SLAB=y
+CONFIG_SLUB_DEBUG=y
-# CONFIG_SLUB is not set
+# CONFIG_SLAB is not set
+CONFIG_SLUB=y
 # CONFIG_SLOB is not set
 CONFIG_RT_MUTEXES=y
 # CONFIG_TINY_SHMEM is not set
@@ -1373,7 +1374,7 @@ CONFIG_DETECT_SOFTLOCKUP=y
 CONFIG_SCHED_DEBUG=y
 # CONFIG_SCHEDSTATS is not set
 # CONFIG_TIMER_STATS is not set
-# CONFIG_DEBUG_SLAB is not set
+# CONFIG_SLUB_DEBUG_ON is not set
 # CONFIG_DEBUG_RT_MUTEXES is not set
 # CONFIG_RT_MUTEX_TESTER is not set
 # CONFIG_DEBUG_SPINLOCK is not set
diff --git a/arch/powerpc/configs/ebony_defconfig b/arch/powerpc/configs/ebony_defconfig
index 3a50467b1f75..35a95dda681e 100644
--- a/arch/powerpc/configs/ebony_defconfig
+++ b/arch/powerpc/configs/ebony_defconfig
@@ -90,8 +90,9 @@ CONFIG_TIMERFD=y
 CONFIG_EVENTFD=y
 CONFIG_SHMEM=y
 CONFIG_VM_EVENT_COUNTERS=y
-CONFIG_SLAB=y
+CONFIG_SLUB_DEBUG=y
-# CONFIG_SLUB is not set
+# CONFIG_SLAB is not set
+CONFIG_SLUB=y
 # CONFIG_SLOB is not set
 CONFIG_RT_MUTEXES=y
 # CONFIG_TINY_SHMEM is not set
@@ -773,7 +774,7 @@ CONFIG_DETECT_SOFTLOCKUP=y
 CONFIG_SCHED_DEBUG=y
 # CONFIG_SCHEDSTATS is not set
 # CONFIG_TIMER_STATS is not set
-# CONFIG_DEBUG_SLAB is not set
+# CONFIG_SLUB_DEBUG_ON is not set
 # CONFIG_DEBUG_RT_MUTEXES is not set
 # CONFIG_RT_MUTEX_TESTER is not set
 # CONFIG_DEBUG_SPINLOCK is not set
diff --git a/arch/powerpc/configs/g5_defconfig b/arch/powerpc/configs/g5_defconfig
index a655d87b3f8b..0a6fa1fc9766 100644
--- a/arch/powerpc/configs/g5_defconfig
+++ b/arch/powerpc/configs/g5_defconfig
@@ -92,8 +92,9 @@ CONFIG_TIMERFD=y
 CONFIG_EVENTFD=y
 CONFIG_SHMEM=y
 CONFIG_VM_EVENT_COUNTERS=y
-CONFIG_SLAB=y
+CONFIG_SLUB_DEBUG=y
-# CONFIG_SLUB is not set
+# CONFIG_SLAB is not set
+CONFIG_SLUB=y
 # CONFIG_SLOB is not set
 CONFIG_RT_MUTEXES=y
 # CONFIG_TINY_SHMEM is not set
@@ -1580,7 +1581,7 @@ CONFIG_DETECT_SOFTLOCKUP=y
 CONFIG_SCHED_DEBUG=y
 # CONFIG_SCHEDSTATS is not set
 # CONFIG_TIMER_STATS is not set
-# CONFIG_DEBUG_SLAB is not set
+# CONFIG_SLUB_DEBUG_ON is not set
 # CONFIG_DEBUG_RT_MUTEXES is not set
 # CONFIG_RT_MUTEX_TESTER is not set
 # CONFIG_DEBUG_SPINLOCK is not set
diff --git a/arch/powerpc/configs/holly_defconfig b/arch/powerpc/configs/holly_defconfig
index 97d0202a9fe0..11009185d230 100644
--- a/arch/powerpc/configs/holly_defconfig
+++ b/arch/powerpc/configs/holly_defconfig
@@ -88,8 +88,9 @@ CONFIG_TIMERFD=y
 CONFIG_EVENTFD=y
 CONFIG_SHMEM=y
 CONFIG_VM_EVENT_COUNTERS=y
-CONFIG_SLAB=y
+CONFIG_SLUB_DEBUG=y
-# CONFIG_SLUB is not set
+# CONFIG_SLAB is not set
+CONFIG_SLUB=y
 # CONFIG_SLOB is not set
 CONFIG_RT_MUTEXES=y
 # CONFIG_TINY_SHMEM is not set
@@ -909,7 +910,7 @@ CONFIG_DETECT_SOFTLOCKUP=y
 # CONFIG_SCHED_DEBUG is not set
 # CONFIG_SCHEDSTATS is not set
 # CONFIG_TIMER_STATS is not set
-# CONFIG_DEBUG_SLAB is not set
+# CONFIG_SLUB_DEBUG_ON is not set
 # CONFIG_DEBUG_RT_MUTEXES is not set
 # CONFIG_RT_MUTEX_TESTER is not set
 # CONFIG_DEBUG_SPINLOCK is not set
diff --git a/arch/powerpc/configs/iseries_defconfig b/arch/powerpc/configs/iseries_defconfig
index 3fe1929460e7..d78e3a6fc68c 100644
--- a/arch/powerpc/configs/iseries_defconfig
+++ b/arch/powerpc/configs/iseries_defconfig
@@ -93,8 +93,9 @@ CONFIG_TIMERFD=y
 CONFIG_EVENTFD=y
 CONFIG_SHMEM=y
 CONFIG_VM_EVENT_COUNTERS=y
-CONFIG_SLAB=y
+CONFIG_SLUB_DEBUG=y
-# CONFIG_SLUB is not set
+# CONFIG_SLAB is not set
+CONFIG_SLUB=y
 # CONFIG_SLOB is not set
 CONFIG_RT_MUTEXES=y
 # CONFIG_TINY_SHMEM is not set
@@ -1056,7 +1057,7 @@ CONFIG_DETECT_SOFTLOCKUP=y
 CONFIG_SCHED_DEBUG=y
 # CONFIG_SCHEDSTATS is not set
 # CONFIG_TIMER_STATS is not set
-# CONFIG_DEBUG_SLAB is not set
+# CONFIG_SLUB_DEBUG_ON is not set
 # CONFIG_DEBUG_RT_MUTEXES is not set
 # CONFIG_RT_MUTEX_TESTER is not set
 # CONFIG_DEBUG_SPINLOCK is not set
diff --git a/arch/powerpc/configs/kilauea_defconfig b/arch/powerpc/configs/kilauea_defconfig
index 31790d329269..fd1c530aa3ec 100644
--- a/arch/powerpc/configs/kilauea_defconfig
+++ b/arch/powerpc/configs/kilauea_defconfig
@@ -91,8 +91,9 @@ CONFIG_SIGNALFD=y
 CONFIG_EVENTFD=y
 CONFIG_SHMEM=y
 CONFIG_VM_EVENT_COUNTERS=y
-CONFIG_SLAB=y
+CONFIG_SLUB_DEBUG=y
-# CONFIG_SLUB is not set
+# CONFIG_SLAB is not set
+CONFIG_SLUB=y
 # CONFIG_SLOB is not set
 CONFIG_RT_MUTEXES=y
 # CONFIG_TINY_SHMEM is not set
@@ -700,7 +701,7 @@ CONFIG_DETECT_SOFTLOCKUP=y
 CONFIG_SCHED_DEBUG=y
 # CONFIG_SCHEDSTATS is not set
 # CONFIG_TIMER_STATS is not set
-# CONFIG_DEBUG_SLAB is not set
+# CONFIG_SLUB_DEBUG_ON is not set
 # CONFIG_DEBUG_RT_MUTEXES is not set
 # CONFIG_RT_MUTEX_TESTER is not set
 # CONFIG_DEBUG_SPINLOCK is not set
diff --git a/arch/powerpc/configs/linkstation_defconfig b/arch/powerpc/configs/linkstation_defconfig
index a4e3ee045a6a..401033aefd40 100644
--- a/arch/powerpc/configs/linkstation_defconfig
+++ b/arch/powerpc/configs/linkstation_defconfig
@@ -89,8 +89,9 @@ CONFIG_TIMERFD=y
 CONFIG_EVENTFD=y
 CONFIG_SHMEM=y
 CONFIG_VM_EVENT_COUNTERS=y
-CONFIG_SLAB=y
+CONFIG_SLUB_DEBUG=y
-# CONFIG_SLUB is not set
+# CONFIG_SLAB is not set
+CONFIG_SLUB=y
 # CONFIG_SLOB is not set
 CONFIG_RT_MUTEXES=y
 # CONFIG_TINY_SHMEM is not set
@@ -1459,7 +1460,7 @@ CONFIG_DETECT_SOFTLOCKUP=y
 CONFIG_SCHED_DEBUG=y
 # CONFIG_SCHEDSTATS is not set
 # CONFIG_TIMER_STATS is not set
-# CONFIG_DEBUG_SLAB is not set
+# CONFIG_SLUB_DEBUG_ON is not set
 # CONFIG_DEBUG_RT_MUTEXES is not set
 # CONFIG_RT_MUTEX_TESTER is not set
 # CONFIG_DEBUG_SPINLOCK is not set
diff --git a/arch/powerpc/configs/lite5200_defconfig b/arch/powerpc/configs/lite5200_defconfig
index d42e226d3a28..dd78ed955eb0 100644
--- a/arch/powerpc/configs/lite5200_defconfig
+++ b/arch/powerpc/configs/lite5200_defconfig
@@ -87,8 +87,9 @@ CONFIG_TIMERFD=y
 CONFIG_EVENTFD=y
 CONFIG_SHMEM=y
 CONFIG_VM_EVENT_COUNTERS=y
-CONFIG_SLAB=y
+CONFIG_SLUB_DEBUG=y
-# CONFIG_SLUB is not set
+# CONFIG_SLAB is not set
+CONFIG_SLUB=y
 # CONFIG_SLOB is not set
 CONFIG_RT_MUTEXES=y
 # CONFIG_TINY_SHMEM is not set
@@ -816,7 +817,7 @@ CONFIG_DETECT_SOFTLOCKUP=y
 CONFIG_SCHED_DEBUG=y
 # CONFIG_SCHEDSTATS is not set
 # CONFIG_TIMER_STATS is not set
-# CONFIG_DEBUG_SLAB is not set
+# CONFIG_SLUB_DEBUG_ON is not set
 # CONFIG_DEBUG_RT_MUTEXES is not set
 # CONFIG_RT_MUTEX_TESTER is not set
 # CONFIG_DEBUG_SPINLOCK is not set
diff --git a/arch/powerpc/configs/maple_defconfig b/arch/powerpc/configs/maple_defconfig
index 96b538bc676b..84b9ab4a5a92 100644
--- a/arch/powerpc/configs/maple_defconfig
+++ b/arch/powerpc/configs/maple_defconfig
@@ -90,8 +90,9 @@ CONFIG_TIMERFD=y
 CONFIG_EVENTFD=y
 CONFIG_SHMEM=y
 CONFIG_VM_EVENT_COUNTERS=y
-CONFIG_SLAB=y
+CONFIG_SLUB_DEBUG=y
-# CONFIG_SLUB is not set
+# CONFIG_SLAB is not set
+CONFIG_SLUB=y
 # CONFIG_SLOB is not set
 CONFIG_RT_MUTEXES=y
 # CONFIG_TINY_SHMEM is not set
@@ -1095,8 +1096,7 @@ CONFIG_DETECT_SOFTLOCKUP=y
 CONFIG_SCHED_DEBUG=y
 # CONFIG_SCHEDSTATS is not set
 # CONFIG_TIMER_STATS is not set
-CONFIG_DEBUG_SLAB=y
+# CONFIG_SLUB_DEBUG_ON is not set
-# CONFIG_DEBUG_SLAB_LEAK is not set
 # CONFIG_DEBUG_RT_MUTEXES is not set
 # CONFIG_RT_MUTEX_TESTER is not set
 # CONFIG_DEBUG_SPINLOCK is not set
diff --git a/arch/powerpc/configs/mpc7448_hpc2_defconfig b/arch/powerpc/configs/mpc7448_hpc2_defconfig
index 05814a3b0e33..87ae894551b7 100644
--- a/arch/powerpc/configs/mpc7448_hpc2_defconfig
+++ b/arch/powerpc/configs/mpc7448_hpc2_defconfig
@@ -87,8 +87,9 @@ CONFIG_TIMERFD=y
 CONFIG_EVENTFD=y
 CONFIG_SHMEM=y
 CONFIG_VM_EVENT_COUNTERS=y
-CONFIG_SLAB=y
+CONFIG_SLUB_DEBUG=y
-# CONFIG_SLUB is not set
+# CONFIG_SLAB is not set
+CONFIG_SLUB=y
 # CONFIG_SLOB is not set
 CONFIG_RT_MUTEXES=y
 # CONFIG_TINY_SHMEM is not set
diff --git a/arch/powerpc/configs/mpc8272_ads_defconfig b/arch/powerpc/configs/mpc8272_ads_defconfig
index 6b7951ec941a..865a942ecc69 100644
--- a/arch/powerpc/configs/mpc8272_ads_defconfig
+++ b/arch/powerpc/configs/mpc8272_ads_defconfig
@@ -85,8 +85,9 @@ CONFIG_TIMERFD=y
 CONFIG_EVENTFD=y
 CONFIG_SHMEM=y
 CONFIG_VM_EVENT_COUNTERS=y
-CONFIG_SLAB=y
+CONFIG_SLUB_DEBUG=y
-# CONFIG_SLUB is not set
+# CONFIG_SLAB is not set
+CONFIG_SLUB=y
 # CONFIG_SLOB is not set
 CONFIG_RT_MUTEXES=y
 # CONFIG_TINY_SHMEM is not set
@@ -867,7 +868,7 @@ CONFIG_DETECT_SOFTLOCKUP=y
 CONFIG_SCHED_DEBUG=y
 # CONFIG_SCHEDSTATS is not set
 # CONFIG_TIMER_STATS is not set
-# CONFIG_DEBUG_SLAB is not set
+# CONFIG_SLUB_DEBUG_ON is not set
 # CONFIG_DEBUG_RT_MUTEXES is not set
 # CONFIG_RT_MUTEX_TESTER is not set
 # CONFIG_DEBUG_SPINLOCK is not set
diff --git a/arch/powerpc/configs/mpc8313_rdb_defconfig b/arch/powerpc/configs/mpc8313_rdb_defconfig
index f387dac69d09..259d40d1eb5a 100644
--- a/arch/powerpc/configs/mpc8313_rdb_defconfig
+++ b/arch/powerpc/configs/mpc8313_rdb_defconfig
@@ -87,8 +87,9 @@ CONFIG_TIMERFD=y
 CONFIG_EVENTFD=y
 CONFIG_SHMEM=y
 CONFIG_VM_EVENT_COUNTERS=y
-CONFIG_SLAB=y
+CONFIG_SLUB_DEBUG=y
-# CONFIG_SLUB is not set
+# CONFIG_SLAB is not set
+CONFIG_SLUB=y
 # CONFIG_SLOB is not set
 CONFIG_RT_MUTEXES=y
 # CONFIG_TINY_SHMEM is not set
@@ -1272,7 +1273,7 @@ CONFIG_DETECT_SOFTLOCKUP=y
 CONFIG_SCHED_DEBUG=y
 # CONFIG_SCHEDSTATS is not set
 # CONFIG_TIMER_STATS is not set
-# CONFIG_DEBUG_SLAB is not set
+# CONFIG_SLUB_DEBUG_ON is not set
 # CONFIG_DEBUG_RT_MUTEXES is not set
 # CONFIG_RT_MUTEX_TESTER is not set
 # CONFIG_DEBUG_SPINLOCK is not set
diff --git a/arch/powerpc/configs/mpc832x_mds_defconfig b/arch/powerpc/configs/mpc832x_mds_defconfig
index fc6695302cc8..dd68d1818d6b 100644
--- a/arch/powerpc/configs/mpc832x_mds_defconfig
+++ b/arch/powerpc/configs/mpc832x_mds_defconfig
@@ -87,8 +87,9 @@ CONFIG_TIMERFD=y
 CONFIG_EVENTFD=y
 CONFIG_SHMEM=y
 CONFIG_VM_EVENT_COUNTERS=y
-CONFIG_SLAB=y
+CONFIG_SLUB_DEBUG=y
-# CONFIG_SLUB is not set
+# CONFIG_SLAB is not set
+CONFIG_SLUB=y
 # CONFIG_SLOB is not set
 CONFIG_RT_MUTEXES=y
 # CONFIG_TINY_SHMEM is not set
diff --git a/arch/powerpc/configs/mpc832x_rdb_defconfig b/arch/powerpc/configs/mpc832x_rdb_defconfig
index 6d1c3e842051..4f391028c79c 100644
--- a/arch/powerpc/configs/mpc832x_rdb_defconfig
+++ b/arch/powerpc/configs/mpc832x_rdb_defconfig
@@ -87,8 +87,9 @@ CONFIG_TIMERFD=y
 CONFIG_EVENTFD=y
 CONFIG_SHMEM=y
 CONFIG_VM_EVENT_COUNTERS=y
-CONFIG_SLAB=y
+CONFIG_SLUB_DEBUG=y
-# CONFIG_SLUB is not set
+# CONFIG_SLAB is not set
+CONFIG_SLUB=y
 # CONFIG_SLOB is not set
 CONFIG_RT_MUTEXES=y
 # CONFIG_TINY_SHMEM is not set
diff --git a/arch/powerpc/configs/mpc834x_itx_defconfig b/arch/powerpc/configs/mpc834x_itx_defconfig
index ddafa6b9af05..eb28dd85cb2b 100644
--- a/arch/powerpc/configs/mpc834x_itx_defconfig
+++ b/arch/powerpc/configs/mpc834x_itx_defconfig
@@ -87,8 +87,9 @@ CONFIG_TIMERFD=y
 CONFIG_EVENTFD=y
 CONFIG_SHMEM=y
 CONFIG_VM_EVENT_COUNTERS=y
-CONFIG_SLAB=y
+CONFIG_SLUB_DEBUG=y
-# CONFIG_SLUB is not set
+# CONFIG_SLAB is not set
+CONFIG_SLUB=y
 # CONFIG_SLOB is not set
 CONFIG_RT_MUTEXES=y
 # CONFIG_TINY_SHMEM is not set
diff --git a/arch/powerpc/configs/mpc834x_itxgp_defconfig b/arch/powerpc/configs/mpc834x_itxgp_defconfig
index 8241c6985861..22b95462c913 100644
--- a/arch/powerpc/configs/mpc834x_itxgp_defconfig
+++ b/arch/powerpc/configs/mpc834x_itxgp_defconfig
@@ -87,8 +87,9 @@ CONFIG_TIMERFD=y
 CONFIG_EVENTFD=y
 CONFIG_SHMEM=y
 CONFIG_VM_EVENT_COUNTERS=y
-CONFIG_SLAB=y
+CONFIG_SLUB_DEBUG=y
-# CONFIG_SLUB is not set
+# CONFIG_SLAB is not set
+CONFIG_SLUB=y
 # CONFIG_SLOB is not set
 CONFIG_RT_MUTEXES=y
 # CONFIG_TINY_SHMEM is not set
diff --git a/arch/powerpc/configs/mpc834x_mds_defconfig b/arch/powerpc/configs/mpc834x_mds_defconfig
index 06233b1a9418..e59a88e95486 100644
--- a/arch/powerpc/configs/mpc834x_mds_defconfig
+++ b/arch/powerpc/configs/mpc834x_mds_defconfig
@@ -87,8 +87,9 @@ CONFIG_TIMERFD=y
 CONFIG_EVENTFD=y
 CONFIG_SHMEM=y
 CONFIG_VM_EVENT_COUNTERS=y
-CONFIG_SLAB=y
+CONFIG_SLUB_DEBUG=y
-# CONFIG_SLUB is not set
+# CONFIG_SLAB is not set
+CONFIG_SLUB=y
 # CONFIG_SLOB is not set
 CONFIG_RT_MUTEXES=y
 # CONFIG_TINY_SHMEM is not set
diff --git a/arch/powerpc/configs/mpc836x_mds_defconfig b/arch/powerpc/configs/mpc836x_mds_defconfig
index 3045749d62fe..75657528518e 100644
--- a/arch/powerpc/configs/mpc836x_mds_defconfig
+++ b/arch/powerpc/configs/mpc836x_mds_defconfig
@@ -87,8 +87,9 @@ CONFIG_TIMERFD=y
 CONFIG_EVENTFD=y
 CONFIG_SHMEM=y
 CONFIG_VM_EVENT_COUNTERS=y
-CONFIG_SLAB=y
+CONFIG_SLUB_DEBUG=y
-# CONFIG_SLUB is not set
+# CONFIG_SLAB is not set
+CONFIG_SLUB=y
 # CONFIG_SLOB is not set
 CONFIG_RT_MUTEXES=y
 # CONFIG_TINY_SHMEM is not set
diff --git a/arch/powerpc/configs/mpc8540_ads_defconfig b/arch/powerpc/configs/mpc8540_ads_defconfig
index b282c3521dd5..b953b2c51453 100644
--- a/arch/powerpc/configs/mpc8540_ads_defconfig
+++ b/arch/powerpc/configs/mpc8540_ads_defconfig
@@ -90,8 +90,9 @@ CONFIG_TIMERFD=y
 CONFIG_EVENTFD=y
 CONFIG_SHMEM=y
 CONFIG_VM_EVENT_COUNTERS=y
-CONFIG_SLAB=y
+CONFIG_SLUB_DEBUG=y
-# CONFIG_SLUB is not set
+# CONFIG_SLAB is not set
+CONFIG_SLUB=y
 # CONFIG_SLOB is not set
 CONFIG_RT_MUTEXES=y
 # CONFIG_TINY_SHMEM is not set
@@ -704,7 +705,7 @@ CONFIG_DETECT_SOFTLOCKUP=y
 CONFIG_SCHED_DEBUG=y
 # CONFIG_SCHEDSTATS is not set
 # CONFIG_TIMER_STATS is not set
-# CONFIG_DEBUG_SLAB is not set
+# CONFIG_SLUB_DEBUG_ON is not set
 # CONFIG_DEBUG_RT_MUTEXES is not set
 # CONFIG_RT_MUTEX_TESTER is not set
 # CONFIG_DEBUG_SPINLOCK is not set
diff --git a/arch/powerpc/configs/mpc8544_ds_defconfig b/arch/powerpc/configs/mpc8544_ds_defconfig
index 150221f6f723..9a3e08bcd188 100644
--- a/arch/powerpc/configs/mpc8544_ds_defconfig
+++ b/arch/powerpc/configs/mpc8544_ds_defconfig
@@ -93,8 +93,9 @@ CONFIG_TIMERFD=y
 CONFIG_EVENTFD=y
 CONFIG_SHMEM=y
 CONFIG_VM_EVENT_COUNTERS=y
-CONFIG_SLAB=y
+CONFIG_SLUB_DEBUG=y
-# CONFIG_SLUB is not set
+# CONFIG_SLAB is not set
+CONFIG_SLUB=y
 # CONFIG_SLOB is not set
 CONFIG_RT_MUTEXES=y
 # CONFIG_TINY_SHMEM is not set
@@ -1427,7 +1428,7 @@ CONFIG_DETECT_SOFTLOCKUP=y
 CONFIG_SCHED_DEBUG=y
 # CONFIG_SCHEDSTATS is not set
 # CONFIG_TIMER_STATS is not set
-# CONFIG_DEBUG_SLAB is not set
+# CONFIG_SLUB_DEBUG_ON is not set
 # CONFIG_DEBUG_RT_MUTEXES is not set
 # CONFIG_RT_MUTEX_TESTER is not set
 # CONFIG_DEBUG_SPINLOCK is not set
diff --git a/arch/powerpc/configs/mpc8560_ads_defconfig b/arch/powerpc/configs/mpc8560_ads_defconfig
index 3d68c65212cf..0211e6b68e1a 100644
--- a/arch/powerpc/configs/mpc8560_ads_defconfig
+++ b/arch/powerpc/configs/mpc8560_ads_defconfig
@@ -94,8 +94,9 @@ CONFIG_SIGNALFD=y
 CONFIG_EVENTFD=y
 CONFIG_SHMEM=y
 CONFIG_VM_EVENT_COUNTERS=y
-CONFIG_SLAB=y
+CONFIG_SLUB_DEBUG=y
-# CONFIG_SLUB is not set
+# CONFIG_SLAB is not set
+CONFIG_SLUB=y
 # CONFIG_SLOB is not set
 CONFIG_RT_MUTEXES=y
 # CONFIG_TINY_SHMEM is not set
@@ -791,7 +792,7 @@ CONFIG_DETECT_SOFTLOCKUP=y
 CONFIG_SCHED_DEBUG=y
 # CONFIG_SCHEDSTATS is not set
 # CONFIG_TIMER_STATS is not set
-# CONFIG_DEBUG_SLAB is not set
+# CONFIG_SLUB_DEBUG_ON is not set
 # CONFIG_DEBUG_RT_MUTEXES is not set
 # CONFIG_RT_MUTEX_TESTER is not set
 # CONFIG_DEBUG_SPINLOCK is not set
diff --git a/arch/powerpc/configs/mpc8568mds_defconfig b/arch/powerpc/configs/mpc8568mds_defconfig
index 0307fe7b0487..883d8af9debd 100644
--- a/arch/powerpc/configs/mpc8568mds_defconfig
+++ b/arch/powerpc/configs/mpc8568mds_defconfig
@@ -88,8 +88,9 @@ CONFIG_TIMERFD=y
 CONFIG_EVENTFD=y
 CONFIG_SHMEM=y
 CONFIG_VM_EVENT_COUNTERS=y
-CONFIG_SLAB=y
+CONFIG_SLUB_DEBUG=y
-# CONFIG_SLUB is not set
+# CONFIG_SLAB is not set
+CONFIG_SLUB=y
 # CONFIG_SLOB is not set
 CONFIG_RT_MUTEXES=y
 # CONFIG_TINY_SHMEM is not set
@@ -949,7 +950,7 @@ CONFIG_DETECT_SOFTLOCKUP=y
 CONFIG_SCHED_DEBUG=y
 # CONFIG_SCHEDSTATS is not set
 # CONFIG_TIMER_STATS is not set
-# CONFIG_DEBUG_SLAB is not set
+# CONFIG_SLUB_DEBUG_ON is not set
 # CONFIG_DEBUG_RT_MUTEXES is not set
 # CONFIG_RT_MUTEX_TESTER is not set
 # CONFIG_DEBUG_SPINLOCK is not set
diff --git a/arch/powerpc/configs/mpc8572_ds_defconfig b/arch/powerpc/configs/mpc8572_ds_defconfig
index 7f1a3e987138..4e85b2e88525 100644
--- a/arch/powerpc/configs/mpc8572_ds_defconfig
+++ b/arch/powerpc/configs/mpc8572_ds_defconfig
@@ -93,8 +93,9 @@ CONFIG_TIMERFD=y
 CONFIG_EVENTFD=y
 CONFIG_SHMEM=y
 CONFIG_VM_EVENT_COUNTERS=y
-CONFIG_SLAB=y
+CONFIG_SLUB_DEBUG=y
-# CONFIG_SLUB is not set
+# CONFIG_SLAB is not set
+CONFIG_SLUB=y
 # CONFIG_SLOB is not set
 CONFIG_RT_MUTEXES=y
 # CONFIG_TINY_SHMEM is not set
@@ -1427,7 +1428,7 @@ CONFIG_DETECT_SOFTLOCKUP=y
 CONFIG_SCHED_DEBUG=y
 # CONFIG_SCHEDSTATS is not set
 # CONFIG_TIMER_STATS is not set
-# CONFIG_DEBUG_SLAB is not set
+# CONFIG_SLUB_DEBUG_ON is not set
 # CONFIG_DEBUG_RT_MUTEXES is not set
 # CONFIG_RT_MUTEX_TESTER is not set
 # CONFIG_DEBUG_SPINLOCK is not set
diff --git a/arch/powerpc/configs/mpc85xx_cds_defconfig b/arch/powerpc/configs/mpc85xx_cds_defconfig
index e6850c619f88..a4f33d110542 100644
--- a/arch/powerpc/configs/mpc85xx_cds_defconfig
+++ b/arch/powerpc/configs/mpc85xx_cds_defconfig
@@ -90,8 +90,9 @@ CONFIG_TIMERFD=y
 CONFIG_EVENTFD=y
 CONFIG_SHMEM=y
 CONFIG_VM_EVENT_COUNTERS=y
-CONFIG_SLAB=y
+CONFIG_SLUB_DEBUG=y
-# CONFIG_SLUB is not set
+# CONFIG_SLAB is not set
+CONFIG_SLUB=y
 # CONFIG_SLOB is not set
 CONFIG_RT_MUTEXES=y
 # CONFIG_TINY_SHMEM is not set
@@ -832,7 +833,7 @@ CONFIG_DETECT_SOFTLOCKUP=y
 CONFIG_SCHED_DEBUG=y
 # CONFIG_SCHEDSTATS is not set
 # CONFIG_TIMER_STATS is not set
-# CONFIG_DEBUG_SLAB is not set
+# CONFIG_SLUB_DEBUG_ON is not set
 # CONFIG_DEBUG_RT_MUTEXES is not set
 # CONFIG_RT_MUTEX_TESTER is not set
 # CONFIG_DEBUG_SPINLOCK is not set
diff --git a/arch/powerpc/configs/mpc8610_hpcd_defconfig b/arch/powerpc/configs/mpc8610_hpcd_defconfig
index de19b781937f..0483211f52be 100644
--- a/arch/powerpc/configs/mpc8610_hpcd_defconfig
+++ b/arch/powerpc/configs/mpc8610_hpcd_defconfig
@@ -88,8 +88,9 @@ CONFIG_SIGNALFD=y
 CONFIG_EVENTFD=y
 CONFIG_SHMEM=y
 CONFIG_VM_EVENT_COUNTERS=y
-CONFIG_SLAB=y
+CONFIG_SLUB_DEBUG=y
-# CONFIG_SLUB is not set
+# CONFIG_SLAB is not set
+CONFIG_SLUB=y
 # CONFIG_SLOB is not set
 CONFIG_RT_MUTEXES=y
 # CONFIG_TINY_SHMEM is not set
@@ -993,7 +994,7 @@ CONFIG_DETECT_SOFTLOCKUP=y
 CONFIG_SCHED_DEBUG=y
 # CONFIG_SCHEDSTATS is not set
 # CONFIG_TIMER_STATS is not set
-# CONFIG_DEBUG_SLAB is not set
+# CONFIG_SLUB_DEBUG_ON is not set
 # CONFIG_DEBUG_RT_MUTEXES is not set
 # CONFIG_RT_MUTEX_TESTER is not set
 # CONFIG_DEBUG_SPINLOCK is not set
diff --git a/arch/powerpc/configs/mpc8641_hpcn_defconfig b/arch/powerpc/configs/mpc8641_hpcn_defconfig
index b2f389dcaded..ed214fcd8abe 100644
--- a/arch/powerpc/configs/mpc8641_hpcn_defconfig
+++ b/arch/powerpc/configs/mpc8641_hpcn_defconfig
@@ -94,8 +94,9 @@ CONFIG_TIMERFD=y
 CONFIG_EVENTFD=y
 CONFIG_SHMEM=y
 CONFIG_VM_EVENT_COUNTERS=y
-CONFIG_SLAB=y
+CONFIG_SLUB_DEBUG=y
-# CONFIG_SLUB is not set
+# CONFIG_SLAB is not set
+CONFIG_SLUB=y
 # CONFIG_SLOB is not set
 CONFIG_RT_MUTEXES=y
 # CONFIG_TINY_SHMEM is not set
@@ -1432,7 +1433,7 @@ CONFIG_DETECT_SOFTLOCKUP=y
 CONFIG_SCHED_DEBUG=y
 # CONFIG_SCHEDSTATS is not set
 # CONFIG_TIMER_STATS is not set
-# CONFIG_DEBUG_SLAB is not set
+# CONFIG_SLUB_DEBUG_ON is not set
 # CONFIG_DEBUG_RT_MUTEXES is not set
 # CONFIG_RT_MUTEX_TESTER is not set
 # CONFIG_DEBUG_SPINLOCK is not set
diff --git a/arch/powerpc/configs/mpc866_ads_defconfig b/arch/powerpc/configs/mpc866_ads_defconfig
index 143a0cd83327..070b0a5b9c0d 100644
--- a/arch/powerpc/configs/mpc866_ads_defconfig
+++ b/arch/powerpc/configs/mpc866_ads_defconfig
@@ -83,8 +83,9 @@ CONFIG_TIMERFD=y
 CONFIG_EVENTFD=y
 CONFIG_SHMEM=y
 # CONFIG_VM_EVENT_COUNTERS is not set
-CONFIG_SLAB=y
+CONFIG_SLUB_DEBUG=y
-# CONFIG_SLUB is not set
+# CONFIG_SLAB is not set
+CONFIG_SLUB=y
 # CONFIG_SLOB is not set
 CONFIG_RT_MUTEXES=y
 # CONFIG_TINY_SHMEM is not set
diff --git a/arch/powerpc/configs/pasemi_defconfig b/arch/powerpc/configs/pasemi_defconfig
index 295207030c60..1ccf3ed7693e 100644
--- a/arch/powerpc/configs/pasemi_defconfig
+++ b/arch/powerpc/configs/pasemi_defconfig
@@ -90,8 +90,9 @@ CONFIG_TIMERFD=y
 CONFIG_EVENTFD=y
 CONFIG_SHMEM=y
 CONFIG_VM_EVENT_COUNTERS=y
-CONFIG_SLAB=y
+CONFIG_SLUB_DEBUG=y
-# CONFIG_SLUB is not set
+# CONFIG_SLAB is not set
+CONFIG_SLUB=y
 # CONFIG_SLOB is not set
 CONFIG_RT_MUTEXES=y
 # CONFIG_TINY_SHMEM is not set
@@ -1588,7 +1589,7 @@ CONFIG_DETECT_SOFTLOCKUP=y
 CONFIG_SCHED_DEBUG=y
 # CONFIG_SCHEDSTATS is not set
 # CONFIG_TIMER_STATS is not set
-# CONFIG_DEBUG_SLAB is not set
+# CONFIG_SLUB_DEBUG_ON is not set
 # CONFIG_DEBUG_RT_MUTEXES is not set
 # CONFIG_RT_MUTEX_TESTER is not set
 # CONFIG_DEBUG_SPINLOCK is not set
diff --git a/arch/powerpc/configs/pmac32_defconfig b/arch/powerpc/configs/pmac32_defconfig
index cfc9c6573a3c..95b823b60c97 100644
--- a/arch/powerpc/configs/pmac32_defconfig
+++ b/arch/powerpc/configs/pmac32_defconfig
@@ -91,8 +91,9 @@ CONFIG_TIMERFD=y
 CONFIG_EVENTFD=y
 CONFIG_SHMEM=y
 CONFIG_VM_EVENT_COUNTERS=y
-CONFIG_SLAB=y
+CONFIG_SLUB_DEBUG=y
-# CONFIG_SLUB is not set
+# CONFIG_SLAB is not set
+CONFIG_SLUB=y
 # CONFIG_SLOB is not set
 CONFIG_RT_MUTEXES=y
 # CONFIG_TINY_SHMEM is not set
@@ -1829,7 +1830,7 @@ CONFIG_DETECT_SOFTLOCKUP=y
 CONFIG_SCHED_DEBUG=y
 # CONFIG_SCHEDSTATS is not set
 # CONFIG_TIMER_STATS is not set
-# CONFIG_DEBUG_SLAB is not set
+# CONFIG_SLUB_DEBUG_ON is not set
 # CONFIG_DEBUG_RT_MUTEXES is not set
 # CONFIG_RT_MUTEX_TESTER is not set
 # CONFIG_DEBUG_SPINLOCK is not set
diff --git a/arch/powerpc/configs/ppc64_defconfig b/arch/powerpc/configs/ppc64_defconfig
index 5f6224a1feb8..bb8d4e46f0c5 100644
--- a/arch/powerpc/configs/ppc64_defconfig
+++ b/arch/powerpc/configs/ppc64_defconfig
@@ -96,8 +96,9 @@ CONFIG_TIMERFD=y
 CONFIG_EVENTFD=y
 CONFIG_SHMEM=y
 CONFIG_VM_EVENT_COUNTERS=y
-CONFIG_SLAB=y
+CONFIG_SLUB_DEBUG=y
-# CONFIG_SLUB is not set
+# CONFIG_SLAB is not set
+CONFIG_SLUB=y
 # CONFIG_SLOB is not set
 CONFIG_RT_MUTEXES=y
 # CONFIG_TINY_SHMEM is not set
@@ -216,6 +217,10 @@ CONFIG_AXON_RAM=m
 #
 # Kernel options
 #
+CONFIG_TICK_ONESHOT=y
+CONFIG_NO_HZ=y
+CONFIG_HIGH_RES_TIMERS=y
+CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
 # CONFIG_HZ_100 is not set
 CONFIG_HZ_250=y
 # CONFIG_HZ_300 is not set
@@ -1750,7 +1755,7 @@ CONFIG_DETECT_SOFTLOCKUP=y
 CONFIG_SCHED_DEBUG=y
 # CONFIG_SCHEDSTATS is not set
 # CONFIG_TIMER_STATS is not set
-# CONFIG_DEBUG_SLAB is not set
+# CONFIG_SLUB_DEBUG_ON is not set
 # CONFIG_DEBUG_RT_MUTEXES is not set
 # CONFIG_RT_MUTEX_TESTER is not set
 # CONFIG_DEBUG_SPINLOCK is not set
diff --git a/arch/powerpc/configs/pq2fads_defconfig b/arch/powerpc/configs/pq2fads_defconfig
index a51fc39dea4e..9191f557b044 100644
--- a/arch/powerpc/configs/pq2fads_defconfig
+++ b/arch/powerpc/configs/pq2fads_defconfig
@@ -86,8 +86,9 @@ CONFIG_TIMERFD=y
 CONFIG_EVENTFD=y
 CONFIG_SHMEM=y
 CONFIG_VM_EVENT_COUNTERS=y
-CONFIG_SLAB=y
+CONFIG_SLUB_DEBUG=y
-# CONFIG_SLUB is not set
+# CONFIG_SLAB is not set
+CONFIG_SLUB=y
 # CONFIG_SLOB is not set
 CONFIG_RT_MUTEXES=y
 # CONFIG_TINY_SHMEM is not set
@@ -930,7 +931,7 @@ CONFIG_DETECT_SOFTLOCKUP=y
 # CONFIG_SCHED_DEBUG is not set
 # CONFIG_SCHEDSTATS is not set
 # CONFIG_TIMER_STATS is not set
-# CONFIG_DEBUG_SLAB is not set
+# CONFIG_SLUB_DEBUG_ON is not set
 # CONFIG_DEBUG_RT_MUTEXES is not set
 # CONFIG_RT_MUTEX_TESTER is not set
 # CONFIG_DEBUG_SPINLOCK is not set
diff --git a/arch/powerpc/configs/prpmc2800_defconfig b/arch/powerpc/configs/prpmc2800_defconfig
index cce3d3da086b..3e87faf9b5c2 100644
--- a/arch/powerpc/configs/prpmc2800_defconfig
+++ b/arch/powerpc/configs/prpmc2800_defconfig
@@ -89,8 +89,9 @@ CONFIG_TIMERFD=y
 CONFIG_EVENTFD=y
 CONFIG_SHMEM=y
 CONFIG_VM_EVENT_COUNTERS=y
-CONFIG_SLAB=y
+CONFIG_SLUB_DEBUG=y
-# CONFIG_SLUB is not set
+# CONFIG_SLAB is not set
+CONFIG_SLUB=y
 # CONFIG_SLOB is not set
 CONFIG_RT_MUTEXES=y
 # CONFIG_TINY_SHMEM is not set
diff --git a/arch/powerpc/configs/ps3_defconfig b/arch/powerpc/configs/ps3_defconfig
index ca7a197998ee..3566c448bdc0 100644
--- a/arch/powerpc/configs/ps3_defconfig
+++ b/arch/powerpc/configs/ps3_defconfig
@@ -91,8 +91,9 @@ CONFIG_TIMERFD=y
 CONFIG_EVENTFD=y
 CONFIG_SHMEM=y
 CONFIG_VM_EVENT_COUNTERS=y
-CONFIG_SLAB=y
+CONFIG_SLUB_DEBUG=y
-# CONFIG_SLUB is not set
+# CONFIG_SLAB is not set
+CONFIG_SLUB=y
 # CONFIG_SLOB is not set
 CONFIG_RT_MUTEXES=y
 # CONFIG_TINY_SHMEM is not set
@@ -1059,7 +1060,7 @@ CONFIG_DETECT_SOFTLOCKUP=y
 CONFIG_SCHED_DEBUG=y
 # CONFIG_SCHEDSTATS is not set
 # CONFIG_TIMER_STATS is not set
-# CONFIG_DEBUG_SLAB is not set
+# CONFIG_SLUB_DEBUG_ON is not set
 # CONFIG_DEBUG_RT_MUTEXES is not set
 # CONFIG_RT_MUTEX_TESTER is not set
 CONFIG_DEBUG_SPINLOCK=y
diff --git a/arch/powerpc/configs/pseries_defconfig b/arch/powerpc/configs/pseries_defconfig
index 0f274e5f6926..c09eb8cfbe71 100644
--- a/arch/powerpc/configs/pseries_defconfig
+++ b/arch/powerpc/configs/pseries_defconfig
@@ -96,8 +96,9 @@ CONFIG_TIMERFD=y
 CONFIG_EVENTFD=y
 CONFIG_SHMEM=y
 CONFIG_VM_EVENT_COUNTERS=y
-CONFIG_SLAB=y
+CONFIG_SLUB_DEBUG=y
-# CONFIG_SLUB is not set
+# CONFIG_SLAB is not set
+CONFIG_SLUB=y
 # CONFIG_SLOB is not set
 CONFIG_RT_MUTEXES=y
 # CONFIG_TINY_SHMEM is not set
@@ -176,6 +177,10 @@ CONFIG_IBMEBUS=y
 #
 # Kernel options
 #
+CONFIG_TICK_ONESHOT=y
+CONFIG_NO_HZ=y
+CONFIG_HIGH_RES_TIMERS=y
+CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
 # CONFIG_HZ_100 is not set
 CONFIG_HZ_250=y
 # CONFIG_HZ_300 is not set
@@ -1504,7 +1509,7 @@ CONFIG_DETECT_SOFTLOCKUP=y
 CONFIG_SCHED_DEBUG=y
 # CONFIG_SCHEDSTATS is not set
 # CONFIG_TIMER_STATS is not set
-# CONFIG_DEBUG_SLAB is not set
+# CONFIG_SLUB_DEBUG_ON is not set
 # CONFIG_DEBUG_RT_MUTEXES is not set
 # CONFIG_RT_MUTEX_TESTER is not set
 # CONFIG_DEBUG_SPINLOCK is not set
diff --git a/arch/powerpc/configs/sequoia_defconfig b/arch/powerpc/configs/sequoia_defconfig
index bc7f5089a894..45a4ca0e0d7d 100644
--- a/arch/powerpc/configs/sequoia_defconfig
+++ b/arch/powerpc/configs/sequoia_defconfig
@@ -91,8 +91,9 @@ CONFIG_TIMERFD=y
 CONFIG_EVENTFD=y
 CONFIG_SHMEM=y
 CONFIG_VM_EVENT_COUNTERS=y
-CONFIG_SLAB=y
+CONFIG_SLUB_DEBUG=y
-# CONFIG_SLUB is not set
+# CONFIG_SLAB is not set
+CONFIG_SLUB=y
 # CONFIG_SLOB is not set
 CONFIG_RT_MUTEXES=y
 # CONFIG_TINY_SHMEM is not set
@@ -781,7 +782,7 @@ CONFIG_DETECT_SOFTLOCKUP=y
 CONFIG_SCHED_DEBUG=y
 # CONFIG_SCHEDSTATS is not set
 # CONFIG_TIMER_STATS is not set
-# CONFIG_DEBUG_SLAB is not set
+# CONFIG_SLUB_DEBUG_ON is not set
 # CONFIG_DEBUG_RT_MUTEXES is not set
 # CONFIG_RT_MUTEX_TESTER is not set
 # CONFIG_DEBUG_SPINLOCK is not set
diff --git a/arch/powerpc/configs/walnut_defconfig b/arch/powerpc/configs/walnut_defconfig
index 766bf840c18d..7724292cc06d 100644
--- a/arch/powerpc/configs/walnut_defconfig
+++ b/arch/powerpc/configs/walnut_defconfig
@@ -87,8 +87,9 @@ CONFIG_TIMERFD=y
 CONFIG_EVENTFD=y
 CONFIG_SHMEM=y
 CONFIG_VM_EVENT_COUNTERS=y
-CONFIG_SLAB=y
+CONFIG_SLUB_DEBUG=y
-# CONFIG_SLUB is not set
+# CONFIG_SLAB is not set
+CONFIG_SLUB=y
 # CONFIG_SLOB is not set
 CONFIG_RT_MUTEXES=y
 # CONFIG_TINY_SHMEM is not set
@@ -706,7 +707,7 @@ CONFIG_DETECT_SOFTLOCKUP=y
 CONFIG_SCHED_DEBUG=y
 # CONFIG_SCHEDSTATS is not set
 # CONFIG_TIMER_STATS is not set
-# CONFIG_DEBUG_SLAB is not set
+# CONFIG_SLUB_DEBUG_ON is not set
 # CONFIG_DEBUG_RT_MUTEXES is not set
 # CONFIG_RT_MUTEX_TESTER is not set
 # CONFIG_DEBUG_SPINLOCK is not set
diff --git a/arch/powerpc/kernel/binfmt_elf32.c b/arch/powerpc/kernel/binfmt_elf32.c
index 5cb58757e1b1..1d45d7782d4e 100644
--- a/arch/powerpc/kernel/binfmt_elf32.c
+++ b/arch/powerpc/kernel/binfmt_elf32.c
@@ -13,49 +13,44 @@
 * 2 of the License, or (at your option) any later version.
 */
-#define ELF_ARCH                EM_PPC
-#define ELF_CLASS               ELFCLASS32
-#define ELF_DATA                ELFDATA2MSB;
 #include <asm/processor.h>
 #include <linux/module.h>
-#include <linux/elfcore.h>
 #include <linux/compat.h>
+#include <linux/elfcore-compat.h>
+#undef  ELF_ARCH
+#undef  ELF_CLASS
+#define ELF_CLASS       ELFCLASS32
+#define ELF_ARCH        EM_PPC
+#undef  elfhdr
+#undef  elf_phdr
+#undef  elf_note
+#undef  elf_addr_t
+#define elfhdr          elf32_hdr
+#define elf_phdr        elf32_phdr
+#define elf_note        elf32_note
+#define elf_addr_t      Elf32_Off
-#define elf_prstatus elf_prstatus32
+#define elf_prstatus    compat_elf_prstatus
-struct elf_prstatus32
+#define elf_prpsinfo    compat_elf_prpsinfo
+#define elf_core_copy_regs compat_elf_core_copy_regs
+static inline void compat_elf_core_copy_regs(compat_elf_gregset_t *elf_regs,
+                                             struct pt_regs *regs)
 {
-        struct elf_siginfo pr_info;     /* Info associated with signal */
+        PPC_ELF_CORE_COPY_REGS((*elf_regs), regs);
-        short   pr_cursig;              /* Current signal */
+}
-        unsigned int pr_sigpend;        /* Set of pending signals */
-        unsigned int pr_sighold;        /* Set of held signals */
-        pid_t   pr_pid;
-        pid_t   pr_ppid;
-        pid_t   pr_pgrp;
-        pid_t   pr_sid;
-        struct compat_timeval pr_utime; /* User time */
-        struct compat_timeval pr_stime; /* System time */
-        struct compat_timeval pr_cutime;        /* Cumulative user time */
-        struct compat_timeval pr_cstime;        /* Cumulative system time */
-        elf_gregset_t pr_reg;           /* General purpose registers. */
-        int pr_fpvalid;         /* True if math co-processor being used. */
-};
-#define elf_prpsinfo elf_prpsinfo32
+#define elf_core_copy_task_regs compat_elf_core_copy_task_regs
-struct elf_prpsinfo32
+static int compat_elf_core_copy_task_regs(struct task_struct *tsk,
+                                          compat_elf_gregset_t *elf_regs)
 {
-        char    pr_state;       /* numeric process state */
+        struct pt_regs *regs = tsk->thread.regs;
-        char    pr_sname;       /* char for pr_state */
+        if (regs)
-        char    pr_zomb;        /* zombie */
+                compat_elf_core_copy_regs(elf_regs, regs);
-        char    pr_nice;        /* nice val */
+        return 1;
-        unsigned int pr_flag;   /* flags */
+}
-        u32     pr_uid;
-        u32     pr_gid;
-        pid_t   pr_pid, pr_ppid, pr_pgrp, pr_sid;
-        /* Lots missing */
-        char    pr_fname[16];   /* filename of executable */
-        char    pr_psargs[ELF_PRARGSZ]; /* initial part of arg list */
-};
 #include <linux/time.h>
diff --git a/arch/powerpc/kernel/entry_64.S b/arch/powerpc/kernel/entry_64.S
index 0ec134034899..148a3547c9aa 100644
--- a/arch/powerpc/kernel/entry_64.S
+++ b/arch/powerpc/kernel/entry_64.S
@@ -408,6 +408,12 @@ END_FTR_SECTION_IFSET(CPU_FTR_1T_SEGMENT)
        std     r7,SLBSHADOW_STACKVSID(r9)  /* Save VSID */
        std     r0,SLBSHADOW_STACKESID(r9)  /* Save ESID */
+        /* No need to check for CPU_FTR_NO_SLBIE_B here, since when
+         * we have 1TB segments, the only CPUs known to have the errata
+         * only support less than 1TB of system memory and we'll never
+         * actually hit this code path.
+         */
        slbie   r6
        slbie   r6              /* Workaround POWER5 < DD2.1 issue */
        slbmte  r7,r0
diff --git a/arch/powerpc/kernel/ibmebus.c b/arch/powerpc/kernel/ibmebus.c
index 2e16ca5778a3..289d7e935918 100644
--- a/arch/powerpc/kernel/ibmebus.c
+++ b/arch/powerpc/kernel/ibmebus.c
@@ -41,6 +41,7 @@
 #include <linux/kobject.h>
 #include <linux/dma-mapping.h>
 #include <linux/interrupt.h>
+#include <linux/of_platform.h>
 #include <asm/ibmebus.h>
 #include <asm/abs_addr.h>
@@ -50,6 +51,13 @@ static struct device ibmebus_bus_device = { /* fake "parent" device */
 struct bus_type ibmebus_bus_type;
+/* These devices will automatically be added to the bus during init */
+static struct of_device_id builtin_matches[] = {
+        { .compatible = "IBM,lhca" },
+        { .compatible = "IBM,lhea" },
+        {},
+};
 static void *ibmebus_alloc_coherent(struct device *dev,
                                    size_t size,
                                    dma_addr_t *dma_handle,
@@ -124,190 +132,87 @@ static struct dma_mapping_ops ibmebus_dma_ops = {
        .dma_supported  = ibmebus_dma_supported,
 };
-static int ibmebus_bus_probe(struct device *dev)
+static int ibmebus_match_path(struct device *dev, void *data)
 {
-        struct ibmebus_dev *ibmebusdev    = to_ibmebus_dev(dev);
+        struct device_node *dn = to_of_device(dev)->node;
-        struct ibmebus_driver *ibmebusdrv = to_ibmebus_driver(dev->driver);
+        return (dn->full_name &&
-        const struct of_device_id *id;
+                (strcasecmp((char *)data, dn->full_name) == 0));
-        int error = -ENODEV;
-        if (!ibmebusdrv->probe)
-                return error;
-        id = of_match_device(ibmebusdrv->id_table, &ibmebusdev->ofdev);
-        if (id) {
-                error = ibmebusdrv->probe(ibmebusdev, id);
-        }
-        return error;
 }
-static int ibmebus_bus_remove(struct device *dev)
+static int ibmebus_match_node(struct device *dev, void *data)
 {
-        struct ibmebus_dev *ibmebusdev    = to_ibmebus_dev(dev);
+        return to_of_device(dev)->node == data;
-        struct ibmebus_driver *ibmebusdrv = to_ibmebus_driver(dev->driver);
-        if (ibmebusdrv->remove) {
-                return ibmebusdrv->remove(ibmebusdev);
-        }
-        return 0;
 }
-static void __devinit ibmebus_dev_release(struct device *dev)
+static int ibmebus_create_device(struct device_node *dn)
 {
-        of_node_put(to_ibmebus_dev(dev)->ofdev.node);
+        struct of_device *dev;
-        kfree(to_ibmebus_dev(dev));
+        int ret;
-}
-static int __devinit ibmebus_register_device_common(
-        struct ibmebus_dev *dev, const char *name)
-{
-        int err = 0;
-        dev->ofdev.dev.parent  = &ibmebus_bus_device;
-        dev->ofdev.dev.bus     = &ibmebus_bus_type;
-        dev->ofdev.dev.release = ibmebus_dev_release;
-        dev->ofdev.dev.archdata.of_node = dev->ofdev.node;
+        dev = of_device_alloc(dn, NULL, &ibmebus_bus_device);
-        dev->ofdev.dev.archdata.dma_ops = &ibmebus_dma_ops;
-        dev->ofdev.dev.archdata.numa_node = of_node_to_nid(dev->ofdev.node);
-        /* An ibmebusdev is based on a of_device. We have to change the
-         * bus type to use our own DMA mapping operations.
-         */
-        if ((err = of_device_register(&dev->ofdev)) != 0) {
-                printk(KERN_ERR "%s: failed to register device (%d).\n",
-                       __FUNCTION__, err);
-                return -ENODEV;
-        }
-        return 0;
-}
-static struct ibmebus_dev* __devinit ibmebus_register_device_node(
-        struct device_node *dn)
-{
-        struct ibmebus_dev *dev;
-        int i, len, bus_len;
-        dev = kzalloc(sizeof(struct ibmebus_dev), GFP_KERNEL);
        if (!dev)
-                return ERR_PTR(-ENOMEM);
+                return -ENOMEM;
-        dev->ofdev.node = of_node_get(dn);
-        len = strlen(dn->full_name + 1);
-        bus_len = min(len, BUS_ID_SIZE - 1);
-        memcpy(dev->ofdev.dev.bus_id, dn->full_name + 1
-               + (len - bus_len), bus_len);
-        for (i = 0; i < bus_len; i++)
-                if (dev->ofdev.dev.bus_id[i] == '/')
-                        dev->ofdev.dev.bus_id[i] = '_';
-        /* Register with generic device framework. */
-        if (ibmebus_register_device_common(dev, dn->name) != 0) {
-                kfree(dev);
-                return ERR_PTR(-ENODEV);
-        }
-        return dev;
-}
-static void ibmebus_probe_of_nodes(char* name)
-{
-        struct device_node *dn = NULL;
-        while ((dn = of_find_node_by_name(dn, name))) {
-                if (IS_ERR(ibmebus_register_device_node(dn))) {
-                        of_node_put(dn);
-                        return;
-                }
-        }
-        of_node_put(dn);
-        return;
+        dev->dev.bus = &ibmebus_bus_type;
-}
+        dev->dev.archdata.dma_ops = &ibmebus_dma_ops;
-static void ibmebus_add_devices_by_id(struct of_device_id *idt)
+        ret = of_device_register(dev);
-{
+        if (ret) {
-        while (strlen(idt->name) > 0) {
+                of_device_free(dev);
-                ibmebus_probe_of_nodes(idt->name);
+                return ret;
-                idt++;
        }
-        return;
-}
-static int ibmebus_match_name(struct device *dev, void *data)
-{
-        const struct ibmebus_dev *ebus_dev = to_ibmebus_dev(dev);
-        const char *name;
-        name = of_get_property(ebus_dev->ofdev.node, "name", NULL);
-        if (name && (strcmp(data, name) == 0))
-                return 1;
        return 0;
 }
-static int ibmebus_unregister_device(struct device *dev)
+static int ibmebus_create_devices(const struct of_device_id *matches)
 {
-        of_device_unregister(to_of_device(dev));
+        struct device_node *root, *child;
+        int ret = 0;
-        return 0;
+        root = of_find_node_by_path("/");
-}
-static void ibmebus_remove_devices_by_id(struct of_device_id *idt)
+        for (child = NULL; (child = of_get_next_child(root, child)); ) {
-{
+                if (!of_match_node(matches, child))
-        struct device *dev;
+                        continue;
-        while (strlen(idt->name) > 0) {
+                if (bus_find_device(&ibmebus_bus_type, NULL, child,
-                while ((dev = bus_find_device(&ibmebus_bus_type, NULL,
+                                    ibmebus_match_node))
-                                              (void*)idt->name,
+                        continue;
-                                              ibmebus_match_name))) {
-                        ibmebus_unregister_device(dev);
+                ret = ibmebus_create_device(child);
+                if (ret) {
+                        printk(KERN_ERR "%s: failed to create device (%i)",
+                               __FUNCTION__, ret);
+                        of_node_put(child);
+                        break;
                }
-                idt++;
        }
-        return;
+        of_node_put(root);
+        return ret;
 }
-int ibmebus_register_driver(struct ibmebus_driver *drv)
+int ibmebus_register_driver(struct of_platform_driver *drv)
 {
-        int err = 0;
+        /* If the driver uses devices that ibmebus doesn't know, add them */
+        ibmebus_create_devices(drv->match_table);
        drv->driver.name   = drv->name;
        drv->driver.bus    = &ibmebus_bus_type;
-        drv->driver.probe  = ibmebus_bus_probe;
-        drv->driver.remove = ibmebus_bus_remove;
-        if ((err = driver_register(&drv->driver) != 0))
+        return driver_register(&drv->driver);
-                return err;
-        /* remove all supported devices first, in case someone
-         * probed them manually before registering the driver */
-        ibmebus_remove_devices_by_id(drv->id_table);
-        ibmebus_add_devices_by_id(drv->id_table);
-        return 0;
 }
 EXPORT_SYMBOL(ibmebus_register_driver);
-void ibmebus_unregister_driver(struct ibmebus_driver *drv)
+void ibmebus_unregister_driver(struct of_platform_driver *drv)
 {
        driver_unregister(&drv->driver);
-        ibmebus_remove_devices_by_id(drv->id_table);
 }
 EXPORT_SYMBOL(ibmebus_unregister_driver);
-int ibmebus_request_irq(struct ibmebus_dev *dev,
+int ibmebus_request_irq(u32 ist, irq_handler_t handler,
-                        u32 ist,
+                        unsigned long irq_flags, const char *devname,
-                        irq_handler_t handler,
-                        unsigned long irq_flags, const char * devname,
                        void *dev_id)
 {
        unsigned int irq = irq_create_mapping(NULL, ist);
@@ -315,12 +220,11 @@ int ibmebus_request_irq(struct ibmebus_dev *dev,
        if (irq == NO_IRQ)
                return -EINVAL;
-        return request_irq(irq, handler,
+        return request_irq(irq, handler, irq_flags, devname, dev_id);
-                           irq_flags, devname, dev_id);
 }
 EXPORT_SYMBOL(ibmebus_request_irq);
-void ibmebus_free_irq(struct ibmebus_dev *dev, u32 ist, void *dev_id)
+void ibmebus_free_irq(u32 ist, void *dev_id)
 {
        unsigned int irq = irq_find_mapping(NULL, ist);
@@ -328,29 +232,10 @@ void ibmebus_free_irq(struct ibmebus_dev *dev, u32 ist, void *dev_id)
 }
 EXPORT_SYMBOL(ibmebus_free_irq);
-static int ibmebus_bus_match(struct device *dev, struct device_driver *drv)
-{
-        const struct ibmebus_dev *ebus_dev = to_ibmebus_dev(dev);
-        struct ibmebus_driver *ebus_drv    = to_ibmebus_driver(drv);
-        const struct of_device_id *ids     = ebus_drv->id_table;
-        const struct of_device_id *found_id;
-        if (!ids)
-                return 0;
-        found_id = of_match_device(ids, &ebus_dev->ofdev);
-        if (found_id)
-                return 1;
-        return 0;
-}
 static ssize_t name_show(struct device *dev,
                         struct device_attribute *attr, char *buf)
 {
-        struct ibmebus_dev *ebus_dev = to_ibmebus_dev(dev);
+        return sprintf(buf, "%s\n", to_of_device(dev)->node->name);
-        const char *name = of_get_property(ebus_dev->ofdev.node, "name", NULL);
-        return sprintf(buf, "%s\n", name);
 }
 static struct device_attribute ibmebus_dev_attrs[] = {
@@ -358,18 +243,6 @@ static struct device_attribute ibmebus_dev_attrs[] = {
        __ATTR_NULL
 };
-static int ibmebus_match_path(struct device *dev, void *data)
-{
-        int rc;
-        struct device_node *dn =
-                of_node_get(to_ibmebus_dev(dev)->ofdev.node);
-        rc = (dn->full_name && (strcasecmp((char*)data, dn->full_name) == 0));
-        of_node_put(dn);
-        return rc;
-}
 static char *ibmebus_chomp(const char *in, size_t count)
 {
        char *out = kmalloc(count + 1, GFP_KERNEL);
@@ -389,9 +262,8 @@ static ssize_t ibmebus_store_probe(struct bus_type *bus,
                                   const char *buf, size_t count)
 {
        struct device_node *dn = NULL;
-        struct ibmebus_dev *dev;
        char *path;
-        ssize_t rc;
+        ssize_t rc = 0;
        path = ibmebus_chomp(buf, count);
        if (!path)
@@ -406,9 +278,8 @@ static ssize_t ibmebus_store_probe(struct bus_type *bus,
        }
        if ((dn = of_find_node_by_path(path))) {
-                dev = ibmebus_register_device_node(dn);
+                rc = ibmebus_create_device(dn);
                of_node_put(dn);
-                rc = IS_ERR(dev) ? PTR_ERR(dev) : count;
        } else {
                printk(KERN_WARNING "%s: no such device node: %s\n",
                       __FUNCTION__, path);
@@ -417,7 +288,9 @@ static ssize_t ibmebus_store_probe(struct bus_type *bus,
 out:
        kfree(path);
-        return rc;
+        if (rc)
+                return rc;
+        return count;
 }
 static ssize_t ibmebus_store_remove(struct bus_type *bus,
@@ -432,7 +305,7 @@ static ssize_t ibmebus_store_remove(struct bus_type *bus,
        if ((dev = bus_find_device(&ibmebus_bus_type, NULL, path,
                                   ibmebus_match_path))) {
-                ibmebus_unregister_device(dev);
+                of_device_unregister(to_of_device(dev));
                kfree(path);
                return count;
@@ -452,8 +325,7 @@ static struct bus_attribute ibmebus_bus_attrs[] = {
 };
 struct bus_type ibmebus_bus_type = {
-        .name      = "ibmebus",
+        .uevent    = of_device_uevent,
-        .match     = ibmebus_bus_match,
        .dev_attrs = ibmebus_dev_attrs,
        .bus_attrs = ibmebus_bus_attrs
 };
@@ -465,9 +337,9 @@ static int __init ibmebus_bus_init(void)
        printk(KERN_INFO "IBM eBus Device Driver\n");
-        err = bus_register(&ibmebus_bus_type);
+        err = of_bus_type_init(&ibmebus_bus_type, "ibmebus");
        if (err) {
-                printk(KERN_ERR ":%s: failed to register IBM eBus.\n",
+                printk(KERN_ERR "%s: failed to register IBM eBus.\n",
                       __FUNCTION__);
                return err;
        }
@@ -481,6 +353,13 @@ static int __init ibmebus_bus_init(void)
                return err;
        }
+        err = ibmebus_create_devices(builtin_matches);
+        if (err) {
+                device_unregister(&ibmebus_bus_device);
+                bus_unregister(&ibmebus_bus_type);
+                return err;
+        }
        return 0;
 }
-__initcall(ibmebus_bus_init);
+postcore_initcall(ibmebus_bus_init);
diff --git a/arch/powerpc/kernel/of_device.c b/arch/powerpc/kernel/of_device.c
index 8f3db32fac8b..3388ad619996 100644
--- a/arch/powerpc/kernel/of_device.c
+++ b/arch/powerpc/kernel/of_device.c
@@ -7,8 +7,88 @@
 #include <linux/slab.h>
 #include <asm/errno.h>
+#include <asm/dcr.h>
 #include <asm/of_device.h>
+static void of_device_make_bus_id(struct of_device *dev)
+{
+        static atomic_t bus_no_reg_magic;
+        struct device_node *node = dev->node;
+        char *name = dev->dev.bus_id;
+        const u32 *reg;
+        u64 addr;
+        int magic;
+        /*
+         * If it's a DCR based device, use 'd' for native DCRs
+         * and 'D' for MMIO DCRs.
+         */
+#ifdef CONFIG_PPC_DCR
+        reg = of_get_property(node, "dcr-reg", NULL);
+        if (reg) {
+#ifdef CONFIG_PPC_DCR_NATIVE
+                snprintf(name, BUS_ID_SIZE, "d%x.%s",
+                         *reg, node->name);
+#else /* CONFIG_PPC_DCR_NATIVE */
+                addr = of_translate_dcr_address(node, *reg, NULL);
+                if (addr != OF_BAD_ADDR) {
+                        snprintf(name, BUS_ID_SIZE,
+                                 "D%llx.%s", (unsigned long long)addr,
+                                 node->name);
+                        return;
+                }
+#endif /* !CONFIG_PPC_DCR_NATIVE */
+        }
+#endif /* CONFIG_PPC_DCR */
+        /*
+         * For MMIO, get the physical address
+         */
+        reg = of_get_property(node, "reg", NULL);
+        if (reg) {
+                addr = of_translate_address(node, reg);
+                if (addr != OF_BAD_ADDR) {
+                        snprintf(name, BUS_ID_SIZE,
+                                 "%llx.%s", (unsigned long long)addr,
+                                 node->name);
+                        return;
+                }
+        }
+        /*
+         * No BusID, use the node name and add a globally incremented
+         * counter (and pray...)
+         */
+        magic = atomic_add_return(1, &bus_no_reg_magic);
+        snprintf(name, BUS_ID_SIZE, "%s.%d", node->name, magic - 1);
+}
+struct of_device *of_device_alloc(struct device_node *np,
+                                  const char *bus_id,
+                                  struct device *parent)
+{
+        struct of_device *dev;
+        dev = kzalloc(sizeof(*dev), GFP_KERNEL);
+        if (!dev)
+                return NULL;
+        dev->node = of_node_get(np);
+        dev->dev.dma_mask = &dev->dma_mask;
+        dev->dev.parent = parent;
+        dev->dev.release = of_release_dev;
+        dev->dev.archdata.of_node = np;
+        dev->dev.archdata.numa_node = of_node_to_nid(np);
+        if (bus_id)
+                strlcpy(dev->dev.bus_id, bus_id, BUS_ID_SIZE);
+        else
+                of_device_make_bus_id(dev);
+        return dev;
+}
+EXPORT_SYMBOL(of_device_alloc);
 ssize_t of_device_get_modalias(struct of_device *ofdev,
                                char *str, ssize_t len)
 {
diff --git a/arch/powerpc/kernel/of_platform.c b/arch/powerpc/kernel/of_platform.c
index eca8ccc3fa12..aeaa20268ce2 100644
--- a/arch/powerpc/kernel/of_platform.c
+++ b/arch/powerpc/kernel/of_platform.c
@@ -23,7 +23,6 @@
 #include <linux/of_platform.h>
 #include <asm/errno.h>
-#include <asm/dcr.h>
 #include <asm/topology.h>
 #include <asm/pci-bridge.h>
 #include <asm/ppc-pci.h>
@@ -53,8 +52,6 @@ static struct of_device_id of_default_bus_ids[] = {
        {},
 };
-static atomic_t bus_no_reg_magic;
 struct bus_type of_platform_bus_type = {
       .uevent  = of_device_uevent,
 };
@@ -87,89 +84,26 @@ void of_unregister_platform_driver(struct of_platform_driver *drv)
 }
 EXPORT_SYMBOL(of_unregister_platform_driver);
-static void of_platform_make_bus_id(struct of_device *dev)
-{
-        struct device_node *node = dev->node;
-        char *name = dev->dev.bus_id;
-        const u32 *reg;
-        u64 addr;
-        int magic;
-        /*
-         * If it's a DCR based device, use 'd' for native DCRs
-         * and 'D' for MMIO DCRs.
-         */
-#ifdef CONFIG_PPC_DCR
-        reg = of_get_property(node, "dcr-reg", NULL);
-        if (reg) {
-#ifdef CONFIG_PPC_DCR_NATIVE
-                snprintf(name, BUS_ID_SIZE, "d%x.%s",
-                         *reg, node->name);
-#else /* CONFIG_PPC_DCR_NATIVE */
-                addr = of_translate_dcr_address(node, *reg, NULL);
-                if (addr != OF_BAD_ADDR) {
-                        snprintf(name, BUS_ID_SIZE,
-                                 "D%llx.%s", (unsigned long long)addr,
-                                 node->name);
-                        return;
-                }
-#endif /* !CONFIG_PPC_DCR_NATIVE */
-        }
-#endif /* CONFIG_PPC_DCR */
-        /*
-         * For MMIO, get the physical address
-         */
-        reg = of_get_property(node, "reg", NULL);
-        if (reg) {
-                addr = of_translate_address(node, reg);
-                if (addr != OF_BAD_ADDR) {
-                        snprintf(name, BUS_ID_SIZE,
-                                 "%llx.%s", (unsigned long long)addr,
-                                 node->name);
-                        return;
-                }
-        }
-        /*
-         * No BusID, use the node name and add a globally incremented
-         * counter (and pray...)
-         */
-        magic = atomic_add_return(1, &bus_no_reg_magic);
-        snprintf(name, BUS_ID_SIZE, "%s.%d", node->name, magic - 1);
-}
 struct of_device* of_platform_device_create(struct device_node *np,
                                            const char *bus_id,
                                            struct device *parent)
 {
        struct of_device *dev;
-        dev = kzalloc(sizeof(*dev), GFP_KERNEL);
+        dev = of_device_alloc(np, bus_id, parent);
        if (!dev)
                return NULL;
-        dev->node = of_node_get(np);
        dev->dma_mask = 0xffffffffUL;
-        dev->dev.dma_mask = &dev->dma_mask;
-        dev->dev.parent = parent;
        dev->dev.bus = &of_platform_bus_type;
-        dev->dev.release = of_release_dev;
-        dev->dev.archdata.of_node = np;
-        dev->dev.archdata.numa_node = of_node_to_nid(np);
        /* We do not fill the DMA ops for platform devices by default.
         * This is currently the responsibility of the platform code
         * to do such, possibly using a device notifier
         */
-        if (bus_id)
-                strlcpy(dev->dev.bus_id, bus_id, BUS_ID_SIZE);
-        else
-                of_platform_make_bus_id(dev);
        if (of_device_register(dev) != 0) {
-                kfree(dev);
+                of_device_free(dev);
                return NULL;
        }
diff --git a/arch/powerpc/kernel/process.c b/arch/powerpc/kernel/process.c
index 7949c203cb89..ea6ad7a2a7e3 100644
--- a/arch/powerpc/kernel/process.c
+++ b/arch/powerpc/kernel/process.c
@@ -149,10 +149,32 @@ void flush_altivec_to_thread(struct task_struct *tsk)
        }
 }
-int dump_task_altivec(struct pt_regs *regs, elf_vrregset_t *vrregs)
+int dump_task_altivec(struct task_struct *tsk, elf_vrregset_t *vrregs)
 {
-        flush_altivec_to_thread(current);
+        /* ELF_NVRREG includes the VSCR and VRSAVE which we need to save
-        memcpy(vrregs, &current->thread.vr[0], sizeof(*vrregs));
+         * separately, see below */
+        const int nregs = ELF_NVRREG - 2;
+        elf_vrreg_t *reg;
+        u32 *dest;
+        if (tsk == current)
+                flush_altivec_to_thread(tsk);
+        reg = (elf_vrreg_t *)vrregs;
+        /* copy the 32 vr registers */
+        memcpy(reg, &tsk->thread.vr[0], nregs * sizeof(*reg));
+        reg += nregs;
+        /* copy the vscr */
+        memcpy(reg, &tsk->thread.vscr, sizeof(*reg));
+        reg++;
+        /* vrsave is stored in the high 32bit slot of the final 128bits */
+        memset(reg, 0, sizeof(*reg));
+        dest = (u32 *)reg;
+        *dest = tsk->thread.vrsave;
        return 1;
 }
 #endif /* CONFIG_ALTIVEC */
diff --git a/arch/powerpc/kernel/rtas_flash.c b/arch/powerpc/kernel/rtas_flash.c
index 62b7bf2f3eab..f2276593f416 100644
--- a/arch/powerpc/kernel/rtas_flash.c
+++ b/arch/powerpc/kernel/rtas_flash.c
@@ -286,7 +286,7 @@ static ssize_t rtas_flash_read(struct file *file, char __user *buf,
 }
 /* constructor for flash_block_cache */
-void rtas_block_ctor(void *ptr, struct kmem_cache *cache, unsigned long flags)
+void rtas_block_ctor(struct kmem_cache *cache, void *ptr)
 {
        memset(ptr, 0, RTAS_BLK_SIZE);
 }
diff --git a/arch/powerpc/kernel/setup_64.c b/arch/powerpc/kernel/setup_64.c
index 0e014550b83f..ede77dbbd4df 100644
--- a/arch/powerpc/kernel/setup_64.c
+++ b/arch/powerpc/kernel/setup_64.c
@@ -426,11 +426,14 @@ void __init setup_system(void)
        printk("-----------------------------------------------------\n");
        printk("ppc64_pft_size                = 0x%lx\n", ppc64_pft_size);
        printk("physicalMemorySize            = 0x%lx\n", lmb_phys_mem_size());
-        printk("ppc64_caches.dcache_line_size = 0x%x\n",
+        if (ppc64_caches.dline_size != 0x80)
-               ppc64_caches.dline_size);
+                printk("ppc64_caches.dcache_line_size = 0x%x\n",
-        printk("ppc64_caches.icache_line_size = 0x%x\n",
+                       ppc64_caches.dline_size);
-               ppc64_caches.iline_size);
+        if (ppc64_caches.iline_size != 0x80)
-        printk("htab_address                  = 0x%p\n", htab_address);
+                printk("ppc64_caches.icache_line_size = 0x%x\n",
+                       ppc64_caches.iline_size);
+        if (htab_address)
+                printk("htab_address                  = 0x%p\n", htab_address);
        printk("htab_hash_mask                = 0x%lx\n", htab_hash_mask);
 #if PHYSICAL_START > 0
        printk("physical_start                = 0x%x\n", PHYSICAL_START);
diff --git a/arch/powerpc/kernel/sys_ppc32.c b/arch/powerpc/kernel/sys_ppc32.c
index bd85b5fd08c8..4a4f5c6b560b 100644
--- a/arch/powerpc/kernel/sys_ppc32.c
+++ b/arch/powerpc/kernel/sys_ppc32.c
@@ -41,10 +41,10 @@
 #include <linux/compat.h>
 #include <linux/ptrace.h>
 #include <linux/elf.h>
+#include <linux/ipc.h>
 #include <asm/ptrace.h>
 #include <asm/types.h>
-#include <asm/ipc.h>
 #include <asm/uaccess.h>
 #include <asm/unistd.h>
 #include <asm/semaphore.h>
diff --git a/arch/powerpc/kernel/syscalls.c b/arch/powerpc/kernel/syscalls.c
index f85f402ceaef..3b1d5dd65643 100644
--- a/arch/powerpc/kernel/syscalls.c
+++ b/arch/powerpc/kernel/syscalls.c
@@ -38,7 +38,6 @@
 #include <linux/personality.h>
 #include <asm/uaccess.h>
-#include <asm/ipc.h>
 #include <asm/semaphore.h>
 #include <asm/syscalls.h>
 #include <asm/time.h>
diff --git a/arch/powerpc/kernel/time.c b/arch/powerpc/kernel/time.c
index 9368da371f36..863a5d6d9b18 100644
--- a/arch/powerpc/kernel/time.c
+++ b/arch/powerpc/kernel/time.c
@@ -829,7 +829,7 @@ static void register_decrementer_clockevent(int cpu)
        *dec = decrementer_clockevent;
        dec->cpumask = cpumask_of_cpu(cpu);
-        printk(KERN_ERR "clockevent: %s mult[%lx] shift[%d] cpu[%d]\n",
+        printk(KERN_INFO "clockevent: %s mult[%lx] shift[%d] cpu[%d]\n",
               dec->name, dec->mult, dec->shift, cpu);
        clockevents_register_device(dec);
diff --git a/arch/powerpc/kernel/vdso64/sigtramp.S b/arch/powerpc/kernel/vdso64/sigtramp.S
index 17a83fa6dc52..59eb59bb4082 100644
--- a/arch/powerpc/kernel/vdso64/sigtramp.S
+++ b/arch/powerpc/kernel/vdso64/sigtramp.S
@@ -134,13 +134,16 @@ V_FUNCTION_END(__kernel_sigtramp_rt64)
 9:
 /* This is where the pt_regs pointer can be found on the stack.  */
-#define PTREGS 128+168+56
+#define PTREGS  128+168+56
 /* Size of regs.  */
-#define RSIZE 8
+#define RSIZE   8
+/* Size of CR reg in DWARF unwind info. */
+#define CRSIZE  4
 /* This is the offset of the VMX reg pointer.  */
-#define VREGS 48*RSIZE+33*8
+#define VREGS   48*RSIZE+33*8
 /* Describe where general purpose regs are saved.  */
 #define EH_FRAME_GEN \
@@ -178,7 +181,7 @@ V_FUNCTION_END(__kernel_sigtramp_rt64)
  rsave (31, 31*RSIZE);                                                 \
  rsave (67, 32*RSIZE);         /* ap, used as temp for nip */          \
  rsave (65, 36*RSIZE);         /* lr */                                \
-  rsave (70, 38*RSIZE)          /* cr */
+  rsave (70, 38*RSIZE + (RSIZE - CRSIZE)) /* cr */
 /* Describe where the FP regs are saved.  */
 #define EH_FRAME_FP \
diff --git a/arch/powerpc/lib/Makefile b/arch/powerpc/lib/Makefile
index 65d492e316a6..4bb023f4c869 100644
--- a/arch/powerpc/lib/Makefile
+++ b/arch/powerpc/lib/Makefile
@@ -14,7 +14,6 @@ endif
 obj-$(CONFIG_PPC64)     += copypage_64.o copyuser_64.o \
                           memcpy_64.o usercopy_64.o mem_64.o string.o
-obj-$(CONFIG_QUICC_ENGINE) += rheap.o
 obj-$(CONFIG_XMON)      += sstep.o
 obj-$(CONFIG_KPROBES)   += sstep.o
 obj-$(CONFIG_NOT_COHERENT_CACHE)        += dma-noncoherent.o
@@ -23,6 +22,4 @@ ifeq ($(CONFIG_PPC64),y)
 obj-$(CONFIG_SMP)       += locks.o
 endif
-# Temporary hack until we have migrated to asm-powerpc
+obj-$(CONFIG_PPC_LIB_RHEAP) += rheap.o
-obj-$(CONFIG_8xx)       += rheap.o
-obj-$(CONFIG_CPM2)      += rheap.o
diff --git a/arch/powerpc/lib/rheap.c b/arch/powerpc/lib/rheap.c
index ada5b42dd231..22c3b4f53de7 100644
--- a/arch/powerpc/lib/rheap.c
+++ b/arch/powerpc/lib/rheap.c
@@ -15,6 +15,7 @@
 #include <linux/types.h>
 #include <linux/errno.h>
 #include <linux/kernel.h>
+#include <linux/module.h>
 #include <linux/mm.h>
 #include <linux/err.h>
 #include <linux/slab.h>
@@ -275,6 +276,7 @@ rh_info_t *rh_create(unsigned int alignment)
        return info;
 }
+EXPORT_SYMBOL_GPL(rh_create);
 /*
 * Destroy a dynamically created remote heap.  Deallocate only if the areas
@@ -288,6 +290,7 @@ void rh_destroy(rh_info_t * info)
        if ((info->flags & RHIF_STATIC_INFO) == 0)
                kfree(info);
 }
+EXPORT_SYMBOL_GPL(rh_destroy);
 /*
 * Initialize in place a remote heap info block.  This is needed to support
@@ -320,6 +323,7 @@ void rh_init(rh_info_t * info, unsigned int alignment, int max_blocks,
        for (i = 0, blk = block; i < max_blocks; i++, blk++)
                list_add(&blk->list, &info->empty_list);
 }
+EXPORT_SYMBOL_GPL(rh_init);
 /* Attach a free memory region, coalesces regions if adjuscent */
 int rh_attach_region(rh_info_t * info, unsigned long start, int size)
@@ -360,6 +364,7 @@ int rh_attach_region(rh_info_t * info, unsigned long start, int size)
        return 0;
 }
+EXPORT_SYMBOL_GPL(rh_attach_region);
 /* Detatch given address range, splits free block if needed. */
 unsigned long rh_detach_region(rh_info_t * info, unsigned long start, int size)
@@ -428,6 +433,7 @@ unsigned long rh_detach_region(rh_info_t * info, unsigned long start, int size)
        return s;
 }
+EXPORT_SYMBOL_GPL(rh_detach_region);
 /* Allocate a block of memory at the specified alignment.  The value returned
 * is an offset into the buffer initialized by rh_init(), or a negative number
@@ -502,6 +508,7 @@ unsigned long rh_alloc_align(rh_info_t * info, int size, int alignment, const ch
        return start;
 }
+EXPORT_SYMBOL_GPL(rh_alloc_align);
 /* Allocate a block of memory at the default alignment.  The value returned is
 * an offset into the buffer initialized by rh_init(), or a negative number if
@@ -511,6 +518,7 @@ unsigned long rh_alloc(rh_info_t * info, int size, const char *owner)
 {
        return rh_alloc_align(info, size, info->alignment, owner);
 }
+EXPORT_SYMBOL_GPL(rh_alloc);
 /* Allocate a block of memory at the given offset, rounded up to the default
 * alignment.  The value returned is an offset into the buffer initialized by
@@ -594,6 +602,7 @@ unsigned long rh_alloc_fixed(rh_info_t * info, unsigned long start, int size, co
        return start;
 }
+EXPORT_SYMBOL_GPL(rh_alloc_fixed);
 /* Deallocate the memory previously allocated by one of the rh_alloc functions.
 * The return value is the size of the deallocated block, or a negative number
@@ -626,6 +635,7 @@ int rh_free(rh_info_t * info, unsigned long start)
        return size;
 }
+EXPORT_SYMBOL_GPL(rh_free);
 int rh_get_stats(rh_info_t * info, int what, int max_stats, rh_stats_t * stats)
 {
@@ -663,6 +673,7 @@ int rh_get_stats(rh_info_t * info, int what, int max_stats, rh_stats_t * stats)
        return nr;
 }
+EXPORT_SYMBOL_GPL(rh_get_stats);
 int rh_set_owner(rh_info_t * info, unsigned long start, const char *owner)
 {
@@ -687,6 +698,7 @@ int rh_set_owner(rh_info_t * info, unsigned long start, const char *owner)
        return size;
 }
+EXPORT_SYMBOL_GPL(rh_set_owner);
 void rh_dump(rh_info_t * info)
 {
@@ -722,6 +734,7 @@ void rh_dump(rh_info_t * info)
                       st[i].size, st[i].owner != NULL ? st[i].owner : "");
        printk(KERN_INFO "\n");
 }
+EXPORT_SYMBOL_GPL(rh_dump);
 void rh_dump_blk(rh_info_t * info, rh_block_t * blk)
 {
@@ -729,3 +742,5 @@ void rh_dump_blk(rh_info_t * info, rh_block_t * blk)
               "blk @0x%p: 0x%lx-0x%lx (%u)\n",
               blk, blk->start, blk->start + blk->size, blk->size);
 }
+EXPORT_SYMBOL_GPL(rh_dump_blk);
diff --git a/arch/powerpc/math-emu/math.c b/arch/powerpc/math-emu/math.c
index 69058b2873de..381306bb1590 100644
--- a/arch/powerpc/math-emu/math.c
+++ b/arch/powerpc/math-emu/math.c
@@ -407,11 +407,16 @@ do_mathemu(struct pt_regs *regs)
        case XE:
                idx = (insn >> 16) & 0x1f;
-                if (!idx)
-                        goto illegal;
                op0 = (void *)&current->thread.fpr[(insn >> 21) & 0x1f];
-                op1 = (void *)(regs->gpr[idx] + regs->gpr[(insn >> 11) & 0x1f]);
+                if (!idx) {
+                        if (((insn >> 1) & 0x3ff) == STFIWX)
+                                op1 = (void *)(regs->gpr[(insn >> 11) & 0x1f]);
+                        else
+                                goto illegal;
+                } else {
+                        op1 = (void *)(regs->gpr[idx] + regs->gpr[(insn >> 11) & 0x1f]);
+                }
                break;
        case XEU:
diff --git a/arch/powerpc/mm/hash_utils_64.c b/arch/powerpc/mm/hash_utils_64.c
index 611ad084b7e7..c78dc912411f 100644
--- a/arch/powerpc/mm/hash_utils_64.c
+++ b/arch/powerpc/mm/hash_utils_64.c
@@ -209,9 +209,10 @@ static int __init htab_dt_scan_seg_sizes(unsigned long node,
                if (prop[0] == 40) {
                        DBG("1T segment support detected\n");
                        cur_cpu_spec->cpu_features |= CPU_FTR_1T_SEGMENT;
+                        return 1;
                }
-                return 1;
        }
+        cur_cpu_spec->cpu_features &= ~CPU_FTR_NO_SLBIE_B;
        return 0;
 }
diff --git a/arch/powerpc/mm/hugetlbpage.c b/arch/powerpc/mm/hugetlbpage.c
index 08f0d9ff7712..71efb38d599b 100644
--- a/arch/powerpc/mm/hugetlbpage.c
+++ b/arch/powerpc/mm/hugetlbpage.c
@@ -526,7 +526,7 @@ repeat:
        return err;
 }
-static void zero_ctor(void *addr, struct kmem_cache *cache, unsigned long flags)
+static void zero_ctor(struct kmem_cache *cache, void *addr)
 {
        memset(addr, 0, kmem_cache_size(cache));
 }
diff --git a/arch/powerpc/mm/init_64.c b/arch/powerpc/mm/init_64.c
index 702d884a338a..d9c82d3d6482 100644
--- a/arch/powerpc/mm/init_64.c
+++ b/arch/powerpc/mm/init_64.c
@@ -142,7 +142,7 @@ static int __init setup_kcore(void)
 module_init(setup_kcore);
 #endif
-static void zero_ctor(void *addr, struct kmem_cache *cache, unsigned long flags)
+static void zero_ctor(struct kmem_cache *cache, void *addr)
 {
        memset(addr, 0, kmem_cache_size(cache));
 }
@@ -240,7 +240,7 @@ int __meminit vmemmap_populate(struct page *start_page,
                        return -ENOMEM;
                printk(KERN_WARNING "vmemmap %08lx allocated at %p, "
-                                        "physical %p.\n", start, p, __pa(p));
+                                    "physical %08lx.\n", start, p, __pa(p));
                mapped = htab_bolt_mapping(start, start + page_size,
                                        __pa(p), mode_rw, mmu_linear_psize,
diff --git a/arch/powerpc/mm/slb.c b/arch/powerpc/mm/slb.c
index 6c164cec9d2c..bbd2c512ee05 100644
--- a/arch/powerpc/mm/slb.c
+++ b/arch/powerpc/mm/slb.c
@@ -157,7 +157,8 @@ void switch_slb(struct task_struct *tsk, struct mm_struct *mm)
        unsigned long stack = KSTK_ESP(tsk);
        unsigned long unmapped_base;
-        if (offset <= SLB_CACHE_ENTRIES) {
+        if (!cpu_has_feature(CPU_FTR_NO_SLBIE_B) &&
+            offset <= SLB_CACHE_ENTRIES) {
                int i;
                asm volatile("isync" : : : "memory");
                for (i = 0; i < offset; i++) {
diff --git a/arch/powerpc/mm/slice.c b/arch/powerpc/mm/slice.c
index 319826ef1645..ad928edafb0a 100644
--- a/arch/powerpc/mm/slice.c
+++ b/arch/powerpc/mm/slice.c
@@ -34,7 +34,7 @@
 #include <asm/mmu.h>
 #include <asm/spu.h>
-static spinlock_t slice_convert_lock = SPIN_LOCK_UNLOCKED;
+static DEFINE_SPINLOCK(slice_convert_lock);
 #ifdef DEBUG
diff --git a/arch/powerpc/platforms/Kconfig b/arch/powerpc/platforms/Kconfig
index 186397f283bb..229d355ed86a 100644
--- a/arch/powerpc/platforms/Kconfig
+++ b/arch/powerpc/platforms/Kconfig
@@ -264,6 +264,7 @@ config TAU_AVERAGE
 config QUICC_ENGINE
        bool
+        select PPC_LIB_RHEAP
        help
          The QUICC Engine (QE) is a new generation of communications
          coprocessors on Freescale embedded CPUs (akin to CPM in older chips).
@@ -274,6 +275,7 @@ config CPM2
        bool
        default n
        select CPM
+        select PPC_LIB_RHEAP
        help
          The CPM2 (Communications Processor Module) is a coprocessor on
          embedded CPUs made by Freescale.  Selecting this option means that
@@ -313,4 +315,6 @@ config FSL_ULI1575
 config CPM
        bool
+source "arch/powerpc/sysdev/bestcomm/Kconfig"
 endmenu
diff --git a/arch/powerpc/platforms/Kconfig.cputype b/arch/powerpc/platforms/Kconfig.cputype
index 4c315be25015..3c7325ec36ec 100644
--- a/arch/powerpc/platforms/Kconfig.cputype
+++ b/arch/powerpc/platforms/Kconfig.cputype
@@ -37,6 +37,7 @@ config PPC_8xx
        select FSL_SOC
        select 8xx
        select WANT_DEVICE_TREE
+        select PPC_LIB_RHEAP
 config 40x
        bool "AMCC 40x"
diff --git a/arch/powerpc/platforms/cell/spufs/inode.c b/arch/powerpc/platforms/cell/spufs/inode.c
index 11098747d09b..0966d093db43 100644
--- a/arch/powerpc/platforms/cell/spufs/inode.c
+++ b/arch/powerpc/platforms/cell/spufs/inode.c
@@ -68,7 +68,7 @@ spufs_destroy_inode(struct inode *inode)
 }
 static void
-spufs_init_once(void *p, struct kmem_cache * cachep, unsigned long flags)
+spufs_init_once(struct kmem_cache *cachep, void *p)
 {
        struct spufs_inode_info *ei = p;
diff --git a/arch/powerpc/platforms/iseries/htab.c b/arch/powerpc/platforms/iseries/htab.c
index 15a7097e5dd7..f99c6c4b6985 100644
--- a/arch/powerpc/platforms/iseries/htab.c
+++ b/arch/powerpc/platforms/iseries/htab.c
@@ -39,9 +39,9 @@ static inline void iSeries_hunlock(unsigned long slot)
        spin_unlock(&iSeries_hlocks[(slot >> 4) & 0x3f]);
 }
-long iSeries_hpte_insert(unsigned long hpte_group, unsigned long va,
+static long iSeries_hpte_insert(unsigned long hpte_group, unsigned long va,
                         unsigned long pa, unsigned long rflags,
-                         unsigned long vflags, int psize)
+                         unsigned long vflags, int psize, int ssize)
 {
        long slot;
        struct hash_pte lhpte;
diff --git a/arch/powerpc/platforms/iseries/vio.c b/arch/powerpc/platforms/iseries/vio.c
index 910b00b4703e..d6435b03971f 100644
--- a/arch/powerpc/platforms/iseries/vio.c
+++ b/arch/powerpc/platforms/iseries/vio.c
@@ -2,7 +2,7 @@
 * Legacy iSeries specific vio initialisation
 * that needs to be built in (not a module).
 *
- * Â© Copyright 2007 IBM Corporation
+ * © Copyright 2007 IBM Corporation
 *      Author: Stephen Rothwell
 *      Some parts collected from various other files
 *
diff --git a/arch/powerpc/platforms/pasemi/setup.c b/arch/powerpc/platforms/pasemi/setup.c
index 5ddf40a66ae8..3a5d112af5e0 100644
--- a/arch/powerpc/platforms/pasemi/setup.c
+++ b/arch/powerpc/platforms/pasemi/setup.c
@@ -37,6 +37,10 @@
 #include <asm/time.h>
 #include <asm/of_platform.h>
+#include <pcmcia/ss.h>
+#include <pcmcia/cistpl.h>
+#include <pcmcia/ds.h>
 #include "pasemi.h"
 /* SDC reset register, must be pre-mapped at reset time */
@@ -308,7 +312,57 @@ static void __init pas_init_early(void)
        iommu_init_early_pasemi();
 }
+#ifdef CONFIG_PCMCIA
+static int pcmcia_notify(struct notifier_block *nb, unsigned long action,
+                         void *data)
+{
+        struct device *dev = data;
+        struct device *parent;
+        struct pcmcia_device *pdev = to_pcmcia_dev(dev);
+        /* We are only intereted in device addition */
+        if (action != BUS_NOTIFY_ADD_DEVICE)
+                return 0;
+        parent = pdev->socket->dev.parent;
+        /* We know electra_cf devices will always have of_node set, since
+         * electra_cf is an of_platform driver.
+         */
+        if (!parent->archdata.of_node)
+                return 0;
+        if (!of_device_is_compatible(parent->archdata.of_node, "electra-cf"))
+                return 0;
+        /* We use the direct ops for localbus */
+        dev->archdata.dma_ops = &dma_direct_ops;
+        return 0;
+}
+static struct notifier_block pcmcia_notifier = {
+        .notifier_call = pcmcia_notify,
+};
+static inline void pasemi_pcmcia_init(void)
+{
+        extern struct bus_type pcmcia_bus_type;
+        bus_register_notifier(&pcmcia_bus_type, &pcmcia_notifier);
+}
+#else
+static inline void pasemi_pcmcia_init(void)
+{
+}
+#endif
 static struct of_device_id pasemi_bus_ids[] = {
+        { .type = "localbus", },
        { .type = "sdc", },
        {},
 };
@@ -318,6 +372,8 @@ static int __init pasemi_publish_devices(void)
        if (!machine_is(pasemi))
                return 0;
+        pasemi_pcmcia_init();
        /* Publish OF platform devices for SDC and other non-PCI devices */
        of_platform_bus_probe(NULL, pasemi_bus_ids, NULL);
diff --git a/arch/powerpc/sysdev/Makefile b/arch/powerpc/sysdev/Makefile
index 1a6f5641ebc8..99a77d743d48 100644
--- a/arch/powerpc/sysdev/Makefile
+++ b/arch/powerpc/sysdev/Makefile
@@ -14,6 +14,7 @@ obj-$(CONFIG_FSL_SOC)		+= fsl_soc.o
 obj-$(CONFIG_FSL_PCI)           += fsl_pci.o
 obj-$(CONFIG_TSI108_BRIDGE)     += tsi108_pci.o tsi108_dev.o
 obj-$(CONFIG_QUICC_ENGINE)      += qe_lib/
+obj-$(CONFIG_PPC_BESTCOMM)      += bestcomm/
 mv64x60-$(CONFIG_PCI)           += mv64x60_pci.o
 obj-$(CONFIG_MV64X60)           += $(mv64x60-y) mv64x60_pic.o mv64x60_dev.o \
                                   mv64x60_udbg.o
diff --git a/arch/powerpc/sysdev/bestcomm/Kconfig b/arch/powerpc/sysdev/bestcomm/Kconfig
new file mode 100644
index 000000000000..57cc56562567
--- /dev/null
+++ b/arch/powerpc/sysdev/bestcomm/Kconfig
@@ -0,0 +1,39 @@
+#
+# Kconfig options for Bestcomm
+#
+config PPC_BESTCOMM
+        tristate "Bestcomm DMA engine support"
+        depends on PPC_MPC52xx
+        default n
+        select PPC_LIB_RHEAP
+        help
+          BestComm is the name of the communication coprocessor found
+          on the Freescale MPC5200 family of processor. It's usage is
+          optionnal for some drivers (like ATA), but required for
+          others (like FEC).
+          If you want to use drivers that require DMA operations,
+          answer Y or M. Otherwise say N.
+config PPC_BESTCOMM_ATA
+        tristate "Bestcomm ATA task support"
+        depends on PPC_BESTCOMM
+        default n
+        help
+          This option enables the support for the ATA task.
+config PPC_BESTCOMM_FEC
+        tristate "Bestcomm FEC tasks support"
+        depends on PPC_BESTCOMM
+        default n
+        help
+          This option enables the support for the FEC tasks.
+config PPC_BESTCOMM_GEN_BD
+        tristate "Bestcomm GenBD tasks support"
+        depends on PPC_BESTCOMM
+        default n
+        help
+          This option enables the support for the GenBD tasks.
diff --git a/arch/powerpc/sysdev/bestcomm/Makefile b/arch/powerpc/sysdev/bestcomm/Makefile
new file mode 100644
index 000000000000..aed2df2a6580
--- /dev/null
+++ b/arch/powerpc/sysdev/bestcomm/Makefile
@@ -0,0 +1,14 @@
+#
+# Makefile for BestComm & co
+#
+bestcomm-core-objs      := bestcomm.o sram.o
+bestcomm-ata-objs       := ata.o bcom_ata_task.o
+bestcomm-fec-objs       := fec.o bcom_fec_rx_task.o bcom_fec_tx_task.o
+bestcomm-gen-bd-objs    := gen_bd.o bcom_gen_bd_rx_task.o bcom_gen_bd_tx_task.o
+obj-$(CONFIG_PPC_BESTCOMM)              += bestcomm-core.o
+obj-$(CONFIG_PPC_BESTCOMM_ATA)          += bestcomm-ata.o
+obj-$(CONFIG_PPC_BESTCOMM_FEC)          += bestcomm-fec.o
+obj-$(CONFIG_PPC_BESTCOMM_GEN_BD)       += bestcomm-gen-bd.o
+ 
diff --git a/arch/powerpc/sysdev/bestcomm/ata.c b/arch/powerpc/sysdev/bestcomm/ata.c
new file mode 100644
index 000000000000..1f5258fb38c3
--- /dev/null
+++ b/arch/powerpc/sysdev/bestcomm/ata.c
@@ -0,0 +1,154 @@
+/*
+ * Bestcomm ATA task driver
+ *
+ *
+ * Patterned after bestcomm/fec.c by Dale Farnsworth <dfarnsworth@mvista.com>
+ *                                   2003-2004 (c) MontaVista, Software, Inc.
+ *
+ * Copyright (C) 2006-2007 Sylvain Munaut <tnt@246tNt.com>
+ * Copyright (C) 2006      Freescale - John Rigby
+ *
+ * This file is licensed under the terms of the GNU General Public License
+ * version 2. This program is licensed "as is" without any warranty of any
+ * kind, whether express or implied.
+ */
+#include <linux/kernel.h>
+#include <linux/module.h>
+#include <linux/types.h>
+#include <asm/io.h>
+#include "bestcomm.h"
+#include "bestcomm_priv.h"
+#include "ata.h"
+/* ======================================================================== */
+/* Task image/var/inc                                                       */
+/* ======================================================================== */
+/* ata task image */
+extern u32 bcom_ata_task[];
+/* ata task vars that need to be set before enabling the task */
+struct bcom_ata_var {
+        u32 enable;             /* (u16*) address of task's control register */
+        u32 bd_base;            /* (struct bcom_bd*) beginning of ring buffer */
+        u32 bd_last;            /* (struct bcom_bd*) end of ring buffer */
+        u32 bd_start;           /* (struct bcom_bd*) current bd */
+        u32 buffer_size;        /* size of receive buffer */
+};
+/* ata task incs that need to be set before enabling the task */
+struct bcom_ata_inc {
+        u16 pad0;
+        s16 incr_bytes;
+        u16 pad1;
+        s16 incr_dst;
+        u16 pad2;
+        s16 incr_src;
+};
+/* ======================================================================== */
+/* Task support code                                                        */
+/* ======================================================================== */
+struct bcom_task *
+bcom_ata_init(int queue_len, int maxbufsize)
+{
+        struct bcom_task *tsk;
+        struct bcom_ata_var *var;
+        struct bcom_ata_inc *inc;
+        tsk = bcom_task_alloc(queue_len, sizeof(struct bcom_ata_bd), 0);
+        if (!tsk)
+                return NULL;
+        tsk->flags = BCOM_FLAGS_NONE;
+        bcom_ata_reset_bd(tsk);
+        var = (struct bcom_ata_var *) bcom_task_var(tsk->tasknum);
+        inc = (struct bcom_ata_inc *) bcom_task_inc(tsk->tasknum);
+        if (bcom_load_image(tsk->tasknum, bcom_ata_task)) {
+                bcom_task_free(tsk);
+                return NULL;
+        }
+        var->enable     = bcom_eng->regs_base +
+                                offsetof(struct mpc52xx_sdma, tcr[tsk->tasknum]);
+        var->bd_base    = tsk->bd_pa;
+        var->bd_last    = tsk->bd_pa + ((tsk->num_bd-1) * tsk->bd_size);
+        var->bd_start   = tsk->bd_pa;
+        var->buffer_size = maxbufsize;
+        /* Configure some stuff */
+        bcom_set_task_pragma(tsk->tasknum, BCOM_ATA_PRAGMA);
+        bcom_set_task_auto_start(tsk->tasknum, tsk->tasknum);
+        out_8(&bcom_eng->regs->ipr[BCOM_INITIATOR_ATA_RX], BCOM_IPR_ATA_RX);
+        out_8(&bcom_eng->regs->ipr[BCOM_INITIATOR_ATA_TX], BCOM_IPR_ATA_TX);
+        out_be32(&bcom_eng->regs->IntPend, 1<<tsk->tasknum); /* Clear ints */
+        return tsk;
+}
+EXPORT_SYMBOL_GPL(bcom_ata_init);
+void bcom_ata_rx_prepare(struct bcom_task *tsk)
+{
+        struct bcom_ata_inc *inc;
+        inc = (struct bcom_ata_inc *) bcom_task_inc(tsk->tasknum);
+        inc->incr_bytes = -(s16)sizeof(u32);
+        inc->incr_src   = 0;
+        inc->incr_dst   = sizeof(u32);
+        bcom_set_initiator(tsk->tasknum, BCOM_INITIATOR_ATA_RX);
+}
+EXPORT_SYMBOL_GPL(bcom_ata_rx_prepare);
+void bcom_ata_tx_prepare(struct bcom_task *tsk)
+{
+        struct bcom_ata_inc *inc;
+        inc = (struct bcom_ata_inc *) bcom_task_inc(tsk->tasknum);
+        inc->incr_bytes = -(s16)sizeof(u32);
+        inc->incr_src   = sizeof(u32);
+        inc->incr_dst   = 0;
+        bcom_set_initiator(tsk->tasknum, BCOM_INITIATOR_ATA_TX);
+}
+EXPORT_SYMBOL_GPL(bcom_ata_tx_prepare);
+void bcom_ata_reset_bd(struct bcom_task *tsk)
+{
+        struct bcom_ata_var *var;
+        /* Reset all BD */
+        memset(tsk->bd, 0x00, tsk->num_bd * tsk->bd_size);
+        tsk->index = 0;
+        tsk->outdex = 0;
+        var = (struct bcom_ata_var *) bcom_task_var(tsk->tasknum);
+        var->bd_start = var->bd_base;
+}
+EXPORT_SYMBOL_GPL(bcom_ata_reset_bd);
+void bcom_ata_release(struct bcom_task *tsk)
+{
+        /* Nothing special for the ATA tasks */
+        bcom_task_free(tsk);
+}
+EXPORT_SYMBOL_GPL(bcom_ata_release);
+MODULE_DESCRIPTION("BestComm ATA task driver");
+MODULE_AUTHOR("John Rigby");
+MODULE_LICENSE("GPL v2");
diff --git a/arch/powerpc/sysdev/bestcomm/ata.h b/arch/powerpc/sysdev/bestcomm/ata.h
new file mode 100644
index 000000000000..10982769c465
--- /dev/null
+++ b/arch/powerpc/sysdev/bestcomm/ata.h
@@ -0,0 +1,37 @@
+/*
+ * Header for Bestcomm ATA task driver
+ *
+ *
+ * Copyright (C) 2006 Freescale - John Rigby
+ * Copyright (C) 2006 Sylvain Munaut <tnt@246tNt.com>
+ *
+ * This file is licensed under the terms of the GNU General Public License
+ * version 2. This program is licensed "as is" without any warranty of any
+ * kind, whether express or implied.
+ */
+#ifndef __BESTCOMM_ATA_H__
+#define __BESTCOMM_ATA_H__
+struct bcom_ata_bd {
+        u32     status;
+        u32     dst_pa;
+        u32     src_pa;
+};
+extern struct bcom_task *
+bcom_ata_init(int queue_len, int maxbufsize);
+extern void
+bcom_ata_rx_prepare(struct bcom_task *tsk);
+extern void
+bcom_ata_tx_prepare(struct bcom_task *tsk);
+extern void
+bcom_ata_reset_bd(struct bcom_task *tsk);
+#endif /* __BESTCOMM_ATA_H__ */
diff --git a/arch/powerpc/sysdev/bestcomm/bcom_ata_task.c b/arch/powerpc/sysdev/bestcomm/bcom_ata_task.c
new file mode 100644
index 000000000000..cc6049a4e469
--- /dev/null
+++ b/arch/powerpc/sysdev/bestcomm/bcom_ata_task.c
@@ -0,0 +1,67 @@
+/*
+ * Bestcomm ATA task microcode
+ *
+ * Copyright (c) 2004 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.
+ *
+ * Created based on bestcom/code_dma/image_rtos1/dma_image.hex
+ */
+#include <asm/types.h>
+/*
+ * The header consists of the following fields:
+ *      u32     magic;
+ *      u8      desc_size;
+ *      u8      var_size;
+ *      u8      inc_size;
+ *      u8      first_var;
+ *      u8      reserved[8];
+ *
+ * The size fields contain the number of 32-bit words.
+ */
+u32 bcom_ata_task[] = {
+        /* header */
+        0x4243544b,
+        0x0e060709,
+        0x00000000,
+        0x00000000,
+        /* Task descriptors */
+        0x8198009b, /* LCD: idx0 = var3; idx0 <= var2; idx0 += inc3 */
+        0x13e00c08, /*   DRD1A: var3 = var1; FN=0 MORE init=31 WS=0 RS=0 */
+        0xb8000264, /*   LCD: idx1 = *idx0, idx2 = var0; idx1 < var9; idx1 += inc4, idx2 += inc4 */
+        0x10000f00, /*     DRD1A: var3 = idx0; FN=0 MORE init=0 WS=0 RS=0 */
+        0x60140002, /*     DRD2A: EU0=0 EU1=0 EU2=0 EU3=2 EXT init=0 WS=2 RS=2 */
+        0x0c8cfc8a, /*     DRD2B1: *idx2 = EU3(); EU3(*idx2,var10)  */
+        0xd8988240, /*   LCDEXT: idx1 = idx1; idx1 > var9; idx1 += inc0 */
+        0xf845e011, /*   LCDEXT: idx2 = *(idx0 + var00000015); ; idx2 += inc2 */
+        0xb845e00a, /*   LCD: idx3 = *(idx0 + var00000019); ; idx3 += inc1 */
+        0x0bfecf90, /*     DRD1A: *idx3 = *idx2; FN=0 TFD init=31 WS=3 RS=3 */
+        0x9898802d, /*   LCD: idx1 = idx1; idx1 once var0; idx1 += inc5 */
+        0x64000005, /*     DRD2A: EU0=0 EU1=0 EU2=0 EU3=5 INT EXT init=0 WS=0 RS=0 */
+        0x0c0cf849, /*     DRD2B1: *idx0 = EU3(); EU3(idx1,var9)  */
+        0x000001f8, /* NOP */
+        /* VAR[9]-VAR[14] */
+        0x40000000,
+        0x7fff7fff,
+        0x00000000,
+        0x00000000,
+        0x00000000,
+        0x00000000,
+        /* INC[0]-INC[6] */
+        0x40000000,
+        0xe0000000,
+        0xe0000000,
+        0xa000000c,
+        0x20000000,
+        0x00000000,
+        0x00000000,
+};
diff --git a/arch/powerpc/sysdev/bestcomm/bcom_fec_rx_task.c b/arch/powerpc/sysdev/bestcomm/bcom_fec_rx_task.c
new file mode 100644
index 000000000000..a1ad6a02fcef
--- /dev/null
+++ b/arch/powerpc/sysdev/bestcomm/bcom_fec_rx_task.c
@@ -0,0 +1,78 @@
+/*
+ * Bestcomm FEC RX task microcode
+ *
+ * Copyright (c) 2004 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.
+ *
+ * Automatically created based on BestCommAPI-2.2/code_dma/image_rtos1/dma_image.hex
+ * on Tue Mar 22 11:19:38 2005 GMT
+ */
+#include <asm/types.h>
+/*
+ * The header consists of the following fields:
+ *      u32     magic;
+ *      u8      desc_size;
+ *      u8      var_size;
+ *      u8      inc_size;
+ *      u8      first_var;
+ *      u8      reserved[8];
+ *
+ * The size fields contain the number of 32-bit words.
+ */
+u32 bcom_fec_rx_task[] = {
+        /* header */
+        0x4243544b,
+        0x18060709,
+        0x00000000,
+        0x00000000,
+        /* Task descriptors */
+        0x808220e3, /* LCD: idx0 = var1, idx1 = var4; idx1 <= var3; idx0 += inc4, idx1 += inc3 */
+        0x10601010, /*   DRD1A: var4 = var2; FN=0 MORE init=3 WS=0 RS=0 */
+        0xb8800264, /*   LCD: idx2 = *idx1, idx3 = var0; idx2 < var9; idx2 += inc4, idx3 += inc4 */
+        0x10001308, /*     DRD1A: var4 = idx1; FN=0 MORE init=0 WS=0 RS=0 */
+        0x60140002, /*     DRD2A: EU0=0 EU1=0 EU2=0 EU3=2 EXT init=0 WS=2 RS=2 */
+        0x0cccfcca, /*     DRD2B1: *idx3 = EU3(); EU3(*idx3,var10)  */
+        0x80004000, /*   LCDEXT: idx2 = 0x00000000; ; */
+        0xb8c58029, /*   LCD: idx3 = *(idx1 + var00000015); idx3 once var0; idx3 += inc5 */
+        0x60000002, /*     DRD2A: EU0=0 EU1=0 EU2=0 EU3=2 EXT init=0 WS=0 RS=0 */
+        0x088cf8cc, /*     DRD2B1: idx2 = EU3(); EU3(idx3,var12)  */
+        0x991982f2, /*   LCD: idx2 = idx2, idx3 = idx3; idx2 > var11; idx2 += inc6, idx3 += inc2 */
+        0x006acf80, /*     DRD1A: *idx3 = *idx0; FN=0 init=3 WS=1 RS=1 */
+        0x80004000, /*   LCDEXT: idx2 = 0x00000000; ; */
+        0x9999802d, /*   LCD: idx3 = idx3; idx3 once var0; idx3 += inc5 */
+        0x70000002, /*     DRD2A: EU0=0 EU1=0 EU2=0 EU3=2 EXT MORE init=0 WS=0 RS=0 */
+        0x034cfc4e, /*     DRD2B1: var13 = EU3(); EU3(*idx1,var14)  */
+        0x00008868, /*     DRD1A: idx2 = var13; FN=0 init=0 WS=0 RS=0 */
+        0x99198341, /*   LCD: idx2 = idx2, idx3 = idx3; idx2 > var13; idx2 += inc0, idx3 += inc1 */
+        0x007ecf80, /*     DRD1A: *idx3 = *idx0; FN=0 init=3 WS=3 RS=3 */
+        0x99198272, /*   LCD: idx2 = idx2, idx3 = idx3; idx2 > var9; idx2 += inc6, idx3 += inc2 */
+        0x046acf80, /*     DRD1A: *idx3 = *idx0; FN=0 INT init=3 WS=1 RS=1 */
+        0x9819002d, /*   LCD: idx2 = idx0; idx2 once var0; idx2 += inc5 */
+        0x0060c790, /*     DRD1A: *idx1 = *idx2; FN=0 init=3 WS=0 RS=0 */
+        0x000001f8, /*   NOP */
+        /* VAR[9]-VAR[14] */
+        0x40000000,
+        0x7fff7fff,
+        0x00000000,
+        0x00000003,
+        0x40000008,
+        0x43ffffff,
+        /* INC[0]-INC[6] */
+        0x40000000,
+        0xe0000000,
+        0xe0000000,
+        0xa0000008,
+        0x20000000,
+        0x00000000,
+        0x4000ffff,
+};
diff --git a/arch/powerpc/sysdev/bestcomm/bcom_fec_tx_task.c b/arch/powerpc/sysdev/bestcomm/bcom_fec_tx_task.c
new file mode 100644
index 000000000000..b1c495c3a65a
--- /dev/null
+++ b/arch/powerpc/sysdev/bestcomm/bcom_fec_tx_task.c
@@ -0,0 +1,91 @@
+/*
+ * Bestcomm FEC TX task microcode
+ *
+ * Copyright (c) 2004 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.
+ *
+ * Automatically created based on BestCommAPI-2.2/code_dma/image_rtos1/dma_image.hex
+ * on Tue Mar 22 11:19:29 2005 GMT
+ */
+#include <asm/types.h>
+/*
+ * The header consists of the following fields:
+ *      u32     magic;
+ *      u8      desc_size;
+ *      u8      var_size;
+ *      u8      inc_size;
+ *      u8      first_var;
+ *      u8      reserved[8];
+ *
+ * The size fields contain the number of 32-bit words.
+ */
+u32 bcom_fec_tx_task[] = {
+        /* header */
+        0x4243544b,
+        0x2407070d,
+        0x00000000,
+        0x00000000,
+        /* Task descriptors */
+        0x8018001b, /* LCD: idx0 = var0; idx0 <= var0; idx0 += inc3 */
+        0x60000005, /*   DRD2A: EU0=0 EU1=0 EU2=0 EU3=5 EXT init=0 WS=0 RS=0 */
+        0x01ccfc0d, /*   DRD2B1: var7 = EU3(); EU3(*idx0,var13)  */
+        0x8082a123, /* LCD: idx0 = var1, idx1 = var5; idx1 <= var4; idx0 += inc4, idx1 += inc3 */
+        0x10801418, /*   DRD1A: var5 = var3; FN=0 MORE init=4 WS=0 RS=0 */
+        0xf88103a4, /*   LCDEXT: idx2 = *idx1, idx3 = var2; idx2 < var14; idx2 += inc4, idx3 += inc4 */
+        0x801a6024, /*   LCD: idx4 = var0; ; idx4 += inc4 */
+        0x10001708, /*     DRD1A: var5 = idx1; FN=0 MORE init=0 WS=0 RS=0 */
+        0x60140002, /*     DRD2A: EU0=0 EU1=0 EU2=0 EU3=2 EXT init=0 WS=2 RS=2 */
+        0x0cccfccf, /*     DRD2B1: *idx3 = EU3(); EU3(*idx3,var15)  */
+        0x991a002c, /*   LCD: idx2 = idx2, idx3 = idx4; idx2 once var0; idx2 += inc5, idx3 += inc4 */
+        0x70000002, /*     DRD2A: EU0=0 EU1=0 EU2=0 EU3=2 EXT MORE init=0 WS=0 RS=0 */
+        0x024cfc4d, /*     DRD2B1: var9 = EU3(); EU3(*idx1,var13)  */
+        0x60000003, /*     DRD2A: EU0=0 EU1=0 EU2=0 EU3=3 EXT init=0 WS=0 RS=0 */
+        0x0cccf247, /*     DRD2B1: *idx3 = EU3(); EU3(var9,var7)  */
+        0x80004000, /*   LCDEXT: idx2 = 0x00000000; ; */
+        0xb8c80029, /*   LCD: idx3 = *(idx1 + var0000001a); idx3 once var0; idx3 += inc5 */
+        0x70000002, /*     DRD2A: EU0=0 EU1=0 EU2=0 EU3=2 EXT MORE init=0 WS=0 RS=0 */
+        0x088cf8d1, /*     DRD2B1: idx2 = EU3(); EU3(idx3,var17)  */
+        0x00002f10, /*     DRD1A: var11 = idx2; FN=0 init=0 WS=0 RS=0 */
+        0x99198432, /*   LCD: idx2 = idx2, idx3 = idx3; idx2 > var16; idx2 += inc6, idx3 += inc2 */
+        0x008ac398, /*     DRD1A: *idx0 = *idx3; FN=0 init=4 WS=1 RS=1 */
+        0x80004000, /*   LCDEXT: idx2 = 0x00000000; ; */
+        0x9999802d, /*   LCD: idx3 = idx3; idx3 once var0; idx3 += inc5 */
+        0x70000002, /*     DRD2A: EU0=0 EU1=0 EU2=0 EU3=2 EXT MORE init=0 WS=0 RS=0 */
+        0x048cfc53, /*     DRD2B1: var18 = EU3(); EU3(*idx1,var19)  */
+        0x60000008, /*     DRD2A: EU0=0 EU1=0 EU2=0 EU3=8 EXT init=0 WS=0 RS=0 */
+        0x088cf48b, /*     DRD2B1: idx2 = EU3(); EU3(var18,var11)  */
+        0x99198481, /*   LCD: idx2 = idx2, idx3 = idx3; idx2 > var18; idx2 += inc0, idx3 += inc1 */
+        0x009ec398, /*     DRD1A: *idx0 = *idx3; FN=0 init=4 WS=3 RS=3 */
+        0x991983b2, /*   LCD: idx2 = idx2, idx3 = idx3; idx2 > var14; idx2 += inc6, idx3 += inc2 */
+        0x088ac398, /*     DRD1A: *idx0 = *idx3; FN=0 TFD init=4 WS=1 RS=1 */
+        0x9919002d, /*   LCD: idx2 = idx2; idx2 once var0; idx2 += inc5 */
+        0x60000005, /*     DRD2A: EU0=0 EU1=0 EU2=0 EU3=5 EXT init=0 WS=0 RS=0 */
+        0x0c4cf88e, /*     DRD2B1: *idx1 = EU3(); EU3(idx2,var14)  */
+        0x000001f8, /*   NOP */
+        /* VAR[13]-VAR[19] */
+        0x0c000000,
+        0x40000000,
+        0x7fff7fff,
+        0x00000000,
+        0x00000003,
+        0x40000004,
+        0x43ffffff,
+        /* INC[0]-INC[6] */
+        0x40000000,
+        0xe0000000,
+        0xe0000000,
+        0xa0000008,
+        0x20000000,
+        0x00000000,
+        0x4000ffff,
+};
diff --git a/arch/powerpc/sysdev/bestcomm/bcom_gen_bd_rx_task.c b/arch/powerpc/sysdev/bestcomm/bcom_gen_bd_rx_task.c
new file mode 100644
index 000000000000..efee022b0256
--- /dev/null
+++ b/arch/powerpc/sysdev/bestcomm/bcom_gen_bd_rx_task.c
@@ -0,0 +1,63 @@
+/*
+ * Bestcomm GenBD RX task microcode
+ *
+ * Copyright (C) 2006 AppSpec Computer Technologies Corp.
+ *                    Jeff Gibbons <jeff.gibbons@appspec.com>
+ * Copyright (c) 2004 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.
+ *
+ * Based on BestCommAPI-2.2/code_dma/image_rtos1/dma_image.hex
+ * on Tue Mar 4 10:14:12 2006 GMT
+ *
+ */
+#include <asm/types.h>
+/*
+ * The header consists of the following fields:
+ *      u32     magic;
+ *      u8      desc_size;
+ *      u8      var_size;
+ *      u8      inc_size;
+ *      u8      first_var;
+ *      u8      reserved[8];
+ *
+ * The size fields contain the number of 32-bit words.
+ */
+u32 bcom_gen_bd_rx_task[] = {
+        /* header */
+        0x4243544b,
+        0x0d020409,
+        0x00000000,
+        0x00000000,
+        /* Task descriptors */
+        0x808220da, /* LCD: idx0 = var1, idx1 = var4; idx1 <= var3; idx0 += inc3, idx1 += inc2 */
+        0x13e01010, /*   DRD1A: var4 = var2; FN=0 MORE init=31 WS=0 RS=0 */
+        0xb880025b, /*   LCD: idx2 = *idx1, idx3 = var0; idx2 < var9; idx2 += inc3, idx3 += inc3 */
+        0x10001308, /*     DRD1A: var4 = idx1; FN=0 MORE init=0 WS=0 RS=0 */
+        0x60140002, /*     DRD2A: EU0=0 EU1=0 EU2=0 EU3=2 EXT init=0 WS=2 RS=2 */
+        0x0cccfcca, /*     DRD2B1: *idx3 = EU3(); EU3(*idx3,var10)  */
+        0xd9190240, /*   LCDEXT: idx2 = idx2; idx2 > var9; idx2 += inc0 */
+        0xb8c5e009, /*   LCD: idx3 = *(idx1 + var00000015); ; idx3 += inc1 */
+        0x07fecf80, /*     DRD1A: *idx3 = *idx0; FN=0 INT init=31 WS=3 RS=3 */
+        0x99190024, /*   LCD: idx2 = idx2; idx2 once var0; idx2 += inc4 */
+        0x60000005, /*     DRD2A: EU0=0 EU1=0 EU2=0 EU3=5 EXT init=0 WS=0 RS=0 */
+        0x0c4cf889, /*     DRD2B1: *idx1 = EU3(); EU3(idx2,var9)  */
+        0x000001f8, /*   NOP */
+        /* VAR[9]-VAR[10] */
+        0x40000000,
+        0x7fff7fff,
+        /* INC[0]-INC[3] */
+        0x40000000,
+        0xe0000000,
+        0xa0000008,
+        0x20000000,
+};
diff --git a/arch/powerpc/sysdev/bestcomm/bcom_gen_bd_tx_task.c b/arch/powerpc/sysdev/bestcomm/bcom_gen_bd_tx_task.c
new file mode 100644
index 000000000000..c605aa42ecbb
--- /dev/null
+++ b/arch/powerpc/sysdev/bestcomm/bcom_gen_bd_tx_task.c
@@ -0,0 +1,69 @@
+/*
+ * Bestcomm GenBD TX task microcode
+ *
+ * Copyright (C) 2006 AppSpec Computer Technologies Corp.
+ *                    Jeff Gibbons <jeff.gibbons@appspec.com>
+ * Copyright (c) 2004 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.
+ *
+ * Based on BestCommAPI-2.2/code_dma/image_rtos1/dma_image.hex
+ * on Tue Mar 4 10:14:12 2006 GMT
+ *
+ */
+#include <asm/types.h>
+/*
+ * The header consists of the following fields:
+ *      u32     magic;
+ *      u8      desc_size;
+ *      u8      var_size;
+ *      u8      inc_size;
+ *      u8      first_var;
+ *      u8      reserved[8];
+ *
+ * The size fields contain the number of 32-bit words.
+ */
+u32 bcom_gen_bd_tx_task[] = {
+        /* header */
+        0x4243544b,
+        0x0f040609,
+        0x00000000,
+        0x00000000,
+        /* Task descriptors */
+        0x800220e3, /* LCD: idx0 = var0, idx1 = var4; idx1 <= var3; idx0 += inc4, idx1 += inc3 */
+        0x13e01010, /*   DRD1A: var4 = var2; FN=0 MORE init=31 WS=0 RS=0 */
+        0xb8808264, /*   LCD: idx2 = *idx1, idx3 = var1; idx2 < var9; idx2 += inc4, idx3 += inc4 */
+        0x10001308, /*     DRD1A: var4 = idx1; FN=0 MORE init=0 WS=0 RS=0 */
+        0x60140002, /*     DRD2A: EU0=0 EU1=0 EU2=0 EU3=2 EXT init=0 WS=2 RS=2 */
+        0x0cccfcca, /*     DRD2B1: *idx3 = EU3(); EU3(*idx3,var10)  */
+        0xd9190300, /*   LCDEXT: idx2 = idx2; idx2 > var12; idx2 += inc0 */
+        0xb8c5e009, /*   LCD: idx3 = *(idx1 + var00000015); ; idx3 += inc1 */
+        0x03fec398, /*     DRD1A: *idx0 = *idx3; FN=0 init=31 WS=3 RS=3 */
+        0x9919826a, /*   LCD: idx2 = idx2, idx3 = idx3; idx2 > var9; idx2 += inc5, idx3 += inc2 */
+        0x0feac398, /*     DRD1A: *idx0 = *idx3; FN=0 TFD INT init=31 WS=1 RS=1 */
+        0x99190036, /*   LCD: idx2 = idx2; idx2 once var0; idx2 += inc6 */
+        0x60000005, /*     DRD2A: EU0=0 EU1=0 EU2=0 EU3=5 EXT init=0 WS=0 RS=0 */
+        0x0c4cf889, /*     DRD2B1: *idx1 = EU3(); EU3(idx2,var9)  */
+        0x000001f8, /*   NOP */
+        /* VAR[9]-VAR[12] */
+        0x40000000,
+        0x7fff7fff,
+        0x00000000,
+        0x40000004,
+        /* INC[0]-INC[5] */
+        0x40000000,
+        0xe0000000,
+        0xe0000000,
+        0xa0000008,
+        0x20000000,
+        0x4000ffff,
+};
diff --git a/arch/powerpc/sysdev/bestcomm/bestcomm.c b/arch/powerpc/sysdev/bestcomm/bestcomm.c
new file mode 100644
index 000000000000..48492a83e5a7
--- /dev/null
+++ b/arch/powerpc/sysdev/bestcomm/bestcomm.c
@@ -0,0 +1,528 @@
+/*
+ * Driver for MPC52xx processor BestComm peripheral controller
+ *
+ *
+ * Copyright (C) 2006-2007 Sylvain Munaut <tnt@246tNt.com>
+ * Copyright (C) 2005      Varma Electronics Oy,
+ *                         ( by Andrey Volkov <avolkov@varma-el.com> )
+ * Copyright (C) 2003-2004 MontaVista, Software, Inc.
+ *                         ( by Dale Farnsworth <dfarnsworth@mvista.com> )
+ *
+ * This file is licensed under the terms of the GNU General Public License
+ * version 2. This program is licensed "as is" without any warranty of any
+ * kind, whether express or implied.
+ */
+#include <linux/module.h>
+#include <linux/kernel.h>
+#include <linux/slab.h>
+#include <linux/of.h>
+#include <linux/of_device.h>
+#include <linux/of_platform.h>
+#include <asm/io.h>
+#include <asm/irq.h>
+#include <asm/mpc52xx.h>
+#include "sram.h"
+#include "bestcomm_priv.h"
+#include "bestcomm.h"
+#define DRIVER_NAME "bestcomm-core"
+struct bcom_engine *bcom_eng = NULL;
+EXPORT_SYMBOL_GPL(bcom_eng);    /* needed for inline functions */
+/* ======================================================================== */
+/* Public and private API                                                   */
+/* ======================================================================== */
+/* Private API */
+struct bcom_task *
+bcom_task_alloc(int bd_count, int bd_size, int priv_size)
+{
+        int i, tasknum = -1;
+        struct bcom_task *tsk;
+        /* Get and reserve a task num */
+        spin_lock(&bcom_eng->lock);
+        for (i=0; i<BCOM_MAX_TASKS; i++)
+                if (!bcom_eng->tdt[i].stop) {   /* we use stop as a marker */
+                        bcom_eng->tdt[i].stop = 0xfffffffful; /* dummy addr */
+                        tasknum = i;
+                        break;
+                }
+        spin_unlock(&bcom_eng->lock);
+        if (tasknum < 0)
+                return NULL;
+        /* Allocate our structure */
+        tsk = kzalloc(sizeof(struct bcom_task) + priv_size, GFP_KERNEL);
+        if (!tsk)
+                goto error;
+        tsk->tasknum = tasknum;
+        if (priv_size)
+                tsk->priv = (void*)tsk + sizeof(struct bcom_task);
+        /* Get IRQ of that task */
+        tsk->irq = irq_of_parse_and_map(bcom_eng->ofnode, tsk->tasknum);
+        if (tsk->irq == NO_IRQ)
+                goto error;
+        /* Init the BDs, if needed */
+        if (bd_count) {
+                tsk->cookie = kmalloc(sizeof(void*) * bd_count, GFP_KERNEL);
+                if (!tsk->cookie)
+                        goto error;
+                tsk->bd = bcom_sram_alloc(bd_count * bd_size, 4, &tsk->bd_pa);
+                if (!tsk->bd)
+                        goto error;
+                memset(tsk->bd, 0x00, bd_count * bd_size);
+                tsk->num_bd = bd_count;
+                tsk->bd_size = bd_size;
+        }
+        return tsk;
+error:
+        if (tsk) {
+                if (tsk->irq != NO_IRQ)
+                        irq_dispose_mapping(tsk->irq);
+                bcom_sram_free(tsk->bd);
+                kfree(tsk->cookie);
+                kfree(tsk);
+        }
+        bcom_eng->tdt[tasknum].stop = 0;
+        return NULL;
+}
+EXPORT_SYMBOL_GPL(bcom_task_alloc);
+void
+bcom_task_free(struct bcom_task *tsk)
+{
+        /* Stop the task */
+        bcom_disable_task(tsk->tasknum);
+        /* Clear TDT */
+        bcom_eng->tdt[tsk->tasknum].start = 0;
+        bcom_eng->tdt[tsk->tasknum].stop  = 0;
+        /* Free everything */
+        irq_dispose_mapping(tsk->irq);
+        bcom_sram_free(tsk->bd);
+        kfree(tsk->cookie);
+        kfree(tsk);
+}
+EXPORT_SYMBOL_GPL(bcom_task_free);
+int
+bcom_load_image(int task, u32 *task_image)
+{
+        struct bcom_task_header *hdr = (struct bcom_task_header *)task_image;
+        struct bcom_tdt *tdt;
+        u32 *desc, *var, *inc;
+        u32 *desc_src, *var_src, *inc_src;
+        /* Safety checks */
+        if (hdr->magic != BCOM_TASK_MAGIC) {
+                printk(KERN_ERR DRIVER_NAME
+                        ": Trying to load invalid microcode\n");
+                return -EINVAL;
+        }
+        if ((task < 0) || (task >= BCOM_MAX_TASKS)) {
+                printk(KERN_ERR DRIVER_NAME
+                        ": Trying to load invalid task %d\n", task);
+                return -EINVAL;
+        }
+        /* Initial load or reload */
+        tdt = &bcom_eng->tdt[task];
+        if (tdt->start) {
+                desc = bcom_task_desc(task);
+                if (hdr->desc_size != bcom_task_num_descs(task)) {
+                        printk(KERN_ERR DRIVER_NAME
+                                ": Trying to reload wrong task image "
+                                "(%d size %d/%d)!\n",
+                                task,
+                                hdr->desc_size,
+                                bcom_task_num_descs(task));
+                        return -EINVAL;
+                }
+        } else {
+                phys_addr_t start_pa;
+                desc = bcom_sram_alloc(hdr->desc_size * sizeof(u32), 4, &start_pa);
+                if (!desc)
+                        return -ENOMEM;
+                tdt->start = start_pa;
+                tdt->stop = start_pa + ((hdr->desc_size-1) * sizeof(u32));
+        }
+        var = bcom_task_var(task);
+        inc = bcom_task_inc(task);
+        /* Clear & copy */
+        memset(var, 0x00, BCOM_VAR_SIZE);
+        memset(inc, 0x00, BCOM_INC_SIZE);
+        desc_src = (u32 *)(hdr + 1);
+        var_src = desc_src + hdr->desc_size;
+        inc_src = var_src + hdr->var_size;
+        memcpy(desc, desc_src, hdr->desc_size * sizeof(u32));
+        memcpy(var + hdr->first_var, var_src, hdr->var_size * sizeof(u32));
+        memcpy(inc, inc_src, hdr->inc_size * sizeof(u32));
+        return 0;
+}
+EXPORT_SYMBOL_GPL(bcom_load_image);
+void
+bcom_set_initiator(int task, int initiator)
+{
+        int i;
+        int num_descs;
+        u32 *desc;
+        int next_drd_has_initiator;
+        bcom_set_tcr_initiator(task, initiator);
+        /* Just setting tcr is apparently not enough due to some problem */
+        /* with it. So we just go thru all the microcode and replace in  */
+        /* the DRD directly */
+        desc = bcom_task_desc(task);
+        next_drd_has_initiator = 1;
+        num_descs = bcom_task_num_descs(task);
+        for (i=0; i<num_descs; i++, desc++) {
+                if (!bcom_desc_is_drd(*desc))
+                        continue;
+                if (next_drd_has_initiator)
+                        if (bcom_desc_initiator(*desc) != BCOM_INITIATOR_ALWAYS)
+                                bcom_set_desc_initiator(desc, initiator);
+                next_drd_has_initiator = !bcom_drd_is_extended(*desc);
+        }
+}
+EXPORT_SYMBOL_GPL(bcom_set_initiator);
+/* Public API */
+void
+bcom_enable(struct bcom_task *tsk)
+{
+        bcom_enable_task(tsk->tasknum);
+}
+EXPORT_SYMBOL_GPL(bcom_enable);
+void
+bcom_disable(struct bcom_task *tsk)
+{
+        bcom_disable_task(tsk->tasknum);
+}
+EXPORT_SYMBOL_GPL(bcom_disable);
+/* ======================================================================== */
+/* Engine init/cleanup                                                      */
+/* ======================================================================== */
+/* Function Descriptor table */
+/* this will need to be updated if Freescale changes their task code FDT */
+static u32 fdt_ops[] = {
+        0xa0045670,     /* FDT[48] - load_acc()   */
+        0x80045670,     /* FDT[49] - unload_acc() */
+        0x21800000,     /* FDT[50] - and()        */
+        0x21e00000,     /* FDT[51] - or()         */
+        0x21500000,     /* FDT[52] - xor()        */
+        0x21400000,     /* FDT[53] - andn()       */
+        0x21500000,     /* FDT[54] - not()        */
+        0x20400000,     /* FDT[55] - add()        */
+        0x20500000,     /* FDT[56] - sub()        */
+        0x20800000,     /* FDT[57] - lsh()        */
+        0x20a00000,     /* FDT[58] - rsh()        */
+        0xc0170000,     /* FDT[59] - crc8()       */
+        0xc0145670,     /* FDT[60] - crc16()      */
+        0xc0345670,     /* FDT[61] - crc32()      */
+        0xa0076540,     /* FDT[62] - endian32()   */
+        0xa0000760,     /* FDT[63] - endian16()   */
+};
+static int __devinit
+bcom_engine_init(void)
+{
+        int task;
+        phys_addr_t tdt_pa, ctx_pa, var_pa, fdt_pa;
+        unsigned int tdt_size, ctx_size, var_size, fdt_size;
+        /* Allocate & clear SRAM zones for FDT, TDTs, contexts and vars/incs */
+        tdt_size = BCOM_MAX_TASKS * sizeof(struct bcom_tdt);
+        ctx_size = BCOM_MAX_TASKS * BCOM_CTX_SIZE;
+        var_size = BCOM_MAX_TASKS * (BCOM_VAR_SIZE + BCOM_INC_SIZE);
+        fdt_size = BCOM_FDT_SIZE;
+        bcom_eng->tdt = bcom_sram_alloc(tdt_size, sizeof(u32), &tdt_pa);
+        bcom_eng->ctx = bcom_sram_alloc(ctx_size, BCOM_CTX_ALIGN, &ctx_pa);
+        bcom_eng->var = bcom_sram_alloc(var_size, BCOM_VAR_ALIGN, &var_pa);
+        bcom_eng->fdt = bcom_sram_alloc(fdt_size, BCOM_FDT_ALIGN, &fdt_pa);
+        if (!bcom_eng->tdt || !bcom_eng->ctx || !bcom_eng->var || !bcom_eng->fdt) {
+                printk(KERN_ERR "DMA: SRAM alloc failed in engine init !\n");
+                bcom_sram_free(bcom_eng->tdt);
+                bcom_sram_free(bcom_eng->ctx);
+                bcom_sram_free(bcom_eng->var);
+                bcom_sram_free(bcom_eng->fdt);
+                return -ENOMEM;
+        }
+        memset(bcom_eng->tdt, 0x00, tdt_size);
+        memset(bcom_eng->ctx, 0x00, ctx_size);
+        memset(bcom_eng->var, 0x00, var_size);
+        memset(bcom_eng->fdt, 0x00, fdt_size);
+        /* Copy the FDT for the EU#3 */
+        memcpy(&bcom_eng->fdt[48], fdt_ops, sizeof(fdt_ops));
+        /* Initialize Task base structure */
+        for (task=0; task<BCOM_MAX_TASKS; task++)
+        {
+                out_be16(&bcom_eng->regs->tcr[task], 0);
+                out_8(&bcom_eng->regs->ipr[task], 0);
+                bcom_eng->tdt[task].context     = ctx_pa;
+                bcom_eng->tdt[task].var = var_pa;
+                bcom_eng->tdt[task].fdt = fdt_pa;
+                var_pa += BCOM_VAR_SIZE + BCOM_INC_SIZE;
+                ctx_pa += BCOM_CTX_SIZE;
+        }
+        out_be32(&bcom_eng->regs->taskBar, tdt_pa);
+        /* Init 'always' initiator */
+        out_8(&bcom_eng->regs->ipr[BCOM_INITIATOR_ALWAYS], BCOM_IPR_ALWAYS);
+        /* Disable COMM Bus Prefetch, apparently it's not reliable yet */
+        /* FIXME: This should be done on 5200 and not 5200B ... */
+        out_be16(&bcom_eng->regs->PtdCntrl, in_be16(&bcom_eng->regs->PtdCntrl) | 1);
+        /* Init lock */
+        spin_lock_init(&bcom_eng->lock);
+        return 0;
+}
+static void
+bcom_engine_cleanup(void)
+{
+        int task;
+        /* Stop all tasks */
+        for (task=0; task<BCOM_MAX_TASKS; task++)
+        {
+                out_be16(&bcom_eng->regs->tcr[task], 0);
+                out_8(&bcom_eng->regs->ipr[task], 0);
+        }
+        out_be32(&bcom_eng->regs->taskBar, 0ul);
+        /* Release the SRAM zones */
+        bcom_sram_free(bcom_eng->tdt);
+        bcom_sram_free(bcom_eng->ctx);
+        bcom_sram_free(bcom_eng->var);
+        bcom_sram_free(bcom_eng->fdt);
+}
+/* ======================================================================== */
+/* OF platform driver                                                       */
+/* ======================================================================== */
+static int __devinit
+mpc52xx_bcom_probe(struct of_device *op, const struct of_device_id *match)
+{
+        struct device_node *ofn_sram;
+        struct resource res_bcom;
+        int rv;
+        /* Inform user we're ok so far */
+        printk(KERN_INFO "DMA: MPC52xx BestComm driver\n");
+        /* Get the bestcomm node */
+        of_node_get(op->node);
+        /* Prepare SRAM */
+        ofn_sram = of_find_compatible_node(NULL, "sram", "mpc5200-sram");
+        if (!ofn_sram) {
+                printk(KERN_ERR DRIVER_NAME ": "
+                        "No SRAM found in device tree\n");
+                rv = -ENODEV;
+                goto error_ofput;
+        }
+        rv = bcom_sram_init(ofn_sram, DRIVER_NAME);
+        of_node_put(ofn_sram);
+        if (rv) {
+                printk(KERN_ERR DRIVER_NAME ": "
+                        "Error in SRAM init\n");
+                goto error_ofput;
+        }
+        /* Get a clean struct */
+        bcom_eng = kzalloc(sizeof(struct bcom_engine), GFP_KERNEL);
+        if (!bcom_eng) {
+                printk(KERN_ERR DRIVER_NAME ": "
+                        "Can't allocate state structure\n");
+                rv = -ENOMEM;
+                goto error_sramclean;
+        }
+        /* Save the node */
+        bcom_eng->ofnode = op->node;
+        /* Get, reserve & map io */
+        if (of_address_to_resource(op->node, 0, &res_bcom)) {
+                printk(KERN_ERR DRIVER_NAME ": "
+                        "Can't get resource\n");
+                rv = -EINVAL;
+                goto error_sramclean;
+        }
+        if (!request_mem_region(res_bcom.start, sizeof(struct mpc52xx_sdma),
+                                DRIVER_NAME)) {
+                printk(KERN_ERR DRIVER_NAME ": "
+                        "Can't request registers region\n");
+                rv = -EBUSY;
+                goto error_sramclean;
+        }
+        bcom_eng->regs_base = res_bcom.start;
+        bcom_eng->regs = ioremap(res_bcom.start, sizeof(struct mpc52xx_sdma));
+        if (!bcom_eng->regs) {
+                printk(KERN_ERR DRIVER_NAME ": "
+                        "Can't map registers\n");
+                rv = -ENOMEM;
+                goto error_release;
+        }
+        /* Now, do the real init */
+        rv = bcom_engine_init();
+        if (rv)
+                goto error_unmap;
+        /* Done ! */
+        printk(KERN_INFO "DMA: MPC52xx BestComm engine @%08lx ok !\n",
+                bcom_eng->regs_base);
+        return 0;
+        /* Error path */
+error_unmap:
+        iounmap(bcom_eng->regs);
+error_release:
+        release_mem_region(res_bcom.start, sizeof(struct mpc52xx_sdma));
+error_sramclean:
+        kfree(bcom_eng);
+        bcom_sram_cleanup();
+error_ofput:
+        of_node_put(op->node);
+        printk(KERN_ERR "DMA: MPC52xx BestComm init failed !\n");
+        return rv;
+}
+static int
+mpc52xx_bcom_remove(struct of_device *op)
+{
+        /* Clean up the engine */
+        bcom_engine_cleanup();
+        /* Cleanup SRAM */
+        bcom_sram_cleanup();
+        /* Release regs */
+        iounmap(bcom_eng->regs);
+        release_mem_region(bcom_eng->regs_base, sizeof(struct mpc52xx_sdma));
+        /* Release the node */
+        of_node_put(bcom_eng->ofnode);
+        /* Release memory */
+        kfree(bcom_eng);
+        bcom_eng = NULL;
+        return 0;
+}
+static struct of_device_id mpc52xx_bcom_of_match[] = {
+        {
+                .type           = "dma-controller",
+                .compatible     = "mpc5200-bestcomm",
+        },
+        {},
+};
+MODULE_DEVICE_TABLE(of, mpc52xx_bcom_of_match);
+static struct of_platform_driver mpc52xx_bcom_of_platform_driver = {
+        .owner          = THIS_MODULE,
+        .name           = DRIVER_NAME,
+        .match_table    = mpc52xx_bcom_of_match,
+        .probe          = mpc52xx_bcom_probe,
+        .remove         = mpc52xx_bcom_remove,
+        .driver         = {
+                .name   = DRIVER_NAME,
+                .owner  = THIS_MODULE,
+        },
+};
+/* ======================================================================== */
+/* Module                                                                   */
+/* ======================================================================== */
+static int __init
+mpc52xx_bcom_init(void)
+{
+        return of_register_platform_driver(&mpc52xx_bcom_of_platform_driver);
+}
+static void __exit
+mpc52xx_bcom_exit(void)
+{
+        of_unregister_platform_driver(&mpc52xx_bcom_of_platform_driver);
+}
+/* If we're not a module, we must make sure everything is setup before  */
+/* anyone tries to use us ... that's why we use subsys_initcall instead */
+/* of module_init. */
+subsys_initcall(mpc52xx_bcom_init);
+module_exit(mpc52xx_bcom_exit);
+MODULE_DESCRIPTION("Freescale MPC52xx BestComm DMA");
+MODULE_AUTHOR("Sylvain Munaut <tnt@246tNt.com>");
+MODULE_AUTHOR("Andrey Volkov <avolkov@varma-el.com>");
+MODULE_AUTHOR("Dale Farnsworth <dfarnsworth@mvista.com>");
+MODULE_LICENSE("GPL v2");
diff --git a/arch/powerpc/sysdev/bestcomm/bestcomm.h b/arch/powerpc/sysdev/bestcomm/bestcomm.h
new file mode 100644
index 000000000000..e802cb4eb69a
--- /dev/null
+++ b/arch/powerpc/sysdev/bestcomm/bestcomm.h
@@ -0,0 +1,190 @@
+/*
+ * Public header for the MPC52xx processor BestComm driver
+ *
+ *
+ * Copyright (C) 2006      Sylvain Munaut <tnt@246tNt.com>
+ * Copyright (C) 2005      Varma Electronics Oy,
+ *                         ( by Andrey Volkov <avolkov@varma-el.com> )
+ * Copyright (C) 2003-2004 MontaVista, Software, Inc.
+ *                         ( by Dale Farnsworth <dfarnsworth@mvista.com> )
+ *
+ * This file is licensed under the terms of the GNU General Public License
+ * version 2. This program is licensed "as is" without any warranty of any
+ * kind, whether express or implied.
+ */
+#ifndef __BESTCOMM_H__
+#define __BESTCOMM_H__
+struct bcom_bd; /* defined later on ... */
+/* ======================================================================== */
+/* Generic task managment                                                   */
+/* ======================================================================== */
+/**
+ * struct bcom_task - Structure describing a loaded BestComm task
+ *
+ * This structure is never built by the driver it self. It's built and
+ * filled the intermediate layer of the BestComm API, the task dependent
+ * support code.
+ *
+ * Most likely you don't need to poke around inside this structure. The
+ * fields are exposed in the header just for the sake of inline functions
+ */
+struct bcom_task {
+        unsigned int    tasknum;
+        unsigned int    flags;
+        int             irq;
+        struct bcom_bd  *bd;
+        phys_addr_t     bd_pa;
+        void            **cookie;
+        unsigned short  index;
+        unsigned short  outdex;
+        unsigned int    num_bd;
+        unsigned int    bd_size;
+        void*           priv;
+};
+#define BCOM_FLAGS_NONE         0x00000000ul
+#define BCOM_FLAGS_ENABLE_TASK  (1ul <<  0)
+/**
+ * bcom_enable - Enable a BestComm task
+ * @tsk: The BestComm task structure
+ *
+ * This function makes sure the given task is enabled and can be run
+ * by the BestComm engine as needed
+ */
+extern void bcom_enable(struct bcom_task *tsk);
+/**
+ * bcom_disable - Disable a BestComm task
+ * @tsk: The BestComm task structure
+ *
+ * This function disable a given task, making sure it's not executed
+ * by the BestComm engine.
+ */
+extern void bcom_disable(struct bcom_task *tsk);
+/**
+ * bcom_get_task_irq - Returns the irq number of a BestComm task
+ * @tsk: The BestComm task structure
+ */
+static inline int
+bcom_get_task_irq(struct bcom_task *tsk) {
+        return tsk->irq;
+}
+/* ======================================================================== */
+/* BD based tasks helpers                                                   */
+/* ======================================================================== */
+/**
+ * struct bcom_bd - Structure describing a generic BestComm buffer descriptor
+ * @status: The current status of this buffer. Exact meaning depends on the
+ *          task type
+ * @data: An array of u32 whose meaning depends on the task type.
+ */
+struct bcom_bd {
+        u32     status;
+        u32     data[1];        /* variable, but at least 1 */
+};
+#define BCOM_BD_READY   0x40000000ul
+/** _bcom_next_index - Get next input index.
+ * @tsk: pointer to task structure
+ *
+ * Support function; Device drivers should not call this
+ */
+static inline int
+_bcom_next_index(struct bcom_task *tsk)
+{
+        return ((tsk->index + 1) == tsk->num_bd) ? 0 : tsk->index + 1;
+}
+/** _bcom_next_outdex - Get next output index.
+ * @tsk: pointer to task structure
+ *
+ * Support function; Device drivers should not call this
+ */
+static inline int
+_bcom_next_outdex(struct bcom_task *tsk)
+{
+        return ((tsk->outdex + 1) == tsk->num_bd) ? 0 : tsk->outdex + 1;
+}
+/**
+ * bcom_queue_empty - Checks if a BestComm task BD queue is empty
+ * @tsk: The BestComm task structure
+ */
+static inline int
+bcom_queue_empty(struct bcom_task *tsk)
+{
+        return tsk->index == tsk->outdex;
+}
+/**
+ * bcom_queue_full - Checks if a BestComm task BD queue is full
+ * @tsk: The BestComm task structure
+ */
+static inline int
+bcom_queue_full(struct bcom_task *tsk)
+{
+        return tsk->outdex == _bcom_next_index(tsk);
+}
+/**
+ * bcom_buffer_done - Checks if a BestComm 
+ * @tsk: The BestComm task structure
+ */
+static inline int
+bcom_buffer_done(struct bcom_task *tsk)
+{
+        if (bcom_queue_empty(tsk))
+                return 0;
+        return !(tsk->bd[tsk->outdex].status & BCOM_BD_READY);
+}
+/**
+ * bcom_prepare_next_buffer - clear status of next available buffer.
+ * @tsk: The BestComm task structure
+ *
+ * Returns pointer to next buffer descriptor
+ */
+static inline struct bcom_bd *
+bcom_prepare_next_buffer(struct bcom_task *tsk)
+{
+        tsk->bd[tsk->index].status = 0; /* cleanup last status */
+        return &tsk->bd[tsk->index];
+}
+static inline void
+bcom_submit_next_buffer(struct bcom_task *tsk, void *cookie)
+{
+        tsk->cookie[tsk->index] = cookie;
+        mb();   /* ensure the bd is really up-to-date */
+        tsk->bd[tsk->index].status |= BCOM_BD_READY;
+        tsk->index = _bcom_next_index(tsk);
+        if (tsk->flags & BCOM_FLAGS_ENABLE_TASK)
+                bcom_enable(tsk);
+}
+static inline void *
+bcom_retrieve_buffer(struct bcom_task *tsk, u32 *p_status, struct bcom_bd **p_bd)
+{
+        void *cookie = tsk->cookie[tsk->outdex];
+        if (p_status)
+                *p_status = tsk->bd[tsk->outdex].status;
+        if (p_bd)
+                *p_bd = &tsk->bd[tsk->outdex];
+        tsk->outdex = _bcom_next_outdex(tsk);
+        return cookie;
+}
+#endif /* __BESTCOMM_H__ */
diff --git a/arch/powerpc/sysdev/bestcomm/bestcomm_priv.h b/arch/powerpc/sysdev/bestcomm/bestcomm_priv.h
new file mode 100644
index 000000000000..866a2915ef2f
--- /dev/null
+++ b/arch/powerpc/sysdev/bestcomm/bestcomm_priv.h
@@ -0,0 +1,334 @@
+/*
+ * Private header for the MPC52xx processor BestComm driver
+ *
+ * By private, we mean that driver should not use it directly. It's meant
+ * to be used by the BestComm engine driver itself and by the intermediate
+ * layer between the core and the drivers.
+ *
+ * Copyright (C) 2006      Sylvain Munaut <tnt@246tNt.com>
+ * Copyright (C) 2005      Varma Electronics Oy,
+ *                         ( by Andrey Volkov <avolkov@varma-el.com> )
+ * Copyright (C) 2003-2004 MontaVista, Software, Inc.
+ *                         ( by Dale Farnsworth <dfarnsworth@mvista.com> )
+ *
+ * This file is licensed under the terms of the GNU General Public License
+ * version 2. This program is licensed "as is" without any warranty of any
+ * kind, whether express or implied.
+ */
+#ifndef __BESTCOMM_PRIV_H__
+#define __BESTCOMM_PRIV_H__
+#include <linux/spinlock.h>
+#include <linux/of.h>
+#include <asm/io.h>
+#include <asm/mpc52xx.h>
+#include "sram.h"
+/* ======================================================================== */
+/* Engine related stuff                                                     */
+/* ======================================================================== */
+/* Zones sizes and needed alignments */
+#define BCOM_MAX_TASKS          16
+#define BCOM_MAX_VAR            24
+#define BCOM_MAX_INC            8
+#define BCOM_MAX_FDT            64
+#define BCOM_MAX_CTX            20
+#define BCOM_CTX_SIZE           (BCOM_MAX_CTX * sizeof(u32))
+#define BCOM_CTX_ALIGN          0x100
+#define BCOM_VAR_SIZE           (BCOM_MAX_VAR * sizeof(u32))
+#define BCOM_INC_SIZE           (BCOM_MAX_INC * sizeof(u32))
+#define BCOM_VAR_ALIGN          0x80
+#define BCOM_FDT_SIZE           (BCOM_MAX_FDT * sizeof(u32))
+#define BCOM_FDT_ALIGN          0x100
+/**
+ * struct bcom_tdt - Task Descriptor Table Entry
+ *
+ */
+struct bcom_tdt {
+        u32 start;
+        u32 stop;
+        u32 var;
+        u32 fdt;
+        u32 exec_status;        /* used internally by BestComm engine */
+        u32 mvtp;               /* used internally by BestComm engine */
+        u32 context;
+        u32 litbase;
+};
+/**
+ * struct bcom_engine
+ *
+ * This holds all info needed globaly to handle the engine
+ */
+struct bcom_engine {
+        struct device_node              *ofnode;
+        struct mpc52xx_sdma __iomem     *regs;
+        phys_addr_t                      regs_base;
+        struct bcom_tdt                 *tdt;
+        u32                             *ctx;
+        u32                             *var;
+        u32                             *fdt;
+        spinlock_t                      lock;
+};
+extern struct bcom_engine *bcom_eng;
+/* ======================================================================== */
+/* Tasks related stuff                                                      */
+/* ======================================================================== */
+/* Tasks image header */
+#define BCOM_TASK_MAGIC         0x4243544B      /* 'BCTK' */
+struct bcom_task_header {
+        u32     magic;
+        u8      desc_size;      /* the size fields     */
+        u8      var_size;       /* are given in number */
+        u8      inc_size;       /* of 32-bits words    */
+        u8      first_var;
+        u8      reserved[8];
+};
+/* Descriptors stucture & co */
+#define BCOM_DESC_NOP           0x000001f8
+#define BCOM_LCD_MASK           0x80000000
+#define BCOM_DRD_EXTENDED       0x40000000
+#define BCOM_DRD_INITIATOR_SHIFT        21
+/* Tasks pragma */
+#define BCOM_PRAGMA_BIT_RSV             7       /* reserved pragma bit */
+#define BCOM_PRAGMA_BIT_PRECISE_INC     6       /* increment 0=when possible, */
+                                                /*           1=iter end */
+#define BCOM_PRAGMA_BIT_RST_ERROR_NO    5       /* don't reset errors on */
+                                                /* task enable */
+#define BCOM_PRAGMA_BIT_PACK            4       /* pack data enable */
+#define BCOM_PRAGMA_BIT_INTEGER         3       /* data alignment */
+                                                /* 0=frac(msb), 1=int(lsb) */
+#define BCOM_PRAGMA_BIT_SPECREAD        2       /* XLB speculative read */
+#define BCOM_PRAGMA_BIT_CW              1       /* write line buffer enable */
+#define BCOM_PRAGMA_BIT_RL              0       /* read line buffer enable */
+        /* Looks like XLB speculative read generates XLB errors when a buffer
+         * is at the end of the physical memory. i.e. when accessing the
+         * lasts words, the engine tries to prefetch the next but there is no
+         * next ...
+         */
+#define BCOM_STD_PRAGMA         ((0 << BCOM_PRAGMA_BIT_RSV)             | \
+                                 (0 << BCOM_PRAGMA_BIT_PRECISE_INC)     | \
+                                 (0 << BCOM_PRAGMA_BIT_RST_ERROR_NO)    | \
+                                 (0 << BCOM_PRAGMA_BIT_PACK)            | \
+                                 (0 << BCOM_PRAGMA_BIT_INTEGER)         | \
+                                 (0 << BCOM_PRAGMA_BIT_SPECREAD)        | \
+                                 (1 << BCOM_PRAGMA_BIT_CW)              | \
+                                 (1 << BCOM_PRAGMA_BIT_RL))
+#define BCOM_PCI_PRAGMA         ((0 << BCOM_PRAGMA_BIT_RSV)             | \
+                                 (0 << BCOM_PRAGMA_BIT_PRECISE_INC)     | \
+                                 (0 << BCOM_PRAGMA_BIT_RST_ERROR_NO)    | \
+                                 (0 << BCOM_PRAGMA_BIT_PACK)            | \
+                                 (1 << BCOM_PRAGMA_BIT_INTEGER)         | \
+                                 (0 << BCOM_PRAGMA_BIT_SPECREAD)        | \
+                                 (1 << BCOM_PRAGMA_BIT_CW)              | \
+                                 (1 << BCOM_PRAGMA_BIT_RL))
+#define BCOM_ATA_PRAGMA         BCOM_STD_PRAGMA
+#define BCOM_CRC16_DP_0_PRAGMA  BCOM_STD_PRAGMA
+#define BCOM_CRC16_DP_1_PRAGMA  BCOM_STD_PRAGMA
+#define BCOM_FEC_RX_BD_PRAGMA   BCOM_STD_PRAGMA
+#define BCOM_FEC_TX_BD_PRAGMA   BCOM_STD_PRAGMA
+#define BCOM_GEN_DP_0_PRAGMA    BCOM_STD_PRAGMA
+#define BCOM_GEN_DP_1_PRAGMA    BCOM_STD_PRAGMA
+#define BCOM_GEN_DP_2_PRAGMA    BCOM_STD_PRAGMA
+#define BCOM_GEN_DP_3_PRAGMA    BCOM_STD_PRAGMA
+#define BCOM_GEN_DP_BD_0_PRAGMA BCOM_STD_PRAGMA
+#define BCOM_GEN_DP_BD_1_PRAGMA BCOM_STD_PRAGMA
+#define BCOM_GEN_RX_BD_PRAGMA   BCOM_STD_PRAGMA
+#define BCOM_GEN_TX_BD_PRAGMA   BCOM_STD_PRAGMA
+#define BCOM_GEN_LPC_PRAGMA     BCOM_STD_PRAGMA
+#define BCOM_PCI_RX_PRAGMA      BCOM_PCI_PRAGMA
+#define BCOM_PCI_TX_PRAGMA      BCOM_PCI_PRAGMA
+/* Initiators number */
+#define BCOM_INITIATOR_ALWAYS    0
+#define BCOM_INITIATOR_SCTMR_0   1
+#define BCOM_INITIATOR_SCTMR_1   2
+#define BCOM_INITIATOR_FEC_RX    3
+#define BCOM_INITIATOR_FEC_TX    4
+#define BCOM_INITIATOR_ATA_RX    5
+#define BCOM_INITIATOR_ATA_TX    6
+#define BCOM_INITIATOR_SCPCI_RX  7
+#define BCOM_INITIATOR_SCPCI_TX  8
+#define BCOM_INITIATOR_PSC3_RX   9
+#define BCOM_INITIATOR_PSC3_TX  10
+#define BCOM_INITIATOR_PSC2_RX  11
+#define BCOM_INITIATOR_PSC2_TX  12
+#define BCOM_INITIATOR_PSC1_RX  13
+#define BCOM_INITIATOR_PSC1_TX  14
+#define BCOM_INITIATOR_SCTMR_2  15
+#define BCOM_INITIATOR_SCLPC    16
+#define BCOM_INITIATOR_PSC5_RX  17
+#define BCOM_INITIATOR_PSC5_TX  18
+#define BCOM_INITIATOR_PSC4_RX  19
+#define BCOM_INITIATOR_PSC4_TX  20
+#define BCOM_INITIATOR_I2C2_RX  21
+#define BCOM_INITIATOR_I2C2_TX  22
+#define BCOM_INITIATOR_I2C1_RX  23
+#define BCOM_INITIATOR_I2C1_TX  24
+#define BCOM_INITIATOR_PSC6_RX  25
+#define BCOM_INITIATOR_PSC6_TX  26
+#define BCOM_INITIATOR_IRDA_RX  25
+#define BCOM_INITIATOR_IRDA_TX  26
+#define BCOM_INITIATOR_SCTMR_3  27
+#define BCOM_INITIATOR_SCTMR_4  28
+#define BCOM_INITIATOR_SCTMR_5  29
+#define BCOM_INITIATOR_SCTMR_6  30
+#define BCOM_INITIATOR_SCTMR_7  31
+/* Initiators priorities */
+#define BCOM_IPR_ALWAYS         7
+#define BCOM_IPR_SCTMR_0        2
+#define BCOM_IPR_SCTMR_1        2
+#define BCOM_IPR_FEC_RX         6
+#define BCOM_IPR_FEC_TX         5
+#define BCOM_IPR_ATA_RX         4
+#define BCOM_IPR_ATA_TX         3
+#define BCOM_IPR_SCPCI_RX       2
+#define BCOM_IPR_SCPCI_TX       2
+#define BCOM_IPR_PSC3_RX        2
+#define BCOM_IPR_PSC3_TX        2
+#define BCOM_IPR_PSC2_RX        2
+#define BCOM_IPR_PSC2_TX        2
+#define BCOM_IPR_PSC1_RX        2
+#define BCOM_IPR_PSC1_TX        2
+#define BCOM_IPR_SCTMR_2        2
+#define BCOM_IPR_SCLPC          2
+#define BCOM_IPR_PSC5_RX        2
+#define BCOM_IPR_PSC5_TX        2
+#define BCOM_IPR_PSC4_RX        2
+#define BCOM_IPR_PSC4_TX        2
+#define BCOM_IPR_I2C2_RX        2
+#define BCOM_IPR_I2C2_TX        2
+#define BCOM_IPR_I2C1_RX        2
+#define BCOM_IPR_I2C1_TX        2
+#define BCOM_IPR_PSC6_RX        2
+#define BCOM_IPR_PSC6_TX        2
+#define BCOM_IPR_IRDA_RX        2
+#define BCOM_IPR_IRDA_TX        2
+#define BCOM_IPR_SCTMR_3        2
+#define BCOM_IPR_SCTMR_4        2
+#define BCOM_IPR_SCTMR_5        2
+#define BCOM_IPR_SCTMR_6        2
+#define BCOM_IPR_SCTMR_7        2
+/* ======================================================================== */
+/* API                                                                      */
+/* ======================================================================== */
+extern struct bcom_task *bcom_task_alloc(int bd_count, int bd_size, int priv_size);
+extern void bcom_task_free(struct bcom_task *tsk);
+extern int bcom_load_image(int task, u32 *task_image);
+extern void bcom_set_initiator(int task, int initiator);
+#define TASK_ENABLE             0x8000
+static inline void
+bcom_enable_task(int task)
+{
+        u16 reg;
+        reg = in_be16(&bcom_eng->regs->tcr[task]);
+        out_be16(&bcom_eng->regs->tcr[task],  reg | TASK_ENABLE);
+}
+static inline void
+bcom_disable_task(int task)
+{
+        u16 reg = in_be16(&bcom_eng->regs->tcr[task]);
+        out_be16(&bcom_eng->regs->tcr[task], reg & ~TASK_ENABLE);
+}
+static inline u32 *
+bcom_task_desc(int task)
+{
+        return bcom_sram_pa2va(bcom_eng->tdt[task].start);
+}
+static inline int
+bcom_task_num_descs(int task)
+{
+        return (bcom_eng->tdt[task].stop - bcom_eng->tdt[task].start)/sizeof(u32) + 1;
+}
+static inline u32 *
+bcom_task_var(int task)
+{
+        return bcom_sram_pa2va(bcom_eng->tdt[task].var);
+}
+static inline u32 *
+bcom_task_inc(int task)
+{
+        return &bcom_task_var(task)[BCOM_MAX_VAR];
+}
+static inline int
+bcom_drd_is_extended(u32 desc)
+{
+        return (desc) & BCOM_DRD_EXTENDED;
+}
+static inline int
+bcom_desc_is_drd(u32 desc)
+{
+        return !(desc & BCOM_LCD_MASK) && desc != BCOM_DESC_NOP;
+}
+static inline int
+bcom_desc_initiator(u32 desc)
+{
+        return (desc >> BCOM_DRD_INITIATOR_SHIFT) & 0x1f;
+}
+static inline void
+bcom_set_desc_initiator(u32 *desc, int initiator)
+{
+        *desc = (*desc & ~(0x1f << BCOM_DRD_INITIATOR_SHIFT)) |
+                        ((initiator & 0x1f) << BCOM_DRD_INITIATOR_SHIFT);
+}
+static inline void
+bcom_set_task_pragma(int task, int pragma)
+{
+        u32 *fdt = &bcom_eng->tdt[task].fdt;
+        *fdt = (*fdt & ~0xff) | pragma;
+}
+static inline void
+bcom_set_task_auto_start(int task, int next_task)
+{
+        u16 __iomem *tcr = &bcom_eng->regs->tcr[task];
+        out_be16(tcr, (in_be16(tcr) & ~0xff) | 0x00c0 | next_task);
+}
+static inline void
+bcom_set_tcr_initiator(int task, int initiator)
+{
+        u16 __iomem *tcr = &bcom_eng->regs->tcr[task];
+        out_be16(tcr, (in_be16(tcr) & ~0x1f00) | ((initiator & 0x1f) << 8));
+}
+#endif /* __BESTCOMM_PRIV_H__ */
diff --git a/arch/powerpc/sysdev/bestcomm/fec.c b/arch/powerpc/sysdev/bestcomm/fec.c
new file mode 100644
index 000000000000..957a988d23ea
--- /dev/null
+++ b/arch/powerpc/sysdev/bestcomm/fec.c
@@ -0,0 +1,270 @@
+/*
+ * Bestcomm FEC tasks driver
+ *
+ *
+ * Copyright (C) 2006-2007 Sylvain Munaut <tnt@246tNt.com>
+ * Copyright (C) 2003-2004 MontaVista, Software, Inc.
+ *                         ( by Dale Farnsworth <dfarnsworth@mvista.com> )
+ *
+ * This file is licensed under the terms of the GNU General Public License
+ * version 2. This program is licensed "as is" without any warranty of any
+ * kind, whether express or implied.
+ */
+#include <linux/kernel.h>
+#include <linux/module.h>
+#include <linux/types.h>
+#include <asm/io.h>
+#include "bestcomm.h"
+#include "bestcomm_priv.h"
+#include "fec.h"
+/* ======================================================================== */
+/* Task image/var/inc                                                       */
+/* ======================================================================== */
+/* fec tasks images */
+extern u32 bcom_fec_rx_task[];
+extern u32 bcom_fec_tx_task[];
+/* rx task vars that need to be set before enabling the task */
+struct bcom_fec_rx_var {
+        u32 enable;             /* (u16*) address of task's control register */
+        u32 fifo;               /* (u32*) address of fec's fifo */
+        u32 bd_base;            /* (struct bcom_bd*) beginning of ring buffer */
+        u32 bd_last;            /* (struct bcom_bd*) end of ring buffer */
+        u32 bd_start;           /* (struct bcom_bd*) current bd */
+        u32 buffer_size;        /* size of receive buffer */
+};
+/* rx task incs that need to be set before enabling the task */
+struct bcom_fec_rx_inc {
+        u16 pad0;
+        s16 incr_bytes;
+        u16 pad1;
+        s16 incr_dst;
+        u16 pad2;
+        s16 incr_dst_ma;
+};
+/* tx task vars that need to be set before enabling the task */
+struct bcom_fec_tx_var {
+        u32 DRD;                /* (u32*) address of self-modified DRD */
+        u32 fifo;               /* (u32*) address of fec's fifo */
+        u32 enable;             /* (u16*) address of task's control register */
+        u32 bd_base;            /* (struct bcom_bd*) beginning of ring buffer */
+        u32 bd_last;            /* (struct bcom_bd*) end of ring buffer */
+        u32 bd_start;           /* (struct bcom_bd*) current bd */
+        u32 buffer_size;        /* set by uCode for each packet */
+};
+/* tx task incs that need to be set before enabling the task */
+struct bcom_fec_tx_inc {
+        u16 pad0;
+        s16 incr_bytes;
+        u16 pad1;
+        s16 incr_src;
+        u16 pad2;
+        s16 incr_src_ma;
+};
+/* private structure in the task */
+struct bcom_fec_priv {
+        phys_addr_t     fifo;
+        int             maxbufsize;
+};
+/* ======================================================================== */
+/* Task support code                                                        */
+/* ======================================================================== */
+struct bcom_task *
+bcom_fec_rx_init(int queue_len, phys_addr_t fifo, int maxbufsize)
+{
+        struct bcom_task *tsk;
+        struct bcom_fec_priv *priv;
+        tsk = bcom_task_alloc(queue_len, sizeof(struct bcom_fec_bd),
+                                sizeof(struct bcom_fec_priv));
+        if (!tsk)
+                return NULL;
+        tsk->flags = BCOM_FLAGS_NONE;
+        priv = tsk->priv;
+        priv->fifo = fifo;
+        priv->maxbufsize = maxbufsize;
+        if (bcom_fec_rx_reset(tsk)) {
+                bcom_task_free(tsk);
+                return NULL;
+        }
+        return tsk;
+}
+EXPORT_SYMBOL_GPL(bcom_fec_rx_init);
+int
+bcom_fec_rx_reset(struct bcom_task *tsk)
+{
+        struct bcom_fec_priv *priv = tsk->priv;
+        struct bcom_fec_rx_var *var;
+        struct bcom_fec_rx_inc *inc;
+        /* Shutdown the task */
+        bcom_disable_task(tsk->tasknum);
+        /* Reset the microcode */
+        var = (struct bcom_fec_rx_var *) bcom_task_var(tsk->tasknum);
+        inc = (struct bcom_fec_rx_inc *) bcom_task_inc(tsk->tasknum);
+        if (bcom_load_image(tsk->tasknum, bcom_fec_rx_task))
+                return -1;
+        var->enable     = bcom_eng->regs_base +
+                                offsetof(struct mpc52xx_sdma, tcr[tsk->tasknum]);
+        var->fifo       = (u32) priv->fifo;
+        var->bd_base    = tsk->bd_pa;
+        var->bd_last    = tsk->bd_pa + ((tsk->num_bd-1) * tsk->bd_size);
+        var->bd_start   = tsk->bd_pa;
+        var->buffer_size = priv->maxbufsize;
+        inc->incr_bytes = -(s16)sizeof(u32);    /* These should be in the   */
+        inc->incr_dst   = sizeof(u32);          /* task image, but we stick */
+        inc->incr_dst_ma= sizeof(u8);           /* to the official ones     */
+        /* Reset the BDs */
+        tsk->index = 0;
+        tsk->outdex = 0;
+        memset(tsk->bd, 0x00, tsk->num_bd * tsk->bd_size);
+        /* Configure some stuff */
+        bcom_set_task_pragma(tsk->tasknum, BCOM_FEC_RX_BD_PRAGMA);
+        bcom_set_task_auto_start(tsk->tasknum, tsk->tasknum);
+        out_8(&bcom_eng->regs->ipr[BCOM_INITIATOR_FEC_RX], BCOM_IPR_FEC_RX);
+        out_be32(&bcom_eng->regs->IntPend, 1<<tsk->tasknum);    /* Clear ints */
+        return 0;
+}
+EXPORT_SYMBOL_GPL(bcom_fec_rx_reset);
+void
+bcom_fec_rx_release(struct bcom_task *tsk)
+{
+        /* Nothing special for the FEC tasks */
+        bcom_task_free(tsk);
+}
+EXPORT_SYMBOL_GPL(bcom_fec_rx_release);
+        /* Return 2nd to last DRD */
+        /* This is an ugly hack, but at least it's only done
+           once at initialization */
+static u32 *self_modified_drd(int tasknum)
+{
+        u32 *desc;
+        int num_descs;
+        int drd_count;
+        int i;
+        num_descs = bcom_task_num_descs(tasknum);
+        desc = bcom_task_desc(tasknum) + num_descs - 1;
+        drd_count = 0;
+        for (i=0; i<num_descs; i++, desc--)
+                if (bcom_desc_is_drd(*desc) && ++drd_count == 3)
+                        break;
+        return desc;
+}
+struct bcom_task *
+bcom_fec_tx_init(int queue_len, phys_addr_t fifo)
+{
+        struct bcom_task *tsk;
+        struct bcom_fec_priv *priv;
+        tsk = bcom_task_alloc(queue_len, sizeof(struct bcom_fec_bd),
+                                sizeof(struct bcom_fec_priv));
+        if (!tsk)
+                return NULL;
+        tsk->flags = BCOM_FLAGS_ENABLE_TASK;
+        priv = tsk->priv;
+        priv->fifo = fifo;
+        if (bcom_fec_tx_reset(tsk)) {
+                bcom_task_free(tsk);
+                return NULL;
+        }
+        return tsk;
+}
+EXPORT_SYMBOL_GPL(bcom_fec_tx_init);
+int
+bcom_fec_tx_reset(struct bcom_task *tsk)
+{
+        struct bcom_fec_priv *priv = tsk->priv;
+        struct bcom_fec_tx_var *var;
+        struct bcom_fec_tx_inc *inc;
+        /* Shutdown the task */
+        bcom_disable_task(tsk->tasknum);
+        /* Reset the microcode */
+        var = (struct bcom_fec_tx_var *) bcom_task_var(tsk->tasknum);
+        inc = (struct bcom_fec_tx_inc *) bcom_task_inc(tsk->tasknum);
+        if (bcom_load_image(tsk->tasknum, bcom_fec_tx_task))
+                return -1;
+        var->enable     = bcom_eng->regs_base +
+                                offsetof(struct mpc52xx_sdma, tcr[tsk->tasknum]);
+        var->fifo       = (u32) priv->fifo;
+        var->DRD        = bcom_sram_va2pa(self_modified_drd(tsk->tasknum));
+        var->bd_base    = tsk->bd_pa;
+        var->bd_last    = tsk->bd_pa + ((tsk->num_bd-1) * tsk->bd_size);
+        var->bd_start   = tsk->bd_pa;
+        inc->incr_bytes = -(s16)sizeof(u32);    /* These should be in the   */
+        inc->incr_src   = sizeof(u32);          /* task image, but we stick */
+        inc->incr_src_ma= sizeof(u8);           /* to the official ones     */
+        /* Reset the BDs */
+        tsk->index = 0;
+        tsk->outdex = 0;
+        memset(tsk->bd, 0x00, tsk->num_bd * tsk->bd_size);
+        /* Configure some stuff */
+        bcom_set_task_pragma(tsk->tasknum, BCOM_FEC_TX_BD_PRAGMA);
+        bcom_set_task_auto_start(tsk->tasknum, tsk->tasknum);
+        out_8(&bcom_eng->regs->ipr[BCOM_INITIATOR_FEC_TX], BCOM_IPR_FEC_TX);
+        out_be32(&bcom_eng->regs->IntPend, 1<<tsk->tasknum);    /* Clear ints */
+        return 0;
+}
+EXPORT_SYMBOL_GPL(bcom_fec_tx_reset);
+void
+bcom_fec_tx_release(struct bcom_task *tsk)
+{
+        /* Nothing special for the FEC tasks */
+        bcom_task_free(tsk);
+}
+EXPORT_SYMBOL_GPL(bcom_fec_tx_release);
+MODULE_DESCRIPTION("BestComm FEC tasks driver");
+MODULE_AUTHOR("Dale Farnsworth <dfarnsworth@mvista.com>");
+MODULE_LICENSE("GPL v2");
diff --git a/arch/powerpc/sysdev/bestcomm/fec.h b/arch/powerpc/sysdev/bestcomm/fec.h
new file mode 100644
index 000000000000..ee565d94d503
--- /dev/null
+++ b/arch/powerpc/sysdev/bestcomm/fec.h
@@ -0,0 +1,61 @@
+/*
+ * Header for Bestcomm FEC tasks driver
+ *
+ *
+ * Copyright (C) 2006-2007 Sylvain Munaut <tnt@246tNt.com>
+ * Copyright (C) 2003-2004 MontaVista, Software, Inc.
+ *                         ( by Dale Farnsworth <dfarnsworth@mvista.com> )
+ *
+ * This file is licensed under the terms of the GNU General Public License
+ * version 2. This program is licensed "as is" without any warranty of any
+ * kind, whether express or implied.
+ */
+#ifndef __BESTCOMM_FEC_H__
+#define __BESTCOMM_FEC_H__
+struct bcom_fec_bd {
+        u32     status;
+        u32     skb_pa;
+};
+#define BCOM_FEC_TX_BD_TFD      0x08000000ul    /* transmit frame done */
+#define BCOM_FEC_TX_BD_TC       0x04000000ul    /* transmit CRC */
+#define BCOM_FEC_TX_BD_ABC      0x02000000ul    /* append bad CRC */
+#define BCOM_FEC_RX_BD_L        0x08000000ul    /* buffer is last in frame */
+#define BCOM_FEC_RX_BD_BC       0x00800000ul    /* DA is broadcast */
+#define BCOM_FEC_RX_BD_MC       0x00400000ul    /* DA is multicast and not broadcast */
+#define BCOM_FEC_RX_BD_LG       0x00200000ul    /* Rx frame length violation */
+#define BCOM_FEC_RX_BD_NO       0x00100000ul    /* Rx non-octet aligned frame */
+#define BCOM_FEC_RX_BD_CR       0x00040000ul    /* Rx CRC error */
+#define BCOM_FEC_RX_BD_OV       0x00020000ul    /* overrun */
+#define BCOM_FEC_RX_BD_TR       0x00010000ul    /* Rx frame truncated */
+#define BCOM_FEC_RX_BD_LEN_MASK 0x000007fful    /* mask for length of received frame */
+#define BCOM_FEC_RX_BD_ERRORS   (BCOM_FEC_RX_BD_LG | BCOM_FEC_RX_BD_NO | \
+                BCOM_FEC_RX_BD_CR | BCOM_FEC_RX_BD_OV | BCOM_FEC_RX_BD_TR)
+extern struct bcom_task *
+bcom_fec_rx_init(int queue_len, phys_addr_t fifo, int maxbufsize);
+extern int
+bcom_fec_rx_reset(struct bcom_task *tsk);
+extern void
+bcom_fec_rx_release(struct bcom_task *tsk);
+extern struct bcom_task *
+bcom_fec_tx_init(int queue_len, phys_addr_t fifo);
+extern int
+bcom_fec_tx_reset(struct bcom_task *tsk);
+extern void
+bcom_fec_tx_release(struct bcom_task *tsk);
+#endif /* __BESTCOMM_FEC_H__ */
diff --git a/arch/powerpc/sysdev/bestcomm/gen_bd.c b/arch/powerpc/sysdev/bestcomm/gen_bd.c
new file mode 100644
index 000000000000..8d33eafbb3f4
--- /dev/null
+++ b/arch/powerpc/sysdev/bestcomm/gen_bd.c
@@ -0,0 +1,260 @@
+/*
+ * Driver for MPC52xx processor BestComm General Buffer Descriptor
+ *
+ * Copyright (C) 2007 Sylvain Munaut <tnt@246tNt.com>
+ * Copyright (C) 2006 AppSpec Computer Technologies Corp.
+ *                    Jeff Gibbons <jeff.gibbons@appspec.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/version.h>
+#include <linux/module.h>
+#include <linux/kernel.h>
+#include <linux/string.h>
+#include <linux/types.h>
+#include <asm/errno.h>
+#include <asm/io.h>
+#include <asm/mpc52xx.h>
+#include "bestcomm.h"
+#include "bestcomm_priv.h"
+#include "gen_bd.h"
+/* ======================================================================== */
+/* Task image/var/inc                                                       */
+/* ======================================================================== */
+/* gen_bd tasks images */
+extern u32 bcom_gen_bd_rx_task[];
+extern u32 bcom_gen_bd_tx_task[];
+/* rx task vars that need to be set before enabling the task */
+struct bcom_gen_bd_rx_var {
+        u32 enable;             /* (u16*) address of task's control register */
+        u32 fifo;               /* (u32*) address of gen_bd's fifo */
+        u32 bd_base;            /* (struct bcom_bd*) beginning of ring buffer */
+        u32 bd_last;            /* (struct bcom_bd*) end of ring buffer */
+        u32 bd_start;           /* (struct bcom_bd*) current bd */
+        u32 buffer_size;        /* size of receive buffer */
+};
+/* rx task incs that need to be set before enabling the task */
+struct bcom_gen_bd_rx_inc {
+        u16 pad0;
+        s16 incr_bytes;
+        u16 pad1;
+        s16 incr_dst;
+};
+/* tx task vars that need to be set before enabling the task */
+struct bcom_gen_bd_tx_var {
+        u32 fifo;               /* (u32*) address of gen_bd's fifo */
+        u32 enable;             /* (u16*) address of task's control register */
+        u32 bd_base;            /* (struct bcom_bd*) beginning of ring buffer */
+        u32 bd_last;            /* (struct bcom_bd*) end of ring buffer */
+        u32 bd_start;           /* (struct bcom_bd*) current bd */
+        u32 buffer_size;        /* set by uCode for each packet */
+};
+/* tx task incs that need to be set before enabling the task */
+struct bcom_gen_bd_tx_inc {
+        u16 pad0;
+        s16 incr_bytes;
+        u16 pad1;
+        s16 incr_src;
+        u16 pad2;
+        s16 incr_src_ma;
+};
+/* private structure */
+struct bcom_gen_bd_priv {
+        phys_addr_t     fifo;
+        int             initiator;
+        int             ipr;
+        int             maxbufsize;
+};
+/* ======================================================================== */
+/* Task support code                                                        */
+/* ======================================================================== */
+struct bcom_task *
+bcom_gen_bd_rx_init(int queue_len, phys_addr_t fifo,
+                        int initiator, int ipr, int maxbufsize)
+{
+        struct bcom_task *tsk;
+        struct bcom_gen_bd_priv *priv;
+        tsk = bcom_task_alloc(queue_len, sizeof(struct bcom_gen_bd),
+                        sizeof(struct bcom_gen_bd_priv));
+        if (!tsk)
+                return NULL;
+        tsk->flags = BCOM_FLAGS_NONE;
+        priv = tsk->priv;
+        priv->fifo      = fifo;
+        priv->initiator = initiator;
+        priv->ipr       = ipr;
+        priv->maxbufsize = maxbufsize;
+        if (bcom_gen_bd_rx_reset(tsk)) {
+                bcom_task_free(tsk);
+                return NULL;
+        }
+        return tsk;
+}
+EXPORT_SYMBOL_GPL(bcom_gen_bd_rx_init);
+int
+bcom_gen_bd_rx_reset(struct bcom_task *tsk)
+{
+        struct bcom_gen_bd_priv *priv = tsk->priv;
+        struct bcom_gen_bd_rx_var *var;
+        struct bcom_gen_bd_rx_inc *inc;
+        /* Shutdown the task */
+        bcom_disable_task(tsk->tasknum);
+        /* Reset the microcode */
+        var = (struct bcom_gen_bd_rx_var *) bcom_task_var(tsk->tasknum);
+        inc = (struct bcom_gen_bd_rx_inc *) bcom_task_inc(tsk->tasknum);
+        if (bcom_load_image(tsk->tasknum, bcom_gen_bd_rx_task))
+                return -1;
+        var->enable     = bcom_eng->regs_base +
+                                offsetof(struct mpc52xx_sdma, tcr[tsk->tasknum]);
+        var->fifo       = (u32) priv->fifo;
+        var->bd_base    = tsk->bd_pa;
+        var->bd_last    = tsk->bd_pa + ((tsk->num_bd-1) * tsk->bd_size);
+        var->bd_start   = tsk->bd_pa;
+        var->buffer_size = priv->maxbufsize;
+        inc->incr_bytes = -(s16)sizeof(u32);
+        inc->incr_dst   = sizeof(u32);
+        /* Reset the BDs */
+        tsk->index = 0;
+        tsk->outdex = 0;
+        memset(tsk->bd, 0x00, tsk->num_bd * tsk->bd_size);
+        /* Configure some stuff */
+        bcom_set_task_pragma(tsk->tasknum, BCOM_GEN_RX_BD_PRAGMA);
+        bcom_set_task_auto_start(tsk->tasknum, tsk->tasknum);
+        out_8(&bcom_eng->regs->ipr[priv->initiator], priv->ipr);
+        bcom_set_initiator(tsk->tasknum, priv->initiator);
+        out_be32(&bcom_eng->regs->IntPend, 1<<tsk->tasknum);    /* Clear ints */
+        return 0;
+}
+EXPORT_SYMBOL_GPL(bcom_gen_bd_rx_reset);
+void
+bcom_gen_bd_rx_release(struct bcom_task *tsk)
+{
+        /* Nothing special for the GenBD tasks */
+        bcom_task_free(tsk);
+}
+EXPORT_SYMBOL_GPL(bcom_gen_bd_rx_release);
+extern struct bcom_task *
+bcom_gen_bd_tx_init(int queue_len, phys_addr_t fifo,
+                        int initiator, int ipr)
+{
+        struct bcom_task *tsk;
+        struct bcom_gen_bd_priv *priv;
+        tsk = bcom_task_alloc(queue_len, sizeof(struct bcom_gen_bd),
+                        sizeof(struct bcom_gen_bd_priv));
+        if (!tsk)
+                return NULL;
+        tsk->flags = BCOM_FLAGS_NONE;
+        priv = tsk->priv;
+        priv->fifo      = fifo;
+        priv->initiator = initiator;
+        priv->ipr       = ipr;
+        if (bcom_gen_bd_tx_reset(tsk)) {
+                bcom_task_free(tsk);
+                return NULL;
+        }
+        return tsk;
+}
+EXPORT_SYMBOL_GPL(bcom_gen_bd_tx_init);
+int
+bcom_gen_bd_tx_reset(struct bcom_task *tsk)
+{
+        struct bcom_gen_bd_priv *priv = tsk->priv;
+        struct bcom_gen_bd_tx_var *var;
+        struct bcom_gen_bd_tx_inc *inc;
+        /* Shutdown the task */
+        bcom_disable_task(tsk->tasknum);
+        /* Reset the microcode */
+        var = (struct bcom_gen_bd_tx_var *) bcom_task_var(tsk->tasknum);
+        inc = (struct bcom_gen_bd_tx_inc *) bcom_task_inc(tsk->tasknum);
+        if (bcom_load_image(tsk->tasknum, bcom_gen_bd_tx_task))
+                return -1;
+        var->enable     = bcom_eng->regs_base +
+                                offsetof(struct mpc52xx_sdma, tcr[tsk->tasknum]);
+        var->fifo       = (u32) priv->fifo;
+        var->bd_base    = tsk->bd_pa;
+        var->bd_last    = tsk->bd_pa + ((tsk->num_bd-1) * tsk->bd_size);
+        var->bd_start   = tsk->bd_pa;
+        inc->incr_bytes = -(s16)sizeof(u32);
+        inc->incr_src   = sizeof(u32);
+        inc->incr_src_ma = sizeof(u8);
+        /* Reset the BDs */
+        tsk->index = 0;
+        tsk->outdex = 0;
+        memset(tsk->bd, 0x00, tsk->num_bd * tsk->bd_size);
+        /* Configure some stuff */
+        bcom_set_task_pragma(tsk->tasknum, BCOM_GEN_TX_BD_PRAGMA);
+        bcom_set_task_auto_start(tsk->tasknum, tsk->tasknum);
+        out_8(&bcom_eng->regs->ipr[priv->initiator], priv->ipr);
+        bcom_set_initiator(tsk->tasknum, priv->initiator);
+        out_be32(&bcom_eng->regs->IntPend, 1<<tsk->tasknum);    /* Clear ints */
+        return 0;
+}
+EXPORT_SYMBOL_GPL(bcom_gen_bd_tx_reset);
+void
+bcom_gen_bd_tx_release(struct bcom_task *tsk)
+{
+        /* Nothing special for the GenBD tasks */
+        bcom_task_free(tsk);
+}
+EXPORT_SYMBOL_GPL(bcom_gen_bd_tx_release);
+MODULE_DESCRIPTION("BestComm General Buffer Descriptor tasks driver");
+MODULE_AUTHOR("Jeff Gibbons <jeff.gibbons@appspec.com>");
+MODULE_LICENSE("GPL v2");
diff --git a/arch/powerpc/sysdev/bestcomm/gen_bd.h b/arch/powerpc/sysdev/bestcomm/gen_bd.h
new file mode 100644
index 000000000000..5b6fa803c6aa
--- /dev/null
+++ b/arch/powerpc/sysdev/bestcomm/gen_bd.h
@@ -0,0 +1,48 @@
+/*
+ * Header for Bestcomm General Buffer Descriptor tasks driver
+ *
+ *
+ * Copyright (C) 2007 Sylvain Munaut <tnt@246tNt.com>
+ * Copyright (C) 2006 AppSpec Computer Technologies Corp.
+ *                    Jeff Gibbons <jeff.gibbons@appspec.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.
+ *
+ *
+ */
+#ifndef __BESTCOMM_GEN_BD_H__
+#define __BESTCOMM_GEN_BD_H__
+struct bcom_gen_bd {
+        u32     status;
+        u32     buf_pa;
+};
+extern struct bcom_task *
+bcom_gen_bd_rx_init(int queue_len, phys_addr_t fifo,
+                        int initiator, int ipr, int maxbufsize);
+extern int
+bcom_gen_bd_rx_reset(struct bcom_task *tsk);
+extern void
+bcom_gen_bd_rx_release(struct bcom_task *tsk);
+extern struct bcom_task *
+bcom_gen_bd_tx_init(int queue_len, phys_addr_t fifo,
+                        int initiator, int ipr);
+extern int
+bcom_gen_bd_tx_reset(struct bcom_task *tsk);
+extern void
+bcom_gen_bd_tx_release(struct bcom_task *tsk);
+#endif  /* __BESTCOMM_GEN_BD_H__ */
diff --git a/arch/powerpc/sysdev/bestcomm/sram.c b/arch/powerpc/sysdev/bestcomm/sram.c
new file mode 100644
index 000000000000..99784383a843
--- /dev/null
+++ b/arch/powerpc/sysdev/bestcomm/sram.c
@@ -0,0 +1,177 @@
+/*
+ * Simple memory allocator for on-board SRAM
+ *
+ *
+ * Maintainer : Sylvain Munaut <tnt@246tNt.com>
+ *
+ * Copyright (C) 2005 Sylvain Munaut <tnt@246tNt.com>
+ *
+ * This file is licensed under the terms of the GNU General Public License
+ * version 2. This program is licensed "as is" without any warranty of any
+ * kind, whether express or implied.
+ */
+#include <linux/kernel.h>
+#include <linux/module.h>
+#include <linux/slab.h>
+#include <linux/spinlock.h>
+#include <linux/string.h>
+#include <linux/ioport.h>
+#include <linux/of.h>
+#include <asm/io.h>
+#include <asm/mmu.h>
+#include "sram.h"
+/* Struct keeping our 'state' */
+struct bcom_sram *bcom_sram = NULL;
+EXPORT_SYMBOL_GPL(bcom_sram);   /* needed for inline functions */
+/* ======================================================================== */
+/* Public API                                                               */
+/* ======================================================================== */
+/* DO NOT USE in interrupts, if needed in irq handler, we should use the
+   _irqsave version of the spin_locks */
+int bcom_sram_init(struct device_node *sram_node, char *owner)
+{
+        int rv;
+        const u32 *regaddr_p;
+        u64 regaddr64, size64;
+        unsigned int psize;
+        /* Create our state struct */
+        if (bcom_sram) {
+                printk(KERN_ERR "%s: bcom_sram_init: "
+                        "Already initialized !\n", owner);
+                return -EBUSY;
+        }
+        bcom_sram = kmalloc(sizeof(struct bcom_sram), GFP_KERNEL);
+        if (!bcom_sram) {
+                printk(KERN_ERR "%s: bcom_sram_init: "
+                        "Couldn't allocate internal state !\n", owner);
+                return -ENOMEM;
+        }
+        /* Get address and size of the sram */
+        regaddr_p = of_get_address(sram_node, 0, &size64, NULL);
+        if (!regaddr_p) {
+                printk(KERN_ERR "%s: bcom_sram_init: "
+                        "Invalid device node !\n", owner);
+                rv = -EINVAL;
+                goto error_free;
+        }
+        regaddr64 = of_translate_address(sram_node, regaddr_p);
+        bcom_sram->base_phys = (phys_addr_t) regaddr64;
+        bcom_sram->size = (unsigned int) size64;
+        /* Request region */
+        if (!request_mem_region(bcom_sram->base_phys, bcom_sram->size, owner)) {
+                printk(KERN_ERR "%s: bcom_sram_init: "
+                        "Couldn't request region !\n", owner);
+                rv = -EBUSY;
+                goto error_free;
+        }
+        /* Map SRAM */
+                /* sram is not really __iomem */
+        bcom_sram->base_virt = (void*) ioremap(bcom_sram->base_phys, bcom_sram->size);
+        if (!bcom_sram->base_virt) {
+                printk(KERN_ERR "%s: bcom_sram_init: "
+                        "Map error SRAM zone 0x%08lx (0x%0x)!\n",
+                        owner, bcom_sram->base_phys, bcom_sram->size );
+                rv = -ENOMEM;
+                goto error_release;
+        }
+        /* Create an rheap (defaults to 32 bits word alignment) */
+        bcom_sram->rh = rh_create(4);
+        /* Attach the free zones */
+#if 0
+        /* Currently disabled ... for future use only */
+        reg_addr_p = of_get_property(sram_node, "available", &psize);
+#else
+        regaddr_p = NULL;
+        psize = 0;
+#endif
+        if (!regaddr_p || !psize) {
+                /* Attach the whole zone */
+                rh_attach_region(bcom_sram->rh, 0, bcom_sram->size);
+        } else {
+                /* Attach each zone independently */
+                while (psize >= 2 * sizeof(u32)) {
+                        phys_addr_t zbase = of_translate_address(sram_node, regaddr_p);
+                        rh_attach_region(bcom_sram->rh, zbase - bcom_sram->base_phys, regaddr_p[1]);
+                        regaddr_p += 2;
+                        psize -= 2 * sizeof(u32);
+                }
+        }
+        /* Init our spinlock */
+        spin_lock_init(&bcom_sram->lock);
+        return 0;
+error_release:
+        release_mem_region(bcom_sram->base_phys, bcom_sram->size);
+error_free:
+        kfree(bcom_sram);
+        bcom_sram = NULL;
+        return rv;
+}
+EXPORT_SYMBOL_GPL(bcom_sram_init);
+void bcom_sram_cleanup(void)
+{
+        /* Free resources */
+        if (bcom_sram) {
+                rh_destroy(bcom_sram->rh);
+                iounmap((void __iomem *)bcom_sram->base_virt);
+                release_mem_region(bcom_sram->base_phys, bcom_sram->size);
+                kfree(bcom_sram);
+                bcom_sram = NULL;
+        }
+}
+EXPORT_SYMBOL_GPL(bcom_sram_cleanup);
+void* bcom_sram_alloc(int size, int align, phys_addr_t *phys)
+{
+        unsigned long offset;
+        spin_lock(&bcom_sram->lock);
+        offset = rh_alloc_align(bcom_sram->rh, size, align, NULL);
+        spin_unlock(&bcom_sram->lock);
+        if (IS_ERR_VALUE(offset))
+                return NULL;
+        *phys = bcom_sram->base_phys + offset;
+        return bcom_sram->base_virt + offset;
+}
+EXPORT_SYMBOL_GPL(bcom_sram_alloc);
+void bcom_sram_free(void *ptr)
+{
+        unsigned long offset;
+        if (!ptr)
+                return;
+        offset = ptr - bcom_sram->base_virt;
+        spin_lock(&bcom_sram->lock);
+        rh_free(bcom_sram->rh, offset);
+        spin_unlock(&bcom_sram->lock);
+}
+EXPORT_SYMBOL_GPL(bcom_sram_free);
diff --git a/arch/powerpc/sysdev/bestcomm/sram.h b/arch/powerpc/sysdev/bestcomm/sram.h
new file mode 100644
index 000000000000..b6d668963cce
--- /dev/null
+++ b/arch/powerpc/sysdev/bestcomm/sram.h
@@ -0,0 +1,54 @@
+/*
+ * Handling of a sram zone for bestcomm
+ *
+ *
+ * Copyright (C) 2007 Sylvain Munaut <tnt@246tNt.com>
+ *
+ * This file is licensed under the terms of the GNU General Public License
+ * version 2. This program is licensed "as is" without any warranty of any
+ * kind, whether express or implied.
+ */
+#ifndef __BESTCOMM_SRAM_H__
+#define __BESTCOMM_SRAM_H__
+#include <asm/rheap.h>
+#include <asm/mmu.h>
+#include <linux/spinlock.h>
+/* Structure used internally */
+        /* The internals are here for the inline functions
+         * sake, certainly not for the user to mess with !
+         */
+struct bcom_sram {
+        phys_addr_t              base_phys;
+        void                    *base_virt;
+        unsigned int             size;
+        rh_info_t               *rh;
+        spinlock_t               lock;
+};
+extern struct bcom_sram *bcom_sram;
+/* Public API */
+extern int  bcom_sram_init(struct device_node *sram_node, char *owner);
+extern void bcom_sram_cleanup(void);
+extern void* bcom_sram_alloc(int size, int align, phys_addr_t *phys);
+extern void  bcom_sram_free(void *ptr);
+static inline phys_addr_t bcom_sram_va2pa(void *va) {
+        return bcom_sram->base_phys +
+                (unsigned long)(va - bcom_sram->base_virt);
+}
+static inline void *bcom_sram_pa2va(phys_addr_t pa) {
+        return bcom_sram->base_virt +
+                (unsigned long)(pa - bcom_sram->base_phys);
+}
+#endif  /* __BESTCOMM_SRAM_H__ */
diff --git a/arch/powerpc/sysdev/fsl_pci.c b/arch/powerpc/sysdev/fsl_pci.c
index af090c93be10..33df4c347ca7 100644
--- a/arch/powerpc/sysdev/fsl_pci.c
+++ b/arch/powerpc/sysdev/fsl_pci.c
@@ -255,7 +255,7 @@ DECLARE_PCI_FIXUP_EARLY(0x1957, PCI_DEVICE_ID_MPC8533E, quirk_fsl_pcie_transpare
 DECLARE_PCI_FIXUP_EARLY(0x1957, PCI_DEVICE_ID_MPC8533, quirk_fsl_pcie_transparent);
 DECLARE_PCI_FIXUP_EARLY(0x1957, PCI_DEVICE_ID_MPC8544E, quirk_fsl_pcie_transparent);
 DECLARE_PCI_FIXUP_EARLY(0x1957, PCI_DEVICE_ID_MPC8544, quirk_fsl_pcie_transparent);
-DECLARE_PCI_FIXUP_EARLY(0x1957, PCI_DEVICE_ID_MPC8572E, quirk_fsl_pcie_transparent)
+DECLARE_PCI_FIXUP_EARLY(0x1957, PCI_DEVICE_ID_MPC8572E, quirk_fsl_pcie_transparent);
 DECLARE_PCI_FIXUP_EARLY(0x1957, PCI_DEVICE_ID_MPC8572, quirk_fsl_pcie_transparent);
 DECLARE_PCI_FIXUP_EARLY(0x1957, PCI_DEVICE_ID_MPC8641, quirk_fsl_pcie_transparent);
 DECLARE_PCI_FIXUP_EARLY(0x1957, PCI_DEVICE_ID_MPC8641D, quirk_fsl_pcie_transparent);
diff --git a/arch/ppc/Kconfig b/arch/ppc/Kconfig
index 20dce4681259..607925c8a99e 100644
--- a/arch/ppc/Kconfig
+++ b/arch/ppc/Kconfig
@@ -102,6 +102,7 @@ config 44x
 config 8xx
        bool "8xx"
+        select PPC_LIB_RHEAP
 config E200
        bool "e200"
@@ -798,6 +799,7 @@ config CPM1
 config CPM2
        bool
        depends on 8260 || MPC8560 || MPC8555
+        select PPC_LIB_RHEAP
        default y
        help
          The CPM2 (Communications Processor Module) is a coprocessor on
@@ -1277,6 +1279,10 @@ config BOOT_LOAD
 config PIN_TLB
        bool "Pinned Kernel TLBs (860 ONLY)"
        depends on ADVANCED_OPTIONS && 8xx
+config PPC_LIB_RHEAP
+        bool
 endmenu
 source "net/Kconfig"
diff --git a/arch/s390/kernel/compat_linux.c b/arch/s390/kernel/compat_linux.c
index 5236fdb17fcb..50b85d07ddd2 100644
--- a/arch/s390/kernel/compat_linux.c
+++ b/arch/s390/kernel/compat_linux.c
@@ -58,9 +58,9 @@
 #include <linux/vfs.h>
 #include <linux/ptrace.h>
 #include <linux/fadvise.h>
+#include <linux/ipc.h>
 #include <asm/types.h>
-#include <asm/ipc.h>
 #include <asm/uaccess.h>
 #include <asm/semaphore.h>
diff --git a/arch/s390/kernel/sys_s390.c b/arch/s390/kernel/sys_s390.c
index 1eaff84a1eb6..fefee99f28aa 100644
--- a/arch/s390/kernel/sys_s390.c
+++ b/arch/s390/kernel/sys_s390.c
@@ -28,9 +28,9 @@
 #include <linux/utsname.h>
 #include <linux/personality.h>
 #include <linux/unistd.h>
+#include <linux/ipc.h>
 #include <asm/uaccess.h>
-#include <asm/ipc.h>
 /*
 * sys_pipe() is the normal C calling standard for creating
diff --git a/arch/s390/mm/cmm.c b/arch/s390/mm/cmm.c
index fabc50adc46a..d4ed93dfb9c7 100644
--- a/arch/s390/mm/cmm.c
+++ b/arch/s390/mm/cmm.c
@@ -17,6 +17,7 @@
 #include <linux/ctype.h>
 #include <linux/swap.h>
 #include <linux/kthread.h>
+#include <linux/oom.h>
 #include <asm/pgalloc.h>
 #include <asm/uaccess.h>
diff --git a/arch/sh/drivers/pci/dma-dreamcast.c b/arch/sh/drivers/pci/dma-dreamcast.c
index 230d6ec0d239..888a34050599 100644
--- a/arch/sh/drivers/pci/dma-dreamcast.c
+++ b/arch/sh/drivers/pci/dma-dreamcast.c
@@ -51,7 +51,7 @@ void *dreamcast_consistent_alloc(struct device *dev, size_t size,
        buf = P2SEGADDR(buf);
        /* Flush the dcache before we hand off the buffer */
-        dma_cache_wback_inv((void *)buf, size);
+        __flush_purge_region((void *)buf, size);
        return (void *)buf;
 }
diff --git a/arch/sh/kernel/sys_sh.c b/arch/sh/kernel/sys_sh.c
index 024ce5dedd8c..d545a686a201 100644
--- a/arch/sh/kernel/sys_sh.c
+++ b/arch/sh/kernel/sys_sh.c
@@ -22,9 +22,9 @@
 #include <linux/utsname.h>
 #include <linux/module.h>
 #include <linux/fs.h>
+#include <linux/ipc.h>
 #include <asm/cacheflush.h>
 #include <asm/uaccess.h>
-#include <asm/ipc.h>
 #include <asm/unistd.h>
 /*
diff --git a/arch/sh/mm/consistent.c b/arch/sh/mm/consistent.c
index 38c82d890ffd..e220c29a3c00 100644
--- a/arch/sh/mm/consistent.c
+++ b/arch/sh/mm/consistent.c
@@ -34,7 +34,7 @@ void *consistent_alloc(gfp_t gfp, size_t size, dma_addr_t *handle)
        /*
         * We must flush the cache before we pass it on to the device
         */
-        dma_cache_wback_inv(ret, size);
+        __flush_purge_region(ret, size);
        page = virt_to_page(ret);
        free = page + (size >> PAGE_SHIFT);
@@ -68,13 +68,13 @@ void consistent_sync(void *vaddr, size_t size, int direction)
        switch (direction) {
        case DMA_FROM_DEVICE:           /* invalidate only */
-                dma_cache_inv(p1addr, size);
+                __flush_invalidate_region(p1addr, size);
                break;
        case DMA_TO_DEVICE:             /* writeback only */
-                dma_cache_wback(p1addr, size);
+                __flush_wback_region(p1addr, size);
                break;
        case DMA_BIDIRECTIONAL:         /* writeback and invalidate */
-                dma_cache_wback_inv(p1addr, size);
+                __flush_purge_region(p1addr, size);
                break;
        default:
                BUG();
diff --git a/arch/sh/mm/pmb.c b/arch/sh/mm/pmb.c
index 7d43758dc244..1d45b82f0a63 100644
--- a/arch/sh/mm/pmb.c
+++ b/arch/sh/mm/pmb.c
@@ -292,8 +292,7 @@ void pmb_unmap(unsigned long addr)
        } while (pmbe);
 }
-static void pmb_cache_ctor(void *pmb, struct kmem_cache *cachep,
+static void pmb_cache_ctor(struct kmem_cache *cachep, void *pmb)
-                           unsigned long flags)
 {
        struct pmb_entry *pmbe = pmb;
diff --git a/arch/sh64/kernel/sys_sh64.c b/arch/sh64/kernel/sys_sh64.c
index b7f18e298a20..de0a303ba26f 100644
--- a/arch/sh64/kernel/sys_sh64.c
+++ b/arch/sh64/kernel/sys_sh64.c
@@ -29,8 +29,8 @@
 #include <linux/file.h>
 #include <linux/utsname.h>
 #include <linux/syscalls.h>
+#include <linux/ipc.h>
 #include <asm/uaccess.h>
-#include <asm/ipc.h>
 #include <asm/ptrace.h>
 #include <asm/unistd.h>
diff --git a/arch/sh64/mm/consistent.c b/arch/sh64/mm/consistent.c
index 8875a2a40da7..c439620402cb 100644
--- a/arch/sh64/mm/consistent.c
+++ b/arch/sh64/mm/consistent.c
@@ -11,6 +11,7 @@
 #include <linux/mm.h>
 #include <linux/string.h>
 #include <linux/pci.h>
+#include <linux/dma-mapping.h>
 #include <linux/module.h>
 #include <asm/io.h>
@@ -32,7 +33,7 @@ void *consistent_alloc(struct pci_dev *hwdev, size_t size,
        if (vp != NULL) {
                memset(vp, 0, size);
                *dma_handle = virt_to_phys(ret);
-                dma_cache_wback_inv((unsigned long)ret, size);
+                dma_cache_sync(NULL, ret, size, DMA_BIDIRECTIONAL);
        }
        return vp;
diff --git a/arch/sparc/Kconfig b/arch/sparc/Kconfig
index 9d327ec59759..c0f4ba109daa 100644
--- a/arch/sparc/Kconfig
+++ b/arch/sparc/Kconfig
@@ -321,7 +321,6 @@ endmenu
 source "fs/Kconfig"
 menu "Instrumentation Support"
-        depends on EXPERIMENTAL
 source "arch/sparc/oprofile/Kconfig"
diff --git a/arch/sparc/kernel/sys_sparc.c b/arch/sparc/kernel/sys_sparc.c
index a954a0c00000..6c0221e9a9f5 100644
--- a/arch/sparc/kernel/sys_sparc.c
+++ b/arch/sparc/kernel/sys_sparc.c
@@ -21,9 +21,9 @@
 #include <linux/utsname.h>
 #include <linux/smp.h>
 #include <linux/smp_lock.h>
+#include <linux/ipc.h>
 #include <asm/uaccess.h>
-#include <asm/ipc.h>
 #include <asm/unistd.h>
 /* #define DEBUG_UNIMP_SYSCALL */
diff --git a/arch/sparc64/Kconfig b/arch/sparc64/Kconfig
index 2f22fa90461a..59c4d752d286 100644
--- a/arch/sparc64/Kconfig
+++ b/arch/sparc64/Kconfig
@@ -461,7 +461,6 @@ source "drivers/fc4/Kconfig"
 source "fs/Kconfig"
 menu "Instrumentation Support"
-        depends on EXPERIMENTAL
 source "arch/sparc64/oprofile/Kconfig"
diff --git a/arch/sparc64/kernel/binfmt_aout32.c b/arch/sparc64/kernel/binfmt_aout32.c
index d208cc7804f2..92c1b36a2e16 100644
--- a/arch/sparc64/kernel/binfmt_aout32.c
+++ b/arch/sparc64/kernel/binfmt_aout32.c
@@ -35,11 +35,14 @@
 static int load_aout32_binary(struct linux_binprm *, struct pt_regs * regs);
 static int load_aout32_library(struct file*);
-static int aout32_core_dump(long signr, struct pt_regs * regs, struct file *file);
+static int aout32_core_dump(long signr, struct pt_regs *regs, struct file *file, unsigned long limit);
 static struct linux_binfmt aout32_format = {
-        NULL, THIS_MODULE, load_aout32_binary, load_aout32_library, aout32_core_dump,
+        .module         = THIS_MODULE,
-        PAGE_SIZE
+        .load_binary    = load_aout32_binary,
+        .load_shlib     = load_aout32_library,
+        .core_dump      = aout32_core_dump,
+        .min_coredump   = PAGE_SIZE,
 };
 static void set_brk(unsigned long start, unsigned long end)
@@ -83,7 +86,7 @@ if (file->f_op->llseek) { \
 * dumping of the process results in another error..
 */
-static int aout32_core_dump(long signr, struct pt_regs *regs, struct file *file)
+static int aout32_core_dump(long signr, struct pt_regs *regs, struct file *file, unsigned long limit)
 {
        mm_segment_t fs;
        int has_dumped = 0;
@@ -102,13 +105,11 @@ static int aout32_core_dump(long signr, struct pt_regs *regs, struct file *file)
 /* If the size of the dump file exceeds the rlimit, then see what would happen
   if we wrote the stack, but not the data area.  */
-        if ((dump.u_dsize+dump.u_ssize) >
+        if (dump.u_dsize + dump.u_ssize > limit)
-            current->signal->rlim[RLIMIT_CORE].rlim_cur)
                dump.u_dsize = 0;
 /* Make sure we have enough room to write the stack and data areas. */
-        if ((dump.u_ssize) >
+        if (dump.u_ssize > limit)
-            current->signal->rlim[RLIMIT_CORE].rlim_cur)
                dump.u_ssize = 0;
 /* make sure we actually have a data and stack area to dump */
diff --git a/arch/sparc64/kernel/sys_sparc.c b/arch/sparc64/kernel/sys_sparc.c
index 0d5c50264945..560cb1edb1d0 100644
--- a/arch/sparc64/kernel/sys_sparc.c
+++ b/arch/sparc64/kernel/sys_sparc.c
@@ -26,7 +26,6 @@
 #include <linux/random.h>
 #include <asm/uaccess.h>
-#include <asm/ipc.h>
 #include <asm/utrap.h>
 #include <asm/perfctr.h>
 #include <asm/a.out.h>
diff --git a/arch/sparc64/kernel/sys_sparc32.c b/arch/sparc64/kernel/sys_sparc32.c
index e8dce90d05d4..78caff926737 100644
--- a/arch/sparc64/kernel/sys_sparc32.c
+++ b/arch/sparc64/kernel/sys_sparc32.c
@@ -54,7 +54,6 @@
 #include <linux/highuid.h>
 #include <asm/types.h>
-#include <asm/ipc.h>
 #include <asm/uaccess.h>
 #include <asm/fpumacro.h>
 #include <asm/semaphore.h>
diff --git a/arch/sparc64/solaris/ipc.c b/arch/sparc64/solaris/ipc.c
index a531a2cdb381..499135fa7060 100644
--- a/arch/sparc64/solaris/ipc.c
+++ b/arch/sparc64/solaris/ipc.c
@@ -11,10 +11,10 @@
 #include <linux/shm.h>
 #include <linux/sem.h>
 #include <linux/msg.h>
+#include <linux/ipc.h>
 #include <asm/uaccess.h>
 #include <asm/string.h>
-#include <asm/ipc.h>
 #include "conv.h"
diff --git a/arch/um/sys-i386/syscalls.c b/arch/um/sys-i386/syscalls.c
index 710d5fb807e1..e2d142684412 100644
--- a/arch/um/sys-i386/syscalls.c
+++ b/arch/um/sys-i386/syscalls.c
@@ -5,7 +5,7 @@
 #include "linux/sched.h"
 #include "linux/shm.h"
-#include "asm/ipc.h"
+#include "linux/ipc.h"
 #include "asm/mman.h"
 #include "asm/uaccess.h"
 #include "asm/unistd.h"
diff --git a/arch/v850/kernel/syscalls.c b/arch/v850/kernel/syscalls.c
index f9f00ccf5324..0a4df4d6e05f 100644
--- a/arch/v850/kernel/syscalls.c
+++ b/arch/v850/kernel/syscalls.c
@@ -30,7 +30,6 @@
 #include <linux/file.h>
 #include <asm/uaccess.h>
-#include <asm/ipc.h>
 #include <asm/semaphore.h>
 #include <asm/unistd.h>
diff --git a/arch/x86/boot/Makefile b/arch/x86/boot/Makefile
index e8756e5f6b29..89dbf970e058 100644
--- a/arch/x86/boot/Makefile
+++ b/arch/x86/boot/Makefile
@@ -39,6 +39,7 @@ setup-y		+= printf.o string.o tty.o video.o version.o voyager.o
 setup-y         += video-vga.o
 setup-y         += video-vesa.o
 setup-y         += video-bios.o
 targets         += $(setup-y)
 hostprogs-y     := tools/build
diff --git a/arch/x86/ia32/ia32_aout.c b/arch/x86/ia32/ia32_aout.c
index 08781370256d..7cf1c29bf90e 100644
--- a/arch/x86/ia32/ia32_aout.c
+++ b/arch/x86/ia32/ia32_aout.c
@@ -40,7 +40,7 @@ static int load_aout_binary(struct linux_binprm *, struct pt_regs * regs);
 static int load_aout_library(struct file*);
 #ifdef CORE_DUMP
-static int aout_core_dump(long signr, struct pt_regs * regs, struct file *file);
+static int aout_core_dump(long signr, struct pt_regs *regs, struct file *file, unsigned long limit);
 /*
 * fill in the user structure for a core dump..
@@ -148,7 +148,7 @@ if (file->f_op->llseek) { \
 * dumping of the process results in another error..
 */
-static int aout_core_dump(long signr, struct pt_regs * regs, struct file *file)
+static int aout_core_dump(long signr, struct pt_regs *regs, struct file *file, unsigned long limit)
 {
        mm_segment_t fs;
        int has_dumped = 0;
@@ -168,13 +168,11 @@ static int aout_core_dump(long signr, struct pt_regs * regs, struct file *file)
 /* If the size of the dump file exceeds the rlimit, then see what would happen
   if we wrote the stack, but not the data area.  */
-        if ((dump.u_dsize+dump.u_ssize+1) * PAGE_SIZE >
+        if ((dump.u_dsize + dump.u_ssize + 1) * PAGE_SIZE > limit)
-            current->signal->rlim[RLIMIT_CORE].rlim_cur)
                dump.u_dsize = 0;
 /* Make sure we have enough room to write the stack and data areas. */
-        if ((dump.u_ssize+1) * PAGE_SIZE >
+        if ((dump.u_ssize + 1) * PAGE_SIZE > limit)
-            current->signal->rlim[RLIMIT_CORE].rlim_cur)
                dump.u_ssize = 0;
 /* make sure we actually have a data and stack area to dump */
diff --git a/arch/x86/ia32/ia32_binfmt.c b/arch/x86/ia32/ia32_binfmt.c
index dffd2ac72747..d3c53e8b05c0 100644
--- a/arch/x86/ia32/ia32_binfmt.c
+++ b/arch/x86/ia32/ia32_binfmt.c
@@ -188,6 +188,7 @@ elf_core_copy_task_fpregs(struct task_struct *tsk, struct pt_regs *regs, elf_fpr
 }
 #define ELF_CORE_COPY_XFPREGS 1
+#define ELF_CORE_XFPREG_TYPE NT_PRXFPREG
 static inline int 
 elf_core_copy_task_xfpregs(struct task_struct *t, elf_fpxregset_t *xfpu)
 {
diff --git a/arch/x86/ia32/ipc32.c b/arch/x86/ia32/ipc32.c
index 2e1869ec4db4..7b3342e5aab5 100644
--- a/arch/x86/ia32/ipc32.c
+++ b/arch/x86/ia32/ipc32.c
@@ -9,8 +9,6 @@
 #include <linux/ipc.h>
 #include <linux/compat.h>
-#include <asm/ipc.h>
 asmlinkage long
 sys32_ipc(u32 call, int first, int second, int third,
                compat_uptr_t ptr, u32 fifth)
diff --git a/arch/x86/kernel/e820_64.c b/arch/x86/kernel/e820_64.c
index 0f4d5e209e9b..e422b8159f69 100644
--- a/arch/x86/kernel/e820_64.c
+++ b/arch/x86/kernel/e820_64.c
@@ -24,7 +24,7 @@
 #include <asm/page.h>
 #include <asm/e820.h>
 #include <asm/proto.h>
-#include <asm/bootsetup.h>
+#include <asm/setup.h>
 #include <asm/sections.h>
 struct e820map e820;
@@ -68,10 +68,15 @@ static inline int bad_addr(unsigned long *addrp, unsigned long size)
        /* initrd */ 
 #ifdef CONFIG_BLK_DEV_INITRD
-        if (LOADER_TYPE && INITRD_START && last >= INITRD_START && 
+        if (boot_params.hdr.type_of_loader && boot_params.hdr.ramdisk_image) {
-            addr < INITRD_START+INITRD_SIZE) { 
+                unsigned long ramdisk_image = boot_params.hdr.ramdisk_image;
-                *addrp = PAGE_ALIGN(INITRD_START + INITRD_SIZE);
+                unsigned long ramdisk_size  = boot_params.hdr.ramdisk_size;
-                return 1;
+                unsigned long ramdisk_end   = ramdisk_image+ramdisk_size;
+                if (last >= ramdisk_image && addr < ramdisk_end) {
+                        *addrp = PAGE_ALIGN(ramdisk_end);
+                        return 1;
+                }
        } 
 #endif
        /* kernel code */
@@ -594,8 +599,8 @@ void __init setup_memory_region(void)
         * Otherwise fake a memory map; one section from 0k->640k,
         * the next section from 1mb->appropriate_mem_k
         */
-        sanitize_e820_map(E820_MAP, &E820_MAP_NR);
+        sanitize_e820_map(boot_params.e820_map, &boot_params.e820_entries);
-        if (copy_e820_map(E820_MAP, E820_MAP_NR) < 0)
+        if (copy_e820_map(boot_params.e820_map, boot_params.e820_entries) < 0)
                early_panic("Cannot find a valid memory map");
        printk(KERN_INFO "BIOS-provided physical RAM map:\n");
        e820_print_map("BIOS-e820");
diff --git a/arch/x86/kernel/early_printk.c b/arch/x86/kernel/early_printk.c
index fd9aff3f3890..b7d6c23f2871 100644
--- a/arch/x86/kernel/early_printk.c
+++ b/arch/x86/kernel/early_printk.c
@@ -6,15 +6,10 @@
 #include <asm/io.h>
 #include <asm/processor.h>
 #include <asm/fcntl.h>
+#include <asm/setup.h>
 #include <xen/hvc-console.h>
 /* Simple VGA output */
-#ifdef __i386__
-#include <asm/setup.h>
-#else
-#include <asm/bootsetup.h>
-#endif
 #define VGABASE         (__ISA_IO_base + 0xb8000)
 static int max_ypos = 25, max_xpos = 80;
@@ -234,10 +229,10 @@ static int __init setup_early_printk(char *buf)
                early_serial_init(buf);
                early_console = &early_serial_console;
        } else if (!strncmp(buf, "vga", 3)
-                   && SCREEN_INFO.orig_video_isVGA == 1) {
+                   && boot_params.screen_info.orig_video_isVGA == 1) {
-                max_xpos = SCREEN_INFO.orig_video_cols;
+                max_xpos = boot_params.screen_info.orig_video_cols;
-                max_ypos = SCREEN_INFO.orig_video_lines;
+                max_ypos = boot_params.screen_info.orig_video_lines;
-                current_ypos = SCREEN_INFO.orig_y;
+                current_ypos = boot_params.screen_info.orig_y;
                early_console = &early_vga_console;
        } else if (!strncmp(buf, "simnow", 6)) {
                simnow_init(buf + 6);
diff --git a/arch/x86/kernel/efi_32.c b/arch/x86/kernel/efi_32.c
index 2452c6fbe992..b42558c48e9d 100644
--- a/arch/x86/kernel/efi_32.c
+++ b/arch/x86/kernel/efi_32.c
@@ -331,11 +331,13 @@ void __init efi_init(void)
        memset(&efi, 0, sizeof(efi) );
        memset(&efi_phys, 0, sizeof(efi_phys));
-        efi_phys.systab = EFI_SYSTAB;
+        efi_phys.systab =
-        memmap.phys_map = EFI_MEMMAP;
+                (efi_system_table_t *)boot_params.efi_info.efi_systab;
-        memmap.nr_map = EFI_MEMMAP_SIZE/EFI_MEMDESC_SIZE;
+        memmap.phys_map = (void *)boot_params.efi_info.efi_memmap;
-        memmap.desc_version = EFI_MEMDESC_VERSION;
+        memmap.nr_map = boot_params.efi_info.efi_memmap_size/
-        memmap.desc_size = EFI_MEMDESC_SIZE;
+                boot_params.efi_info.efi_memdesc_size;
+        memmap.desc_version = boot_params.efi_info.efi_memdesc_version;
+        memmap.desc_size = boot_params.efi_info.efi_memdesc_size;
        efi.systab = (efi_system_table_t *)
                boot_ioremap((unsigned long) efi_phys.systab,
@@ -446,7 +448,8 @@ void __init efi_init(void)
                printk(KERN_ERR PFX "Could not map the runtime service table!\n");
        /* Map the EFI memory map for use until paging_init() */
-        memmap.map = boot_ioremap((unsigned long) EFI_MEMMAP, EFI_MEMMAP_SIZE);
+        memmap.map = boot_ioremap(boot_params.efi_info.efi_memmap,
+                                  boot_params.efi_info.efi_memmap_size);
        if (memmap.map == NULL)
                printk(KERN_ERR PFX "Could not map the EFI memory map!\n");
diff --git a/arch/x86/kernel/head64.c b/arch/x86/kernel/head64.c
index 8561f626edad..a7eee0a4751d 100644
--- a/arch/x86/kernel/head64.c
+++ b/arch/x86/kernel/head64.c
@@ -14,7 +14,6 @@
 #include <asm/processor.h>
 #include <asm/proto.h>
 #include <asm/smp.h>
-#include <asm/bootsetup.h>
 #include <asm/setup.h>
 #include <asm/desc.h>
 #include <asm/pgtable.h>
@@ -36,26 +35,15 @@ static void __init clear_bss(void)
               (unsigned long) __bss_stop - (unsigned long) __bss_start);
 }
-#define NEW_CL_POINTER          0x228   /* Relative to real mode data */
-#define OLD_CL_MAGIC_ADDR       0x20
-#define OLD_CL_MAGIC            0xA33F
-#define OLD_CL_OFFSET           0x22
 static void __init copy_bootdata(char *real_mode_data)
 {
-        unsigned long new_data;
        char * command_line;
-        memcpy(x86_boot_params, real_mode_data, BOOT_PARAM_SIZE);
+        memcpy(&boot_params, real_mode_data, sizeof boot_params);
-        new_data = *(u32 *) (x86_boot_params + NEW_CL_POINTER);
+        if (boot_params.hdr.cmd_line_ptr) {
-        if (!new_data) {
+                command_line = __va(boot_params.hdr.cmd_line_ptr);
-                if (OLD_CL_MAGIC != *(u16 *)(real_mode_data + OLD_CL_MAGIC_ADDR)) {
+                memcpy(boot_command_line, command_line, COMMAND_LINE_SIZE);
-                        return;
-                }
-                new_data = __pa(real_mode_data) + *(u16 *)(real_mode_data + OLD_CL_OFFSET);
        }
-        command_line = __va(new_data);
-        memcpy(boot_command_line, command_line, COMMAND_LINE_SIZE);
 }
 void __init x86_64_start_kernel(char * real_mode_data)
diff --git a/arch/x86/kernel/machine_kexec_32.c b/arch/x86/kernel/machine_kexec_32.c
index deda9a221cf2..8459ca64bc2f 100644
--- a/arch/x86/kernel/machine_kexec_32.c
+++ b/arch/x86/kernel/machine_kexec_32.c
@@ -10,6 +10,7 @@
 #include <linux/kexec.h>
 #include <linux/delay.h>
 #include <linux/init.h>
+#include <linux/numa.h>
 #include <asm/pgtable.h>
 #include <asm/pgalloc.h>
 #include <asm/tlbflush.h>
@@ -169,3 +170,15 @@ static int __init parse_crashkernel(char *arg)
        return 0;
 }
 early_param("crashkernel", parse_crashkernel);
+void arch_crash_save_vmcoreinfo(void)
+{
+#ifdef CONFIG_ARCH_DISCONTIGMEM_ENABLE
+        VMCOREINFO_SYMBOL(node_data);
+        VMCOREINFO_LENGTH(node_data, MAX_NUMNODES);
+#endif
+#ifdef CONFIG_X86_PAE
+        VMCOREINFO_CONFIG(X86_PAE);
+#endif
+}
diff --git a/arch/x86/kernel/machine_kexec_64.c b/arch/x86/kernel/machine_kexec_64.c
index cd1899a2f0c5..7450b69710b5 100644
--- a/arch/x86/kernel/machine_kexec_64.c
+++ b/arch/x86/kernel/machine_kexec_64.c
@@ -10,6 +10,7 @@
 #include <linux/kexec.h>
 #include <linux/string.h>
 #include <linux/reboot.h>
+#include <linux/numa.h>
 #include <asm/pgtable.h>
 #include <asm/tlbflush.h>
 #include <asm/mmu_context.h>
@@ -257,3 +258,11 @@ static int __init setup_crashkernel(char *arg)
 }
 early_param("crashkernel", setup_crashkernel);
+void arch_crash_save_vmcoreinfo(void)
+{
+#ifdef CONFIG_ARCH_DISCONTIGMEM_ENABLE
+        VMCOREINFO_SYMBOL(node_data);
+        VMCOREINFO_LENGTH(node_data, MAX_NUMNODES);
+#endif
+}
diff --git a/arch/x86/kernel/mce_64.c b/arch/x86/kernel/mce_64.c
index a66d607f5b92..97d2b757d6bd 100644
--- a/arch/x86/kernel/mce_64.c
+++ b/arch/x86/kernel/mce_64.c
@@ -76,9 +76,6 @@ void mce_log(struct mce *mce)
        wmb();
        for (;;) {
                entry = rcu_dereference(mcelog.next);
-                /* The rmb forces the compiler to reload next in each
-                    iteration */
-                rmb();
                for (;;) {
                        /* When the buffer fills up discard new entries. Assume
                           that the earlier errors are the more interesting. */
diff --git a/arch/x86/kernel/setup64.c b/arch/x86/kernel/setup64.c
index 1200aaac403e..ba9188235057 100644
--- a/arch/x86/kernel/setup64.c
+++ b/arch/x86/kernel/setup64.c
@@ -11,7 +11,6 @@
 #include <linux/bootmem.h>
 #include <linux/bitops.h>
 #include <linux/module.h>
-#include <asm/bootsetup.h>
 #include <asm/pda.h>
 #include <asm/pgtable.h>
 #include <asm/processor.h>
@@ -23,8 +22,9 @@
 #include <asm/percpu.h>
 #include <asm/proto.h>
 #include <asm/sections.h>
+#include <asm/setup.h>
-char x86_boot_params[BOOT_PARAM_SIZE] __initdata;
+struct boot_params __initdata boot_params;
 cpumask_t cpu_initialized __cpuinitdata = CPU_MASK_NONE;
diff --git a/arch/x86/kernel/setup_32.c b/arch/x86/kernel/setup_32.c
index c8e1bc38d421..b87a6fd5ba48 100644
--- a/arch/x86/kernel/setup_32.c
+++ b/arch/x86/kernel/setup_32.c
@@ -137,10 +137,11 @@ EXPORT_SYMBOL(edd);
 */
 static inline void copy_edd(void)
 {
-     memcpy(edd.mbr_signature, EDD_MBR_SIGNATURE, sizeof(edd.mbr_signature));
+     memcpy(edd.mbr_signature, boot_params.edd_mbr_sig_buffer,
-     memcpy(edd.edd_info, EDD_BUF, sizeof(edd.edd_info));
+            sizeof(edd.mbr_signature));
-     edd.mbr_signature_nr = EDD_MBR_SIG_NR;
+     memcpy(edd.edd_info, boot_params.eddbuf, sizeof(edd.edd_info));
-     edd.edd_info_nr = EDD_NR;
+     edd.mbr_signature_nr = boot_params.edd_mbr_sig_buf_entries;
+     edd.edd_info_nr = boot_params.eddbuf_entries;
 }
 #else
 static inline void copy_edd(void)
@@ -434,17 +435,20 @@ void __init setup_bootmem_allocator(void)
 #endif
        numa_kva_reserve();
 #ifdef CONFIG_BLK_DEV_INITRD
-        if (LOADER_TYPE && INITRD_START) {
+        if (boot_params.hdr.type_of_loader && boot_params.hdr.ramdisk_image) {
-                if (INITRD_START + INITRD_SIZE <= (max_low_pfn << PAGE_SHIFT)) {
+                unsigned long ramdisk_image = boot_params.hdr.ramdisk_image;
-                        reserve_bootmem(INITRD_START, INITRD_SIZE);
+                unsigned long ramdisk_size  = boot_params.hdr.ramdisk_size;
-                        initrd_start = INITRD_START + PAGE_OFFSET;
+                unsigned long ramdisk_end   = ramdisk_image + ramdisk_size;
-                        initrd_end = initrd_start+INITRD_SIZE;
+                unsigned long end_of_lowmem = max_low_pfn << PAGE_SHIFT;
-                }
-                else {
+                if (ramdisk_end <= end_of_lowmem) {
+                        reserve_bootmem(ramdisk_image, ramdisk_size);
+                        initrd_start = ramdisk_image + PAGE_OFFSET;
+                        initrd_end = initrd_start+ramdisk_size;
+                } else {
                        printk(KERN_ERR "initrd extends beyond end of memory "
-                            "(0x%08lx > 0x%08lx)\ndisabling initrd\n",
+                               "(0x%08lx > 0x%08lx)\ndisabling initrd\n",
-                            INITRD_START + INITRD_SIZE,
+                               ramdisk_end, end_of_lowmem);
-                            max_low_pfn << PAGE_SHIFT);
                        initrd_start = 0;
                }
        }
@@ -512,28 +516,29 @@ void __init setup_arch(char **cmdline_p)
         * the system table is valid.  If not, then initialize normally.
         */
 #ifdef CONFIG_EFI
-        if ((LOADER_TYPE == 0x50) && EFI_SYSTAB)
+        if ((boot_params.hdr.type_of_loader == 0x50) &&
+            boot_params.efi_info.efi_systab)
                efi_enabled = 1;
 #endif
-        ROOT_DEV = old_decode_dev(ORIG_ROOT_DEV);
+        ROOT_DEV = old_decode_dev(boot_params.hdr.root_dev);
-        screen_info = SCREEN_INFO;
+        screen_info = boot_params.screen_info;
-        edid_info = EDID_INFO;
+        edid_info = boot_params.edid_info;
-        apm_info.bios = APM_BIOS_INFO;
+        apm_info.bios = boot_params.apm_bios_info;
-        ist_info = IST_INFO;
+        ist_info = boot_params.ist_info;
-        saved_videomode = VIDEO_MODE;
+        saved_videomode = boot_params.hdr.vid_mode;
-        if( SYS_DESC_TABLE.length != 0 ) {
+        if( boot_params.sys_desc_table.length != 0 ) {
-                set_mca_bus(SYS_DESC_TABLE.table[3] & 0x2);
+                set_mca_bus(boot_params.sys_desc_table.table[3] & 0x2);
-                machine_id = SYS_DESC_TABLE.table[0];
+                machine_id = boot_params.sys_desc_table.table[0];
-                machine_submodel_id = SYS_DESC_TABLE.table[1];
+                machine_submodel_id = boot_params.sys_desc_table.table[1];
-                BIOS_revision = SYS_DESC_TABLE.table[2];
+                BIOS_revision = boot_params.sys_desc_table.table[2];
        }
-        bootloader_type = LOADER_TYPE;
+        bootloader_type = boot_params.hdr.type_of_loader;
 #ifdef CONFIG_BLK_DEV_RAM
-        rd_image_start = RAMDISK_FLAGS & RAMDISK_IMAGE_START_MASK;
+        rd_image_start = boot_params.hdr.ram_size & RAMDISK_IMAGE_START_MASK;
-        rd_prompt = ((RAMDISK_FLAGS & RAMDISK_PROMPT_FLAG) != 0);
+        rd_prompt = ((boot_params.hdr.ram_size & RAMDISK_PROMPT_FLAG) != 0);
-        rd_doload = ((RAMDISK_FLAGS & RAMDISK_LOAD_FLAG) != 0);
+        rd_doload = ((boot_params.hdr.ram_size & RAMDISK_LOAD_FLAG) != 0);
 #endif
        ARCH_SETUP
        if (efi_enabled)
@@ -545,7 +550,7 @@ void __init setup_arch(char **cmdline_p)
        copy_edd();
-        if (!MOUNT_ROOT_RDONLY)
+        if (!boot_params.hdr.root_flags)
                root_mountflags &= ~MS_RDONLY;
        init_mm.start_code = (unsigned long) _text;
        init_mm.end_code = (unsigned long) _etext;
diff --git a/arch/x86/kernel/setup_64.c b/arch/x86/kernel/setup_64.c
index 85b5b6310acc..8159bf0be17a 100644
--- a/arch/x86/kernel/setup_64.c
+++ b/arch/x86/kernel/setup_64.c
@@ -52,7 +52,6 @@
 #include <asm/dma.h>
 #include <asm/mpspec.h>
 #include <asm/mmu_context.h>
-#include <asm/bootsetup.h>
 #include <asm/proto.h>
 #include <asm/setup.h>
 #include <asm/mach_apic.h>
@@ -180,10 +179,11 @@ EXPORT_SYMBOL(edd);
 */
 static inline void copy_edd(void)
 {
-     memcpy(edd.mbr_signature, EDD_MBR_SIGNATURE, sizeof(edd.mbr_signature));
+     memcpy(edd.mbr_signature, boot_params.edd_mbr_sig_buffer,
-     memcpy(edd.edd_info, EDD_BUF, sizeof(edd.edd_info));
+            sizeof(edd.mbr_signature));
-     edd.mbr_signature_nr = EDD_MBR_SIG_NR;
+     memcpy(edd.edd_info, boot_params.eddbuf, sizeof(edd.edd_info));
-     edd.edd_info_nr = EDD_NR;
+     edd.mbr_signature_nr = boot_params.edd_mbr_sig_buf_entries;
+     edd.edd_info_nr = boot_params.eddbuf_entries;
 }
 #else
 static inline void copy_edd(void)
@@ -220,21 +220,21 @@ void __init setup_arch(char **cmdline_p)
 {
        printk(KERN_INFO "Command line: %s\n", boot_command_line);
-        ROOT_DEV = old_decode_dev(ORIG_ROOT_DEV);
+        ROOT_DEV = old_decode_dev(boot_params.hdr.root_dev);
-        screen_info = SCREEN_INFO;
+        screen_info = boot_params.screen_info;
-        edid_info = EDID_INFO;
+        edid_info = boot_params.edid_info;
-        saved_video_mode = SAVED_VIDEO_MODE;
+        saved_video_mode = boot_params.hdr.vid_mode;
-        bootloader_type = LOADER_TYPE;
+        bootloader_type = boot_params.hdr.type_of_loader;
 #ifdef CONFIG_BLK_DEV_RAM
-        rd_image_start = RAMDISK_FLAGS & RAMDISK_IMAGE_START_MASK;
+        rd_image_start = boot_params.hdr.ram_size & RAMDISK_IMAGE_START_MASK;
-        rd_prompt = ((RAMDISK_FLAGS & RAMDISK_PROMPT_FLAG) != 0);
+        rd_prompt = ((boot_params.hdr.ram_size & RAMDISK_PROMPT_FLAG) != 0);
-        rd_doload = ((RAMDISK_FLAGS & RAMDISK_LOAD_FLAG) != 0);
+        rd_doload = ((boot_params.hdr.ram_size & RAMDISK_LOAD_FLAG) != 0);
 #endif
        setup_memory_region();
        copy_edd();
-        if (!MOUNT_ROOT_RDONLY)
+        if (!boot_params.hdr.root_flags)
                root_mountflags &= ~MS_RDONLY;
        init_mm.start_code = (unsigned long) &_text;
        init_mm.end_code = (unsigned long) &_etext;
@@ -339,17 +339,20 @@ void __init setup_arch(char **cmdline_p)
         */
        find_smp_config();
 #ifdef CONFIG_BLK_DEV_INITRD
-        if (LOADER_TYPE && INITRD_START) {
+        if (boot_params.hdr.type_of_loader && boot_params.hdr.ramdisk_image) {
-                if (INITRD_START + INITRD_SIZE <= (end_pfn << PAGE_SHIFT)) {
+                unsigned long ramdisk_image = boot_params.hdr.ramdisk_image;
-                        reserve_bootmem_generic(INITRD_START, INITRD_SIZE);
+                unsigned long ramdisk_size  = boot_params.hdr.ramdisk_size;
-                        initrd_start = INITRD_START + PAGE_OFFSET;
+                unsigned long ramdisk_end   = ramdisk_image + ramdisk_size;
-                        initrd_end = initrd_start+INITRD_SIZE;
+                unsigned long end_of_mem    = end_pfn << PAGE_SHIFT;
-                }
-                else {
+                if (ramdisk_end <= end_of_mem) {
+                        reserve_bootmem_generic(ramdisk_image, ramdisk_size);
+                        initrd_start = ramdisk_image + PAGE_OFFSET;
+                        initrd_end = initrd_start+ramdisk_size;
+                } else {
                        printk(KERN_ERR "initrd extends beyond end of memory "
-                            "(0x%08lx > 0x%08lx)\ndisabling initrd\n",
+                               "(0x%08lx > 0x%08lx)\ndisabling initrd\n",
-                            (unsigned long)(INITRD_START + INITRD_SIZE),
+                               ramdisk_end, end_of_mem);
-                            (unsigned long)(end_pfn << PAGE_SHIFT));
                        initrd_start = 0;
                }
        }
diff --git a/arch/x86/kernel/sys_i386_32.c b/arch/x86/kernel/sys_i386_32.c
index f8bae9ba0324..a86d26f036e1 100644
--- a/arch/x86/kernel/sys_i386_32.c
+++ b/arch/x86/kernel/sys_i386_32.c
@@ -17,10 +17,10 @@
 #include <linux/mman.h>
 #include <linux/file.h>
 #include <linux/utsname.h>
+#include <linux/ipc.h>
 #include <asm/uaccess.h>
 #include <asm/unistd.h>
-#include <asm/ipc.h>
 /*
 * sys_pipe() is the normal C calling standard for creating
diff --git a/arch/x86/mach-default/setup.c b/arch/x86/mach-default/setup.c
index 7f635c7a2381..1bd82983986d 100644
--- a/arch/x86/mach-default/setup.c
+++ b/arch/x86/mach-default/setup.c
@@ -159,16 +159,18 @@ char * __init machine_specific_memory_setup(void)
         * Otherwise fake a memory map; one section from 0k->640k,
         * the next section from 1mb->appropriate_mem_k
         */
-        sanitize_e820_map(E820_MAP, &E820_MAP_NR);
+        sanitize_e820_map(boot_params.e820_map, &boot_params.e820_entries);
-        if (copy_e820_map(E820_MAP, E820_MAP_NR) < 0) {
+        if (copy_e820_map(boot_params.e820_map, boot_params.e820_entries)
+            < 0) {
                unsigned long mem_size;
                /* compare results from other methods and take the greater */
-                if (ALT_MEM_K < EXT_MEM_K) {
+                if (boot_params.alt_mem_k
-                        mem_size = EXT_MEM_K;
+                    < boot_params.screen_info.ext_mem_k) {
+                        mem_size = boot_params.screen_info.ext_mem_k;
                        who = "BIOS-88";
                } else {
-                        mem_size = ALT_MEM_K;
+                        mem_size = boot_params.alt_mem_k;
                        who = "BIOS-e801";
                }
diff --git a/arch/x86/mach-visws/setup.c b/arch/x86/mach-visws/setup.c
index 1f81f10e03a0..de4c9dbd086f 100644
--- a/arch/x86/mach-visws/setup.c
+++ b/arch/x86/mach-visws/setup.c
@@ -152,7 +152,7 @@ char * __init machine_specific_memory_setup(void)
 {
        long long gfx_mem_size = 8 * MB;
-        mem_size = ALT_MEM_K;
+        mem_size = boot_params.alt_mem_k;
        if (!mem_size) {
                printk(KERN_WARNING "Bootloader didn't set memory size, upgrade it !\n");
diff --git a/arch/x86/mach-voyager/setup.c b/arch/x86/mach-voyager/setup.c
index 2b55694e6400..a0ab4002abcd 100644
--- a/arch/x86/mach-voyager/setup.c
+++ b/arch/x86/mach-voyager/setup.c
@@ -83,7 +83,7 @@ char * __init machine_specific_memory_setup(void)
                if(inb(catbase) != VOYAGER_DINO) {
                        printk(KERN_ERR "Voyager: Failed to get DINO for L4, setting tom to EXT_MEM_K\n");
-                        tom = (EXT_MEM_K)<<10;
+                        tom = (boot_params.screen_info.ext_mem_k)<<10;
                }
                who = "Voyager-TOM";
                add_memory_region(0, 0x9f000, E820_RAM);
@@ -104,16 +104,18 @@ char * __init machine_specific_memory_setup(void)
         * Otherwise fake a memory map; one section from 0k->640k,
         * the next section from 1mb->appropriate_mem_k
         */
-        sanitize_e820_map(E820_MAP, &E820_MAP_NR);
+        sanitize_e820_map(boot_params.e820_map, &boot_params.e820_entries);
-        if (copy_e820_map(E820_MAP, E820_MAP_NR) < 0) {
+        if (copy_e820_map(boot_params.e820_map, boot_params.e820_entries)
+            < 0) {
                unsigned long mem_size;
                /* compare results from other methods and take the greater */
-                if (ALT_MEM_K < EXT_MEM_K) {
+                if (boot_params.alt_mem_k
-                        mem_size = EXT_MEM_K;
+                    < boot_params.screen_info.ext_mem_k) {
+                        mem_size = boot_params.screen_info.ext_mem_k;
                        who = "BIOS-88";
                } else {
-                        mem_size = ALT_MEM_K;
+                        mem_size = boot_params.alt_mem_k;
                        who = "BIOS-e801";
                }
diff --git a/arch/x86/mm/discontig_32.c b/arch/x86/mm/discontig_32.c
index 860e912a3fbb..b1e45457d4ef 100644
--- a/arch/x86/mm/discontig_32.c
+++ b/arch/x86/mm/discontig_32.c
@@ -288,8 +288,9 @@ unsigned long __init setup_memory(void)
 #ifdef CONFIG_BLK_DEV_INITRD
        /* Numa kva area is below the initrd */
-        if (LOADER_TYPE && INITRD_START)
+        if (boot_params.hdr.type_of_loader && boot_params.hdr.ramdisk_image)
-                kva_start_pfn = PFN_DOWN(INITRD_START)  - kva_pages;
+                kva_start_pfn = PFN_DOWN(boot_params.hdr.ramdisk_image)
+                        - kva_pages;
 #endif
        kva_start_pfn -= kva_start_pfn & (PTRS_PER_PTE-1);
diff --git a/arch/x86/mm/pgtable_32.c b/arch/x86/mm/pgtable_32.c
index 01437c46baae..ef1f6cd3ea66 100644
--- a/arch/x86/mm/pgtable_32.c
+++ b/arch/x86/mm/pgtable_32.c
@@ -193,7 +193,7 @@ struct page *pte_alloc_one(struct mm_struct *mm, unsigned long address)
        return pte;
 }
-void pmd_ctor(void *pmd, struct kmem_cache *cache, unsigned long flags)
+void pmd_ctor(struct kmem_cache *cache, void *pmd)
 {
        memset(pmd, 0, PTRS_PER_PMD*sizeof(pmd_t));
 }
diff --git a/arch/x86/xen/enlighten.c b/arch/x86/xen/enlighten.c
index f01bfcd4bdee..493a083f6886 100644
--- a/arch/x86/xen/enlighten.c
+++ b/arch/x86/xen/enlighten.c
@@ -1137,9 +1137,10 @@ asmlinkage void __init xen_start_kernel(void)
        new_cpu_data.x86_capability[0] = cpuid_edx(1);
        /* Poke various useful things into boot_params */
-        LOADER_TYPE = (9 << 4) | 0;
+        boot_params.hdr.type_of_loader = (9 << 4) | 0;
-        INITRD_START = xen_start_info->mod_start ? __pa(xen_start_info->mod_start) : 0;
+        boot_params.hdr.ramdisk_image = xen_start_info->mod_start
-        INITRD_SIZE = xen_start_info->mod_len;
+                ? __pa(xen_start_info->mod_start) : 0;
+        boot_params.hdr.ramdisk_size = xen_start_info->mod_len;
        /* Start the world */
        start_kernel();
diff --git a/arch/x86_64/Kconfig b/arch/x86_64/Kconfig
index 8c83dbe4c4d0..d681be88ae5d 100644
--- a/arch/x86_64/Kconfig
+++ b/arch/x86_64/Kconfig
@@ -582,17 +582,18 @@ config CRASH_DUMP
        bool "kernel crash dumps (EXPERIMENTAL)"
        depends on EXPERIMENTAL
        help
-          Generate crash dump after being started by kexec.
+          Generate crash dump after being started by kexec.
-          This should be normally only set in special crash dump kernels
+          This should be normally only set in special crash dump kernels
-          which are loaded in the main kernel with kexec-tools into
+          which are loaded in the main kernel with kexec-tools into
-          a specially reserved region and then later executed after
+          a specially reserved region and then later executed after
-          a crash by kdump/kexec. The crash dump kernel must be compiled
+          a crash by kdump/kexec. The crash dump kernel must be compiled
          to a memory address not used by the main kernel or BIOS using
-          PHYSICAL_START.
+          PHYSICAL_START, or it must be built as a relocatable image
-          For more details see Documentation/kdump/kdump.txt
+          (CONFIG_RELOCATABLE=y).
+          For more details see Documentation/kdump/kdump.txt
 config RELOCATABLE
-        bool "Build a relocatable kernel(EXPERIMENTAL)"
+        bool "Build a relocatable kernel (EXPERIMENTAL)"
        depends on EXPERIMENTAL
        help
          Builds a relocatable kernel. This enables loading and running
@@ -603,8 +604,8 @@ config RELOCATABLE
          must live at a different physical address than the primary
          kernel.
-          Note: If CONFIG_RELOCATABLE=y, then kernel run from the address
+          Note: If CONFIG_RELOCATABLE=y, then the kernel runs from the address
-          it has been loaded at and compile time physical address
+          it has been loaded at and the compile time physical address
          (CONFIG_PHYSICAL_START) is ignored.
 config PHYSICAL_START
@@ -796,7 +797,6 @@ source "drivers/firmware/Kconfig"
 source fs/Kconfig
 menu "Instrumentation Support"
-        depends on EXPERIMENTAL
 source "arch/x86/oprofile/Kconfig"