diff options
| author | H. Peter Anvin <hpa@linux.intel.com> | 2014-07-15 00:45:44 +0400 |
|---|---|---|
| committer | H. Peter Anvin <hpa@linux.intel.com> | 2014-07-15 00:45:44 +0400 |
| commit | e0463e42d7b73654f39f6a155f82f0b72ad5258a (patch) | |
| tree | 80372e06e4ed47d034c32f2ab34720da24eb28c2 /arch/arm64 | |
| parent | 1795cd9b3a91d4b5473c97f491d63892442212ab (diff) | |
| parent | c7fb93ec51d462ec3540a729ba446663c26a0505 (diff) | |
| download | linux-e0463e42d7b73654f39f6a155f82f0b72ad5258a.tar.xz | |
Merge tag 'efi-urgent' into x86/urgent
* Remove a duplicate copy of linux_banner from the arm64 EFI stub
which, apart from reducing code duplication also stops the arm64 stub
being rebuilt every time make is invoked - Ard Biesheuvel
* Fix the EFI fdt code to not report a boot error if UEFI is
unavailable since booting without UEFI parameters is a valid use case
for non-UEFI platforms - Catalin Marinas
* Include a .bss section in the EFI boot stub PE/COFF headers to fix a
memory corruption bug - Michael Brown
Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
Diffstat (limited to 'arch/arm64')
| -rw-r--r-- | arch/arm64/kernel/efi-stub.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/arm64/kernel/efi-stub.c b/arch/arm64/kernel/efi-stub.c index 60e98a639ac5..e786e6cdc400 100644 --- a/arch/arm64/kernel/efi-stub.c +++ b/arch/arm64/kernel/efi-stub.c @@ -12,8 +12,6 @@ #include <linux/efi.h> #include <linux/libfdt.h> #include <asm/sections.h> -#include <generated/compile.h> -#include <generated/utsrelease.h> /* * AArch64 requires the DTB to be 8-byte aligned in the first 512MiB from |