diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2023-11-01 02:07:35 +0300 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2023-11-01 02:07:35 +0300 |
| commit | 20cd569d7ee8fce24e8753f0f43af6c420557b1f (patch) | |
| tree | f559cfda594846795aa51c99d96f92d8c912851a /arch/s390/boot/startup.c | |
| parent | 62cc9c3cb3ec1bf31cc116146185ed97b450836a (diff) | |
| parent | eeebfe6259ba2d5b0980eb7b0df384eb77e9e4f5 (diff) | |
| download | linux-20cd569d7ee8fce24e8753f0f43af6c420557b1f.tar.xz | |
Merge branch 'for-6.7/config_pm' into for-linus
- #ifdef CONFIG_PM removal from HID code (Thomas Weißschuh)
Diffstat (limited to 'arch/s390/boot/startup.c')
| -rw-r--r-- | arch/s390/boot/startup.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/arch/s390/boot/startup.c b/arch/s390/boot/startup.c index b9681cb22753..d3e48bd9c394 100644 --- a/arch/s390/boot/startup.c +++ b/arch/s390/boot/startup.c @@ -53,10 +53,8 @@ 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); - } } static void setup_lpp(void) |