Skip to content

Commit b6f10e2

Browse files
committed
s390: remove "noexec" option
Do the same like x86 with commit 76ea002 ("x86/cpu: Remove "noexec"") and remove the "noexec" kernel command line option. Reviewed-by: Alexander Gordeev <agordeev@linux.ibm.com> Signed-off-by: Heiko Carstens <hca@linux.ibm.com>
1 parent 7b03942 commit b6f10e2

File tree

5 files changed

+2
-12
lines changed

5 files changed

+2
-12
lines changed

arch/s390/boot/ipl_parm.c

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ struct parmarea parmarea __section(".parmarea") = {
1919
};
2020

2121
char __bootdata(early_command_line)[COMMAND_LINE_SIZE];
22-
int __bootdata(noexec_disabled);
2322

2423
unsigned int __bootdata_preserved(zlib_dfltcc_support) = ZLIB_DFLTCC_FULL;
2524
struct ipl_parameter_block __bootdata_preserved(ipl_block);
@@ -290,12 +289,6 @@ void parse_boot_command_line(void)
290289
zlib_dfltcc_support = ZLIB_DFLTCC_FULL_DEBUG;
291290
}
292291

293-
if (!strcmp(param, "noexec")) {
294-
rc = kstrtobool(val, &enabled);
295-
if (!rc && !enabled)
296-
noexec_disabled = 1;
297-
}
298-
299292
if (!strcmp(param, "facilities") && val)
300293
modify_fac_list(val);
301294

arch/s390/boot/startup.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ static void detect_facilities(void)
5353
}
5454
if (test_facility(78))
5555
machine.has_edat2 = 1;
56-
if (!noexec_disabled && test_facility(130)) {
56+
if (test_facility(130)) {
5757
machine.has_nx = 1;
5858
__ctl_set_bit(0, 20);
5959
}

arch/s390/include/asm/setup.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,6 @@ extern unsigned int zlib_dfltcc_support;
7272
#define ZLIB_DFLTCC_INFLATE_ONLY 3
7373
#define ZLIB_DFLTCC_FULL_DEBUG 4
7474

75-
extern int noexec_disabled;
7675
extern unsigned long ident_map_size;
7776
extern unsigned long max_mappable;
7877

arch/s390/kernel/early.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,6 @@ early_param(#param, ignore_decompressor_param_##param)
4444
decompressor_handled_param(mem);
4545
decompressor_handled_param(vmalloc);
4646
decompressor_handled_param(dfltcc);
47-
decompressor_handled_param(noexec);
4847
decompressor_handled_param(facilities);
4948
decompressor_handled_param(nokaslr);
5049
#if IS_ENABLED(CONFIG_KVM)
@@ -233,7 +232,7 @@ static __init void detect_machine_facilities(void)
233232
S390_lowcore.machine_flags |= MACHINE_FLAG_VX;
234233
__ctl_set_bit(0, 17);
235234
}
236-
if (test_facility(130) && !noexec_disabled) {
235+
if (test_facility(130)) {
237236
S390_lowcore.machine_flags |= MACHINE_FLAG_NX;
238237
__ctl_set_bit(0, 20);
239238
}

arch/s390/kernel/setup.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,6 @@ static u32 __amode31_ref *__ctl_duald = __ctl_duald_amode31;
145145
static u32 __amode31_ref *__ctl_linkage_stack = __ctl_linkage_stack_amode31;
146146
static u32 __amode31_ref *__ctl_duct = __ctl_duct_amode31;
147147

148-
int __bootdata(noexec_disabled);
149148
unsigned long __bootdata_preserved(max_mappable);
150149
unsigned long __bootdata(ident_map_size);
151150
struct physmem_info __bootdata(physmem_info);

0 commit comments

Comments
 (0)