[Linux-abi-cvs] CVS: linux-abi/linux-26/arch/parisc/kernel signal.c,1.3,1.4

[Fred W. <fw...@us...>]

Update of /cvsroot/linux-abi/linux-abi/linux-26/arch/parisc/kernel
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2468/linux-26/arch/parisc/kernel

Modified Files:
	signal.c 
Log Message:
linux-26: patch to 2.6.14, incl. audit syscalls

Index: signal.c
===================================================================
RCS file: /cvsroot/linux-abi/linux-abi/linux-26/arch/parisc/kernel/signal.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** signal.c	24 Jan 2006 00:28:19 -0000	1.3
--- signal.c	24 Jan 2006 04:40:17 -0000	1.4
***************
*** 33,37 ****
  #include <asm/pgalloc.h>
  #include <asm/cacheflush.h>
! #include <asm/offsets.h>
  
  #ifdef CONFIG_COMPAT
--- 33,37 ----
  #include <asm/pgalloc.h>
  #include <asm/cacheflush.h>
! #include <asm/asm-offsets.h>
  
  #ifdef CONFIG_COMPAT
***************
*** 154,158 ****
  	struct compat_rt_sigframe __user * compat_frame;
  	
! 	if(is_cur_personality_id(PERID_LINUX32))
  		sigframe_size = PARISC_RT_SIGFRAME_SIZE32;
  #endif
--- 154,158 ----
  	struct compat_rt_sigframe __user * compat_frame;
  	
! 	if(personality(current->personality) == PER_LINUX32)
  		sigframe_size = PARISC_RT_SIGFRAME_SIZE32;
  #endif
***************
*** 167,171 ****
  	compat_frame = (struct compat_rt_sigframe __user *)frame;
  	
! 	if(is_cur_personality_id(PERID_LINUX32)){
  		DBG(2,"sys_rt_sigreturn: ELF32 process.\n");
  		if (__copy_from_user(&compat_set, &compat_frame->uc.uc_sigmask, sizeof(compat_set)))
--- 167,171 ----
  	compat_frame = (struct compat_rt_sigframe __user *)frame;
  	
! 	if(personality(current->personality) == PER_LINUX32){
  		DBG(2,"sys_rt_sigreturn: ELF32 process.\n");
  		if (__copy_from_user(&compat_set, &compat_frame->uc.uc_sigmask, sizeof(compat_set)))
***************
*** 317,321 ****
  	compat_frame = (struct compat_rt_sigframe __user *)frame;
  	
! 	if(is_personality_id(PERID_LINUX32)) {
  		DBG(1,"setup_rt_frame: frame->info = 0x%p\n", &compat_frame->info);
  		err |= compat_copy_siginfo_to_user(&compat_frame->info, info);
--- 317,321 ----
  	compat_frame = (struct compat_rt_sigframe __user *)frame;
  	
! 	if(personality(current->personality) == PER_LINUX32) {
  		DBG(1,"setup_rt_frame: frame->info = 0x%p\n", &compat_frame->info);
  		err |= compat_copy_siginfo_to_user(&compat_frame->info, info);
***************
*** 441,445 ****
  		unsigned long psw = USER_PSW;
  #ifdef __LP64__
! 		if(is_cur_personality_id(PERID_LINUX))	
  			psw |= PSW_W;
  #endif
--- 441,445 ----
  		unsigned long psw = USER_PSW;
  #ifdef __LP64__
! 		if(is_cur_personality_id(PERID_LINUX))
  			psw |= PSW_W;
  #endif
***************
*** 518,528 ****
  		return 0;
  
! 	if (!(ka->sa.sa_flags & SA_NODEFER)) {
! 		spin_lock_irq(&current->sighand->siglock);
! 		sigorsets(&current->blocked,&current->blocked,&ka->sa.sa_mask);
  		sigaddset(&current->blocked,sig);
! 		recalc_sigpending();
! 		spin_unlock_irq(&current->sighand->siglock);
! 	}
  	return 1;
  }
--- 518,527 ----
  		return 0;
  
! 	spin_lock_irq(&current->sighand->siglock);
! 	sigorsets(&current->blocked,&current->blocked,&ka->sa.sa_mask);
! 	if (!(ka->sa.sa_flags & SA_NODEFER))
  		sigaddset(&current->blocked,sig);
! 	recalc_sigpending();
! 	spin_unlock_irq(&current->sighand->siglock);
  	return 1;
  }