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

[patch 06/10] Add return value to reserve_bootmem_node()

!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@...>
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@...>
Subject: [patch 06/10] Add return value to reserve_bootmem_node()
Date: Monday, June 23, 2008 - 7:04 pm

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

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

commit 71c2742f5e6348d76ee62085cf0a13e5eff0f00e upstream

This patch changes the function reserve_bootmem_node() from void to int,
returning -ENOMEM if the allocation fails.

This fixes a build problem on x86 with CONFIG_KEXEC=y and
CONFIG_NEED_MULTIPLE_NODES=y

Signed-off-by: Bernhard Walle <bwalle@suse.de>
Reported-by: Adrian Bunk <bunk@kernel.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

---
 include/linux/bootmem.h |    2 +-
 mm/bootmem.c            |    4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

--- a/include/linux/bootmem.h
+++ b/include/linux/bootmem.h
@@ -94,7 +94,7 @@ extern unsigned long init_bootmem_node(p
 				       unsigned long freepfn,
 				       unsigned long startpfn,
 				       unsigned long endpfn);
-extern void reserve_bootmem_node(pg_data_t *pgdat,
+extern int reserve_bootmem_node(pg_data_t *pgdat,
 				 unsigned long physaddr,
 				 unsigned long size,
 				 int flags);
--- a/mm/bootmem.c
+++ b/mm/bootmem.c
@@ -398,10 +398,10 @@ unsigned long __init init_bootmem_node(p
 	return init_bootmem_core(pgdat, freepfn, startpfn, endpfn);
 }
 
-void __init reserve_bootmem_node(pg_data_t *pgdat, unsigned long physaddr,
+int __init reserve_bootmem_node(pg_data_t *pgdat, unsigned long physaddr,
 				 unsigned long size, int flags)
 {
-	reserve_bootmem_core(pgdat->bdata, physaddr, size, flags);
+	return reserve_bootmem_core(pgdat->bdata, physaddr, size, flags);
 }
 
 void __init free_bootmem_node(pg_data_t *pgdat, unsigned long physaddr,

-- 
--
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)