瀏覽代碼

Remove the macro get_personality

Remove the macro get_personality, use ->personality instead.

Cc: Christoph Hellwig <hch@infradead.org
Cc: Alexey Dobriyan <adobriyan@gmail.com>
Cc: David Howells <dhowells@redhat.com>
Cc: Bryan Wu <bryan.wu@analog.com>
Signed-off-by: WANG Cong <xiyou.wangcong@gmail.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
WANG Cong 17 年之前
父節點
當前提交
ecd0fa9825
共有 3 個文件被更改,包括 3 次插入7 次删除
  1. 1 1
      arch/blackfin/kernel/signal.c
  2. 2 2
      arch/frv/kernel/signal.c
  3. 0 4
      include/linux/personality.h

+ 1 - 1
arch/blackfin/kernel/signal.c

@@ -212,7 +212,7 @@ setup_rt_frame(int sig, struct k_sigaction *ka, siginfo_t * info,
 
 
 	/* Set up registers for signal handler */
 	/* Set up registers for signal handler */
 	wrusp((unsigned long)frame);
 	wrusp((unsigned long)frame);
-	if (get_personality & FDPIC_FUNCPTRS) {
+	if (current->personality & FDPIC_FUNCPTRS) {
 		struct fdpic_func_descriptor __user *funcptr =
 		struct fdpic_func_descriptor __user *funcptr =
 			(struct fdpic_func_descriptor *) ka->sa.sa_handler;
 			(struct fdpic_func_descriptor *) ka->sa.sa_handler;
 		__get_user(regs->pc, &funcptr->text);
 		__get_user(regs->pc, &funcptr->text);

+ 2 - 2
arch/frv/kernel/signal.c

@@ -297,7 +297,7 @@ static int setup_frame(int sig, struct k_sigaction *ka, sigset_t *set)
 	__frame->lr   = (unsigned long) &frame->retcode;
 	__frame->lr   = (unsigned long) &frame->retcode;
 	__frame->gr8  = sig;
 	__frame->gr8  = sig;
 
 
-	if (get_personality & FDPIC_FUNCPTRS) {
+	if (current->personality & FDPIC_FUNCPTRS) {
 		struct fdpic_func_descriptor __user *funcptr =
 		struct fdpic_func_descriptor __user *funcptr =
 			(struct fdpic_func_descriptor __user *) ka->sa.sa_handler;
 			(struct fdpic_func_descriptor __user *) ka->sa.sa_handler;
 		__get_user(__frame->pc, &funcptr->text);
 		__get_user(__frame->pc, &funcptr->text);
@@ -396,7 +396,7 @@ static int setup_rt_frame(int sig, struct k_sigaction *ka, siginfo_t *info,
 	__frame->gr8 = sig;
 	__frame->gr8 = sig;
 	__frame->gr9 = (unsigned long) &frame->info;
 	__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 *funcptr =
 			(struct fdpic_func_descriptor __user *) ka->sa.sa_handler;
 			(struct fdpic_func_descriptor __user *) ka->sa.sa_handler;
 		__get_user(__frame->pc, &funcptr->text);
 		__get_user(__frame->pc, &funcptr->text);

+ 0 - 4
include/linux/personality.h

@@ -105,10 +105,6 @@ struct exec_domain {
  */
  */
 #define personality(pers)	(pers & PER_MASK)
 #define personality(pers)	(pers & PER_MASK)
 
 
-/*
- * Personality of the currently running process.
- */
-#define get_personality		(current->personality)
 
 
 /*
 /*
  * Change personality of the currently running process.
  * Change personality of the currently running process.