Home » Mailing list archives » linux-kernel » 2008 » June » 23

[patch 04/10] x86: use BOOTMEM_EXCLUSIVE on 32-bit

!MAILaRCHIVE_VOTE_RePLACE
Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
[view in full thread]
From: Greg KH <gregkh@...>
To: <linux-kernel@...>, <stable@...>, <jejb@...>
Cc: Justin Forbes <jmforbes@...>, Zwane Mwaikambo <zwane@...>, Theodore Ts'o <tytso@...>, Randy Dunlap <rdunlap@...>, Dave Jones <davej@...>, Chuck Wolber <chuckw@...>, Chris Wedgwood <reviews@...>, Michael Krufky <mkrufky@...>, Chuck Ebbert <cebbert@...>, Domenico Andreoli <cavokz@...>, Willy Tarreau <w@...>, Rodrigo Rubira Branco <rbranco@...>, <torvalds@...>, <akpm@...>, <alan@...>, Bernhard Walle <bwalle@...>, Ingo Molnar <mingo@...>
Subject: [patch 04/10] x86: use BOOTMEM_EXCLUSIVE on 32-bit
Date: Monday, June 23, 2008 - 7:05 pm

2.6.25.9-stable review patch.  If anyone has any objections, please let
us know.

------------------ 
From: Bernhard Walle <bwalle@suse.de>

commit d3942cff620bea073fc4e3c8ed878eb1e84615ce upstream

This patch uses the BOOTMEM_EXCLUSIVE for crashkernel reservation also for
i386 and prints a error message on failure.

The patch is still for 2.6.26 since it is only bug fixing. The unification
of reserve_crashkernel() between i386 and x86_64 should be done for 2.6.27.

Signed-off-by: Bernhard Walle <bwalle@suse.de>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

---
 arch/x86/kernel/setup_32.c |   10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

--- a/arch/x86/kernel/setup_32.c
+++ b/arch/x86/kernel/setup_32.c
@@ -483,10 +483,16 @@ static void __init reserve_crashkernel(v
 					(unsigned long)(crash_size >> 20),
 					(unsigned long)(crash_base >> 20),
 					(unsigned long)(total_mem >> 20));
+
+			if (reserve_bootmem(crash_base, crash_size,
+					BOOTMEM_EXCLUSIVE) < 0) {
+				printk(KERN_INFO "crashkernel reservation "
+					"failed - memory is in use\n");
+				return;
+			}
+
 			crashk_res.start = crash_base;
 			crashk_res.end   = crash_base + crash_size - 1;
-			reserve_bootmem(crash_base, crash_size,
-					BOOTMEM_DEFAULT);
 		} else
 			printk(KERN_INFO "crashkernel reservation failed - "
 					"you have to specify a base address\n");

-- 
--
Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
Messages in current thread:
[patch 00/10] 2.6.28.9-rc2 review, Greg KH, (Mon Jun 23, 7:04 pm)
Re: [patch 00/10] 2.6.28.9-rc2 review, Greg KH, (Mon Jun 23, 7:22 pm)
[patch 04/10] x86: use BOOTMEM_EXCLUSIVE on 32-bit, Greg KH, (Mon Jun 23, 7:05 pm)
[patch 03/10] sctp: Make sure N * sizeof(union sctp_addr) do..., Greg KH, (Mon Jun 23, 7:05 pm)
[patch 02/10] Reinstate ZERO_PAGE optimization in get_user_p..., Greg KH, (Mon Jun 23, 7:05 pm)
[patch 01/10] atl1: relax eeprom mac address error check, Greg KH, (Mon Jun 23, 7:05 pm)
[patch 07/10] watchdog: hpwdt: fix use of inline assembly, Greg KH, (Mon Jun 23, 7:05 pm)
[patch 06/10] Add return value to reserve_bootmem_node(), Greg KH, (Mon Jun 23, 7:04 pm)
Re: [patch 06/10] Add return value to reserve_bootmem_node(), Adrian Bunk, (Tue Jun 24, 7:06 am)
Re: [patch 06/10] Add return value to reserve_bootmem_node(), Greg KH, (Tue Jun 24, 5:07 pm)
[patch 05/10] x86: set PAE PHYSICAL_MASK_SHIFT to 44 bits., Greg KH, (Mon Jun 23, 7:04 pm)
[patch 10/10] Fix ZERO_PAGE breakage with vmware, Greg KH, (Mon Jun 23, 7:04 pm)
Re: [patch 10/10] Fix ZERO_PAGE breakage with vmware, Linus Torvalds, (Mon Jun 23, 7:28 pm)
Re: [patch 10/10] Fix ZERO_PAGE breakage with vmware, Greg KH, (Tue Jun 24, 2:04 am)
[patch 09/10] hwmon: (adt7473) Initialize max_duty_at_overhe..., Greg KH, (Mon Jun 23, 7:04 pm)
[patch 08/10] hwmon: (lm85) Fix function RANGE_TO_REG(), Greg KH, (Mon Jun 23, 7:04 pm)