Skip to content

Commit cc26ebb

Browse files
aegltorvalds
authored andcommitted
ia64: Fix kernel BUG at lib/ioremap.c:72!
Commit 0bbf47e ("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: 0bbf47e ("ia64: use asm-generic/io.h") Suggested-by: Arnd Bergman <[email protected]> Signed-off-by: Tony Luck <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
1 parent 8fdd36d commit cc26ebb

File tree

1 file changed

+1
-0
lines changed
  • arch/ia64/include/asm

1 file changed

+1
-0
lines changed

arch/ia64/include/asm/io.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -454,6 +454,7 @@ extern void memset_io(volatile void __iomem *s, int c, long n);
454454
#define xlate_dev_kmem_ptr xlate_dev_kmem_ptr
455455
#define xlate_dev_mem_ptr xlate_dev_mem_ptr
456456
#include <asm-generic/io.h>
457+
#undef PCI_IOBASE
457458

458459
# endif /* __KERNEL__ */
459460

0 commit comments

Comments
 (0)