diff options
author | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-10-20 06:46:43 +0200 |
---|---|---|
committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-10-20 06:46:43 +0200 |
commit | 5ec75f810f09a224ce0f77ba312599eb4c7321bc (patch) | |
tree | dcb2b1a0d97363e1a678726925d875c1bea151fa /0001-s390-Lock-down-the-kernel-when-the-IPL-secure-flag-i.patch | |
parent | 11a8f14639c96c38e142ba04c87f50de9c557ba7 (diff) | |
parent | a71ee103a729754519abc15fd58e6b258a89e58b (diff) | |
download | kernel-5ec75f810f09a224ce0f77ba312599eb4c7321bc.tar.gz kernel-5ec75f810f09a224ce0f77ba312599eb4c7321bc.tar.xz kernel-5ec75f810f09a224ce0f77ba312599eb4c7321bc.zip |
merge origin
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 | 6 |
1 files changed, 3 insertions, 3 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 63cd86b35..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 07aa15ba43b3..307abb2d82d7 100644 +index e600f6953d7c..4264e01824b3 100644 --- a/arch/s390/kernel/setup.c +++ b/arch/s390/kernel/setup.c @@ -49,6 +49,7 @@ @@ -52,7 +52,7 @@ index 07aa15ba43b3..307abb2d82d7 100644 #include <asm/boot_data.h> #include <asm/ipl.h> -@@ -1086,6 +1087,9 @@ void __init setup_arch(char **cmdline_p) +@@ -1085,6 +1086,9 @@ void __init setup_arch(char **cmdline_p) log_component_list(); @@ -63,5 +63,5 @@ index 07aa15ba43b3..307abb2d82d7 100644 /* boot_command_line has been already set up in early.c */ *cmdline_p = boot_command_line; -- -2.26.2 +2.28.0 |