diff options
-rw-r--r-- | include/linux/kexec.h | 4 | ||||
-rw-r--r-- | kernel/kexec.c | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/include/linux/kexec.h b/include/linux/kexec.h index c2478a342cd7..07d9aba75562 100644 --- a/include/linux/kexec.h +++ b/include/linux/kexec.h | |||
@@ -33,6 +33,10 @@ | |||
33 | #error KEXEC_ARCH not defined | 33 | #error KEXEC_ARCH not defined |
34 | #endif | 34 | #endif |
35 | 35 | ||
36 | #ifndef KEXEC_CRASH_CONTROL_MEMORY_LIMIT | ||
37 | #define KEXEC_CRASH_CONTROL_MEMORY_LIMIT KEXEC_CONTROL_MEMORY_LIMIT | ||
38 | #endif | ||
39 | |||
36 | #define KEXEC_NOTE_HEAD_BYTES ALIGN(sizeof(struct elf_note), 4) | 40 | #define KEXEC_NOTE_HEAD_BYTES ALIGN(sizeof(struct elf_note), 4) |
37 | #define KEXEC_CORE_NOTE_NAME "CORE" | 41 | #define KEXEC_CORE_NOTE_NAME "CORE" |
38 | #define KEXEC_CORE_NOTE_NAME_BYTES ALIGN(sizeof(KEXEC_CORE_NOTE_NAME), 4) | 42 | #define KEXEC_CORE_NOTE_NAME_BYTES ALIGN(sizeof(KEXEC_CORE_NOTE_NAME), 4) |
diff --git a/kernel/kexec.c b/kernel/kexec.c index 296fbc84d659..7204fb982ed5 100644 --- a/kernel/kexec.c +++ b/kernel/kexec.c | |||
@@ -498,7 +498,7 @@ static struct page *kimage_alloc_crash_control_pages(struct kimage *image, | |||
498 | while (hole_end <= crashk_res.end) { | 498 | while (hole_end <= crashk_res.end) { |
499 | unsigned long i; | 499 | unsigned long i; |
500 | 500 | ||
501 | if (hole_end > KEXEC_CONTROL_MEMORY_LIMIT) | 501 | if (hole_end > KEXEC_CRASH_CONTROL_MEMORY_LIMIT) |
502 | break; | 502 | break; |
503 | if (hole_end > crashk_res.end) | 503 | if (hole_end > crashk_res.end) |
504 | break; | 504 | break; |