diff options
| author | Ingo Molnar <mingo@kernel.org> | 2020-01-20 08:05:16 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2020-01-20 08:05:16 +0100 |
| commit | a786810cc864e31237a755b933e8872ba3e118bc (patch) | |
| tree | f94bd068691d03be00b582fd2fdabe7ccff0f044 /arch/s390 | |
| parent | efi: Allow disabling PCI busmastering on bridges during boot (diff) | |
| parent | Linux 5.5-rc7 (diff) | |
| download | linux-a786810cc864e31237a755b933e8872ba3e118bc.tar.xz linux-a786810cc864e31237a755b933e8872ba3e118bc.zip | |
Merge tag 'v5.5-rc7' into efi/core, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/s390')
| -rw-r--r-- | arch/s390/kernel/setup.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/s390/kernel/setup.c b/arch/s390/kernel/setup.c index 9cbf490fd162..d5fbd754f41a 100644 --- a/arch/s390/kernel/setup.c +++ b/arch/s390/kernel/setup.c @@ -1052,7 +1052,7 @@ static void __init log_component_list(void) if (!early_ipl_comp_list_addr) return; - if (ipl_block.hdr.flags & IPL_PL_FLAG_IPLSR) + if (ipl_block.hdr.flags & IPL_PL_FLAG_SIPL) pr_info("Linux is running with Secure-IPL enabled\n"); else pr_info("Linux is running with Secure-IPL disabled\n"); |