android/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ia64: fix EFI_DEBUG build

Browse Source 
[ Upstream commit e3db00b79d74caaf84cd9e1d4927979abfd0d7c9 ]

When enabled local debugging via `#define EFI_DEBUG 1` noticed build
failure:

    arch/ia64/kernel/efi.c:564:8: error: 'i' undeclared (first use in this function)

While at it fixed benign string format mismatches visible only when
EFI_DEBUG is enabled:

    arch/ia64/kernel/efi.c:589:11:
        warning: format '%lx' expects argument of type 'long unsigned int',
        but argument 5 has type 'u64' {aka 'long long unsigned int'} [-Wformat=]

Link: https://lkml.kernel.org/r/20210328212246.685601-1-slyfox@gentoo.org
Fixes: 14fb420909 ("efi: Merge EFI system table revision and vendor checks")
Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org>
Cc: Ard Biesheuvel <ardb@kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Sergei Trofimovich 2021-04-29 22:53:39 -07:00 committed by Greg Kroah-Hartman
parent c6b7e0b1ab
commit c02dd80655
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
arch/ia64/kernel/efi.c
View File

@ -413,10 +413,10 @@ efi_get_pal_addr (void)
mask = ~((1 << IA64_GRANULE_SHIFT) - 1); mask = ~((1 << IA64_GRANULE_SHIFT) - 1);
printk(KERN_INFO "CPU %d: mapping PAL code " printk(KERN_INFO "CPU %d: mapping PAL code "
"[0x%lx-0x%lx) into [0x%lx-0x%lx)\n", "[0x%llx-0x%llx) into [0x%llx-0x%llx)\n",
smp_processor_id(), md->phys_addr, smp_processor_id(), md->phys_addr,
md->phys_addr + efi_md_size(md), md->phys_addr + efi_md_size(md),
vaddr & mask, (vaddr & mask) + IA64_GRANULE_SIZE); vaddr & mask, (vaddr & mask) + IA64_GRANULE_SIZE);
#endif #endif
return __va(md->phys_addr); return __va(md->phys_addr);
} }
@ -558,6 +558,7 @@ efi_init (void)
{ {
efi_memory_desc_t *md; efi_memory_desc_t *md;
void *p; void *p;
unsigned int i;
for (i = 0, p = efi_map_start; p < efi_map_end; for (i = 0, p = efi_map_start; p < efi_map_end;
++i, p += efi_desc_size) ++i, p += efi_desc_size)
@ -584,7 +585,7 @@ efi_init (void)
} }
printk("mem%02d: %s " printk("mem%02d: %s "
"range=[0x%016lx-0x%016lx) (%4lu%s)\n", "range=[0x%016llx-0x%016llx) (%4lu%s)\n",
i, efi_md_typeattr_format(buf, sizeof(buf), md), i, efi_md_typeattr_format(buf, sizeof(buf), md),
md->phys_addr, md->phys_addr,
md->phys_addr + efi_md_size(md), size, unit); md->phys_addr + efi_md_size(md), size, unit);