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

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)