Commit fa686453 authored by Thomas Gleixner's avatar Thomas Gleixner Committed by Ingo Molnar
Browse files

sched/rt, s390: 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 preemption and entry code over to use CONFIG_PREEMPTION. Add
PREEMPT_RT output to die().

[bigeasy: +Kconfig, dumpstack.c]

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: Christian Borntraeger <borntraeger@de.ibm.com>
Cc: Heiko Carstens <heiko.carstens@de.ibm.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Vasily Gorbik <gor@linux.ibm.com>
Cc: linux-s390@vger.kernel.org
Link: https://lore.kernel.org/r/20191015191821.11479-18-bigeasy@linutronix.de


Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parent 29ff6492

arch/s390/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -30,7 +30,7 @@ config GENERIC_BUG_RELATIVE_POINTERS 
	def_bool y



config GENERIC_LOCKBREAK

	def_bool y if PREEMPT

	def_bool y if PREEMPTTION



config PGSTE

	def_bool y if KVM

arch/s390/include/asm/preempt.h

+2 −2
Original line number Diff line number Diff line
@@ -130,11 +130,11 @@ static inline bool should_resched(int preempt_offset) 


#endif /* CONFIG_HAVE_MARCH_Z196_FEATURES */



#ifdef CONFIG_PREEMPT

#ifdef CONFIG_PREEMPTION

extern asmlinkage void preempt_schedule(void);

#define __preempt_schedule() preempt_schedule()

extern asmlinkage void preempt_schedule_notrace(void);

#define __preempt_schedule_notrace() preempt_schedule_notrace()

#endif /* CONFIG_PREEMPT */

#endif /* CONFIG_PREEMPTION */



#endif /* __ASM_PREEMPT_H */

arch/s390/kernel/dumpstack.c

+2 −0
Original line number Diff line number Diff line
@@ -195,6 +195,8 @@ void die(struct pt_regs *regs, const char *str) 
	       regs->int_code >> 17, ++die_counter);

#ifdef CONFIG_PREEMPT

	pr_cont("PREEMPT ");

#elif defined(CONFIG_PREEMPT_RT)

	pr_cont("PREEMPT_RT ");

#endif

	pr_cont("SMP ");

	if (debug_pagealloc_enabled())

arch/s390/kernel/entry.S

+1 −1
Original line number Diff line number Diff line
@@ -790,7 +790,7 @@ ENTRY(io_int_handler) 
.Lio_work:

	tm	__PT_PSW+1(%r11),0x01	# returning to user ?

	jo	.Lio_work_user		# yes -> do resched & signal

#ifdef CONFIG_PREEMPT

#ifdef CONFIG_PREEMPTION

	# check for preemptive scheduling

	icm	%r0,15,__LC_PREEMPT_COUNT

	jnz	.Lio_restore		# preemption is disabled

CRA Git | Maintained and supported by SUSTech CRA and CCSE