8 files changed, 3 insertions, 126 deletions

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 7cbf4ef5c6fd..392e7ae69452 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -2133,16 +2133,6 @@ menu "Userspace binary formats"
 
 source "fs/Kconfig.binfmt"
 
-config ARTHUR
-        tristate "RISC OS personality"
-        depends on !AEABI
-        help
-          Say Y here to include the kernel code necessary if you want to run
-          Acorn RISC OS/Arthur binaries under Linux. This code is still very
-          experimental; if this sounds frightening, say N and sleep in peace.
-          You can also say M here to compile this support as a module (which
-          will be called arthur).
-
 endmenu
 
 menu "Power management options"
diff --git a/arch/arm/configs/badge4_defconfig b/arch/arm/configs/badge4_defconfig
index 0494c8f229a2..d59009878312 100644
--- a/arch/arm/configs/badge4_defconfig
+++ b/arch/arm/configs/badge4_defconfig
@@ -12,7 +12,6 @@ CONFIG_CPU_FREQ_GOV_PERFORMANCE=y
 CONFIG_FPE_NWFPE=y
 CONFIG_BINFMT_AOUT=m
 CONFIG_BINFMT_MISC=m
-CONFIG_ARTHUR=m
 CONFIG_NET=y
 CONFIG_PACKET=y
 CONFIG_UNIX=y
diff --git a/arch/arm/include/asm/thread_info.h b/arch/arm/include/asm/thread_info.h
index 72812a1f3d1c..bd32eded3e50 100644
--- a/arch/arm/include/asm/thread_info.h
+++ b/arch/arm/include/asm/thread_info.h
@@ -23,7 +23,6 @@
 #ifndef __ASSEMBLY__
 
 struct task_struct;
-struct exec_domain;
 
 #include <asm/types.h>
 #include <asm/domain.h>
