3.10: fix up a mistake in the arm patch

diff --git a/queue-3.10/arm-fix-a-cockup-in-48be69a02-arm-move-signal-handlers-into-a-vdso-like-page.patch b/queue-3.10/arm-fix-a-cockup-in-48be69a02-arm-move-signal-handlers-into-a-vdso-like-page.patch
index 1730f24c49bc910977c23299b1bc3ab98d1eee85..48ee1f7306226c54c8f99fe747c7d38bd62b301a 100644 (file)
--- a/queue-3.10/arm-fix-a-cockup-in-48be69a02-arm-move-signal-handlers-into-a-vdso-like-page.patch
+++ b/queue-3.10/arm-fix-a-cockup-in-48be69a02-arm-move-signal-handlers-into-a-vdso-like-page.patch
@@ -71,7 +71,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
                mm->context.sigpage = addr;
 --- a/arch/arm/kernel/signal.c
 +++ b/arch/arm/kernel/signal.c
-@@ -610,35 +610,32 @@ do_work_pending(struct pt_regs *regs, un
+@@ -609,35 +609,32 @@ do_work_pending(struct pt_regs *regs, un
        return 0;
  }
  

diff --git a/queue-3.10/arm-fix-nommu-builds-with-48be69a02-arm-move-signal-handlers-into-a-vdso-like-page.patch b/queue-3.10/arm-fix-nommu-builds-with-48be69a02-arm-move-signal-handlers-into-a-vdso-like-page.patch
index d529110a1d9ad10d419c2a074f0ab18190173cbc..e0940c17e359802a2dd434f5d5ef02297c26fa84 100644 (file)
--- a/queue-3.10/arm-fix-nommu-builds-with-48be69a02-arm-move-signal-handlers-into-a-vdso-like-page.patch
+++ b/queue-3.10/arm-fix-nommu-builds-with-48be69a02-arm-move-signal-handlers-into-a-vdso-like-page.patch
@@ -48,8 +48,8 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
                if (cpsr & MODE32_BIT) {
                        struct mm_struct *mm = current->mm;
                        /*
-@@ -408,7 +409,9 @@ setup_return(struct pt_regs *regs, struc
-                       retcode = KERN_SIGRETURN_CODE + (idx << 2) + thumb;
+@@ -407,7 +408,9 @@ setup_return(struct pt_regs *regs, struc
+                        */
                        retcode = mm->context.sigpage + signal_return_offset +
                                  (idx << 2) + thumb;
 -              } else {

diff --git a/queue-3.10/arm-move-signal-handlers-into-a-vdso-like-page.patch b/queue-3.10/arm-move-signal-handlers-into-a-vdso-like-page.patch
index 51672f3640ffbb5cfc5697c010c947745f92f72f..ddd643168f7a964d082a97738805c9de2c4d1f78 100644 (file)
--- a/queue-3.10/arm-move-signal-handlers-into-a-vdso-like-page.patch
+++ b/queue-3.10/arm-move-signal-handlers-into-a-vdso-like-page.patch
@@ -20,10 +20,10 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  arch/arm/include/asm/elf.h |    4 +++
  arch/arm/include/asm/mmu.h |    1 
  arch/arm/kernel/process.c  |   40 +++++++++++++++++++++++++++++++++---
- arch/arm/kernel/signal.c   |   49 ++++++++++++++++++++++++++++++++++++++++-----
- arch/arm/kernel/signal.h   |   12 -----------
+ arch/arm/kernel/signal.c   |   50 +++++++++++++++++++++++++++++++++++++++------
+ arch/arm/kernel/signal.h   |   12 ----------
  arch/arm/kernel/traps.c    |    9 --------
- 6 files changed, 86 insertions(+), 29 deletions(-)
+ 6 files changed, 86 insertions(+), 30 deletions(-)
 
 --- a/arch/arm/include/asm/elf.h
 +++ b/arch/arm/include/asm/elf.h
@@ -140,7 +140,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  #ifdef CONFIG_CRUNCH
  static int preserve_crunch_context(struct crunch_sigframe __user *frame)
  {
-@@ -397,11 +399,15 @@ setup_return(struct pt_regs *regs, struc
+@@ -397,11 +399,14 @@ setup_return(struct pt_regs *regs, struc
                        return 1;
  
                if (cpsr & MODE32_BIT) {
@@ -152,13 +152,13 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 +                       * except when the MPU has protected the vectors
 +                       * page from PL0
                         */
-                       retcode = KERN_SIGRETURN_CODE + (idx << 2) + thumb;
+-                      retcode = KERN_SIGRETURN_CODE + (idx << 2) + thumb;
 +                      retcode = mm->context.sigpage + signal_return_offset +
 +                                (idx << 2) + thumb;
                } else {
                        /*
                         * Ensure that the instruction cache sees
-@@ -603,3 +609,36 @@ do_work_pending(struct pt_regs *regs, un
+@@ -603,3 +608,36 @@ do_work_pending(struct pt_regs *regs, un
        } while (thread_flags & _TIF_WORK_MASK);
        return 0;
  }