diff options
| author | Ard Biesheuvel <ard.biesheuvel@linaro.org> | 2016-01-12 14:22:46 +0100 |
|---|---|---|
| committer | Tony Luck <tony.luck@intel.com> | 2016-01-13 10:35:14 -0800 |
| commit | 0f7f2f0c0fcbe5e2bcba707a628ebaedfe2be4b4 (patch) | |
| tree | 0c2614b11197a3e0ad4f9c964545f0c95ff51496 | |
| parent | 809267708557ed5575831282f719ca644698084b (diff) | |
| download | linux-0f7f2f0c0fcbe5e2bcba707a628ebaedfe2be4b4.tar.bz2 | |
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>
| -rw-r--r-- | drivers/firmware/efi/efi.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/firmware/efi/efi.c b/drivers/firmware/efi/efi.c index cffa89b3317b..2cd37dad67a6 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, |