Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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: Christophe Leroy <christophe.leroy@c-s.fr>
[mpe: Move to a/p/kexec, drop the 'machine' naming and use 'core' instead]
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Link: https://lore.kernel.org/r/afbef97ec6a978574a5cf91a4441000e0a9da42a.1572351221.git.christophe.leroy@c-s.fr

authored by

Christophe Leroy and committed by
Michael Ellerman
793b08e2 9f7bd920

+27 -19
+1
arch/powerpc/Kbuild
··· 14 14 obj-$(CONFIG_KVM) += kvm/ 15 15 16 16 obj-$(CONFIG_PERF_EVENTS) += perf/ 17 + obj-$(CONFIG_KEXEC_CORE) += kexec/ 17 18 obj-$(CONFIG_KEXEC_FILE) += purgatory/
-18
arch/powerpc/kernel/Makefile
··· 5 5 6 6 CFLAGS_ptrace.o += -DUTS_MACHINE='"$(UTS_MACHINE)"' 7 7 8 - # Disable clang warning for using setjmp without setjmp.h header 9 - CFLAGS_crash.o += $(call cc-disable-warning, builtin-requires-header) 10 - 11 8 ifdef CONFIG_PPC64 12 9 CFLAGS_prom_init.o += $(NO_MINIMAL_TOC) 13 10 endif ··· 79 82 obj-$(CONFIG_PRESERVE_FA_DUMP) += fadump.o 80 83 ifdef CONFIG_PPC32 81 84 obj-$(CONFIG_E500) += idle_e500.o 82 - obj-$(CONFIG_KEXEC_CORE) += kexec_relocate_32.o 83 85 endif 84 86 obj-$(CONFIG_PPC_BOOK3S_32) += idle_6xx.o l2cr_6xx.o cpu_setup_6xx.o 85 87 obj-$(CONFIG_TAU) += tau_6xx.o ··· 122 126 obj-$(CONFIG_PCI) += pci_$(BITS).o $(pci64-y) \ 123 127 pci-common.o pci_of_scan.o 124 128 obj-$(CONFIG_PCI_MSI) += msi.o 125 - obj-$(CONFIG_KEXEC_CORE) += machine_kexec.o crash.o \ 126 - machine_kexec_$(BITS).o 127 - obj-$(CONFIG_KEXEC_FILE) += machine_kexec_file_$(BITS).o kexec_elf_$(BITS).o 128 - ifdef CONFIG_HAVE_IMA_KEXEC 129 - ifdef CONFIG_IMA 130 - obj-y += ima_kexec.o 131 - endif 132 - endif 133 129 134 130 obj-$(CONFIG_AUDIT) += audit.o 135 131 obj64-$(CONFIG_AUDIT) += compat_audit.o ··· 156 168 GCOV_PROFILE_prom_init.o := n 157 169 KCOV_INSTRUMENT_prom_init.o := n 158 170 UBSAN_SANITIZE_prom_init.o := n 159 - GCOV_PROFILE_machine_kexec_64.o := n 160 - KCOV_INSTRUMENT_machine_kexec_64.o := n 161 - UBSAN_SANITIZE_machine_kexec_64.o := n 162 - GCOV_PROFILE_machine_kexec_32.o := n 163 - KCOV_INSTRUMENT_machine_kexec_32.o := n 164 - UBSAN_SANITIZE_machine_kexec_32.o := n 165 171 GCOV_PROFILE_kprobes.o := n 166 172 KCOV_INSTRUMENT_kprobes.o := n 167 173 UBSAN_SANITIZE_kprobes.o := n
arch/powerpc/kernel/crash.c arch/powerpc/kexec/crash.c
arch/powerpc/kernel/ima_kexec.c arch/powerpc/kexec/ima.c
arch/powerpc/kernel/kexec_elf_64.c arch/powerpc/kexec/elf_64.c
+1 -1
arch/powerpc/kernel/kexec_relocate_32.S arch/powerpc/kexec/relocate_32.S
··· 32 32 mr r31, r5 33 33 34 34 #define ENTRY_MAPPING_KEXEC_SETUP 35 - #include "fsl_booke_entry_mapping.S" 35 + #include <kernel/fsl_booke_entry_mapping.S> 36 36 #undef ENTRY_MAPPING_KEXEC_SETUP 37 37 38 38 mr r3, r29
arch/powerpc/kernel/machine_kexec.c arch/powerpc/kexec/core.c
arch/powerpc/kernel/machine_kexec_32.c arch/powerpc/kexec/core_32.c
arch/powerpc/kernel/machine_kexec_64.c arch/powerpc/kexec/core_64.c
arch/powerpc/kernel/machine_kexec_file_64.c arch/powerpc/kexec/file_load.c
+25
arch/powerpc/kexec/Makefile
··· 1 + # SPDX-License-Identifier: GPL-2.0 2 + # 3 + # Makefile for the linux kernel. 4 + # 5 + 6 + # Disable clang warning for using setjmp without setjmp.h header 7 + CFLAGS_crash.o += $(call cc-disable-warning, builtin-requires-header) 8 + 9 + obj-y += core.o crash.o core_$(BITS).o 10 + 11 + obj-$(CONFIG_PPC32) += relocate_32.o 12 + 13 + obj-$(CONFIG_KEXEC_FILE) += file_load.o elf_$(BITS).o 14 + 15 + ifdef CONFIG_HAVE_IMA_KEXEC 16 + ifdef CONFIG_IMA 17 + obj-y += ima.o 18 + endif 19 + endif 20 + 21 + 22 + # Disable GCOV, KCOV & sanitizers in odd or sensitive code 23 + GCOV_PROFILE_core_$(BITS).o := n 24 + KCOV_INSTRUMENT_core_$(BITS).o := n 25 + UBSAN_SANITIZE_core_$(BITS).o := n