@@ -53,7 +52,6 @@ struct thread_info {
         int                     preempt_count;  /* 0 => preemptable, <0 => bug */
         mm_segment_t            addr_limit;     /* address limit */
         struct task_struct      *task;          /* main task structure */
-        struct exec_domain      *exec_domain;   /* execution domain */
         __u32                   cpu;            /* cpu */
         __u32                   cpu_domain;     /* cpu domain */
         struct cpu_context_save cpu_context;    /* cpu context */
@@ -73,7 +71,6 @@ struct thread_info {
 #define INIT_THREAD_INFO(tsk)                                           \
 {                                                                       \
         .task           = &tsk,                                         \
-        .exec_domain    = &default_exec_domain,                         \
         .flags          = 0,                                            \
         .preempt_count  = INIT_PREEMPT_COUNT,                           \
         .addr_limit     = KERNEL_DS,                                    \
diff --git a/arch/arm/kernel/Makefile b/arch/arm/kernel/Makefile
index ba5f83226011..752725dcbf42 100644
--- a/arch/arm/kernel/Makefile
+++ b/arch/arm/kernel/Makefile
@@ -34,7 +34,6 @@ obj-$(CONFIG_CPU_IDLE)		+= cpuidle.o
 obj-$(CONFIG_ISA_DMA_API)       += dma.o
 obj-$(CONFIG_FIQ)               += fiq.o fiqasm.o
 obj-$(CONFIG_MODULES)           += armksyms.o module.o
-obj-$(CONFIG_ARTHUR)            += arthur.o
 obj-$(CONFIG_ISA_DMA)           += dma-isa.o
 obj-$(CONFIG_PCI)               += bios32.o isa.o
 obj-$(CONFIG_ARM_CPU_SUSPEND)   += sleep.o suspend.o
diff --git a/arch/arm/kernel/arthur.c b/arch/arm/kernel/arthur.c
deleted file mode 100644
index 321c5291d05f..000000000000
--- a/arch/arm/kernel/arthur.c
+++ /dev/null
@@ -1,94 +0,0 @@
-/*
- *  linux/arch/arm/kernel/arthur.c
- *
- *  Copyright (C) 1998, 1999, 2000, 2001 Philip Blundell
- *
- * Arthur personality
- */
-
-/*
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version
- * 2 of the License, or (at your option) any later version.
- */
-
-#include <linux/module.h>
-#include <linux/personality.h>
-#include <linux/stddef.h>
-#include <linux/signal.h>
-#include <linux/init.h>
-#include <linux/sched.h>
-
-#include <asm/ptrace.h>
-
-/* Arthur doesn't have many signals, and a lot of those that it does
-   have don't map easily to any Linux equivalent.  Never mind.  */
-
-#define ARTHUR_SIGABRT          1
-#define ARTHUR_SIGFPE           2
-#define ARTHUR_SIGILL           3
-#define ARTHUR_SIGINT           4
-#define ARTHUR_SIGSEGV          5
-#define ARTHUR_SIGTERM          6
-#define ARTHUR_SIGSTAK          7
-#define ARTHUR_SIGUSR1          8
-#define ARTHUR_SIGUSR2          9
-#define ARTHUR_SIGOSERROR       10
-
-static unsigned long arthur_to_linux_signals[32] = {
-        0,      1,      2,      3,      4,      5,      6,      7,
-        8,      9,      10,     11,     12,     13,     14,     15,
-        16,     17,     18,     19,     20,     21,     22,     23,
-        24,     25,     26,     27,     28,     29,     30,     31
-};
-
-static unsigned long linux_to_arthur_signals[32] = {
-        0,              -1,             ARTHUR_SIGINT,  -1,
-        ARTHUR_SIGILL,  5,              ARTHUR_SIGABRT, 7,
-        ARTHUR_SIGFPE,  9,              ARTHUR_SIGUSR1, ARTHUR_SIGSEGV, 
-        ARTHUR_SIGUSR2, 13,             14,             ARTHUR_SIGTERM,
-        16,             17,             18,             19,
-        20,             21,             22,             23,
-        24,             25,             26,             27,
-        28,             29,             30,             31
-};
-
-static void arthur_lcall7(int nr, struct pt_regs *regs)
-{
-        struct siginfo info;
-        info.si_signo = SIGSWI;
-        info.si_errno = nr;
-        /* Bounce it to the emulator */
-        send_sig_info(SIGSWI, &info, current);
-}
-
-static struct exec_domain arthur_exec_domain = {
-        .name           = "Arthur",
-        .handler        = arthur_lcall7,
-        .pers_low       = PER_RISCOS,
-        .pers_high      = PER_RISCOS,
-        .signal_map     = arthur_to_linux_signals,
-        .signal_invmap  = linux_to_arthur_signals,
-        .module         = THIS_MODULE,
-};
-
-/*
- * We could do with some locking to stop Arthur being removed while
- * processes are using it.
- */
-
-static int __init arthur_init(void)
-{
-        return register_exec_domain(&arthur_exec_domain);
-}
-
-static void __exit arthur_exit(void)
-{
-        unregister_exec_domain(&arthur_exec_domain);
-}
-
-module_init(arthur_init);
-module_exit(arthur_exit);
-
-MODULE_LICENSE("GPL");
diff --git a/arch/arm/kernel/asm-offsets.c b/arch/arm/kernel/asm-offsets.c
index 61bb5a65eb37..871b8267d211 100644
--- a/arch/arm/kernel/asm-offsets.c
+++ b/arch/arm/kernel/asm-offsets.c
@@ -67,7 +67,6 @@ int main(void)
   DEFINE(TI_PREEMPT,            offsetof(struct thread_info, preempt_count));
   DEFINE(TI_ADDR_LIMIT,         offsetof(struct thread_info, addr_limit));
   DEFINE(TI_TASK,               offsetof(struct thread_info, task));
-  DEFINE(TI_EXEC_DOMAIN,        offsetof(struct thread_info, exec_domain));
   DEFINE(TI_CPU,                offsetof(struct thread_info, cpu));
   DEFINE(TI_CPU_DOMAIN,         offsetof(struct thread_info, cpu_domain));
   DEFINE(TI_CPU_SAVE,           offsetof(struct thread_info, cpu_context));
diff --git a/arch/arm/kernel/signal.c b/arch/arm/kernel/signal.c
index 023ac905e4c3..423663e23791 100644
--- a/arch/arm/kernel/signal.c
+++ b/arch/arm/kernel/signal.c
@@ -318,17 +318,6 @@ get_sigframe(struct ksignal *ksig, struct pt_regs *regs, int framesize)
         return frame;
 }
 
-/*
- * translate the signal
- */
-static inline int map_sig(int sig)
-{
-        struct thread_info *thread = current_thread_info();
-        if (sig < 32 && thread->exec_domain && thread->exec_domain->signal_invmap)
-                sig = thread->exec_domain->signal_invmap[sig];
-        return sig;
-}
-
 static int
 setup_return(struct pt_regs *regs, struct ksignal *ksig,
              unsigned long __user *rc, void __user *frame)
@@ -412,7 +401,7 @@ setup_return(struct pt_regs *regs, struct ksignal *ksig,
                 }
         }
 
-        regs->ARM_r0 = map_sig(ksig->sig);
+        regs->ARM_r0 = ksig->sig;
         regs->ARM_sp = (unsigned long)frame;
         regs->ARM_lr = retcode;
         regs->ARM_pc = handler;
diff --git a/arch/arm/kernel/traps.c b/arch/arm/kernel/traps.c
index 788e23fe64d8..3dce1a342030 100644
--- a/arch/arm/kernel/traps.c
+++ b/arch/arm/kernel/traps.c
@@ -505,12 +505,10 @@ asmlinkage void bad_mode(struct pt_regs *regs, int reason)
 
 static int bad_syscall(int n, struct pt_regs *regs)
 {
-        struct thread_info *thread = current_thread_info();
         siginfo_t info;
 
-        if ((current->personality & PER_MASK) != PER_LINUX &&
-            thread->exec_domain->handler) {
-                thread->exec_domain->handler(n, regs);
+        if ((current->personality & PER_MASK) != PER_LINUX) {
+                send_sig(SIGSEGV, current, 1);
                 return regs->ARM_r0;
         }