diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2013-09-17 18:53:09 +0000 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2013-11-13 20:21:47 +0100 |
| commit | 00d1a39e69d5afa7523dad515a05b21abd17c389 (patch) | |
| tree | 7cc9ab44899be1b50d05f0154345bd0c9e9c0f96 /arch/sh | |
| parent | 9385d949d5bd0eb642ed05ea263c3638c9f4e372 (diff) | |
| download | linux-00d1a39e69d5afa7523dad515a05b21abd17c389.tar.bz2 | |
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
Diffstat (limited to 'arch/sh')
| -rw-r--r-- | arch/sh/include/asm/thread_info.h | 2 | ||||
| -rw-r--r-- | arch/sh/kernel/entry-common.S | 6 |
2 files changed, 2 insertions, 6 deletions
diff --git a/arch/sh/include/asm/thread_info.h b/arch/sh/include/asm/thread_info.h index 45a93669289d..ad27ffa65e2e 100644 --- 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 diff --git a/arch/sh/kernel/entry-common.S b/arch/sh/kernel/entry-common.S index 9b6e4beeb296..ca46834294b7 100644 --- 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) |