summaryrefslogtreecommitdiffstats
path: root/0001-s390-Lock-down-the-kernel-when-the-IPL-secure-flag-i.patch
diff options
context:
space:
mode:
authorThorsten Leemhuis <fedora@leemhuis.info>2020-09-30 18:44:02 +0200
committerThorsten Leemhuis <fedora@leemhuis.info>2020-09-30 18:44:02 +0200
commite5237f62c21f764ed70f1abcea884b15f30ca984 (patch)
tree30612d7f7dcef570d7f4f5dabbec7d246b6da140 /0001-s390-Lock-down-the-kernel-when-the-IPL-secure-flag-i.patch
parente3fcce771836f3bf4ad59b6beed900b3e9a25ea0 (diff)
parent8bf7e7fde6b9176ccaac91a0c95464f326d8a008 (diff)
downloadkernel-e5237f62c21f764ed70f1abcea884b15f30ca984.tar.gz
kernel-e5237f62c21f764ed70f1abcea884b15f30ca984.tar.xz
kernel-e5237f62c21f764ed70f1abcea884b15f30ca984.zip
Merge remote-tracking branch 'origin/master' into rawhide-user-thl-vanilla-fedorakernel-5.9.0-0.rc7.20200930gitfb0155a09b02.22.vanilla.1.fc32
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.patch2
1 files changed, 1 insertions, 1 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 12eadc312..6613f6a35 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 90a2a17239b0..be3b72c53656 100644
+ return !!ipl_secure_flag;
+}
diff --git a/arch/s390/kernel/setup.c b/arch/s390/kernel/setup.c
-index c2c1b4e723ea..1247f80a3bf0 100644
+index e600f6953d7c..4264e01824b3 100644
--- a/arch/s390/kernel/setup.c
+++ b/arch/s390/kernel/setup.c
@@ -49,6 +49,7 @@