summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristophe Leroy <christophe.leroy@c-s.fr>2019-05-06 06:21:01 +0000
committerMichael Ellerman <mpe@ellerman.id.au>2019-05-06 20:21:56 +1000
commit471e475c69a1689e059b5e57e893a7da75d2831a (patch)
tree55441eb9b69f16d4cd7824a143b85b1b8e756a00
parent305d60012304684bd59ea1f67703e51662e4906a (diff)
downloadlinux-471e475c69a1689e059b5e57e893a7da75d2831a.tar.bz2
powerpc/mm: Fix makefile for KASAN
In commit 17312f258cf6 ("powerpc/mm: Move book3s32 specifics in subdirectory mm/book3s64"), ppc_mmu_32.c was moved and renamed. This patch fixes Makefiles to disable KASAN instrumentation on the new name and location. Fixes: f072015c7b74 ("powerpc: disable KASAN instrumentation on early/critical files.") Signed-off-by: Christophe Leroy <christophe.leroy@c-s.fr> Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
-rw-r--r--arch/powerpc/mm/Makefile6
-rw-r--r--arch/powerpc/mm/book3s32/Makefile6
2 files changed, 6 insertions, 6 deletions
diff --git a/arch/powerpc/mm/Makefile b/arch/powerpc/mm/Makefile
index d8c0ce9b2557..7a7527116c3a 100644
--- a/arch/powerpc/mm/Makefile
+++ b/arch/powerpc/mm/Makefile
@@ -5,12 +5,6 @@
ccflags-$(CONFIG_PPC64) := $(NO_MINIMAL_TOC)
-KASAN_SANITIZE_ppc_mmu_32.o := n
-
-ifdef CONFIG_KASAN
-CFLAGS_ppc_mmu_32.o += -DDISABLE_BRANCH_PROFILING
-endif
-
obj-y := fault.o mem.o pgtable.o mmap.o \
init_$(BITS).o pgtable_$(BITS).o \
pgtable-frag.o \
diff --git a/arch/powerpc/mm/book3s32/Makefile b/arch/powerpc/mm/book3s32/Makefile
index a4e217d0f3b7..1732eaa740a9 100644
--- a/arch/powerpc/mm/book3s32/Makefile
+++ b/arch/powerpc/mm/book3s32/Makefile
@@ -1,3 +1,9 @@
# SPDX-License-Identifier: GPL-2.0
+KASAN_SANITIZE_mmu.o := n
+
+ifdef CONFIG_KASAN
+CFLAGS_mmu.o += -DDISABLE_BRANCH_PROFILING
+endif
+
obj-y += mmu.o hash_low.o mmu_context.o tlb.o