From 7e8cd3259aba928ff0dcc0e94208c7ad8c1ebe24 Mon Sep 17 00:00:00 2001 From: Michael Holzheu Date: Sun, 30 Oct 2011 15:16:36 +0100 Subject: [PATCH] --- yaml --- r: 272055 b: refs/heads/master c: 3d214faea6e4f9b6018bf8589f4b245126349c0a h: refs/heads/master i: 272053: d1923d415412bddcc3b3ed30d6ebe6cd34574d12 272051: 43090b025e4d9239ea754205eea146ae5efaaf19 272047: 8e86506014d386ede2cb0db6fb04ad91fb861979 v: v3 --- [refs] | 2 +- trunk/include/linux/kexec.h | 4 ++++ trunk/kernel/kexec.c | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index e3c1e1a21eea..dd6f4e805cff 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 80853a8ab4fcfff55d88e86ed1f50695dba0d8ff +refs/heads/master: 3d214faea6e4f9b6018bf8589f4b245126349c0a diff --git a/trunk/include/linux/kexec.h b/trunk/include/linux/kexec.h index c2478a342cd7..07d9aba75562 100644 --- a/trunk/include/linux/kexec.h +++ b/trunk/include/linux/kexec.h @@ -33,6 +33,10 @@ #error KEXEC_ARCH not defined #endif +#ifndef KEXEC_CRASH_CONTROL_MEMORY_LIMIT +#define KEXEC_CRASH_CONTROL_MEMORY_LIMIT KEXEC_CONTROL_MEMORY_LIMIT +#endif + #define KEXEC_NOTE_HEAD_BYTES ALIGN(sizeof(struct elf_note), 4) #define KEXEC_CORE_NOTE_NAME "CORE" #define KEXEC_CORE_NOTE_NAME_BYTES ALIGN(sizeof(KEXEC_CORE_NOTE_NAME), 4) diff --git a/trunk/kernel/kexec.c b/trunk/kernel/kexec.c index 296fbc84d659..7204fb982ed5 100644 --- a/trunk/kernel/kexec.c +++ b/trunk/kernel/kexec.c @@ -498,7 +498,7 @@ static struct page *kimage_alloc_crash_control_pages(struct kimage *image, while (hole_end <= crashk_res.end) { unsigned long i; - if (hole_end > KEXEC_CONTROL_MEMORY_LIMIT) + if (hole_end > KEXEC_CRASH_CONTROL_MEMORY_LIMIT) break; if (hole_end > crashk_res.end) break;