fixed up queue-3.10/powerpc-tm-disable-irq-in-tm_recheckpoint.patch

diff --git a/queue-3.10/powerpc-tm-disable-irq-in-tm_recheckpoint.patch b/queue-3.10/powerpc-tm-disable-irq-in-tm_recheckpoint.patch
index e716187bf1b045463565bd62cd8ff369ac52122d..0fec9a81ecef9435a5728a0f337e99d0ee8cb6ad 100644 (file)
--- a/queue-3.10/powerpc-tm-disable-irq-in-tm_recheckpoint.patch
+++ b/queue-3.10/powerpc-tm-disable-irq-in-tm_recheckpoint.patch
@@ -53,12 +53,23 @@ Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
 Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 
 ---
+ arch/powerpc/include/asm/reg.h  |    1 +
  arch/powerpc/kernel/process.c   |   34 ++++++++++++++++++++++++++++------
  arch/powerpc/kernel/signal_32.c |    2 ++
  arch/powerpc/kernel/signal_64.c |    2 ++
  arch/powerpc/kernel/tm.S        |    2 +-
- 4 files changed, 33 insertions(+), 7 deletions(-)
+ 5 files changed, 34 insertions(+), 7 deletions(-)
 
+--- a/arch/powerpc/include/asm/reg.h
++++ b/arch/powerpc/include/asm/reg.h
+@@ -208,6 +208,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
 --- a/arch/powerpc/kernel/process.c
 +++ b/arch/powerpc/kernel/process.c
 @@ -523,6 +523,31 @@ out_and_saveregs: