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)
committerTony Luck <tony.luck@intel.com>
Wed, 13 Jan 2016 18:35:14 +0000 (10:35 -0800)
commit0f7f2f0c0fcbe5e2bcba707a628ebaedfe2be4b4
tree0c2614b11197a3e0ad4f9c964545f0c95ff51496
parent809267708557ed5575831282f719ca644698084b
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>
drivers/firmware/efi/efi.c