Merge branch 'exec_domain_rip_v2' of git://git.kernel.org/pub/scm/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
  ...

3 files changed, 4 insertions, 19 deletions

diff --git a/arch/frv/include/asm/thread_info.h b/arch/frv/include/asm/thread_info.h
index 6b917f1c2955..ccba3b6ce918 100644
--- a/arch/frv/include/asm/thread_info.h
+++ b/arch/frv/include/asm/thread_info.h
@@ -31,7 +31,6 @@
 
 struct thread_info {
         struct task_struct      *task;          /* main task structure */
-        struct exec_domain      *exec_domain;   /* execution domain */
         unsigned long           flags;          /* low level flags */
         unsigned long           status;         /* thread-synchronous flags */
         __u32                   cpu;            /* current CPU */
@@ -59,7 +58,6 @@ struct thread_info {
 #define INIT_THREAD_INFO(tsk)                   \
 {                                               \
         .task           = &tsk,                 \
-        .exec_domain    = &default_exec_domain, \
         .flags          = 0,                    \
         .cpu            = 0,                    \
         .preempt_count  = INIT_PREEMPT_COUNT,   \
diff --git a/arch/frv/kernel/asm-offsets.c b/arch/frv/kernel/asm-offsets.c
index 446e89d500cc..8414293f213a 100644
--- a/arch/frv/kernel/asm-offsets.c
+++ b/arch/frv/kernel/asm-offsets.c
@@ -34,7 +34,6 @@ void foo(void)
 {
         /* offsets into the thread_info structure */
         OFFSET(TI_TASK,                 thread_info, task);
-        OFFSET(TI_EXEC_DOMAIN,          thread_info, exec_domain);
         OFFSET(TI_FLAGS,                thread_info, flags);
         OFFSET(TI_STATUS,               thread_info, status);
         OFFSET(TI_CPU,                  thread_info, cpu);
diff --git a/arch/frv/kernel/signal.c b/arch/frv/kernel/signal.c
index 85ca6727ca07..82d5e914dc15 100644
--- a/arch/frv/kernel/signal.c
+++ b/arch/frv/kernel/signal.c
@@ -174,20 +174,14 @@ static inline void __user *get_sigframe(struct ksignal *ksig,
 static int setup_frame(struct ksignal *ksig, sigset_t *set)
 {
         struct sigframe __user *frame;
-        int rsig, sig = ksig->sig;
+        int sig = ksig->sig;
 
         frame = get_sigframe(ksig, sizeof(*frame));
 
         if (!access_ok(VERIFY_WRITE, frame, sizeof(*frame)))
                 return -EFAULT;
 
-        rsig = sig;
-        if (sig < 32 &&
-            __current_thread_info->exec_domain &&
-            __current_thread_info->exec_domain->signal_invmap)
-                rsig = __current_thread_info->exec_domain->signal_invmap[sig];
-
-        if (__put_user(rsig, &frame->sig) < 0)
+        if (__put_user(sig, &frame->sig) < 0)
                 return -EFAULT;
 
         if (setup_sigcontext(&frame->sc, set->sig[0]))
@@ -253,20 +247,14 @@ static int setup_frame(struct ksignal *ksig, sigset_t *set)
 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;
 
         frame = get_sigframe(ksig, sizeof(*frame));
 
         if (!access_ok(VERIFY_WRITE, frame, sizeof(*frame)))
                 return -EFAULT;
 
-        rsig = sig;
-        if (sig < 32 &&
-            __current_thread_info->exec_domain &&
-            __current_thread_info->exec_domain->signal_invmap)
-                rsig = __current_thread_info->exec_domain->signal_invmap[sig];
-
-        if (__put_user(rsig,            &frame->sig) ||
+        if (__put_user(sig,             &frame->sig) ||
             __put_user(&frame->info,    &frame->pinfo) ||
             __put_user(&frame->uc,      &frame->puc))
                 return -EFAULT;