From: Jan Beulich <JBeulich@suse.com>
Date: Mon, 25 Sep 2017 08:06:19 +0000 (-0600)
Subject: ACPI / APEI: adjust a local variable type in ghes_ioremap_pfn_irq()
X-Git-Tag: v4.14.9~166
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=2cb7165b4dcf80b03d7cc86fedd1a65a455823b3;p=platform%2Fkernel%2Flinux-rpi.git

ACPI / APEI: adjust a local variable type in ghes_ioremap_pfn_irq()

commit 095f613c6b386a1704b73a549e9ba66c1d5381ae upstream.

Match up with what 7edda0886b ("acpi: apei: handle SEA notification
type for ARMv8") did for ghes_ioremap_pfn_nmi().

Signed-off-by: Jan Beulich <jbeulich@suse.com>
Reviewed-by: Borislav Petkov <bp@suse.de>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---

diff --git a/drivers/acpi/apei/ghes.c b/drivers/acpi/apei/ghes.c
index 3c3a37b..69ef0b6 100644
--- a/drivers/acpi/apei/ghes.c
+++ b/drivers/acpi/apei/ghes.c
@@ -174,7 +174,8 @@ static void __iomem *ghes_ioremap_pfn_nmi(u64 pfn)
 
 static void __iomem *ghes_ioremap_pfn_irq(u64 pfn)
 {
-	unsigned long vaddr, paddr;
+	unsigned long vaddr;
+	phys_addr_t paddr;
 	pgprot_t prot;
 
 	vaddr = (unsigned long)GHES_IOREMAP_IRQ_PAGE(ghes_ioremap_area->addr);