From 3f7ff8daeb07c08ab5f8deded05e5c650ce8210d Mon Sep 17 00:00:00 2001 From: Anton Blanchard Date: Sun, 22 Feb 2009 01:49:58 +0000 Subject: [PATCH] --- yaml --- r: 138489 b: refs/heads/master c: a465f9b694bcfa4957d06751c0274ded49421c82 h: refs/heads/master i: 138487: 4d127648ea01e2ef2e6070661b89fb8389d27f17 v: v3 --- [refs] | 2 +- trunk/arch/powerpc/include/asm/thread_info.h | 7 +++++++ trunk/arch/powerpc/kernel/signal.h | 10 ---------- 3 files changed, 8 insertions(+), 11 deletions(-) diff --git a/[refs] b/[refs] index e93b6758146c..6a5c0600c663 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 4c4ece3cf8391e842f2c67a4760885e0acb3a461 +refs/heads/master: a465f9b694bcfa4957d06751c0274ded49421c82 diff --git a/trunk/arch/powerpc/include/asm/thread_info.h b/trunk/arch/powerpc/include/asm/thread_info.h index 9665a26a253a..995ab7b80f69 100644 --- a/trunk/arch/powerpc/include/asm/thread_info.h +++ b/trunk/arch/powerpc/include/asm/thread_info.h @@ -154,6 +154,13 @@ static inline void set_restore_sigmask(void) ti->local_flags |= _TLF_RESTORE_SIGMASK; set_bit(TIF_SIGPENDING, &ti->flags); } + +#ifdef CONFIG_PPC64 +#define is_32bit_task() (test_thread_flag(TIF_32BIT)) +#else +#define is_32bit_task() (1) +#endif + #endif /* !__ASSEMBLY__ */ #endif /* __KERNEL__ */ diff --git a/trunk/arch/powerpc/kernel/signal.h b/trunk/arch/powerpc/kernel/signal.h index b427bf8e1d8f..f1442d69d4ec 100644 --- a/trunk/arch/powerpc/kernel/signal.h +++ b/trunk/arch/powerpc/kernel/signal.h @@ -39,22 +39,12 @@ extern unsigned long copy_vsx_from_user(struct task_struct *task, #ifdef CONFIG_PPC64 -static inline int is_32bit_task(void) -{ - return test_thread_flag(TIF_32BIT); -} - extern int handle_rt_signal64(int signr, struct k_sigaction *ka, siginfo_t *info, sigset_t *set, struct pt_regs *regs); #else /* CONFIG_PPC64 */ -static inline int is_32bit_task(void) -{ - return 1; -} - static inline int handle_rt_signal64(int signr, struct k_sigaction *ka, siginfo_t *info, sigset_t *set, struct pt_regs *regs)