From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Tue, 30 Oct 2012 03:51:14 +0000 (+1100)
Subject: Merge remote-tracking branch 'signal/for-next'
X-Git-Tag: next-20121030~7
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=d72cb24903cbc28fb2a487234c81a22405e8a446;p=karo-tx-linux.git

Merge remote-tracking branch 'signal/for-next'

Conflicts:
	arch/sparc/kernel/sys_sparc_64.c
---

d72cb24903cbc28fb2a487234c81a22405e8a446
diff --cc arch/sparc/kernel/sys_sparc_64.c
index 878ef3d5fec5,adfe60ece05f..51b85feb8b97
--- a/arch/sparc/kernel/sys_sparc_64.c
+++ b/arch/sparc/kernel/sys_sparc_64.c
@@@ -729,30 -729,3 +729,8 @@@ SYSCALL_DEFINE5(rt_sigaction, int, sig
  
  	return ret;
  }
 +
- /*
-  * Do a system call from kernel instead of calling sys_execve so we
-  * end up with proper pt_regs.
-  */
- int kernel_execve(const char *filename,
- 		  const char *const argv[],
- 		  const char *const envp[])
- {
- 	long __res;
- 	register long __g1 __asm__ ("g1") = __NR_execve;
- 	register long __o0 __asm__ ("o0") = (long)(filename);
- 	register long __o1 __asm__ ("o1") = (long)(argv);
- 	register long __o2 __asm__ ("o2") = (long)(envp);
- 	asm volatile ("t 0x6d\n\t"
- 		      "sub %%g0, %%o0, %0\n\t"
- 		      "movcc %%xcc, %%o0, %0\n\t"
- 		      : "=r" (__res), "=&r" (__o0)
- 		      : "1" (__o0), "r" (__o1), "r" (__o2), "r" (__g1)
- 		      : "cc");
- 	return __res;
- }
- 
 +asmlinkage long sys_kern_features(void)
 +{
 +	return KERN_FEATURE_MIXED_MODE_STACK;
 +}