Message ID | 20230827101128.70931-4-bhe@redhat.com (mailing list archive) |
---|---|
State | Handled Elsewhere |
Headers | show |
Series | kdump: use generic functions to simplify crashkernel reservation in architectures | expand |
Context | Check | Description |
---|---|---|
conchuod/cover_letter | success | Series has a cover letter |
conchuod/tree_selection | success | Guessed tree name to be for-next at HEAD 9f944d2e0ab3 |
conchuod/fixes_present | success | Fixes tag not required for -next series |
conchuod/maintainers_pattern | success | MAINTAINERS pattern errors before the patch: 4 and now 4 |
conchuod/verify_signedoff | success | Signed-off-by tag matches author and committer |
conchuod/kdoc | success | Errors and warnings before: 0 this patch: 0 |
conchuod/build_rv64_clang_allmodconfig | success | Errors and warnings before: 46 this patch: 46 |
conchuod/module_param | success | Was 0 now: 0 |
conchuod/build_rv64_gcc_allmodconfig | success | Errors and warnings before: 306 this patch: 306 |
conchuod/build_rv32_defconfig | fail | Build failed |
conchuod/dtb_warn_rv64 | success | Errors and warnings before: 12 this patch: 12 |
conchuod/header_inline | success | No static functions without inline keyword in header files |
conchuod/checkpatch | success | total: 0 errors, 0 warnings, 0 checks, 32 lines checked |
conchuod/build_rv64_nommu_k210_defconfig | fail | Build failed |
conchuod/verify_fixes | success | No Fixes tag |
conchuod/build_rv64_nommu_virt_defconfig | fail | Build failed |
diff --git a/include/linux/kexec.h b/include/linux/kexec.h index 22b5cd24f581..8768fd9e2a66 100644 --- a/include/linux/kexec.h +++ b/include/linux/kexec.h @@ -15,25 +15,25 @@ #if !defined(__ASSEMBLY__) -#include <linux/crash_core.h> #include <asm/io.h> #include <linux/range.h> #include <uapi/linux/kexec.h> #include <linux/verification.h> -/* Location of a reserved region to hold the crash kernel. - */ -extern struct resource crashk_res; -extern struct resource crashk_low_res; -extern note_buf_t __percpu *crash_notes; - #ifdef CONFIG_KEXEC_CORE #include <linux/list.h> #include <linux/compat.h> #include <linux/ioport.h> #include <linux/module.h> #include <asm/kexec.h> +#include <linux/crash_core.h> + +/* Location of a reserved region to hold the crash kernel. + */ +extern struct resource crashk_res; +extern struct resource crashk_low_res; +extern note_buf_t __percpu *crash_notes; /* Verify architecture specific macros are defined */
Later generic macros related to crash_core will be added into <linux/crash_core.h>, and the corresponding arch specific macros will be added to override them if needed. And Kconfig option KEXEC_CORE selects CRASH_CORE. So move <linux/crash_core.h> including after <asm/kexec.h>. And also move the crash_res|low_res and crash_notes delcarations after <linux/crash_core.h> including because they are all defined in kernel/kexec_core.c, and note_buf_t is definied in crash_core.h. This is a preparation patch. Signed-off-by: Baoquan He <bhe@redhat.com> --- include/linux/kexec.h | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-)