Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/lmb-2.6

diff --combined arch/powerpc/Kconfig
index 5b8d8382b7629e93ccdb07a7d86b96049f587e38,bd645f0d1e439ef23e07d437f178178f36983bf4..e4e13e0bca16d67024181891effcc05a6423f46d
--- 1/arch/powerpc/Kconfig
--- 2/arch/powerpc/Kconfig
+++ b/arch/powerpc/Kconfig
@@@ -90,6 -90,7 +90,7 @@@ config PP
        select HAVE_IDE
        select HAVE_OPROFILE
        select HAVE_KPROBES
+       select HAVE_LMB
  
  config EARLY_PRINTK
        bool
@@@ -442,6 -443,10 +443,6 @@@ config SECCOM
  
          If unsure, say Y. Only embedded should say N here.
  
 -config WANT_DEVICE_TREE
 -      bool
 -      default n
 -
  endmenu
  
  config ISA_DMA_API

diff --combined arch/powerpc/kernel/prom.c
index eac97f48b9b8df29171e59476a95b50f01a6ef67,c17a5851bdb72fdd2255f578265f4e0fde240dd8..ff600ef0b4d6c2e82aed50476aca6774b770d93a
--- 1/arch/powerpc/kernel/prom.c
--- 2/arch/powerpc/kernel/prom.c
+++ b/arch/powerpc/kernel/prom.c
@@@ -31,10 -31,10 +31,10 @@@
  #include <linux/kexec.h>
  #include <linux/debugfs.h>
  #include <linux/irq.h>
+ #include <linux/lmb.h>
  
  #include <asm/prom.h>
  #include <asm/rtas.h>
- #include <asm/lmb.h>
  #include <asm/page.h>
  #include <asm/processor.h>
  #include <asm/irq.h>
@@@ -865,12 -865,12 +865,12 @@@ static int __init early_init_dt_scan_ro
        return 1;
  }
  
 -static unsigned long __init dt_mem_next_cell(int s, cell_t **cellp)
 +static u64 __init dt_mem_next_cell(int s, cell_t **cellp)
  {
        cell_t *p = *cellp;
  
        *cellp = p + s;
 -      return of_read_ulong(p, s);
 +      return of_read_number(p, s);
  }
  
  #ifdef CONFIG_PPC_PSERIES
@@@ -883,8 -883,8 +883,8 @@@
  static int __init early_init_dt_scan_drconf_memory(unsigned long node)
  {
        cell_t *dm, *ls;
 -      unsigned long l, n;
 -      unsigned long base, size, lmb_size, flags;
 +      unsigned long l, n, flags;
 +      u64 base, size, lmb_size;
  
        ls = (cell_t *)of_get_flat_dt_prop(node, "ibm,lmb-size", &l);
        if (ls == NULL || l < dt_root_size_cells * sizeof(cell_t))
@@@ -959,15 -959,14 +959,15 @@@ static int __init early_init_dt_scan_me
            uname, l, reg[0], reg[1], reg[2], reg[3]);
  
        while ((endp - reg) >= (dt_root_addr_cells + dt_root_size_cells)) {
 -              unsigned long base, size;
 +              u64 base, size;
  
                base = dt_mem_next_cell(dt_root_addr_cells, &reg);
                size = dt_mem_next_cell(dt_root_size_cells, &reg);
  
                if (size == 0)
                        continue;
 -              DBG(" - %lx ,  %lx\n", base, size);
 +              DBG(" - %llx ,  %llx\n", (unsigned long long)base,
 +                  (unsigned long long)size);
  #ifdef CONFIG_PPC64
                if (iommu_is_off) {
                        if (base >= 0x80000000ul)

diff --combined arch/powerpc/kernel/vdso.c
index d3437c4c4a6f9b81f99020353dceaff248a54a06,d715048370dfc3eef66556d87d09472773219c29..c21a626af676fde938922c25e110c203e892a24f
--- 1/arch/powerpc/kernel/vdso.c
--- 2/arch/powerpc/kernel/vdso.c
+++ b/arch/powerpc/kernel/vdso.c
@@@ -21,13 -21,14 +21,14 @@@
  #include <linux/elf.h>
  #include <linux/security.h>
  #include <linux/bootmem.h>
+ #include <linux/lmb.h>
  
  #include <asm/pgtable.h>
  #include <asm/system.h>
  #include <asm/processor.h>
  #include <asm/mmu.h>
  #include <asm/mmu_context.h>
- #include <asm/lmb.h>
+ #include <asm/prom.h>
  #include <asm/machdep.h>
  #include <asm/cputable.h>
  #include <asm/sections.h>
@@@ -336,9 -337,9 +337,9 @@@ static unsigned long __init find_functi
        return sym->st_value - VDSO32_LBASE;
  }
  
 -static int vdso_do_func_patch32(struct lib32_elfinfo *v32,
 -                              struct lib64_elfinfo *v64,
 -                              const char *orig, const char *fix)
 +static int __init vdso_do_func_patch32(struct lib32_elfinfo *v32,
 +                                     struct lib64_elfinfo *v64,
 +                                     const char *orig, const char *fix)
  {
        Elf32_Sym *sym32_gen, *sym32_fix;
  
@@@ -433,9 -434,9 +434,9 @@@ static unsigned long __init find_functi
  #endif
  }
  
 -static int vdso_do_func_patch64(struct lib32_elfinfo *v32,
 -                              struct lib64_elfinfo *v64,
 -                              const char *orig, const char *fix)
 +static int __init vdso_do_func_patch64(struct lib32_elfinfo *v32,
 +                                     struct lib64_elfinfo *v64,
 +                                     const char *orig, const char *fix)
  {
        Elf64_Sym *sym64_gen, *sym64_fix;