diff options
author | Miklos Szeredi <mszeredi@redhat.com> | 2016-07-21 12:14:30 +0300 |
---|---|---|
committer | Miklos Szeredi <mszeredi@redhat.com> | 2016-07-21 12:14:30 +0300 |
commit | 0f7d93416d97f3a943d6add836ec0d681ae030f5 (patch) | |
tree | c1d612d00f93b0e98c616bc9a40123c4af97a764 /arch/powerpc/mm/pgtable-radix.c | |
parent | 7879c4e58b7c884ee62b9306721dd1106e624b52 (diff) | |
parent | 7d3a07fcb8a0d5c06718de14fb91fdf1ef20a0e2 (diff) | |
download | linux-0f7d93416d97f3a943d6add836ec0d681ae030f5.tar.xz |
Merge branch 'for-miklos' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs into for-next
Diffstat (limited to 'arch/powerpc/mm/pgtable-radix.c')
-rw-r--r-- | arch/powerpc/mm/pgtable-radix.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/arch/powerpc/mm/pgtable-radix.c b/arch/powerpc/mm/pgtable-radix.c index e58707deef5c..7931e1496f0d 100644 --- a/arch/powerpc/mm/pgtable-radix.c +++ b/arch/powerpc/mm/pgtable-radix.c @@ -328,6 +328,11 @@ void __init radix__early_init_mmu(void) __vmalloc_end = RADIX_VMALLOC_END; vmemmap = (struct page *)RADIX_VMEMMAP_BASE; ioremap_bot = IOREMAP_BASE; + +#ifdef CONFIG_PCI + pci_io_base = ISA_IO_BASE; +#endif + /* * For now radix also use the same frag size */ |