Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 61aa4884 authored by Heiko Carstens's avatar Heiko Carstens Committed by Martin Schwidefsky
Browse files

s390: use IS_ENABLED to check if a CONFIG is set to y or m 



This is shorter and should be used instead of the longer form
which checks for both possible config options.

Signed-off-by: default avatarHeiko Carstens <heiko.carstens@de.ibm.com>
Signed-off-by: default avatarMartin Schwidefsky <schwidefsky@de.ibm.com>
parent d5b877ff

arch/s390/kernel/entry64.S

+3 −3
Original line number Diff line number Diff line
@@ -74,7 +74,7 @@ _TIF_TRACE = (_TIF_SYSCALL_TRACE | _TIF_SYSCALL_AUDIT | _TIF_SECCOMP | \ 
	.endm



	.macro LPP newpp

#if defined(CONFIG_KVM) || defined(CONFIG_KVM_MODULE)

#if IS_ENABLED(CONFIG_KVM)

	tm	__LC_MACHINE_FLAGS+6,0x20	# MACHINE_FLAG_LPP

	jz	.+8

	.insn	s,0xb2800000,\newpp
@@ -82,7 +82,7 @@ _TIF_TRACE = (_TIF_SYSCALL_TRACE | _TIF_SYSCALL_AUDIT | _TIF_SECCOMP | \ 
	.endm



	.macro	HANDLE_SIE_INTERCEPT scratch,reason

#if defined(CONFIG_KVM) || defined(CONFIG_KVM_MODULE)

#if IS_ENABLED(CONFIG_KVM)

	tmhh	%r8,0x0001		# interrupting from user ?

	jnz	.+62

	lgr	\scratch,%r9
@@ -946,7 +946,7 @@ cleanup_idle_insn: 
	.quad	__critical_end - __critical_start





#if defined(CONFIG_KVM) || defined(CONFIG_KVM_MODULE)

#if IS_ENABLED(CONFIG_KVM)

/*

 * sie64a calling convention:

 * %r2 pointer to sie control block

arch/s390/kernel/perf_event.c

+1 −1
Original line number Diff line number Diff line
@@ -60,7 +60,7 @@ static bool is_in_guest(struct pt_regs *regs) 
{

	if (user_mode(regs))

		return false;

#if defined(CONFIG_KVM) || defined(CONFIG_KVM_MODULE)

#if IS_ENABLED(CONFIG_KVM)

	return instruction_pointer(regs) == (unsigned long) &sie_exit;

#else

	return false;

arch/s390/kernel/s390_ksyms.c

+1 −1
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ 
#ifdef CONFIG_FUNCTION_TRACER

EXPORT_SYMBOL(_mcount);

#endif

#if defined(CONFIG_KVM) || defined(CONFIG_KVM_MODULE)

#if IS_ENABLED(CONFIG_KVM)

EXPORT_SYMBOL(sie64a);

EXPORT_SYMBOL(sie_exit);

#endif