Commit b6f10e2f authored by Heiko Carstens's avatar Heiko Carstens
Browse files

s390: remove "noexec" option 



Do the same like x86 with commit 76ea0025 ("x86/cpu: Remove "noexec"")
and remove the "noexec" kernel command line option.

Reviewed-by: default avatarAlexander Gordeev <agordeev@linux.ibm.com>
Signed-off-by: default avatarHeiko Carstens <hca@linux.ibm.com>
parent 7b03942f

arch/s390/boot/ipl_parm.c

+0 −7
Original line number Diff line number Diff line
@@ -19,7 +19,6 @@ struct parmarea parmarea __section(".parmarea") = { 
};



char __bootdata(early_command_line)[COMMAND_LINE_SIZE];

int __bootdata(noexec_disabled);



unsigned int __bootdata_preserved(zlib_dfltcc_support) = ZLIB_DFLTCC_FULL;

struct ipl_parameter_block __bootdata_preserved(ipl_block);
@@ -290,12 +289,6 @@ void parse_boot_command_line(void) 
				zlib_dfltcc_support = ZLIB_DFLTCC_FULL_DEBUG;

		}



		if (!strcmp(param, "noexec")) {

			rc = kstrtobool(val, &enabled);

			if (!rc && !enabled)

				noexec_disabled = 1;

		}



		if (!strcmp(param, "facilities") && val)

			modify_fac_list(val);

arch/s390/boot/startup.c

+1 −1
Original line number Diff line number Diff line
@@ -53,7 +53,7 @@ static void detect_facilities(void) 
	}

	if (test_facility(78))

		machine.has_edat2 = 1;

	if (!noexec_disabled && test_facility(130)) {

	if (test_facility(130)) {

		machine.has_nx = 1;

		__ctl_set_bit(0, 20);

	}

arch/s390/include/asm/setup.h

+0 −1
Original line number Diff line number Diff line
@@ -72,7 +72,6 @@ extern unsigned int zlib_dfltcc_support; 
#define ZLIB_DFLTCC_INFLATE_ONLY	3

#define ZLIB_DFLTCC_FULL_DEBUG		4



extern int noexec_disabled;

extern unsigned long ident_map_size;

extern unsigned long max_mappable;

arch/s390/kernel/early.c

+1 −2
Original line number Diff line number Diff line
@@ -44,7 +44,6 @@ early_param(#param, ignore_decompressor_param_##param) 
decompressor_handled_param(mem);

decompressor_handled_param(vmalloc);

decompressor_handled_param(dfltcc);

decompressor_handled_param(noexec);

decompressor_handled_param(facilities);

decompressor_handled_param(nokaslr);

#if IS_ENABLED(CONFIG_KVM)
@@ -233,7 +232,7 @@ static __init void detect_machine_facilities(void) 
		S390_lowcore.machine_flags |= MACHINE_FLAG_VX;

		__ctl_set_bit(0, 17);

	}

	if (test_facility(130) && !noexec_disabled) {

	if (test_facility(130)) {

		S390_lowcore.machine_flags |= MACHINE_FLAG_NX;

		__ctl_set_bit(0, 20);

	}

arch/s390/kernel/setup.c

+0 −1
Original line number Diff line number Diff line
@@ -145,7 +145,6 @@ static u32 __amode31_ref *__ctl_duald = __ctl_duald_amode31; 
static u32 __amode31_ref *__ctl_linkage_stack = __ctl_linkage_stack_amode31;

static u32 __amode31_ref *__ctl_duct = __ctl_duct_amode31;



int __bootdata(noexec_disabled);

unsigned long __bootdata_preserved(max_mappable);

unsigned long __bootdata(ident_map_size);

struct physmem_info __bootdata(physmem_info);