From: Hanjun Guo <guohanjun@huawei.com> hulk inclusion category: bugfix bugzilla: https://gitee.com/openeuler/kernel/issues/I46CWD?from=project-issue CVE: NA ----------------------------------------------- Fix the build warning: /builds/linux/arch/arm/kernel/setup.c:971: warning: "CRASH_ALIGN" redefined 971 | #define CRASH_ALIGN (128 << 20) | In file included from /builds/linux/arch/arm/kernel/setup.c:24: /builds/linux/include/linux/kexec.h:67: note: this is the location of the previous definition 67 | #define CRASH_ALIGN SZ_128M | Signed-off-by: Hanjun Guo <guohanjun@huawei.com> Reviewed-by: Xie XiuQi <xiexiuqi@huawei.com> Signed-off-by: Yang Yingliang <yangyingliang@huawei.com> --- arch/arm/kernel/setup.c | 1 + 1 file changed, 1 insertion(+) diff --git a/arch/arm/kernel/setup.c b/arch/arm/kernel/setup.c index 95db057ed2fab..91345c6b4b7d4 100644 --- a/arch/arm/kernel/setup.c +++ b/arch/arm/kernel/setup.c @@ -968,6 +968,7 @@ late_initcall(init_machine_late); * The crash region must be aligned to 128MB to avoid * zImage relocating below the reserved region. */ +#undef CRASH_ALIGN #define CRASH_ALIGN (128 << 20) static inline unsigned long long get_total_mem(void) -- 2.25.1