Add return value to reserve_bootmem_node()

Bernhard Walle · torvalds · commit 71c2742f5e63 · 2008-06-21T11:25:10.000-07:00
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 &lt;bwalle@suse.de&gt;
Reported-by: Adrian Bunk &lt;bunk@kernel.org&gt;
Signed-off-by: Linus Torvalds &lt;torvalds@linux-foundation.org&gt;
diff --git 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
@@ -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);
 }
 
-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)
 {
 	int ret;
 
 	ret = can_reserve_bootmem_core(pgdat->bdata, physaddr, size, flags);
 	if (ret < 0)
-		return;
+		return -ENOMEM;
 	reserve_bootmem_core(pgdat->bdata, physaddr, size, flags);
+
+	return 0;
 }
 
 void __init free_bootmem_node(pg_data_t *pgdat, unsigned long physaddr,

Original file line number	Diff line number	Diff line change
`@@ -442,15 +442,17 @@ unsigned long __init init_bootmem_node(pg_data_t *pgdat, unsigned long freepfn,`
`442`	`442`	`return init_bootmem_core(pgdat, freepfn, startpfn, endpfn);`
`443`	`443`	`}`
`444`	`444`
`445`		`-void __init reserve_bootmem_node(pg_data_t *pgdat, unsigned long physaddr,`
	`445`	`+int __init reserve_bootmem_node(pg_data_t *pgdat, unsigned long physaddr,`
`446`	`446`	`unsigned long size, int flags)`
`447`	`447`	`{`
`448`	`448`	`int ret;`
`449`	`449`
`450`	`450`	`ret = can_reserve_bootmem_core(pgdat->bdata, physaddr, size, flags);`
`451`	`451`	`if (ret < 0)`
`452`		`- return;`
	`452`	`+ return -ENOMEM;`
`453`	`453`	`reserve_bootmem_core(pgdat->bdata, physaddr, size, flags);`
	`454`	`+`
	`455`	`+ return 0;`
`454`	`456`	`}`
`455`	`457`
`456`	`458`	`void __init free_bootmem_node(pg_data_t *pgdat, unsigned long physaddr,`