---

yaml --- r: 272055 b: refs/heads/master c: 3d214fa h: refs/heads/master i: 272053: d1923d4 272051: 43090b0 272047: 8e86506 v: v3
git-mirror · Oct 30, 2011 · 7e8cd32 · 7e8cd32
1 parent c870fae
commit 7e8cd32
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git 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
@@ -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
@@ -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;