powerpc/mm: Fix makefile for KASAN (471e475c) · Commits · 戴 / test

In commit ("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: ("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>

arch/powerpc/mm/Makefile

+0 −6

Original line number	Original line	Diff line number	Diff line
	@@ -5,12 +5,6 @@

	ccflags-$(CONFIG_PPC64) := $(NO_MINIMAL_TOC)		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 \		obj-y := fault.o mem.o pgtable.o mmap.o \
	init_$(BITS).o pgtable_$(BITS).o \		init_$(BITS).o pgtable_$(BITS).o \
	pgtable-frag.o \		pgtable-frag.o \

arch/powerpc/mm/book3s32/Makefile

+6 −0

Original line number	Original line	Diff line number	Diff line
	# SPDX-License-Identifier: GPL-2.0		# 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		obj-y += mmu.o hash_low.o mmu_context.o tlb.o

Admin message