summaryrefslogtreecommitdiffstats
path: root/0001-s390-Lock-down-the-kernel-when-the-IPL-secure-flag-i.patch
diff options
context:
space:
mode:
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.patch12
1 files changed, 6 insertions, 6 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 0686272d3..dd90c0420 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
@@ -16,10 +16,10 @@ Signed-off-by: Jeremy Cline <jcline@redhat.com>
3 files changed, 10 insertions(+)
diff --git a/arch/s390/include/asm/ipl.h b/arch/s390/include/asm/ipl.h
-index b63bd66404b8..3482d9602e68 100644
+index 7d5cfdda5277..be66ee5d0437 100644
--- a/arch/s390/include/asm/ipl.h
+++ b/arch/s390/include/asm/ipl.h
-@@ -109,6 +109,7 @@ int ipl_report_add_component(struct ipl_report *report, struct kexec_buf *kbuf,
+@@ -120,6 +120,7 @@ int ipl_report_add_component(struct ipl_report *report, struct kexec_buf *kbuf,
unsigned char flags, unsigned short cert);
int ipl_report_add_certificate(struct ipl_report *report, void *key,
unsigned long addr, unsigned long len);
@@ -28,10 +28,10 @@ index b63bd66404b8..3482d9602e68 100644
/*
* DIAG 308 support
diff --git a/arch/s390/kernel/ipl.c b/arch/s390/kernel/ipl.c
-index 4a71061974fd..9baf0b570c3d 100644
+index ccea9a245867..558f9fbfd114 100644
--- a/arch/s390/kernel/ipl.c
+++ b/arch/s390/kernel/ipl.c
-@@ -1901,3 +1901,8 @@ int ipl_report_free(struct ipl_report *report)
+@@ -2110,3 +2110,8 @@ int ipl_report_free(struct ipl_report *report)
}
#endif
@@ -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 0f0b140b5558..5554ae03060f 100644
+index 5853c9872dfe..fab9bc9889da 100644
--- a/arch/s390/kernel/setup.c
+++ b/arch/s390/kernel/setup.c
@@ -49,6 +49,7 @@
@@ -52,7 +52,7 @@ index 0f0b140b5558..5554ae03060f 100644
#include <asm/boot_data.h>
#include <asm/ipl.h>
-@@ -1090,6 +1091,9 @@ void __init setup_arch(char **cmdline_p)
+@@ -1086,6 +1087,9 @@ void __init setup_arch(char **cmdline_p)
log_component_list();