Commit 51466979 authored by Thomas Gleixner's avatar Thomas Gleixner Committed by Ingo Molnar

sched/rt, c6x: Use CONFIG_PREEMPTION

CONFIG_PREEMPTION is selected by CONFIG_PREEMPT and by CONFIG_PREEMPT_RT.
Both PREEMPT and PREEMPT_RT require the same functionality which today
depends on CONFIG_PREEMPT.

Switch the entry code over to use CONFIG_PREEMPTION.
Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
Signed-off-by: default avatarSebastian Andrzej Siewior <bigeasy@linutronix.de>
Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
Cc: Aurelien Jacquiot <jacquiot.aurelien@gmail.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Mark Salter <msalter@redhat.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: linux-c6x-dev@linux-c6x.org
Link: https://lore.kernel.org/r/20191015191821.11479-6-bigeasy@linutronix.deSigned-off-by: default avatarIngo Molnar <mingo@kernel.org>
parent 91659172
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
#define DP B14 #define DP B14
#define SP B15 #define SP B15
#ifndef CONFIG_PREEMPT #ifndef CONFIG_PREEMPTION
#define resume_kernel restore_all #define resume_kernel restore_all
#endif #endif
...@@ -287,7 +287,7 @@ work_notifysig: ...@@ -287,7 +287,7 @@ work_notifysig:
;; is a little bit different ;; is a little bit different
;; ;;
ENTRY(ret_from_exception) ENTRY(ret_from_exception)
#ifdef CONFIG_PREEMPT #ifdef CONFIG_PREEMPTION
MASK_INT B2 MASK_INT B2
#endif #endif
...@@ -557,7 +557,7 @@ ENDPROC(_nmi_handler) ...@@ -557,7 +557,7 @@ ENDPROC(_nmi_handler)
;; ;;
;; Jump to schedule() then return to ret_from_isr ;; Jump to schedule() then return to ret_from_isr
;; ;;
#ifdef CONFIG_PREEMPT #ifdef CONFIG_PREEMPTION
resume_kernel: resume_kernel:
GET_THREAD_INFO A12 GET_THREAD_INFO A12
LDW .D1T1 *+A12(THREAD_INFO_PREEMPT_COUNT),A1 LDW .D1T1 *+A12(THREAD_INFO_PREEMPT_COUNT),A1
...@@ -582,7 +582,7 @@ preempt_schedule: ...@@ -582,7 +582,7 @@ preempt_schedule:
B .S2 preempt_schedule_irq B .S2 preempt_schedule_irq
#endif #endif
ADDKPC .S2 preempt_schedule,B3,4 ADDKPC .S2 preempt_schedule,B3,4
#endif /* CONFIG_PREEMPT */ #endif /* CONFIG_PREEMPTION */
ENTRY(enable_exception) ENTRY(enable_exception)
DINT DINT
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment