From 81fd1844feddbf96b6bf60ed16fab7f08e7c3c59 Mon Sep 17 00:00:00 2001 From: Bernhard Walle Date: Sat, 21 Jun 2008 19:01:02 +0200 Subject: [PATCH] --- yaml --- r: 98369 b: refs/heads/master c: 71c2742f5e6348d76ee62085cf0a13e5eff0f00e h: refs/heads/master i: 98367: 02581e536c3e62cedb465fd101b61b9142e87adb v: v3 --- [refs] | 2 +- trunk/include/linux/bootmem.h | 2 +- trunk/mm/bootmem.c | 6 ++++-- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 9481b4a7e6d0..c17a50beaacd 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a19214430d27a3af6f1672ec26f3c893ef899ede +refs/heads/master: 71c2742f5e6348d76ee62085cf0a13e5eff0f00e diff --git a/trunk/include/linux/bootmem.h b/trunk/include/linux/bootmem.h index 6a5dbdc8a7dc..686895bacd9d 100644 --- a/trunk/include/linux/bootmem.h +++ b/trunk/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/trunk/mm/bootmem.c b/trunk/mm/bootmem.c index e8fb927392b9..8d9f60e06f62 100644 --- a/trunk/mm/bootmem.c +++ b/trunk/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,