preempt: Make PREEMPT_ACTIVE generic

No point in having this bit defined by architecture. Signed-off-by: Thomas Gleixner <tglx@linutronix.de> Acked-by: Peter Zijlstra <peterz@infradead.org> Link: http://lkml.kernel.org/r/20130917183629.090698799@linutronix.de
2013-09-17 18:53:09 +00:00 · 2013-09-17 18:53:09 +00:00 · 00d1a39e69
commit 00d1a39e69
parent 9385d949d5
32 changed files with 8 additions and 89 deletions
--- a/arch/alpha/include/asm/thread_info.h
+++ b/arch/alpha/include/asm/thread_info.h
@ -58,8 +58,6 @@ register struct thread_info *__current_thread_info __asm__("$8");
 #define THREAD_SIZE_ORDER 1
 #define THREAD_SIZE (2*PAGE_SIZE)

-#define PREEMPT_ACTIVE		0x40000000
-
 /*
 * Thread information flags:
 * - these are process state flags and used from assembly
--- a/arch/arc/include/asm/thread_info.h
+++ b/arch/arc/include/asm/thread_info.h
@ -80,8 +80,6 @@ static inline __attribute_const__ struct thread_info *current_thread_info(void)

 #endif /* !__ASSEMBLY__ */

-#define PREEMPT_ACTIVE      0x10000000
-
 /*
 * thread information flags
 * - these are process state flags that various assembly files may need to
--- a/arch/arm/include/asm/thread_info.h
+++ b/arch/arm/include/asm/thread_info.h
@ -140,12 +140,6 @@ extern int vfp_restore_user_hwstate(struct user_vfp __user *,
 				    struct user_vfp_exc __user *);
 #endif

-/*
- * We use bit 30 of the preempt_count to indicate that kernel
- * preemption is occurring.  See <asm/hardirq.h>.
- */
-#define PREEMPT_ACTIVE	0x40000000
-
 /*
 * thread information flags:
 *  TIF_SYSCALL_TRACE	- syscall trace active
--- a/arch/arm64/include/asm/thread_info.h
+++ b/arch/arm64/include/asm/thread_info.h
@ -88,12 +88,6 @@ static inline struct thread_info *current_thread_info(void)

 #endif

-/*
- * We use bit 30 of the preempt_count to indicate that kernel
- * preemption is occurring.  See <asm/hardirq.h>.
- */
-#define PREEMPT_ACTIVE	0x40000000
-
 /*
 * thread information flags:
 *  TIF_SYSCALL_TRACE	- syscall trace active
--- a/arch/avr32/include/asm/thread_info.h
+++ b/arch/avr32/include/asm/thread_info.h
@ -66,8 +66,6 @@ static inline struct thread_info *current_thread_info(void)

 #endif /* !__ASSEMBLY__ */

-#define PREEMPT_ACTIVE		0x40000000
-
 /*
 * Thread information flags
 * - these are process state flags that various assembly files may need to access
--- a/arch/blackfin/include/asm/thread_info.h
+++ b/arch/blackfin/include/asm/thread_info.h
@ -88,8 +88,6 @@ static inline struct thread_info *current_thread_info(void)
 #define TI_CPU		12
 #define TI_PREEMPT	16

-#define	PREEMPT_ACTIVE	0x4000000
-
 /*
 * thread information flag bit numbers
 */
--- a/arch/c6x/include/asm/thread_info.h
+++ b/arch/c6x/include/asm/thread_info.h
@ -84,8 +84,6 @@ struct thread_info *current_thread_info(void)
 #define put_thread_info(ti)	put_task_struct((ti)->task)
 #endif /* __ASSEMBLY__ */

