diff options
| author |   Tony Luck <tony.luck@intel.com> | 2018-08-20 09:31:04 -0700 |
|---|---|---|
| committer |   Linus Torvalds <torvalds@linux-foundation.org> | 2018-08-20 12:22:48 -0700 |
| commit | cc26ebbebde8548014d9329ac2f6cf0178181789 (patch) | |
| tree | d056c73be8a3359e6c1102be867d0bc497327163 /arch/ia64 | |
| parent | Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu (diff) | |
| download | linux-dev-cc26ebbebde8548014d9329ac2f6cf0178181789.tar.xz linux-dev-cc26ebbebde8548014d9329ac2f6cf0178181789.zip | |
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@arndb.de>
Signed-off-by: Tony Luck <tony.luck@intel.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'arch/ia64')
| -rw-r--r-- | arch/ia64/include/asm/io.h | 1 |
1 files changed, 1 insertions, 0 deletions
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__ */ |