diff options
-rw-r--r-- | arch/powerpc/include/asm/thread_info.h | 7 | ||||
-rw-r--r-- | arch/powerpc/kernel/signal.h | 10 |
2 files changed, 7 insertions, 10 deletions
diff --git a/arch/powerpc/include/asm/thread_info.h b/arch/powerpc/include/asm/thread_info.h index 9665a26a253a..995ab7b80f69 100644 --- a/arch/powerpc/include/asm/thread_info.h +++ b/arch/powerpc/include/asm/thread_info.h | |||
@@ -154,6 +154,13 @@ static inline void set_restore_sigmask(void) | |||
154 | ti->local_flags |= _TLF_RESTORE_SIGMASK; | 154 | ti->local_flags |= _TLF_RESTORE_SIGMASK; |
155 | set_bit(TIF_SIGPENDING, &ti->flags); | 155 | set_bit(TIF_SIGPENDING, &ti->flags); |
156 | } | 156 | } |
157 | |||
158 | #ifdef CONFIG_PPC64 | ||
159 | #define is_32bit_task() (test_thread_flag(TIF_32BIT)) | ||
160 | #else | ||
161 | #define is_32bit_task() (1) | ||
162 | #endif | ||
163 | |||
157 | #endif /* !__ASSEMBLY__ */ | 164 | #endif /* !__ASSEMBLY__ */ |
158 | 165 | ||
159 | #endif /* __KERNEL__ */ | 166 | #endif /* __KERNEL__ */ |
diff --git a/arch/powerpc/kernel/signal.h b/arch/powerpc/kernel/signal.h index b427bf8e1d8f..f1442d69d4ec 100644 --- a/arch/powerpc/kernel/signal.h +++ b/arch/powerpc/kernel/signal.h | |||
@@ -39,22 +39,12 @@ extern unsigned long copy_vsx_from_user(struct task_struct *task, | |||
39 | 39 | ||
40 | #ifdef CONFIG_PPC64 | 40 | #ifdef CONFIG_PPC64 |
41 | 41 | ||
42 | static inline int is_32bit_task(void) | ||
43 | { | ||
44 | return test_thread_flag(TIF_32BIT); | ||
45 | } | ||
46 | |||
47 | extern int handle_rt_signal64(int signr, struct k_sigaction *ka, | 42 | extern int handle_rt_signal64(int signr, struct k_sigaction *ka, |
48 | siginfo_t *info, sigset_t *set, | 43 | siginfo_t *info, sigset_t *set, |
49 | struct pt_regs *regs); | 44 | struct pt_regs *regs); |
50 | 45 | ||
51 | #else /* CONFIG_PPC64 */ | 46 | #else /* CONFIG_PPC64 */ |
52 | 47 | ||
53 | static inline int is_32bit_task(void) | ||
54 | { | ||
55 | return 1; | ||
56 | } | ||
57 | |||
58 | static inline int handle_rt_signal64(int signr, struct k_sigaction *ka, | 48 | static inline int handle_rt_signal64(int signr, struct k_sigaction *ka, |
59 | siginfo_t *info, sigset_t *set, | 49 | siginfo_t *info, sigset_t *set, |
60 | struct pt_regs *regs) | 50 | struct pt_regs *regs) |