From cc26ebbebde8548014d9329ac2f6cf0178181789 Mon Sep 17 00:00:00 2001 From: Tony Luck Date: Mon, 20 Aug 2018 09:31:04 -0700 Subject: 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 Signed-off-by: Tony Luck Signed-off-by: Linus Torvalds --- arch/ia64/include/asm/io.h | 1 + 1 file changed, 1 insertion(+) (limited to 'arch/ia64/include/asm/io.h') 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 +#undef PCI_IOBASE # endif /* __KERNEL__ */ -- cgit v1.2.3