From d5f320566eb00901161a51fbd50b5ebbc51f47be Mon Sep 17 00:00:00 2001 From: "Justin M. Forbes" Date: Wed, 26 Aug 2020 16:24:10 -0500 Subject: Linux v5.8.4 rebase Signed-off-by: Justin M. Forbes --- ...390-Lock-down-the-kernel-when-the-IPL-secure-flag-i.patch | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to '0001-s390-Lock-down-the-kernel-when-the-IPL-secure-flag-i.patch') 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..63cd86b35 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 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 90a2a17239b0..be3b72c53656 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 36445dd40fdb..b338a050c5aa 100644 +index 07aa15ba43b3..307abb2d82d7 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 #include -@@ -1093,6 +1094,9 @@ void __init setup_arch(char **cmdline_p) +@@ -1086,6 +1087,9 @@ void __init setup_arch(char **cmdline_p) log_component_list(); -- cgit