ia64: Fix kernel BUG at lib/ioremap.c:72!
Commit0bbf47eab4
("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:0bbf47eab4
("ia64: use asm-generic/io.h") Suggested-by: Arnd Bergman <arnd@arndb.de> Signed-off-by: Tony Luck <tony.luck@intel.com> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
parent
8fdd36d442
commit
cc26ebbebd
@ -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__ */
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user