[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <20180820163104.12879-1-tony.luck@intel.com>
Date: Mon, 20 Aug 2018 09:31:04 -0700
From: Tony Luck <tony.luck@...el.com>
To: Linus Torvalds <torvalds@...ux-foundation.org>
Cc: Tony Luck <tony.luck@...el.com>, linux-ia64@...r.kernel.org,
Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
Arnd Bergmann <arnd@...db.de>,
Boris Brezillon <boris.brezillon@...tlin.com>,
Bjorn Helgaas <bhelgaas@...gle.com>,
Sinan Kaya <okaya@...eaurora.org>,
Tomasz Nowicki <tn@...ihalf.com>,
Lorenzo Pieralisi <lorenzo.pieralisi@....com>,
Miquel Raynal <miquel.raynal@...tlin.com>
Subject: [PATCH] ia64: Fix kernel BUG at lib/ioremap.c:72!
Commit:
0bbf47eab469 ("ia64: use asm-generic/io.h")
results in a BUG while booting ia64. This is because
asm-generic/io.h defines PCI_IOBASE, which results in
the function acpi_pci_root_remap_iospace() doing a lot
of unnecessary (and wrong) things.
I'd suggested an #if !CONFIG_IA64 in the functon, but Arnd
suggested keeping the fix inside the arch/ia64 tree.
Fixes: 0bbf47eab469 ("ia64: use asm-generic/io.h")
Suggested-by: Arnd Bergman <arnd@...db.de>
Signed-off-by: Tony Luck <tony.luck@...el.com>
---
arch/ia64/include/asm/io.h | 1 +
1 file changed, 1 insertion(+)
diff --git a/arch/ia64/include/asm/io.h b/arch/ia64/include/asm/io.h
index 6f952171abf9..1e6fef69bb01 100644
--- a/arch/ia64/include/asm/io.h
+++ b/arch/ia64/include/asm/io.h
@@ -454,6 +454,7 @@ extern void memset_io(volatile void __iomem *s, int c, long n);
#define xlate_dev_kmem_ptr xlate_dev_kmem_ptr
#define xlate_dev_mem_ptr xlate_dev_mem_ptr
#include <asm-generic/io.h>
+#undef PCI_IOBASE
# endif /* __KERNEL__ */
--
2.17.1
Powered by blists - more mailing lists