-#define	PREEMPT_ACTIVE	0x10000000
-
 /*
 * thread information flag bit numbers
 * - pending work-to-be-done flags are in LSW
--- a/arch/cris/include/asm/thread_info.h
+++ b/arch/cris/include/asm/thread_info.h
@ -44,8 +44,6 @@ struct thread_info {

 #endif

-#define PREEMPT_ACTIVE		0x10000000
-
 /*
 * macros/functions for gaining access to the thread information structure
 */
--- a/arch/frv/include/asm/thread_info.h
+++ b/arch/frv/include/asm/thread_info.h
@ -52,8 +52,6 @@ struct thread_info {

 #endif

-#define PREEMPT_ACTIVE		0x10000000
-
 /*
 * macros/functions for gaining access to the thread information structure
 */
--- a/arch/hexagon/include/asm/thread_info.h
+++ b/arch/hexagon/include/asm/thread_info.h
@ -73,10 +73,6 @@ struct thread_info {

 #endif  /* __ASSEMBLY__  */

-/*  looks like "linux/hardirq.h" uses this.  */
-
-#define PREEMPT_ACTIVE		0x10000000
-
 #ifndef __ASSEMBLY__

 #define INIT_THREAD_INFO(tsk)                   \
--- a/arch/ia64/include/asm/thread_info.h
+++ b/arch/ia64/include/asm/thread_info.h
@ -11,9 +11,6 @@
 #include <asm/processor.h>
 #include <asm/ptrace.h>

-#define PREEMPT_ACTIVE_BIT 30
-#define PREEMPT_ACTIVE	(1 << PREEMPT_ACTIVE_BIT)
-
 #ifndef __ASSEMBLY__

 /*
--- a/arch/m32r/include/asm/thread_info.h
+++ b/arch/m32r/include/asm/thread_info.h
@ -53,8 +53,6 @@ struct thread_info {

 #endif

-#define PREEMPT_ACTIVE		0x10000000
-
 #define THREAD_SIZE		(PAGE_SIZE << 1)
 #define THREAD_SIZE_ORDER	1
 /*
--- a/arch/m68k/include/asm/thread_info.h
+++ b/arch/m68k/include/asm/thread_info.h
@ -35,8 +35,6 @@ struct thread_info {
 };
 #endif /* __ASSEMBLY__ */

-#define PREEMPT_ACTIVE		0x4000000
-
 #define INIT_THREAD_INFO(tsk)			\
 {						\
 	.task		= &tsk,			\
--- a/arch/metag/include/asm/thread_info.h
+++ b/arch/metag/include/asm/thread_info.h
@ -46,8 +46,6 @@ struct thread_info {

 #endif

-#define PREEMPT_ACTIVE		0x10000000
-
 #ifdef CONFIG_4KSTACKS
 #define THREAD_SHIFT		12
 #else
--- a/arch/microblaze/include/asm/thread_info.h
+++ b/arch/microblaze/include/asm/thread_info.h
@ -106,8 +106,6 @@ static inline struct thread_info *current_thread_info(void)
 /* thread information allocation */
 #endif /* __ASSEMBLY__ */

-#define PREEMPT_ACTIVE		0x10000000
-
 /*
 * thread information flags
 * - these are process state flags that various assembly files may
--- a/arch/mips/include/asm/thread_info.h
+++ b/arch/mips/include/asm/thread_info.h
@ -92,8 +92,6 @@ static inline struct thread_info *current_thread_info(void)

 #define STACK_WARN	(THREAD_SIZE / 8)

-#define PREEMPT_ACTIVE		0x10000000
-
 /*
 * thread information flags
 * - these are process state flags that various assembly files may need to
--- a/arch/mn10300/include/asm/thread_info.h
+++ b/arch/mn10300/include/asm/thread_info.h
@ -16,8 +16,6 @@

 #include <asm/page.h>

-#define PREEMPT_ACTIVE		0x10000000
-
 #ifdef CONFIG_4KSTACKS
 #define THREAD_SIZE		(4096)
 #define THREAD_SIZE_ORDER	(0)
--- a/arch/parisc/include/asm/thread_info.h
+++ b/arch/parisc/include/asm/thread_info.h
@ -46,9 +46,6 @@ struct thread_info {
 #define THREAD_SIZE             (PAGE_SIZE << THREAD_SIZE_ORDER)
 #define THREAD_SHIFT            (PAGE_SHIFT + THREAD_SIZE_ORDER)

-#define PREEMPT_ACTIVE_BIT	28
-#define PREEMPT_ACTIVE		(1 << PREEMPT_ACTIVE_BIT)
-
 /*
 * thread information flags
 */
--- a/arch/powerpc/include/asm/thread_info.h
+++ b/arch/powerpc/include/asm/thread_info.h
@ -82,8 +82,6 @@ static inline struct thread_info *current_thread_info(void)

 #endif /* __ASSEMBLY__ */

-#define PREEMPT_ACTIVE		0x10000000
-
 /*
 * thread information flag bit numbers
 */
--- a/arch/s390/include/asm/thread_info.h
+++ b/arch/s390/include/asm/thread_info.h
@ -111,6 +111,4 @@ static inline struct thread_info *current_thread_info(void)
 #define is_32bit_task()		(1)
 #endif

-#define PREEMPT_ACTIVE		0x4000000
-
 #endif /* _ASM_THREAD_INFO_H */
--- a/arch/score/include/asm/thread_info.h
+++ b/arch/score/include/asm/thread_info.h
@ -72,8 +72,6 @@ register struct thread_info *__current_thread_info __asm__("r28");

 #endif /* !__ASSEMBLY__ */

-#define PREEMPT_ACTIVE		0x10000000
-
 /*
 * thread information flags
 * - these are process state flags that various assembly files may need to
--- a/arch/sh/include/asm/thread_info.h
+++ b/arch/sh/include/asm/thread_info.h
@ -41,8 +41,6 @@ struct thread_info {

 #endif

-#define PREEMPT_ACTIVE		0x10000000
-
 #if defined(CONFIG_4KSTACKS)
 #define THREAD_SHIFT	12
 #else
--- a/arch/sh/kernel/entry-common.S
+++ b/arch/sh/kernel/entry-common.S
@ -108,7 +108,7 @@ need_resched:
 	and	#(0xf0>>1), r0		! interrupts off (exception path)?
 	cmp/eq	#(0xf0>>1), r0
 	bt	noresched
-	mov.l	3f, r0
+	mov.l	1f, r0
 	jsr	@r0			! call preempt_schedule_irq
 	 nop
 	bra	need_resched
@ -119,9 +119,7 @@ noresched:
 	 nop

 	.align 2
-1:	.long	PREEMPT_ACTIVE
-2:	.long	schedule
-3:	.long	preempt_schedule_irq
+1:	.long	preempt_schedule_irq
 #endif

 ENTRY(resume_userspace)
--- a/arch/sparc/include/asm/thread_info_32.h
+++ b/arch/sparc/include/asm/thread_info_32.h
@ -105,8 +105,6 @@ register struct thread_info *current_thread_info_reg asm("g6");
 #define TI_W_SAVED	0x250
 /* #define TI_RESTART_BLOCK 0x25n */ /* Nobody cares */

-#define PREEMPT_ACTIVE		0x4000000
-
 /*
 * thread information flag bit numbers
 */
--- a/arch/sparc/include/asm/thread_info_64.h
+++ b/arch/sparc/include/asm/thread_info_64.h
@ -111,8 +111,6 @@ struct thread_info {
 #define THREAD_SHIFT PAGE_SHIFT
 #endif /* PAGE_SHIFT == 13 */

-#define PREEMPT_ACTIVE		0x10000000
-
 /*
 * macros/functions for gaining access to the thread information structure
 */
--- a/arch/tile/include/asm/thread_info.h
+++ b/arch/tile/include/asm/thread_info.h
@ -113,8 +113,6 @@ extern void _cpu_idle(void);

 #endif /* !__ASSEMBLY__ */

-#define PREEMPT_ACTIVE		0x10000000
-
 /*
 * Thread information flags that various assembly files may need to access.
 * Keep flags accessed frequently in low bits, particular since it makes
--- a/arch/um/include/asm/thread_info.h
+++ b/arch/um/include/asm/thread_info.h
@ -60,8 +60,6 @@ static inline struct thread_info *current_thread_info(void)

 #endif

-#define PREEMPT_ACTIVE		0x10000000
-
 #define TIF_SYSCALL_TRACE	0	/* syscall trace active */
 #define TIF_SIGPENDING		1	/* signal pending */
 #define TIF_NEED_RESCHED	2	/* rescheduling necessary */
--- a/arch/unicore32/include/asm/thread_info.h
+++ b/arch/unicore32/include/asm/thread_info.h
@ -117,12 +117,6 @@ static inline struct thread_info *current_thread_info(void)

 #endif

-/*
- * We use bit 30 of the preempt_count to indicate that kernel
- * preemption is occurring.  See <asm/hardirq.h>.
- */
-#define PREEMPT_ACTIVE	0x40000000
-
 /*
 * thread information flags:
 *  TIF_SYSCALL_TRACE	- syscall trace active
--- a/arch/x86/include/asm/thread_info.h
+++ b/arch/x86/include/asm/thread_info.h
@ -153,8 +153,6 @@ struct thread_info {
 #define _TIF_WORK_CTXSW_PREV (_TIF_WORK_CTXSW|_TIF_USER_RETURN_NOTIFY)
 #define _TIF_WORK_CTXSW_NEXT (_TIF_WORK_CTXSW)

-#define PREEMPT_ACTIVE		0x10000000
-
 #ifdef CONFIG_X86_32

 #define STACK_WARN	(THREAD_SIZE/8)
--- a/arch/xtensa/include/asm/thread_info.h
+++ b/arch/xtensa/include/asm/thread_info.h
@ -76,8 +76,6 @@ struct thread_info {

 #endif

-#define PREEMPT_ACTIVE		0x10000000
-
 /*
 * macros/functions for gaining access to the thread information structure
 */
--- a/include/linux/preempt_mask.h
+++ b/include/linux/preempt_mask.h
@ -21,6 +21,7 @@
 * SOFTIRQ_MASK:	0x0000ff00
 * HARDIRQ_MASK:	0x000f0000
 *     NMI_MASK:	0x00100000
+ * PREEMPT_ACTIVE:	0x00200000
 */
 #define PREEMPT_BITS	8
 #define SOFTIRQ_BITS	8
@ -46,15 +47,9 @@

 #define SOFTIRQ_DISABLE_OFFSET	(2 * SOFTIRQ_OFFSET)

-#ifndef PREEMPT_ACTIVE
 #define PREEMPT_ACTIVE_BITS	1
 #define PREEMPT_ACTIVE_SHIFT	(NMI_SHIFT + NMI_BITS)
 #define PREEMPT_ACTIVE	(__IRQ_MASK(PREEMPT_ACTIVE_BITS) << PREEMPT_ACTIVE_SHIFT)
-#endif
-
-#if PREEMPT_ACTIVE < (1 << (NMI_SHIFT + NMI_BITS))
-#error PREEMPT_ACTIVE is too low!
-#endif

 #define hardirq_count()	(preempt_count() & HARDIRQ_MASK)
 #define softirq_count()	(preempt_count() & SOFTIRQ_MASK)
--- a/include/linux/sched.h
+++ b/include/linux/sched.h
@ -22,7 +22,7 @@ struct sched_param {
 #include <linux/errno.h>
 #include <linux/nodemask.h>
 #include <linux/mm_types.h>
-#include <linux/preempt.h>
+#include <linux/preempt_mask.h>

 #include <asm/page.h>
 #include <asm/ptrace.h>