diff options
| author | Bernhard Walle <bwalle@suse.de> | 2008-06-21 19:01:02 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2008-06-24 14:08:29 -0700 |
| commit | 8c3a10753bfb7ba66b024398cc9bad9eea82a99f (patch) | |
| tree | 7112e4a92ffd0056ebd1feec0ffc5b66b1ada783 | |
| parent | bd3aae04b2b17300b33e2e1b89482715c2cf7de3 (diff) | |
Add return value to reserve_bootmem_node()
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>
| -rw-r--r-- | include/linux/bootmem.h | 2 | ||||
| -rw-r--r-- | mm/bootmem.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/include/linux/bootmem.h b/include/linux/bootmem.h index 4e4e340592f..db3d837be1c 100644 --- a/include/linux/bootmem.h +++ b/include/linux/bootmem.h @@ -94,7 +94,7 @@ extern unsigned long init_bootmem_node(pg_data_t *pgdat, 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); diff --git a/mm/bootmem.c b/mm/bootmem.c index 2ccea700968..8bb58daeeed 100644 --- a/mm/bootmem.c +++ b/mm/bootmem.c @@ -398,10 +398,10 @@ unsigned long __init init_bootmem_node(pg_data_t *pgdat, unsigned long freepfn, 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, |