From eea7f35e0fa096bf25e7426b526a4060d25edcb4 Mon Sep 17 00:00:00 2001 From: Bernhard Walle Date: Sun, 8 Jun 2008 15:46:31 +0200 Subject: [PATCH] --- yaml --- r: 99797 b: refs/heads/master c: 46f68e1c6b04a04772e828ff3bcd07ed708805c2 h: refs/heads/master i: 99795: dde8df23d6cc836f648ca460a76b96cde6322568 v: v3 --- [refs] | 2 +- trunk/arch/x86/kernel/setup_64.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 0b47afc675c4..2405e56302c6 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3fd052b1b46ac23a2316283a996fe6c32dbcf132 +refs/heads/master: 46f68e1c6b04a04772e828ff3bcd07ed708805c2 diff --git a/trunk/arch/x86/kernel/setup_64.c b/trunk/arch/x86/kernel/setup_64.c index e8df64fad540..4a666cdccb68 100644 --- a/trunk/arch/x86/kernel/setup_64.c +++ b/trunk/arch/x86/kernel/setup_64.c @@ -243,7 +243,7 @@ static void __init reserve_crashkernel(void) return; } - if (reserve_bootmem(crash_base, crash_size, + if (reserve_bootmem_generic(crash_base, crash_size, BOOTMEM_EXCLUSIVE) < 0) { printk(KERN_INFO "crashkernel reservation failed - " "memory is in use\n");