diff options
author | Christophe Leroy <christophe.leroy@c-s.fr> | 2019-05-06 06:47:55 +0000 |
---|---|---|
committer | Michael Ellerman <mpe@ellerman.id.au> | 2019-05-06 20:21:56 +1000 |
commit | c4e31847a5490d52ddd44440a524e8355be11ec1 (patch) | |
tree | fe3ffca0a05914d8a36f5860b74d3b4234505ceb /arch | |
parent | 471e475c69a1689e059b5e57e893a7da75d2831a (diff) | |
download | linux-stable-c4e31847a5490d52ddd44440a524e8355be11ec1.tar.gz linux-stable-c4e31847a5490d52ddd44440a524e8355be11ec1.tar.bz2 linux-stable-c4e31847a5490d52ddd44440a524e8355be11ec1.zip |
powerpc/mm: fix redundant inclusion of pgtable-frag.o in Makefile
The patch identified below added pgtable-frag.o to obj-y
but some merge witchery kept it also for obj-CONFIG_PPC_BOOK3S_64
This patch clears the duplication.
Fixes: 737b434d3d55 ("powerpc/mm: convert Book3E 64 to pte_fragment")
Signed-off-by: Christophe Leroy <christophe.leroy@c-s.fr>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Diffstat (limited to 'arch')
-rw-r--r-- | arch/powerpc/mm/Makefile | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/powerpc/mm/Makefile b/arch/powerpc/mm/Makefile index 7a7527116c3a..0f499db315d6 100644 --- a/arch/powerpc/mm/Makefile +++ b/arch/powerpc/mm/Makefile @@ -12,7 +12,6 @@ obj-y := fault.o mem.o pgtable.o mmap.o \ obj-$(CONFIG_PPC_MMU_NOHASH) += nohash/ obj-$(CONFIG_PPC_BOOK3S_32) += book3s32/ obj-$(CONFIG_PPC_BOOK3S_64) += book3s64/ -obj-$(CONFIG_PPC_BOOK3S_64) += pgtable-frag.o obj-$(CONFIG_NEED_MULTIPLE_NODES) += numa.o obj-$(CONFIG_PPC_MM_SLICES) += slice.o obj-$(CONFIG_HUGETLB_PAGE) += hugetlbpage.o |