refresh 2.6.30 patches

[10.03/openwrt.git] / target / linux / generic-2.6 / patches-2.6.30 / 965-arm_restore_sigmask_v2.patch

diff --git a/target/linux/generic-2.6/patches-2.6.30/965-arm_restore_sigmask_v2.patch b/target/linux/generic-2.6/patches-2.6.30/965-arm_restore_sigmask_v2.patch
index 1ae71af..c8f0bf5 100644 (file)
--- a/target/linux/generic-2.6/patches-2.6.30/965-arm_restore_sigmask_v2.patch
+++ b/target/linux/generic-2.6/patches-2.6.30/965-arm_restore_sigmask_v2.patch
@@ -79,8 +79,8 @@ Signed-off-by: Mikael Pettersson <mikpe@it.uu.se>
 Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
 ---
 
---- a/arch/arm/include/asm/thread_info.h       2009-04-18 18:55:23.000000000 +0200
-+++ b/arch/arm/include/asm/thread_info.h       2009-04-18 19:10:22.000000000 +0200
+--- a/arch/arm/include/asm/thread_info.h
++++ b/arch/arm/include/asm/thread_info.h
 @@ -140,6 +140,7 @@ extern void vfp_sync_state(struct thread
  #define TIF_USING_IWMMXT      17
  #define TIF_MEMDIE            18
@@ -97,8 +97,8 @@ Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
  
  /*
   * Change these and you break ASM code in entry-common.S
---- a/arch/arm/include/asm/unistd.h    2008-10-11 10:43:49.000000000 +0200
-+++ b/arch/arm/include/asm/unistd.h    2009-04-18 19:10:22.000000000 +0200
+--- a/arch/arm/include/asm/unistd.h
++++ b/arch/arm/include/asm/unistd.h
 @@ -360,8 +360,8 @@
  #define __NR_readlinkat                       (__NR_SYSCALL_BASE+332)
  #define __NR_fchmodat                 (__NR_SYSCALL_BASE+333)
@@ -119,7 +119,7 @@ Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
  #define __NR_kexec_load                       (__NR_SYSCALL_BASE+347)
  #define __NR_utimensat                        (__NR_SYSCALL_BASE+348)
  #define __NR_signalfd                 (__NR_SYSCALL_BASE+349)
-@@ -428,6 +428,7 @@
+@@ -430,6 +430,7 @@
  #define __ARCH_WANT_SYS_SIGPENDING
  #define __ARCH_WANT_SYS_SIGPROCMASK
  #define __ARCH_WANT_SYS_RT_SIGACTION
@@ -127,8 +127,8 @@ Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
  
  #if !defined(CONFIG_AEABI) || defined(CONFIG_OABI_COMPAT)
  #define __ARCH_WANT_SYS_TIME
---- a/arch/arm/kernel/calls.S  2009-03-24 18:00:31.000000000 +0100
-+++ b/arch/arm/kernel/calls.S  2009-04-18 19:10:22.000000000 +0200
+--- a/arch/arm/kernel/calls.S
++++ b/arch/arm/kernel/calls.S
 @@ -81,7 +81,7 @@
                CALL(sys_ni_syscall)            /* was sys_ssetmask */
  /* 70 */      CALL(sys_setreuid16)
@@ -167,8 +167,8 @@ Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
                CALL(sys_kexec_load)
                CALL(sys_utimensat)
                CALL(sys_signalfd)
---- a/arch/arm/kernel/entry-common.S   2009-04-18 18:55:23.000000000 +0200
-+++ b/arch/arm/kernel/entry-common.S   2009-04-18 19:10:22.000000000 +0200
+--- a/arch/arm/kernel/entry-common.S
++++ b/arch/arm/kernel/entry-common.S
 @@ -370,16 +370,6 @@ sys_clone_wrapper:
                b       sys_clone
  ENDPROC(sys_clone_wrapper)
@@ -186,8 +186,8 @@ Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
  sys_sigreturn_wrapper:
                add     r0, sp, #S_OFF
                b       sys_sigreturn
---- a/arch/arm/kernel/signal.c 2008-12-25 15:54:13.000000000 +0100
-+++ b/arch/arm/kernel/signal.c 2009-04-18 19:10:22.000000000 +0200
+--- a/arch/arm/kernel/signal.c
++++ b/arch/arm/kernel/signal.c
 @@ -47,57 +47,22 @@ const unsigned long sigreturn_codes[7] =
        MOV_R7_NR_RT_SIGRETURN, SWI_SYS_RT_SIGRETURN, SWI_THUMB_RT_SIGRETURN,
  };
@@ -261,7 +261,7 @@ Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
  handle_signal(unsigned long sig, struct k_sigaction *ka,
              siginfo_t *info, sigset_t *oldset,
              struct pt_regs * regs, int syscall)
-@@ -592,7 +557,7 @@ handle_signal(unsigned long sig, struct 
+@@ -592,7 +557,7 @@ handle_signal(unsigned long sig, struct
  
        if (ret != 0) {
                force_sigsegv(sig, tsk);
@@ -270,7 +270,7 @@ Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
        }
  
        /*
-@@ -606,6 +571,7 @@ handle_signal(unsigned long sig, struct 
+@@ -606,6 +571,7 @@ handle_signal(unsigned long sig, struct
        recalc_sigpending();
        spin_unlock_irq(&tsk->sighand->siglock);
  
@@ -278,7 +278,7 @@ Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
  }
  
  /*
-@@ -617,11 +583,12 @@ handle_signal(unsigned long sig, struct 
+@@ -617,11 +583,12 @@ handle_signal(unsigned long sig, struct
   * the kernel can handle, and then we build all the user-level signal handling
   * stack-frames in one go after that.
   */