File tree Expand file tree Collapse file tree 5 files changed +2
-12
lines changed Expand file tree Collapse file tree 5 files changed +2
-12
lines changed Original file line number Diff line number Diff line change @@ -19,7 +19,6 @@ struct parmarea parmarea __section(".parmarea") = {
19
19
};
20
20
21
21
char __bootdata (early_command_line )[COMMAND_LINE_SIZE ];
22
- int __bootdata (noexec_disabled );
23
22
24
23
unsigned int __bootdata_preserved (zlib_dfltcc_support ) = ZLIB_DFLTCC_FULL ;
25
24
struct ipl_parameter_block __bootdata_preserved (ipl_block );
@@ -290,12 +289,6 @@ void parse_boot_command_line(void)
290
289
zlib_dfltcc_support = ZLIB_DFLTCC_FULL_DEBUG ;
291
290
}
292
291
293
- if (!strcmp (param , "noexec" )) {
294
- rc = kstrtobool (val , & enabled );
295
- if (!rc && !enabled )
296
- noexec_disabled = 1 ;
297
- }
298
-
299
292
if (!strcmp (param , "facilities" ) && val )
300
293
modify_fac_list (val );
301
294
Original file line number Diff line number Diff line change @@ -53,7 +53,7 @@ static void detect_facilities(void)
53
53
}
54
54
if (test_facility (78 ))
55
55
machine .has_edat2 = 1 ;
56
- if (! noexec_disabled && test_facility (130 )) {
56
+ if (test_facility (130 )) {
57
57
machine .has_nx = 1 ;
58
58
__ctl_set_bit (0 , 20 );
59
59
}
Original file line number Diff line number Diff line change @@ -72,7 +72,6 @@ extern unsigned int zlib_dfltcc_support;
72
72
#define ZLIB_DFLTCC_INFLATE_ONLY 3
73
73
#define ZLIB_DFLTCC_FULL_DEBUG 4
74
74
75
- extern int noexec_disabled ;
76
75
extern unsigned long ident_map_size ;
77
76
extern unsigned long max_mappable ;
78
77
Original file line number Diff line number Diff line change @@ -44,7 +44,6 @@ early_param(#param, ignore_decompressor_param_##param)
44
44
decompressor_handled_param (mem );
45
45
decompressor_handled_param (vmalloc );
46
46
decompressor_handled_param (dfltcc );
47
- decompressor_handled_param (noexec );
48
47
decompressor_handled_param (facilities );
49
48
decompressor_handled_param (nokaslr );
50
49
#if IS_ENABLED (CONFIG_KVM )
@@ -233,7 +232,7 @@ static __init void detect_machine_facilities(void)
233
232
S390_lowcore .machine_flags |= MACHINE_FLAG_VX ;
234
233
__ctl_set_bit (0 , 17 );
235
234
}
236
- if (test_facility (130 ) && ! noexec_disabled ) {
235
+ if (test_facility (130 )) {
237
236
S390_lowcore .machine_flags |= MACHINE_FLAG_NX ;
238
237
__ctl_set_bit (0 , 20 );
239
238
}
Original file line number Diff line number Diff line change @@ -145,7 +145,6 @@ static u32 __amode31_ref *__ctl_duald = __ctl_duald_amode31;
145
145
static u32 __amode31_ref * __ctl_linkage_stack = __ctl_linkage_stack_amode31 ;
146
146
static u32 __amode31_ref * __ctl_duct = __ctl_duct_amode31 ;
147
147
148
- int __bootdata (noexec_disabled );
149
148
unsigned long __bootdata_preserved (max_mappable );
150
149
unsigned long __bootdata (ident_map_size );
151
150
struct physmem_info __bootdata (physmem_info );
You can’t perform that action at this time.
0 commit comments