2 files changed, 1 insertions, 45 deletions

diff --git a/include/linux/personality.h b/include/linux/personality.h
index 646c0a7d50fa..aeb7892b2468 100644
--- a/include/linux/personality.h
+++ b/include/linux/personality.h
@@ -3,52 +3,14 @@
 
 #include <uapi/linux/personality.h>
 
-
-/*
- * Handling of different ABIs (personalities).
- */
-
-struct exec_domain;
-struct pt_regs;
-
-extern int              register_exec_domain(struct exec_domain *);
-extern int              unregister_exec_domain(struct exec_domain *);
-extern int              __set_personality(unsigned int);
-
-
-/*
- * Description of an execution domain.
- * 
- * The first two members are refernced from assembly source
- * and should stay where they are unless explicitly needed.
- */
-typedef void (*handler_t)(int, struct pt_regs *);
-
-struct exec_domain {
-        const char              *name;          /* name of the execdomain */
-        handler_t               handler;        /* handler for syscalls */
-        unsigned char           pers_low;       /* lowest personality */
-        unsigned char           pers_high;      /* highest personality */
-        unsigned long           *signal_map;    /* signal mapping */
-        unsigned long           *signal_invmap; /* reverse signal mapping */
-        struct map_segment      *err_map;       /* error mapping */
-        struct map_segment      *socktype_map;  /* socket type mapping */
-        struct map_segment      *sockopt_map;   /* socket option mapping */
-        struct map_segment      *af_map;        /* address family mapping */
-        struct module           *module;        /* module context of the ed. */
-        struct exec_domain      *next;          /* linked list (internal) */
-};
-
 /*
  * Return the base personality without flags.
  */
 #define personality(pers)       (pers & PER_MASK)
 
-
 /*
  * Change personality of the currently running process.
  */
-#define set_personality(pers) \
-        ((current->personality == (pers)) ? 0 : __set_personality(pers))
+#define set_personality(pers)   (current->personality = (pers))
 
 #endif /* _LINUX_PERSONALITY_H */
diff --git a/include/linux/sched.h b/include/linux/sched.h
index a419b65770d6..14d9117ac463 100644
--- a/include/linux/sched.h
+++ b/include/linux/sched.h
@@ -125,7 +125,6 @@ struct sched_attr {
         u64 sched_period;
 };
 
-struct exec_domain;
 struct futex_pi_state;
 struct robust_list_head;
 struct bio_list;
@@ -2288,11 +2287,6 @@ extern void set_curr_task(int cpu, struct task_struct *p);
 
 void yield(void);
 
-/*
- * The default (Linux) execution domain.
- */
-extern struct exec_domain       default_exec_domain;
-
 union thread_union {
         struct thread_info thread_info;
         unsigned long stack[THREAD_SIZE/sizeof(long)];