Commit 793b08e2 authored by Christophe Leroy's avatar Christophe Leroy Committed by Michael Ellerman
Browse files

powerpc/kexec: Move kexec files into a dedicated subdir. 



arch/powerpc/kernel/ contains 8 files dedicated to kexec.

Move them into a dedicated subdirectory.

Signed-off-by: default avatarChristophe Leroy <christophe.leroy@c-s.fr>
[mpe: Move to a/p/kexec, drop the 'machine' naming and use 'core' instead]
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
Link: https://lore.kernel.org/r/afbef97ec6a978574a5cf91a4441000e0a9da42a.1572351221.git.christophe.leroy@c-s.fr
parent 9f7bd920

arch/powerpc/Kbuild

+1 −0
Original line number Diff line number Diff line
@@ -14,4 +14,5 @@ obj-$(CONFIG_XMON) += xmon/ 
obj-$(CONFIG_KVM)  += kvm/



obj-$(CONFIG_PERF_EVENTS) += perf/

obj-$(CONFIG_KEXEC_CORE)  += kexec/

obj-$(CONFIG_KEXEC_FILE)  += purgatory/

arch/powerpc/kernel/Makefile

+0 −18
Original line number Diff line number Diff line
@@ -5,9 +5,6 @@ 


CFLAGS_ptrace.o		+= -DUTS_MACHINE='"$(UTS_MACHINE)"'



# Disable clang warning for using setjmp without setjmp.h header

CFLAGS_crash.o		+= $(call cc-disable-warning, builtin-requires-header)



ifdef CONFIG_PPC64

CFLAGS_prom_init.o	+= $(NO_MINIMAL_TOC)

endif
@@ -82,7 +79,6 @@ obj-$(CONFIG_FA_DUMP) += fadump.o 
obj-$(CONFIG_PRESERVE_FA_DUMP)	+= fadump.o

ifdef CONFIG_PPC32

obj-$(CONFIG_E500)		+= idle_e500.o

obj-$(CONFIG_KEXEC_CORE)	+= kexec_relocate_32.o

endif

obj-$(CONFIG_PPC_BOOK3S_32)	+= idle_6xx.o l2cr_6xx.o cpu_setup_6xx.o

obj-$(CONFIG_TAU)		+= tau_6xx.o
@@ -126,14 +122,6 @@ pci64-$(CONFIG_PPC64) += pci_dn.o pci-hotplug.o isa-bridge.o 
obj-$(CONFIG_PCI)		+= pci_$(BITS).o $(pci64-y) \

				   pci-common.o pci_of_scan.o

obj-$(CONFIG_PCI_MSI)		+= msi.o

obj-$(CONFIG_KEXEC_CORE)	+= machine_kexec.o crash.o \

				   machine_kexec_$(BITS).o

obj-$(CONFIG_KEXEC_FILE)	+= machine_kexec_file_$(BITS).o kexec_elf_$(BITS).o

ifdef CONFIG_HAVE_IMA_KEXEC

ifdef CONFIG_IMA

obj-y				+= ima_kexec.o

endif

endif



obj-$(CONFIG_AUDIT)		+= audit.o

obj64-$(CONFIG_AUDIT)		+= compat_audit.o
@@ -168,12 +156,6 @@ obj-$(CONFIG_PPC_SECVAR_SYSFS) += secvar-sysfs.o 
GCOV_PROFILE_prom_init.o := n

KCOV_INSTRUMENT_prom_init.o := n

UBSAN_SANITIZE_prom_init.o := n

GCOV_PROFILE_machine_kexec_64.o := n

KCOV_INSTRUMENT_machine_kexec_64.o := n

UBSAN_SANITIZE_machine_kexec_64.o := n

GCOV_PROFILE_machine_kexec_32.o := n

KCOV_INSTRUMENT_machine_kexec_32.o := n

UBSAN_SANITIZE_machine_kexec_32.o := n

GCOV_PROFILE_kprobes.o := n

KCOV_INSTRUMENT_kprobes.o := n

UBSAN_SANITIZE_kprobes.o := n

arch/powerpc/kexec/Makefile

0 → 100644
+25 −0
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0

#

# Makefile for the linux kernel.

#



# Disable clang warning for using setjmp without setjmp.h header

CFLAGS_crash.o		+= $(call cc-disable-warning, builtin-requires-header)



obj-y				+= core.o crash.o core_$(BITS).o



obj-$(CONFIG_PPC32)		+= relocate_32.o



obj-$(CONFIG_KEXEC_FILE)	+= file_load.o elf_$(BITS).o



ifdef CONFIG_HAVE_IMA_KEXEC

ifdef CONFIG_IMA

obj-y				+= ima.o

endif

endif





# Disable GCOV, KCOV & sanitizers in odd or sensitive code

GCOV_PROFILE_core_$(BITS).o := n

KCOV_INSTRUMENT_core_$(BITS).o := n

UBSAN_SANITIZE_core_$(BITS).o := n