From 87b0e714dee438309efca998616a2dbb064ca1a0 Mon Sep 17 00:00:00 2001 From: Al Viro Date: Sat, 5 May 2012 18:29:41 -0400 Subject: unicore32: unobfuscate _TIF_WORK_MASK bits 3..7 in flags are never set there, so this 0xff is pointless Signed-off-by: Al Viro --- arch/unicore32/include/asm/thread_info.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'arch/unicore32') diff --git a/arch/unicore32/include/asm/thread_info.h b/arch/unicore32/include/asm/thread_info.h index 89f7557583b..bf1c3e01197 100644 --- a/arch/unicore32/include/asm/thread_info.h +++ b/arch/unicore32/include/asm/thread_info.h @@ -146,7 +146,8 @@ static inline struct thread_info *current_thread_info(void) /* * Change these and you break ASM code in entry-common.S */ -#define _TIF_WORK_MASK 0x000000ff +#define _TIF_WORK_MASK \ + (_TIF_SIGPENDING | _TIF_NEED_RESCHED | _TIF_NOTIFY_RESUME) #endif /* __KERNEL__ */ #endif /* __UNICORE_THREAD_INFO_H__ */ -- cgit v1.2.3 From 8af4efac26e1805c76144ad44118157239308d35 Mon Sep 17 00:00:00 2001 From: Al Viro Date: Fri, 1 Jun 2012 14:21:16 -0400 Subject: bury _TIF_RESTORE_SIGMASK never used... Signed-off-by: Al Viro --- arch/unicore32/include/asm/thread_info.h | 1 - 1 file changed, 1 deletion(-) (limited to 'arch/unicore32') diff --git a/arch/unicore32/include/asm/thread_info.h b/arch/unicore32/include/asm/thread_info.h index bf1c3e01197..818b4a1edb5 100644 --- a/arch/unicore32/include/asm/thread_info.h +++ b/arch/unicore32/include/asm/thread_info.h @@ -141,7 +141,6 @@ static inline struct thread_info *current_thread_info(void) #define _TIF_NEED_RESCHED (1 << TIF_NEED_RESCHED) #define _TIF_NOTIFY_RESUME (1 << TIF_NOTIFY_RESUME) #define _TIF_SYSCALL_TRACE (1 << TIF_SYSCALL_TRACE) -#define _TIF_RESTORE_SIGMASK (1 << TIF_RESTORE_SIGMASK) /* * Change these and you break ASM code in entry-common.S -- cgit v1.2.3 From fe9d7feab567085112ca02b238c839ca1b4cd9c5 Mon Sep 17 00:00:00 2001 From: Al Viro Date: Sat, 26 May 2012 00:25:15 -0400 Subject: unicore32: remove pointless test we can get into work_pending only if at least one of NEED_RESCHED, SIGPENDING or NOTIFY_RESUME is set. So once we'd found no NEED_RESCHED, there's no need to check that one of the other two is set. Signed-off-by: Al Viro --- arch/unicore32/kernel/entry.S | 2 -- 1 file changed, 2 deletions(-) (limited to 'arch/unicore32') diff --git a/arch/unicore32/kernel/entry.S b/arch/unicore32/kernel/entry.S index 00a259f9819..dcb87ab19dd 100644 --- a/arch/unicore32/kernel/entry.S +++ b/arch/unicore32/kernel/entry.S @@ -544,8 +544,6 @@ fast_work_pending: work_pending: cand.a r1, #_TIF_NEED_RESCHED bne work_resched - cand.a r1, #_TIF_SIGPENDING|_TIF_NOTIFY_RESUME - beq no_work_pending mov r0, sp @ 'regs' mov r2, why @ 'syscall' cand.a r1, #_TIF_SIGPENDING @ delivering a signal? -- cgit v1.2.3 From 3cffdc8c3a4445bb3a4b1b31b10867edeb9fa288 Mon Sep 17 00:00:00 2001 From: Richard Weinberger Date: Sat, 26 May 2012 01:57:10 +0200 Subject: Uninclude linux/freezer.h This include is no longer needed. (seems to be a leftover from try_to_freeze()) Signed-off-by: Richard Weinberger Signed-off-by: Al Viro --- arch/unicore32/kernel/signal.c | 1 - 1 file changed, 1 deletion(-) (limited to 'arch/unicore32') diff --git a/arch/unicore32/kernel/signal.c b/arch/unicore32/kernel/signal.c index 8adedb37720..b8b2ffd774d 100644 --- a/arch/unicore32/kernel/signal.c +++ b/arch/unicore32/kernel/signal.c @@ -12,7 +12,6 @@ #include #include #include -#include #include #include #include -- cgit v1.2.3