From: WANG Cong Remove the macro get_personality, use ->personality instead. Cc: Christoph Hellwig Cc: David Howells Cc: Bryan Wu Signed-off-by: WANG Cong Signed-off-by: Andrew Morton --- arch/blackfin/kernel/signal.c | 2 +- arch/frv/kernel/signal.c | 4 ++-- include/linux/personality.h | 4 ---- 3 files changed, 3 insertions(+), 7 deletions(-) diff -puN arch/blackfin/kernel/signal.c~remove-the-macro-get_personality arch/blackfin/kernel/signal.c --- a/arch/blackfin/kernel/signal.c~remove-the-macro-get_personality +++ a/arch/blackfin/kernel/signal.c @@ -224,7 +224,7 @@ setup_rt_frame(int sig, struct k_sigacti /* Set up registers for signal handler */ wrusp((unsigned long)frame); - if (get_personality & FDPIC_FUNCPTRS) { + if (current->personality & FDPIC_FUNCPTRS) { struct fdpic_func_descriptor __user *funcptr = (struct fdpic_func_descriptor *) ka->sa.sa_handler; __get_user(regs->pc, &funcptr->text); diff -puN arch/frv/kernel/signal.c~remove-the-macro-get_personality arch/frv/kernel/signal.c --- a/arch/frv/kernel/signal.c~remove-the-macro-get_personality +++ a/arch/frv/kernel/signal.c @@ -297,7 +297,7 @@ static int setup_frame(int sig, struct k __frame->lr = (unsigned long) &frame->retcode; __frame->gr8 = sig; - if (get_personality & FDPIC_FUNCPTRS) { + if (current->personality & FDPIC_FUNCPTRS) { struct fdpic_func_descriptor __user *funcptr = (struct fdpic_func_descriptor __user *) ka->sa.sa_handler; __get_user(__frame->pc, &funcptr->text); @@ -396,7 +396,7 @@ static int setup_rt_frame(int sig, struc __frame->gr8 = sig; __frame->gr9 = (unsigned long) &frame->info; - if (get_personality & FDPIC_FUNCPTRS) { + if (current->personality & FDPIC_FUNCPTRS) { struct fdpic_func_descriptor __user *funcptr = (struct fdpic_func_descriptor __user *) ka->sa.sa_handler; __get_user(__frame->pc, &funcptr->text); diff -puN include/linux/personality.h~remove-the-macro-get_personality include/linux/personality.h --- a/include/linux/personality.h~remove-the-macro-get_personality +++ a/include/linux/personality.h @@ -105,10 +105,6 @@ struct exec_domain { */ #define personality(pers) (pers & PER_MASK) -/* - * Personality of the currently running process. - */ -#define get_personality (current->personality) /* * Change personality of the currently running process. _