rpms/kernel/devel linux-2.6-x86_64-tif-restore-sigmask.patch, 1.3, 1.4

[fedora-cvs-commits redhat com]

Author: dwmw2

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv21449

Modified Files:
	linux-2.6-x86_64-tif-restore-sigmask.patch 
Log Message:
build fix

linux-2.6-x86_64-tif-restore-sigmask.patch:
 arch/x86_64/ia32/ia32_signal.c   |   28 ++++++++------------
 arch/x86_64/kernel/signal.c      |   53 +++++++++++++++++++++++++++------------
 include/asm-x86_64/signal.h      |    4 --
 include/asm-x86_64/thread_info.h |    2 +
 4 files changed, 50 insertions(+), 37 deletions(-)

Index: linux-2.6-x86_64-tif-restore-sigmask.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-x86_64-tif-restore-sigmask.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- linux-2.6-x86_64-tif-restore-sigmask.patch	2 Jul 2006 22:20:10 -0000	1.3
+++ linux-2.6-x86_64-tif-restore-sigmask.patch	2 Jul 2006 22:30:32 -0000	1.4
@@ -70,10 +70,19 @@
 +	return -EFAULT;
  }
 diff --git a/arch/x86_64/kernel/signal.c b/arch/x86_64/kernel/signal.c
-index 2816117..d7e92fb 100644
+index 2816117..8b80ba2 100644
 --- a/arch/x86_64/kernel/signal.c
 +++ b/arch/x86_64/kernel/signal.c
-@@ -341,11 +341,11 @@ #ifdef DEBUG_SIG
+@@ -32,6 +32,8 @@ #include <asm/ia32_unistd.h>
+ 
+ #define _BLOCKABLE (~(sigmask(SIGKILL) | sigmask(SIGSTOP)))
+ 
++static void do_signal(struct pt_regs *regs);
++
+ int ia32_setup_rt_frame(int sig, struct k_sigaction *ka, siginfo_t *info,
+                sigset_t *set, struct pt_regs * regs); 
+ int ia32_setup_frame(int sig, struct k_sigaction *ka,
+@@ -341,11 +343,11 @@ #ifdef DEBUG_SIG
  		current->comm, current->pid, frame, regs->rip, frame->pretcode);
  #endif
  
@@ -87,7 +96,7 @@
  }
  
  /*
-@@ -408,7 +408,7 @@ #ifdef CONFIG_IA32_EMULATION
+@@ -408,7 +410,7 @@ #ifdef CONFIG_IA32_EMULATION
  #endif
  	ret = setup_rt_frame(sig, ka, info, oldset, regs);
  
@@ -96,7 +105,7 @@
  		spin_lock_irq(&current->sighand->siglock);
  		sigorsets(&current->blocked,&current->blocked,&ka->sa.sa_mask);
  		if (!(ka->sa.sa_flags & SA_NODEFER))
-@@ -425,11 +425,12 @@ #endif
+@@ -425,11 +427,12 @@ #endif
   * want to handle. Thus you cannot kill init even with a SIGKILL even by
   * mistake.
   */
@@ -110,7 +119,7 @@
  
  	/*
  	 * We want the common case to go fast, which
-@@ -438,9 +439,11 @@ int do_signal(struct pt_regs *regs, sigs
+@@ -438,9 +441,11 @@ int do_signal(struct pt_regs *regs, sigs
  	 * if so.
  	 */
  	if (!user_mode(regs))
@@ -124,7 +133,7 @@
  		oldset = &current->blocked;
  
  	signr = get_signal_to_deliver(&info, &ka, regs, NULL);
-@@ -454,30 +457,46 @@ int do_signal(struct pt_regs *regs, sigs
+@@ -454,30 +459,46 @@ int do_signal(struct pt_regs *regs, sigs
  			set_debugreg(current->thread.debugreg7, 7);
  
  		/* Whee!  Actually deliver the signal.  */
@@ -179,7 +188,7 @@
  {
  #ifdef DEBUG_SIG
  	printk("do_notify_resume flags:%x rip:%lx rsp:%lx caller:%lx pending:%lx\n",
-@@ -491,8 +510,8 @@ #endif
+@@ -491,8 +512,8 @@ #endif
  	}
  
  	/* deal with pending signal delivery */