Merge commit 'origin'
Benjamin Herrenschmidt [Wed, 15 Oct 2008 00:31:54 +0000 (11:31 +1100)]
Manual fixup of conflicts on:

arch/powerpc/include/asm/dcr-regs.h
drivers/net/ibm_newemac/core.h

12 files changed:
1  2 
arch/powerpc/boot/Makefile
arch/powerpc/boot/dts/mpc8610_hpcd.dts
arch/powerpc/include/asm/sections.h
arch/powerpc/kernel/smp.c
arch/powerpc/platforms/cell/spufs/inode.c
drivers/block/floppy.c
drivers/char/hvc_console.c
drivers/net/ibm_newemac/Kconfig
drivers/net/ibm_newemac/mal.h
drivers/net/ibm_newemac/phy.c
drivers/pnp/pnpbios/core.c
drivers/serial/Kconfig

Simple merge
@@@ -16,14 -18,16 +18,22 @@@ static inline int in_kernel_text(unsign
        return 0;
  }
  
 +static inline int overlaps_kernel_text(unsigned long start, unsigned long end)
 +{
 +      return start < (unsigned long)__init_end &&
 +              (unsigned long)_stext < end;
 +}
 +
  #undef dereference_function_descriptor
- void *dereference_function_descriptor(void *);
+ static inline void *dereference_function_descriptor(void *ptr)
+ {
+       struct ppc64_opd_entry *desc = ptr;
+       void *p;
+       if (!probe_kernel_address(&desc->funcaddr, p))
+               ptr = p;
+       return ptr;
+ }
  
  #endif
  
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge