On Wed, 5 Jun 2019 at 20:11, Matthew Garrett <[email protected]> wrote: > > asm/early_ioremap.h needs to be #included before tpm_eventlog.h in order > to ensure that early_memremap is available. >
Doesn't that make it tpm_eventlog.h's job to #include it? > Signed-off-by: Matthew Garrett <[email protected]> > --- > drivers/firmware/efi/tpm.c | 3 +-- > 1 file changed, 1 insertion(+), 2 deletions(-) > > diff --git a/drivers/firmware/efi/tpm.c b/drivers/firmware/efi/tpm.c > index 0bdceb5913aa..1d3f5ca3eaaf 100644 > --- a/drivers/firmware/efi/tpm.c > +++ b/drivers/firmware/efi/tpm.c > @@ -7,13 +7,12 @@ > #define TPM_MEMREMAP(start, size) early_memremap(start, size) > #define TPM_MEMUNMAP(start, size) early_memunmap(start, size) > > +#include <asm/early_ioremap.h> > #include <linux/efi.h> > #include <linux/init.h> > #include <linux/memblock.h> > #include <linux/tpm_eventlog.h> > > -#include <asm/early_ioremap.h> > - > int efi_tpm_final_log_size; > EXPORT_SYMBOL(efi_tpm_final_log_size); > > -- > 2.22.0.rc1.311.g5d7573a151-goog >
