diff options
-rw-r--r-- | arch/blackfin/kernel/signal.c | 2 | ||||
-rw-r--r-- | arch/frv/kernel/signal.c | 4 | ||||
-rw-r--r-- | include/linux/personality.h | 4 |
3 files changed, 3 insertions, 7 deletions
diff --git a/arch/blackfin/kernel/signal.c b/arch/blackfin/kernel/signal.c index d1fa24401dc6..cb9d883d493c 100644 --- a/arch/blackfin/kernel/signal.c +++ b/arch/blackfin/kernel/signal.c | |||
@@ -212,7 +212,7 @@ setup_rt_frame(int sig, struct k_sigaction *ka, siginfo_t * info, | |||
212 | 212 | ||
213 | /* Set up registers for signal handler */ | 213 | /* Set up registers for signal handler */ |
214 | wrusp((unsigned long)frame); | 214 | wrusp((unsigned long)frame); |
215 | if (get_personality & FDPIC_FUNCPTRS) { | 215 | if (current->personality & FDPIC_FUNCPTRS) { |
216 | struct fdpic_func_descriptor __user *funcptr = | 216 | struct fdpic_func_descriptor __user *funcptr = |
217 | (struct fdpic_func_descriptor *) ka->sa.sa_handler; | 217 | (struct fdpic_func_descriptor *) ka->sa.sa_handler; |
218 | __get_user(regs->pc, &funcptr->text); | 218 | __get_user(regs->pc, &funcptr->text); |
diff --git a/arch/frv/kernel/signal.c b/arch/frv/kernel/signal.c index d64bcaff54cd..3bdb368292a8 100644 --- a/arch/frv/kernel/signal.c +++ b/arch/frv/kernel/signal.c | |||
@@ -297,7 +297,7 @@ static int setup_frame(int sig, struct k_sigaction *ka, sigset_t *set) | |||
297 | __frame->lr = (unsigned long) &frame->retcode; | 297 | __frame->lr = (unsigned long) &frame->retcode; |
298 | __frame->gr8 = sig; | 298 | __frame->gr8 = sig; |
299 | 299 | ||
300 | if (get_personality & FDPIC_FUNCPTRS) { | 300 | if (current->personality & FDPIC_FUNCPTRS) { |
301 | struct fdpic_func_descriptor __user *funcptr = | 301 | struct fdpic_func_descriptor __user *funcptr = |
302 | (struct fdpic_func_descriptor __user *) ka->sa.sa_handler; | 302 | (struct fdpic_func_descriptor __user *) ka->sa.sa_handler; |
303 | __get_user(__frame->pc, &funcptr->text); | 303 | __get_user(__frame->pc, &funcptr->text); |
@@ -396,7 +396,7 @@ static int setup_rt_frame(int sig, struct k_sigaction *ka, siginfo_t *info, | |||
396 | __frame->gr8 = sig; | 396 | __frame->gr8 = sig; |
397 | __frame->gr9 = (unsigned long) &frame->info; | 397 | __frame->gr9 = (unsigned long) &frame->info; |
398 | 398 | ||
399 | if (get_personality & FDPIC_FUNCPTRS) { | 399 | if (current->personality & FDPIC_FUNCPTRS) { |
400 | struct fdpic_func_descriptor __user *funcptr = | 400 | struct fdpic_func_descriptor __user *funcptr = |
401 | (struct fdpic_func_descriptor __user *) ka->sa.sa_handler; | 401 | (struct fdpic_func_descriptor __user *) ka->sa.sa_handler; |
402 | __get_user(__frame->pc, &funcptr->text); | 402 | __get_user(__frame->pc, &funcptr->text); |
diff --git a/include/linux/personality.h b/include/linux/personality.h index 012cd558189b..a84e9ff9b27e 100644 --- a/include/linux/personality.h +++ b/include/linux/personality.h | |||
@@ -105,10 +105,6 @@ struct exec_domain { | |||
105 | */ | 105 | */ |
106 | #define personality(pers) (pers & PER_MASK) | 106 | #define personality(pers) (pers & PER_MASK) |
107 | 107 | ||
108 | /* | ||
109 | * Personality of the currently running process. | ||
110 | */ | ||
111 | #define get_personality (current->personality) | ||
112 | 108 | ||
113 | /* | 109 | /* |
114 | * Change personality of the currently running process. | 110 | * Change personality of the currently running process. |