redonkable
/
alistair23-linux
1
0
Fork 0
Code Releases Activity

Add return value to reserve_bootmem_node() 

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>
hifive-unleashed-5.1
Bernhard Walle 2008-06-21 19:01:02 +02:00 committed by Linus Torvalds
parent a19214430d
commit 71c2742f5e
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/linux/bootmem.h
View File

@ -94,7 +94,7 @@ extern unsigned long init_bootmem_node(pg_data_t *pgdat,
unsigned long freepfn, unsigned long freepfn,
unsigned long startpfn, unsigned long startpfn,
unsigned long endpfn); 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 physaddr,
unsigned long size, unsigned long size,
int flags); int flags);

6
mm/bootmem.c
View File

@ -442,15 +442,17 @@ unsigned long __init init_bootmem_node(pg_data_t *pgdat, unsigned long freepfn,
return init_bootmem_core(pgdat, freepfn, startpfn, endpfn); 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) unsigned long size, int flags)
{ {
int ret; int ret;
ret = can_reserve_bootmem_core(pgdat->bdata, physaddr, size, flags); ret = can_reserve_bootmem_core(pgdat->bdata, physaddr, size, flags);
if (ret < 0) if (ret < 0)
return; return -ENOMEM;
reserve_bootmem_core(pgdat->bdata, physaddr, size, flags); reserve_bootmem_core(pgdat->bdata, physaddr, size, flags);
return 0;
} }
void __init free_bootmem_node(pg_data_t *pgdat, unsigned long physaddr, void __init free_bootmem_node(pg_data_t *pgdat, unsigned long physaddr,