Re: [RFC PATCH 4/5] powerpc: move KASAN into its own subdirectory
From: Andrew Donnellan <hidden>
Date: 2019-02-15 00:25:58
On 15/2/19 11:04 am, Daniel Axtens wrote:
In preparation for adding ppc64 implementations, break out the code into its own subdirectory. Signed-off-by: Daniel Axtens <redacted>
If Christophe respins his series, can we squash this in there?
quoted hunk ↗ jump to hunk
--- arch/powerpc/mm/Makefile | 4 +--- arch/powerpc/mm/kasan/Makefile | 5 +++++ arch/powerpc/mm/{kasan_init.c => kasan/kasan_init_32.c} | 0 3 files changed, 6 insertions(+), 3 deletions(-) create mode 100644 arch/powerpc/mm/kasan/Makefile rename arch/powerpc/mm/{kasan_init.c => kasan/kasan_init_32.c} (100%)diff --git a/arch/powerpc/mm/Makefile b/arch/powerpc/mm/Makefile index d6b76f25f6de..457c0ea2b5e7 100644 --- a/arch/powerpc/mm/Makefile +++ b/arch/powerpc/mm/Makefile@@ -7,8 +7,6 @@ ccflags-$(CONFIG_PPC64) := $(NO_MINIMAL_TOC) CFLAGS_REMOVE_slb.o = $(CC_FLAGS_FTRACE) -KASAN_SANITIZE_kasan_init.o := n - obj-y := fault.o mem.o pgtable.o mmap.o \ init_$(BITS).o pgtable_$(BITS).o \ init-common.o mmu_context.o drmem.o@@ -57,4 +55,4 @@ obj-$(CONFIG_PPC_BOOK3S_64) += dump_linuxpagetables-book3s64.o endif obj-$(CONFIG_PPC_HTDUMP) += dump_hashpagetable.o obj-$(CONFIG_PPC_MEM_KEYS) += pkeys.o -obj-$(CONFIG_KASAN) += kasan_init.o +obj-$(CONFIG_KASAN) += kasan/diff --git a/arch/powerpc/mm/kasan/Makefile b/arch/powerpc/mm/kasan/Makefile new file mode 100644 index 000000000000..6577897673dd --- /dev/null +++ b/arch/powerpc/mm/kasan/Makefile@@ -0,0 +1,5 @@ +# SPDX-License-Identifier: GPL-2.0 + +KASAN_SANITIZE := n + +obj-$(CONFIG_PPC32) += kasan_init_32.odiff --git a/arch/powerpc/mm/kasan_init.c b/arch/powerpc/mm/kasan/kasan_init_32.c similarity index 100% rename from arch/powerpc/mm/kasan_init.c rename to arch/powerpc/mm/kasan/kasan_init_32.c
-- Andrew Donnellan OzLabs, ADL Canberra andrew.donnellan@au1.ibm.com IBM Australia Limited