]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
powerpc/mm: fix undefined reference to `.__kernel_map_pages' on FSL PPC64
authorKim Phillips <kim.phillips@freescale.com>
Mon, 26 Jan 2015 19:22:22 +0000 (13:22 -0600)
committerMichael Ellerman <mpe@ellerman.id.au>
Wed, 28 Jan 2015 03:22:22 +0000 (14:22 +1100)
arch/powerpc has __kernel_map_pages implementations in mm/pgtable_32.c, and
mm/hash_utils_64.c, of which the former is built for PPC32, and the latter
for PPC64 machines with PPC_STD_MMU.  Fix arch/powerpc/Kconfig to not select
ARCH_SUPPORTS_DEBUG_PAGEALLOC when CONFIG_PPC_STD_MMU_64 isn't defined,
i.e., for 64-bit book3e builds to use the generic __kernel_map_pages()
in mm/debug-pagealloc.c.

  LD      init/built-in.o
mm/built-in.o: In function `kernel_map_pages':
include/linux/mm.h:2076: undefined reference to `.__kernel_map_pages'
include/linux/mm.h:2076: undefined reference to `.__kernel_map_pages'
include/linux/mm.h:2076: undefined reference to `.__kernel_map_pages'
Makefile:925: recipe for target 'vmlinux' failed
make: *** [vmlinux] Error 1

Signed-off-by: Kim Phillips <kim.phillips@freescale.com>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
arch/powerpc/Kconfig

index a2a168e2dfe757c02a6935a4a58dfc83af7f86bd..22b0940494bb5016be1fca2a98aa7b75c105487a 100644 (file)
@@ -256,6 +256,7 @@ config PPC_OF_PLATFORM_PCI
        default n
 
 config ARCH_SUPPORTS_DEBUG_PAGEALLOC
+       depends on PPC32 || PPC_STD_MMU_64
        def_bool y
 
 config ARCH_SUPPORTS_UPROBES