Messages in this thread Patch in this message | | | From | Christophe Leroy <> | Subject | [PATCH 2/2] powerpc/kexec: move kexec files into a dedicated subdir. | Date | Tue, 10 Sep 2019 11:49:54 +0000 (UTC) |
| |
arch/powerpc/kernel/ contains 7 files dedicated to kexec.
Move them into a dedicated subdirectory.
Signed-off-by: Christophe Leroy <christophe.leroy@c-s.fr> --- arch/powerpc/kernel/Makefile | 16 +--------------- arch/powerpc/kernel/kexec/Makefile | 22 ++++++++++++++++++++++ arch/powerpc/kernel/{ => kexec}/ima_kexec.c | 0 arch/powerpc/kernel/{ => kexec}/kexec_32.S | 2 +- arch/powerpc/kernel/{ => kexec}/kexec_elf_64.c | 0 arch/powerpc/kernel/{ => kexec}/machine_kexec.c | 0 arch/powerpc/kernel/{ => kexec}/machine_kexec_32.c | 0 arch/powerpc/kernel/{ => kexec}/machine_kexec_64.c | 0 .../kernel/{ => kexec}/machine_kexec_file_64.c | 0 9 files changed, 24 insertions(+), 16 deletions(-) create mode 100644 arch/powerpc/kernel/kexec/Makefile rename arch/powerpc/kernel/{ => kexec}/ima_kexec.c (100%) rename arch/powerpc/kernel/{ => kexec}/kexec_32.S (99%) rename arch/powerpc/kernel/{ => kexec}/kexec_elf_64.c (100%) rename arch/powerpc/kernel/{ => kexec}/machine_kexec.c (100%) rename arch/powerpc/kernel/{ => kexec}/machine_kexec_32.c (100%) rename arch/powerpc/kernel/{ => kexec}/machine_kexec_64.c (100%) rename arch/powerpc/kernel/{ => kexec}/machine_kexec_file_64.c (100%)
diff --git a/arch/powerpc/kernel/Makefile b/arch/powerpc/kernel/Makefile index df708de6f866..b65c44d47157 100644 --- a/arch/powerpc/kernel/Makefile +++ b/arch/powerpc/kernel/Makefile @@ -81,7 +81,6 @@ obj-$(CONFIG_CRASH_DUMP) += crash_dump.o obj-$(CONFIG_FA_DUMP) += fadump.o ifdef CONFIG_PPC32 obj-$(CONFIG_E500) += idle_e500.o -obj-$(CONFIG_KEXEC_CORE) += kexec_32.o endif obj-$(CONFIG_PPC_BOOK3S_32) += idle_6xx.o l2cr_6xx.o cpu_setup_6xx.o obj-$(CONFIG_TAU) += tau_6xx.o @@ -125,14 +124,7 @@ 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_KEXEC_CORE) += kexec/ obj-$(CONFIG_AUDIT) += audit.o obj64-$(CONFIG_AUDIT) += compat_audit.o @@ -164,12 +156,6 @@ endif 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 diff --git a/arch/powerpc/kernel/kexec/Makefile b/arch/powerpc/kernel/kexec/Makefile new file mode 100644 index 000000000000..d96ee5660572 --- /dev/null +++ b/arch/powerpc/kernel/kexec/Makefile @@ -0,0 +1,22 @@ +# SPDX-License-Identifier: GPL-2.0 +# +# Makefile for the linux kernel. +# + +obj-y += machine_kexec.o crash.o machine_kexec_$(BITS).o + +obj-$(CONFIG_PPC32) += kexec_32.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 + + +# Disable GCOV, KCOV & sanitizers in odd or sensitive code +GCOV_PROFILE_machine_kexec_$(BITS).o := n +KCOV_INSTRUMENT_machine_kexec_$(BITS).o := n +UBSAN_SANITIZE_machine_kexec_$(BITS).o := n diff --git a/arch/powerpc/kernel/ima_kexec.c b/arch/powerpc/kernel/kexec/ima_kexec.c similarity index 100% rename from arch/powerpc/kernel/ima_kexec.c rename to arch/powerpc/kernel/kexec/ima_kexec.c diff --git a/arch/powerpc/kernel/kexec_32.S b/arch/powerpc/kernel/kexec/kexec_32.S similarity index 99% rename from arch/powerpc/kernel/kexec_32.S rename to arch/powerpc/kernel/kexec/kexec_32.S index 3f8ca6a566fb..b9355e0d5c85 100644 --- a/arch/powerpc/kernel/kexec_32.S +++ b/arch/powerpc/kernel/kexec/kexec_32.S @@ -32,7 +32,7 @@ relocate_new_kernel: mr r31, r5 #define ENTRY_MAPPING_KEXEC_SETUP -#include "fsl_booke_entry_mapping.S" +#include <kernel/fsl_booke_entry_mapping.S> #undef ENTRY_MAPPING_KEXEC_SETUP mr r3, r29 diff --git a/arch/powerpc/kernel/kexec_elf_64.c b/arch/powerpc/kernel/kexec/kexec_elf_64.c similarity index 100% rename from arch/powerpc/kernel/kexec_elf_64.c rename to arch/powerpc/kernel/kexec/kexec_elf_64.c diff --git a/arch/powerpc/kernel/machine_kexec.c b/arch/powerpc/kernel/kexec/machine_kexec.c similarity index 100% rename from arch/powerpc/kernel/machine_kexec.c rename to arch/powerpc/kernel/kexec/machine_kexec.c diff --git a/arch/powerpc/kernel/machine_kexec_32.c b/arch/powerpc/kernel/kexec/machine_kexec_32.c similarity index 100% rename from arch/powerpc/kernel/machine_kexec_32.c rename to arch/powerpc/kernel/kexec/machine_kexec_32.c diff --git a/arch/powerpc/kernel/machine_kexec_64.c b/arch/powerpc/kernel/kexec/machine_kexec_64.c similarity index 100% rename from arch/powerpc/kernel/machine_kexec_64.c rename to arch/powerpc/kernel/kexec/machine_kexec_64.c diff --git a/arch/powerpc/kernel/machine_kexec_file_64.c b/arch/powerpc/kernel/kexec/machine_kexec_file_64.c similarity index 100% rename from arch/powerpc/kernel/machine_kexec_file_64.c rename to arch/powerpc/kernel/kexec/machine_kexec_file_64.c -- 2.13.3
| |