]> git.proxmox.com Git - mirror_ubuntu-hirsute-kernel.git/commit
ia64: fix EFI_DEBUG build
authorSergei Trofimovich <slyfox@gentoo.org>
Fri, 30 Apr 2021 05:53:39 +0000 (22:53 -0700)
committerKelsey Skunberg <kelsey.skunberg@canonical.com>
Mon, 24 May 2021 23:46:44 +0000 (17:46 -0600)
commit0a4f618856f8861a4b34bd7677fe07c80d678642
tree843dcbdd3c78e8a0372bb5f107b4178c9d9957c6
parent88ed549930ee3913f3bc6ab4edacb6755403184e
ia64: fix EFI_DEBUG build

BugLink: https://bugs.launchpad.net/bugs/1929455
[ 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: 14fb42090943559 ("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>
Signed-off-by: Kamal Mostafa <kamal@canonical.com>
Signed-off-by: Kelsey Skunberg <kelsey.skunberg@canonical.com>
arch/ia64/kernel/efi.c