Commit a5ff1b34 authored by Masahiro Yamada's avatar Masahiro Yamada Committed by Linus Torvalds
Browse files

treewide: replace config_enabled() with IS_ENABLED() (2nd round) 

Commit 97f2645f ("tree-wide: replace config_enabled() with
IS_ENABLED()") mostly killed config_enabled(), but some new users have
appeared for v4.8-rc1.  They are all used for a boolean option, so can
be replaced with IS_ENABLED() safely.

Link: http://lkml.kernel.org/r/1471970749-24867-1-git-send-email-yamada.masahiro@socionext.com


Signed-off-by: default avatarMasahiro Yamada <yamada.masahiro@socionext.com>
Acked-by: default avatarKees Cook <keescook@chromium.org>
Acked-by: default avatarPeter Oberparleiter <oberpar@linux.vnet.ibm.com>
Cc: Martin Schwidefsky <schwidefsky@de.ibm.com>
Cc: Heiko Carstens <heiko.carstens@de.ibm.com>
Cc: Ralf Baechle <ralf@linux-mips.org>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: "H. Peter Anvin" <hpa@zytor.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent ae6c33ba

arch/mips/include/asm/page.h

+2 −2
Original line number Diff line number Diff line
@@ -164,7 +164,7 @@ typedef struct { unsigned long pgprot; } pgprot_t; 
 */

static inline unsigned long ___pa(unsigned long x)

{

	if (config_enabled(CONFIG_64BIT)) {

	if (IS_ENABLED(CONFIG_64BIT)) {

		/*

		 * For MIPS64 the virtual address may either be in one of

		 * the compatibility segements ckseg0 or ckseg1, or it may
@@ -173,7 +173,7 @@ static inline unsigned long ___pa(unsigned long x) 
		return x < CKSEG0 ? XPHYSADDR(x) : CPHYSADDR(x);

	}



	if (!config_enabled(CONFIG_EVA)) {

	if (!IS_ENABLED(CONFIG_EVA)) {

		/*

		 * We're using the standard MIPS32 legacy memory map, ie.

		 * the address x is going to be in kseg0 or kseg1. We can

arch/s390/kernel/setup.c

+2 −4
Original line number Diff line number Diff line
@@ -204,11 +204,9 @@ static void __init conmode_default(void) 
#endif

		}

	} else if (MACHINE_IS_KVM) {

		if (sclp.has_vt220 &&

		    config_enabled(CONFIG_SCLP_VT220_CONSOLE))

		if (sclp.has_vt220 && IS_ENABLED(CONFIG_SCLP_VT220_CONSOLE))

			SET_CONSOLE_VT220;

		else if (sclp.has_linemode &&

			 config_enabled(CONFIG_SCLP_CONSOLE))

		else if (sclp.has_linemode && IS_ENABLED(CONFIG_SCLP_CONSOLE))

			SET_CONSOLE_SCLP;

		else

			SET_CONSOLE_HVC;

arch/x86/mm/kaslr.c

+1 −1
Original line number Diff line number Diff line
@@ -77,7 +77,7 @@ static inline unsigned long get_padding(struct kaslr_memory_region *region) 
 */

static inline bool kaslr_memory_enabled(void)

{

	return kaslr_enabled() && !config_enabled(CONFIG_KASAN);

	return kaslr_enabled() && !IS_ENABLED(CONFIG_KASAN);

}



/* Initialize base and padding for each memory region randomized with KASLR */

CRA Git | Maintained and supported by SUSTech CRA and CCSE