Skip to content

Commit f99d437

Browse files
Pingfan LiuKernel Patches Daemon
authored andcommitted
arm64/kexec: Add PE image format support
Now everything is ready for kexec PE image parser. Select it on arm64 for zboot and UKI image support. Signed-off-by: Pingfan Liu <[email protected]> Acked-by: Catalin Marinas <[email protected]> Cc: Will Deacon <[email protected]> To: [email protected]
1 parent 07875e9 commit f99d437

File tree

3 files changed

+5
-0
lines changed

3 files changed

+5
-0
lines changed

arch/arm64/Kconfig

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1608,6 +1608,7 @@ config ARCH_SELECTS_KEXEC_FILE
16081608
def_bool y
16091609
depends on KEXEC_FILE
16101610
select HAVE_IMA_KEXEC if IMA
1611+
select KEXEC_PE_IMAGE
16111612

16121613
config ARCH_SUPPORTS_KEXEC_SIG
16131614
def_bool y

arch/arm64/include/asm/kexec.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -120,6 +120,7 @@ struct kimage_arch {
120120

121121
#ifdef CONFIG_KEXEC_FILE
122122
extern const struct kexec_file_ops kexec_image_ops;
123+
extern const struct kexec_file_ops kexec_pe_image_ops;
123124

124125
int arch_kimage_file_post_load_cleanup(struct kimage *image);
125126
#define arch_kimage_file_post_load_cleanup arch_kimage_file_post_load_cleanup

arch/arm64/kernel/machine_kexec_file.c

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,9 @@
2424

2525
const struct kexec_file_ops * const kexec_file_loaders[] = {
2626
&kexec_image_ops,
27+
#ifdef CONFIG_KEXEC_PE_IMAGE
28+
&kexec_pe_image_ops,
29+
#endif
2730
NULL
2831
};
2932

0 commit comments

Comments
 (0)