Subject: x86: Common set_restore_sigmask Signed-off-by: Christoph Lameter --- include/asm-x86/thread_info.h | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) Index: linux-2.6.25-mm1/include/asm-x86/thread_info.h =================================================================== --- linux-2.6.25-mm1.orig/include/asm-x86/thread_info.h 2008-04-26 20:16:23.133639758 -0700 +++ linux-2.6.25-mm1/include/asm-x86/thread_info.h 2008-04-26 20:16:43.543639422 -0700 @@ -195,16 +195,6 @@ static inline struct thread_info *curren #define tsk_is_polling(t) (task_thread_info(t)->status & TS_POLLING) -#ifndef __ASSEMBLY__ -#define HAVE_SET_RESTORE_SIGMASK 1 -static inline void set_restore_sigmask(void) -{ - struct thread_info *ti = current_thread_info(); - ti->status |= TS_RESTORE_SIGMASK; - set_bit(TIF_SIGPENDING, &ti->flags); -} -#endif /* !__ASSEMBLY__ */ - #else /* X86_32 */ #include @@ -376,6 +366,8 @@ static inline struct thread_info *stack_ #define tsk_is_polling(t) (task_thread_info(t)->status & TS_POLLING) +#endif /* X86_64 */ + #ifndef __ASSEMBLY__ #define HAVE_SET_RESTORE_SIGMASK 1 static inline void set_restore_sigmask(void) @@ -386,8 +378,6 @@ static inline void set_restore_sigmask(v } #endif /* !__ASSEMBLY__ */ -#endif /* X86_64 */ - #endif /* __KERNEL__ */ #endif /* _ASM_THREAD_INFO_H */