UPSTREAM: efi: include asm/early_ioremap.h not asm/efi.h to get early_memremap
authorArd Biesheuvel <ard.biesheuvel@linaro.org>
Tue, 12 Jan 2016 13:22:46 +0000 (14:22 +0100)
committerSami Tolvanen <samitolvanen@google.com>
Mon, 3 Oct 2016 20:45:44 +0000 (13:45 -0700)
commita92cff09551d9ef0605af1cf6a7d9ee087d036c3
treed4d5c8a57d433226040f8dd419cb41598b9bcaa2
parentd625b6286ac7af9bc19811c1a625867a71c631bf
UPSTREAM: efi: include asm/early_ioremap.h not asm/efi.h to get early_memremap

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 <linux@roeck-us.net>
Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Signed-off-by: Tony Luck <tony.luck@intel.com>
Change-Id: Ifa3e69e0b4078bac1e1d29bfe56861eb394e865b
(cherry picked from commit 0f7f2f0c0fcbe5e2bcba707a628ebaedfe2be4b4)
Signed-off-by: Sami Tolvanen <samitolvanen@google.com>
drivers/firmware/efi/efi.c