git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'mm-stable-2024-03-13-20-04' of git://git.kernel.org/pub/scm/linux/kernel...
[sfrench/cifs-2.6.git]
/
arch
/
x86
/
kernel
/
setup.c
diff --git
a/arch/x86/kernel/setup.c
b/arch/x86/kernel/setup.c
index 46d5a8c520ad4aa165b72036d43c62135e83f037..3e1e96efadfe7ec8fe5a5499529a9d2913e10722 100644
(file)
--- a/
arch/x86/kernel/setup.c
+++ b/
arch/x86/kernel/setup.c
@@
-471,7
+471,7
@@
static void __init arch_reserve_crashkernel(void)
bool high = false;
int ret;
- if (!IS_ENABLED(CONFIG_
KEXEC_COR
E))
+ if (!IS_ENABLED(CONFIG_
CRASH_RESERV
E))
return;
ret = parse_crashkernel(cmdline, memblock_phys_mem_size(),