[PATCH 1/6] arm64: kexec: Rename kexec_image.c to kexec_raw_image.c

[Pingfan Liu]

With the emergence of zboot image format, kexec file load needs to
support multiple formats. In order to better distinguish the file's
purpose, renaming kexec_image.c to kexec_raw_image.c.

Signed-off-by: Pingfan Liu <kernelfans at gmail.com>
Cc: Catalin Marinas <catalin.marinas at arm.com>
Cc: Will Deacon <will at kernel.org>
Cc: Mimi Zohar <zohar at linux.ibm.com>
Cc: Andrew Morton <akpm at linux-foundation.org>
Cc: "Naveen N. Rao" <naveen.n.rao at linux.vnet.ibm.com>
Cc: Ard Biesheuvel <ardb at kernel.org>
Cc: Arnd Bergmann <arnd at arndb.de>
Cc: kexec at lists.infradead.org
To: linux-arm-kernel at lists.infradead.org
---
 arch/arm64/include/asm/kexec.h                         | 2 +-
 arch/arm64/kernel/Makefile                             | 2 +-
 arch/arm64/kernel/{kexec_image.c => kexec_raw_image.c} | 2 +-
 arch/arm64/kernel/machine_kexec_file.c                 | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)
 rename arch/arm64/kernel/{kexec_image.c => kexec_raw_image.c} (98%)

diff --git a/arch/arm64/include/asm/kexec.h b/arch/arm64/include/asm/kexec.h
index 559bfae26715..3f3d5a6830b7 100644
--- a/arch/arm64/include/asm/kexec.h
+++ b/arch/arm64/include/asm/kexec.h
@@ -125,7 +125,7 @@ struct kimage_arch {
 };
 
 #ifdef CONFIG_KEXEC_FILE
-extern const struct kexec_file_ops kexec_image_ops;
+extern const struct kexec_file_ops kexec_raw_ops;
 
 int arch_kimage_file_post_load_cleanup(struct kimage *image);
 #define arch_kimage_file_post_load_cleanup arch_kimage_file_post_load_cleanup
diff --git a/arch/arm64/kernel/Makefile b/arch/arm64/kernel/Makefile
index ceba6792f5b3..99b52710606a 100644
--- a/arch/arm64/kernel/Makefile
+++ b/arch/arm64/kernel/Makefile
@@ -63,7 +63,7 @@ obj-$(CONFIG_HIBERNATION)		+= hibernate.o hibernate-asm.o
 obj-$(CONFIG_ELF_CORE)			+= elfcore.o
 obj-$(CONFIG_KEXEC_CORE)		+= machine_kexec.o relocate_kernel.o	\
 					   cpu-reset.o
-obj-$(CONFIG_KEXEC_FILE)		+= machine_kexec_file.o kexec_image.o
+obj-$(CONFIG_KEXEC_FILE)		+= machine_kexec_file.o kexec_raw_image.o
 obj-$(CONFIG_ARM64_RELOC_TEST)		+= arm64-reloc-test.o
 arm64-reloc-test-y := reloc_test_core.o reloc_test_syms.o
 obj-$(CONFIG_CRASH_DUMP)		+= crash_dump.o
diff --git a/arch/arm64/kernel/kexec_image.c b/arch/arm64/kernel/kexec_raw_image.c
similarity index 98%
rename from arch/arm64/kernel/kexec_image.c
rename to arch/arm64/kernel/kexec_raw_image.c
index 5ed6a585f21f..2b3412b3ad2c 100644
--- a/arch/arm64/kernel/kexec_image.c
+++ b/arch/arm64/kernel/kexec_raw_image.c
@@ -129,7 +129,7 @@ static void *image_load(struct kimage *image,
 	return NULL;
 }
 
-const struct kexec_file_ops kexec_image_ops = {
+const struct kexec_file_ops kexec_raw_ops = {
 	.probe = image_probe,
 	.load = image_load,
 #ifdef CONFIG_KEXEC_IMAGE_VERIFY_SIG
diff --git a/arch/arm64/kernel/machine_kexec_file.c b/arch/arm64/kernel/machine_kexec_file.c
index a11a6e14ba89..0738020507d1 100644
--- a/arch/arm64/kernel/machine_kexec_file.c
+++ b/arch/arm64/kernel/machine_kexec_file.c
@@ -23,7 +23,7 @@
 #include <linux/vmalloc.h>
 
 const struct kexec_file_ops * const kexec_file_loaders[] = {
-	&kexec_image_ops,
+	&kexec_raw_ops,
 	NULL
 };
 
-- 
2.31.1