Commit 475c8e9e authored by Joe Perches's avatar Joe Perches Committed by Martin Schwidefsky
Browse files

s390: Convert IS_ENABLED uses to __is_defined 



IS_ENABLED should be reserved for CONFIG_<FOO> uses so convert
the uses of IS_ENABLED with a #define to __is_defined.

Signed-off-by: default avatarJoe Perches <joe@perches.com>
Signed-off-by: default avatarMartin Schwidefsky <schwidefsky@de.ibm.com>
parent 9a0ceb9c

arch/s390/kernel/nospec-branch.c

+3 −3
Original line number Diff line number Diff line
@@ -37,7 +37,7 @@ static int __init nospec_report(void) 
{

	if (test_facility(156))

		pr_info("Spectre V2 mitigation: etokens\n");

	if (IS_ENABLED(CC_USING_EXPOLINE) && !nospec_disable)

	if (__is_defined(CC_USING_EXPOLINE) && !nospec_disable)

		pr_info("Spectre V2 mitigation: execute trampolines\n");

	if (__test_facility(82, S390_lowcore.alt_stfle_fac_list))

		pr_info("Spectre V2 mitigation: limited branch prediction\n");
@@ -63,10 +63,10 @@ void __init nospec_auto_detect(void) 
		 * The machine supports etokens.

		 * Disable expolines and disable nobp.

		 */

		if (IS_ENABLED(CC_USING_EXPOLINE))

		if (__is_defined(CC_USING_EXPOLINE))

			nospec_disable = 1;

		__clear_facility(82, S390_lowcore.alt_stfle_fac_list);

	} else if (IS_ENABLED(CC_USING_EXPOLINE)) {

	} else if (__is_defined(CC_USING_EXPOLINE)) {

		/*

		 * The kernel has been compiled with expolines.

		 * Keep expolines enabled and disable nobp.

arch/s390/kernel/nospec-sysfs.c

+1 −1
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ ssize_t cpu_show_spectre_v2(struct device *dev, 
{

	if (test_facility(156))

		return sprintf(buf, "Mitigation: etokens\n");

	if (IS_ENABLED(CC_USING_EXPOLINE) && !nospec_disable)

	if (__is_defined(CC_USING_EXPOLINE) && !nospec_disable)

		return sprintf(buf, "Mitigation: execute trampolines\n");

	if (__test_facility(82, S390_lowcore.alt_stfle_fac_list))

		return sprintf(buf, "Mitigation: limited branch prediction\n");

arch/s390/net/bpf_jit_comp.c

+3 −3
Original line number Diff line number Diff line
@@ -455,7 +455,7 @@ static void bpf_jit_epilogue(struct bpf_jit *jit, u32 stack_depth) 
	EMIT4(0xb9040000, REG_2, BPF_REG_0);

	/* Restore registers */

	save_restore_regs(jit, REGS_RESTORE, stack_depth);

	if (IS_ENABLED(CC_USING_EXPOLINE) && !nospec_disable) {

	if (__is_defined(CC_USING_EXPOLINE) && !nospec_disable) {

		jit->r14_thunk_ip = jit->prg;

		/* Generate __s390_indirect_jump_r14 thunk */

		if (test_facility(35)) {
@@ -473,7 +473,7 @@ static void bpf_jit_epilogue(struct bpf_jit *jit, u32 stack_depth) 
	/* br %r14 */

	_EMIT2(0x07fe);



	if (IS_ENABLED(CC_USING_EXPOLINE) && !nospec_disable &&

	if (__is_defined(CC_USING_EXPOLINE) && !nospec_disable &&

	    (jit->seen & SEEN_FUNC)) {

		jit->r1_thunk_ip = jit->prg;

		/* Generate __s390_indirect_jump_r1 thunk */
@@ -999,7 +999,7 @@ static noinline int bpf_jit_insn(struct bpf_jit *jit, struct bpf_prog *fp, int i 
		/* lg %w1,<d(imm)>(%l) */

		EMIT6_DISP_LH(0xe3000000, 0x0004, REG_W1, REG_0, REG_L,

			      EMIT_CONST_U64(func));

		if (IS_ENABLED(CC_USING_EXPOLINE) && !nospec_disable) {

		if (__is_defined(CC_USING_EXPOLINE) && !nospec_disable) {

			/* brasl %r14,__s390_indirect_jump_r1 */

			EMIT6_PCREL_RILB(0xc0050000, REG_14, jit->r1_thunk_ip);

		} else {

CRA Git | Maintained and supported by SUSTech CRA and CCSE