refresh 2.6.30 patches

[openwrt-10.03/.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 30acd0316bec2eaf1c471b5b87b2f11f4dc5c69b..c8f0bf5c8e9e4e7b2d515fc8832ec1aa8d81ca7e 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
@@ -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.
   */