Use get_personality() macro instead of explicit reference
for arm code.
Signed-off-by: WANG Cong <[EMAIL PROTECTED]>
Cc: Russell King <[EMAIL PROTECTED]>
---
arch/arm/kernel/traps.c | 4 ++--
include/asm-arm/namei.h | 2 +-
include/asm-arm/processor.h | 4 ++--
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/arch/arm/kernel/traps.c b/arch/arm/kernel/traps.c
index 5595fdd..975faaf 100644
--- a/arch/arm/kernel/traps.c
+++ b/arch/arm/kernel/traps.c
@@ -381,8 +381,8 @@ static int bad_syscall(int n, struct pt_regs *regs)
struct thread_info *thread = current_thread_info();
siginfo_t info;
- if (current->personality != PER_LINUX &&
- current->personality != PER_LINUX_32BIT &&
+ if (get_personality() != PER_LINUX &&
+ get_personality() != PER_LINUX_32BIT &&
thread->exec_domain->handler) {
thread->exec_domain->handler(n, regs);
return regs->ARM_r0;
diff --git a/include/asm-arm/namei.h b/include/asm-arm/namei.h
index a402d3b..c55dc87 100644
--- a/include/asm-arm/namei.h
+++ b/include/asm-arm/namei.h
@@ -14,7 +14,7 @@
static inline char *__emul_prefix(void)
{
- switch (current->personality) {
+ switch (get_personality()) {
case PER_BSD:
return ARM_BSD_EMUL;
default:
diff --git a/include/asm-arm/processor.h b/include/asm-arm/processor.h
index bd8029e..7f040b4 100644
--- a/include/asm-arm/processor.h
+++ b/include/asm-arm/processor.h
@@ -23,7 +23,7 @@
#include <asm/types.h>
#ifdef __KERNEL__
-#define STACK_TOP ((current->personality == PER_LINUX_32BIT) ? \
+#define STACK_TOP ((get_personality() == PER_LINUX_32BIT) ? \
TASK_SIZE : TASK_SIZE_26)
#define STACK_TOP_MAX TASK_SIZE
#endif
@@ -65,7 +65,7 @@ struct thread_struct {
unsigned long *stack = (unsigned long *)sp; \
set_fs(USER_DS); \
memzero(regs->uregs, sizeof(regs->uregs)); \
- if (current->personality & ADDR_LIMIT_32BIT) \
+ if (get_personality() & ADDR_LIMIT_32BIT) \
regs->ARM_cpsr = USR_MODE; \
else \
regs->ARM_cpsr = USR26_MODE; \
--
1.5.3.8
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
