From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 15 Apr 2015 20:53:55 +0000 (-0700)
Subject: Merge branch 'exec_domain_rip_v2' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Tag: omap-for-v4.1/fixes-rc1~133
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fa2e5c073a355465a2a8c9a2fbecf404f9857c3a;p=pandora-kernel.git

Merge branch 'exec_domain_rip_v2' of git://git./linux/kernel/git/rw/misc

Pull exec domain removal from Richard Weinberger:
 "This series removes execution domain support from Linux.

  The idea behind exec domains was to support different ABIs.  The
  feature was never complete nor stable.  Let's rip it out and make the
  kernel signal handling code less complicated"

* 'exec_domain_rip_v2' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/misc: (27 commits)
  arm64: Removed unused variable
  sparc: Fix execution domain removal
  Remove rest of exec domains.
  arch: Remove exec_domain from remaining archs
  arc: Remove signal translation and exec_domain
  xtensa: Remove signal translation and exec_domain
  xtensa: Autogenerate offsets in struct thread_info
  x86: Remove signal translation and exec_domain
  unicore32: Remove signal translation and exec_domain
  um: Remove signal translation and exec_domain
  tile: Remove signal translation and exec_domain
  sparc: Remove signal translation and exec_domain
  sh: Remove signal translation and exec_domain
  s390: Remove signal translation and exec_domain
  mn10300: Remove signal translation and exec_domain
  microblaze: Remove signal translation and exec_domain
  m68k: Remove signal translation and exec_domain
  m32r: Remove signal translation and exec_domain
  m32r: Autogenerate offsets in struct thread_info
  frv: Remove signal translation and exec_domain
  ...
---

fa2e5c073a355465a2a8c9a2fbecf404f9857c3a
diff --cc arch/frv/kernel/signal.c
index 85ca6727ca07,75c602dc874f..82d5e914dc15
--- a/arch/frv/kernel/signal.c
+++ b/arch/frv/kernel/signal.c
@@@ -174,8 -174,10 +174,8 @@@ static inline void __user *get_sigframe
  static int setup_frame(struct ksignal *ksig, sigset_t *set)
  {
  	struct sigframe __user *frame;
- 	int rsig, sig = ksig->sig;
+ 	int sig = ksig->sig;
  
 -	set_fs(USER_DS);
 -
  	frame = get_sigframe(ksig, sizeof(*frame));
  
  	if (!access_ok(VERIFY_WRITE, frame, sizeof(*frame)))
@@@ -253,8 -249,10 +247,8 @@@
  static int setup_rt_frame(struct ksignal *ksig, sigset_t *set)
  {
  	struct rt_sigframe __user *frame;
- 	int rsig, sig = ksig->sig;
+ 	int sig = ksig->sig;
  
 -	set_fs(USER_DS);
 -
  	frame = get_sigframe(ksig, sizeof(*frame));
  
  	if (!access_ok(VERIFY_WRITE, frame, sizeof(*frame)))
diff --cc arch/sh/kernel/signal_64.c
index 0462995d4d7f,76122d6cd95f..d8a3f0d22809
--- a/arch/sh/kernel/signal_64.c
+++ b/arch/sh/kernel/signal_64.c
@@@ -457,9 -451,11 +451,9 @@@ static int setup_frame(struct ksignal *
  
  	regs->pc = neff_sign_extend((unsigned long)ksig->ka.sa.sa_handler);
  
 -	set_fs(USER_DS);
 -
  	/* Broken %016Lx */
  	pr_debug("SIG deliver (#%d,%s:%d): sp=%p pc=%08Lx%08Lx link=%08Lx%08Lx\n",
- 		 signal, current->comm, current->pid, frame,
+ 		 sig, current->comm, current->pid, frame,
  		 regs->pc >> 32, regs->pc & 0xffffffff,
  		 DEREF_REG_PR >> 32, DEREF_REG_PR & 0xffffffff);
  
@@@ -545,8 -534,10 +532,8 @@@ static int setup_rt_frame(struct ksigna
  	regs->regs[REG_ARG3] = (unsigned long long)(unsigned long)(signed long)&frame->uc.uc_mcontext;
  	regs->pc = neff_sign_extend((unsigned long)ksig->ka.sa.sa_handler);
  
 -	set_fs(USER_DS);
 -
  	pr_debug("SIG deliver (#%d,%s:%d): sp=%p pc=%08Lx%08Lx link=%08Lx%08Lx\n",
- 		 signal, current->comm, current->pid, frame,
+ 		 sig, current->comm, current->pid, frame,
  		 regs->pc >> 32, regs->pc & 0xffffffff,
  		 DEREF_REG_PR >> 32, DEREF_REG_PR & 0xffffffff);
  
diff --cc arch/xtensa/kernel/signal.c
index 6b3790445cbe,1785c4dae1ce..e87adaa07ff3
--- a/arch/xtensa/kernel/signal.c
+++ b/arch/xtensa/kernel/signal.c
@@@ -405,9 -398,14 +398,9 @@@ static int setup_frame(struct ksignal *
  	regs->areg[8] = (unsigned long) &frame->uc;
  	regs->threadptr = tp;
  
 -	/* Set access mode to USER_DS.  Nomenclature is outdated, but
 -	 * functionality is used in uaccess.h
 -	 */
 -	set_fs(USER_DS);
 -
  #if DEBUG_SIG
  	printk("SIG rt deliver (%s:%d): signal=%d sp=%p pc=%08x\n",
- 		current->comm, current->pid, signal, frame, regs->pc);
+ 		current->comm, current->pid, sig, frame, regs->pc);
  #endif
  
  	return 0;