diff options
author | 2023-06-01 20:43:11 -0400 | |
---|---|---|
committer | 2023-06-01 20:43:11 -0400 | |
commit | 792fc9214036633f2c26fe551cd26d5d7abdecfb (patch) | |
tree | 1c4b2a03db3a63569d65de2b09a51f71555b14e8 /drivers/acpi/apei/bert.c | |
parent | Merge tag 'fbdev-for-6.4-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/linux-fbdev (diff) | |
parent | efi: Bump stub image version for macOS HVF compatibility (diff) | |
download | wireguard-linux-792fc9214036633f2c26fe551cd26d5d7abdecfb.tar.xz wireguard-linux-792fc9214036633f2c26fe551cd26d5d7abdecfb.zip |
Merge tag 'efi-fixes-for-v6.4-1' of git://git.kernel.org/pub/scm/linux/kernel/git/efi/efi
Pull EFI fixes from Ard Biesheuvel:
"A few minor fixes for EFI, one of which fixes the reported boot
regression when booting x86 kernels using the BIOS based loader built
into the hypervisor framework on macOS.
- fix harmless warning in zboot code on 'make clean'
- add some missing prototypes
- fix boot regressions triggered by PE/COFF header image minor
version bump"
* tag 'efi-fixes-for-v6.4-1' of git://git.kernel.org/pub/scm/linux/kernel/git/efi/efi:
efi: Bump stub image version for macOS HVF compatibility
efi: fix missing prototype warnings
efi/libstub: zboot: Avoid eager evaluation of objcopy flags
Diffstat (limited to '')
-rw-r--r-- | drivers/acpi/apei/bert.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/acpi/apei/bert.c b/drivers/acpi/apei/bert.c index c23eb75866d0..7514e38d5640 100644 --- a/drivers/acpi/apei/bert.c +++ b/drivers/acpi/apei/bert.c @@ -23,6 +23,7 @@ #include <linux/module.h> #include <linux/init.h> #include <linux/acpi.h> +#include <linux/cper.h> #include <linux/io.h> #include "apei-internal.h" |