projects/linux·commit 0f7f2f0c

efi: include asm/early_ioremap.h not asm/efi.h to get early_memremap

0f7f2f0c · Ard Biesheuvel <[email protected]> · 2016-01-12 14:22:46 +01:00

The code in efi.c uses early_memremap(), but relies on a transitive
include rather than including asm/early_ioremap.h directly, since
this header did not exist on ia64.

Commit f7d924894265 ("arm64/efi: refactor EFI init and runtime code
for reuse by 32-bit ARM") attempted to work around this by including
asm/efi.h, which transitively includes asm/early_ioremap.h on most
architectures. However, since asm/efi.h does not exist on ia64 either,
this is not much of an improvement.

Now that we have created an asm/early_ioremap.h for ia64, we can just
include it directly.

Reported-by: Guenter Roeck <[email protected]>
Signed-off-by: Ard Biesheuvel <[email protected]>
Signed-off-by: Tony Luck <[email protected]>
Commit
0f7f2f0c0fcbe5e2bcba707a628ebaedfe2be4b4
Parents
80926770

Changes

1 files changed · +1 −1

FileStatusAddDelContent
drivers/firmware/efi/efi.cmodified+1−1View file

drivers/firmware/efi/efi.c

View file
diff --git a/drivers/firmware/efi/efi.c b/drivers/firmware/efi/efi.c
index cffa89b..2cd37da 100644
--- a/drivers/firmware/efi/efi.c
+++ b/drivers/firmware/efi/efi.c
@@ -25,7 +25,7 @@
#include <linux/io.h>
#include <linux/platform_device.h>
-#include <asm/efi.h>
+#include <asm/early_ioremap.h>
struct efi __read_mostly efi = {
.mps = EFI_INVALID_TABLE_ADDR,