Merge branch 'kvm-ppchv-next' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus...

diff --combined arch/powerpc/include/asm/reg.h
index 90c06ec6eff51d9863db7be38ea3c748f2c98e38,af21e876837e21ab86c49b796fe5376e9cd044c0..ce17815b8b55a95dd38439bfea2bf95f8d1c98bc
--- 1/arch/powerpc/include/asm/reg.h
--- 2/arch/powerpc/include/asm/reg.h
+++ b/arch/powerpc/include/asm/reg.h
@@@ -213,6 -213,7 +213,7 @@@
  #define SPRN_ACOP     0x1F    /* Available Coprocessor Register */
  #define SPRN_TFIAR    0x81    /* Transaction Failure Inst Addr   */
  #define SPRN_TEXASR   0x82    /* Transaction EXception & Summary */
+ #define   TEXASR_FS   __MASK(63-36)   /* Transaction Failure Summary */
  #define SPRN_TEXASRU  0x83    /* ''      ''      ''    Upper 32  */
  #define SPRN_TFHAR    0x80    /* Transaction Failure Handler Addr */
  #define SPRN_CTRLF    0x088
@@@ -1102,8 -1103,6 +1103,8 @@@
  #define PVR_8560      0x80200000
  #define PVR_VER_E500V1        0x8020
  #define PVR_VER_E500V2        0x8021
 +#define PVR_VER_E6500 0x8040
 +
  /*
   * For the 8xx processors, all of them report the same PVR family for
   * the PowerPC core. The various versions of these processors must be

diff --combined arch/powerpc/include/asm/tm.h
index 0c9f8b74dd9743ecd1977281c9365d6d1381fdf2,386a3efd34972509fe5c329b9712cf74baf96345..c22d704b6d417b2358d890fed6f5a57702671244
--- 1/arch/powerpc/include/asm/tm.h
--- 2/arch/powerpc/include/asm/tm.h
+++ b/arch/powerpc/include/asm/tm.h
@@@ -7,6 -7,8 +7,8 @@@
  
  #include <uapi/asm/tm.h>
  
+ #ifndef __ASSEMBLY__
+ 
  #ifdef CONFIG_PPC_TRANSACTIONAL_MEM
  extern void do_load_up_transact_fpu(struct thread_struct *thread);
  extern void do_load_up_transact_altivec(struct thread_struct *thread);
@@@ -15,9 -17,10 +17,11 @@@
  extern void tm_enable(void);
  extern void tm_reclaim(struct thread_struct *thread,
                       unsigned long orig_msr, uint8_t cause);
 +extern void tm_reclaim_current(uint8_t cause);
  extern void tm_recheckpoint(struct thread_struct *thread,
                            unsigned long orig_msr);
  extern void tm_abort(uint8_t cause);
  extern void tm_save_sprs(struct thread_struct *thread);
  extern void tm_restore_sprs(struct thread_struct *thread);
+ 
+ #endif /* __ASSEMBLY__ */