diff options
| author | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-06-03 21:03:07 +0200 |
|---|---|---|
| committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-06-03 21:03:07 +0200 |
| commit | b16f4ddd7e5422a842beaeaeea0c411bd432d0f4 (patch) | |
| tree | 3268a5a64dd96a1ebc80d1af24cdaa093d496385 /0001-s390-Lock-down-the-kernel-when-the-IPL-secure-flag-i.patch | |
| parent | d5e4e88fb9466ff04a7cd07c1ae8323bbbc36b8b (diff) | |
| parent | 95dc4cf28c756d993d2080a495935006100a62a2 (diff) | |
| download | kernel-b16f4ddd7e5422a842beaeaeea0c411bd432d0f4.tar.gz kernel-b16f4ddd7e5422a842beaeaeea0c411bd432d0f4.tar.xz kernel-b16f4ddd7e5422a842beaeaeea0c411bd432d0f4.zip | |
Merge remote-tracking branch 'origin/master' into rawhide-user-thl-vanilla-fedorakernel-5.8.0-0.rc0.20200603gitd6f9469a03d8.1.vanilla.1.fc33kernel-5.8.0-0.rc0.20200603gitd6f9469a03d8.1.vanilla.1.fc32kernel-5.8.0-0.rc0.20200603gitd6f9469a03d8.1.vanilla.1.fc31
Diffstat (limited to '0001-s390-Lock-down-the-kernel-when-the-IPL-secure-flag-i.patch')
| -rw-r--r-- | 0001-s390-Lock-down-the-kernel-when-the-IPL-secure-flag-i.patch | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/0001-s390-Lock-down-the-kernel-when-the-IPL-secure-flag-i.patch b/0001-s390-Lock-down-the-kernel-when-the-IPL-secure-flag-i.patch index 4332472bb..0686272d3 100644 --- a/0001-s390-Lock-down-the-kernel-when-the-IPL-secure-flag-i.patch +++ b/0001-s390-Lock-down-the-kernel-when-the-IPL-secure-flag-i.patch @@ -41,7 +41,7 @@ index 4a71061974fd..9baf0b570c3d 100644 + return !!ipl_secure_flag; +} diff --git a/arch/s390/kernel/setup.c b/arch/s390/kernel/setup.c -index 36445dd40fdb..b338a050c5aa 100644 +index 0f0b140b5558..5554ae03060f 100644 --- a/arch/s390/kernel/setup.c +++ b/arch/s390/kernel/setup.c @@ -49,6 +49,7 @@ @@ -52,7 +52,7 @@ index 36445dd40fdb..b338a050c5aa 100644 #include <asm/boot_data.h> #include <asm/ipl.h> -@@ -1093,6 +1094,9 @@ void __init setup_arch(char **cmdline_p) +@@ -1090,6 +1091,9 @@ void __init setup_arch(char **cmdline_p) log_component_list(); |