Merge branch 'topic/ppc-kvm' into next

Merge the topic branch we're sharing with the kvm-ppc tree.

diff --cc arch/powerpc/include/asm/reg.h
index c491cfebfc050faf157da7dcbaf6d76ad3236909,04aa1ee8cdb6a1ca69ac41c2a93475849f093ef0..0d4531aa2052d77fb8036b05f3550c33cfdde49e
--- 1/arch/powerpc/include/asm/reg.h
--- 2/arch/powerpc/include/asm/reg.h
+++ b/arch/powerpc/include/asm/reg.h
@@@ -292,6 -295,9 +295,7 @@@
  #define SPRN_HRMOR    0x139   /* Real mode offset register */
  #define SPRN_HSRR0    0x13A   /* Hypervisor Save/Restore 0 */
  #define SPRN_HSRR1    0x13B   /* Hypervisor Save/Restore 1 */
 -#define SPRN_LMRR     0x32D   /* Load Monitor Region Register */
 -#define SPRN_LMSER    0x32E   /* Load Monitor Section Enable Register */
+ #define SPRN_ASDR     0x330   /* Access segment descriptor register */
  #define SPRN_IC               0x350   /* Virtual Instruction Count */
  #define SPRN_VTB      0x351   /* Virtual Time Base */
  #define SPRN_LDBAR    0x352   /* LD Base Address Register */
@@@ -302,6 -308,8 +306,7 @@@
  #define SPRN_PMCR     0x374   /* Power Management Control Register */
  
  /* HFSCR and FSCR bit numbers are the same */
 -#define FSCR_LM_LG    11      /* Enable Load Monitor Registers */
+ #define FSCR_MSGP_LG  10      /* Enable MSGP */
  #define FSCR_TAR_LG   8       /* Enable Target Address Register */
  #define FSCR_EBB_LG   7       /* Enable Event Based Branching */
  #define FSCR_TM_LG    5       /* Enable Transactional Memory */
@@@ -315,6 -324,8 +320,7 @@@
  #define   FSCR_EBB    __MASK(FSCR_EBB_LG)
  #define   FSCR_DSCR   __MASK(FSCR_DSCR_LG)
  #define SPRN_HFSCR    0xbe    /* HV=1 Facility Status & Control Register */
 -#define   HFSCR_LM    __MASK(FSCR_LM_LG)
+ #define   HFSCR_MSGP  __MASK(FSCR_MSGP_LG)
  #define   HFSCR_TAR   __MASK(FSCR_TAR_LG)
  #define   HFSCR_EBB   __MASK(FSCR_EBB_LG)
  #define   HFSCR_TM    __MASK(FSCR_TM_LG)

diff --cc arch/powerpc/mm/hash_native_64.c
Simple merge

diff --cc arch/powerpc/mm/pgtable-radix.c
Simple merge

diff --cc arch/powerpc/platforms/powernv/opal.c
Simple merge

diff --cc arch/powerpc/platforms/pseries/lpar.c
Simple merge