Skip to content

Commit

Permalink
efi: include asm/early_ioremap.h not asm/efi.h to get early_memremap
Browse files Browse the repository at this point in the history
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 f7d9248 ("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>
  • Loading branch information
Ard Biesheuvel authored and aegl committed Jan 13, 2016
1 parent 8092677 commit 0f7f2f0
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion drivers/firmware/efi/efi.c
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down

0 comments on commit 0f7f2f0

Please sign in to comment.