On Mon, May 7, 2012 at 4:37 AM, Johannes Weiner <hannes@xxxxxxxxxxx> wrote:
> __alloc_bootmem_node and __alloc_bootmem_low_node documentation claims
> the functions panic on allocation failure. Do it.
>
> Signed-off-by: Johannes Weiner <hannes@xxxxxxxxxxx>
> ---
> mm/nobootmem.c | 20 ++++++++++++++++----
> 1 file changed, 16 insertions(+), 4 deletions(-)
>
> diff --git a/mm/nobootmem.c b/mm/nobootmem.c
> index e53bb8a..b078ff8 100644
> --- a/mm/nobootmem.c
> +++ b/mm/nobootmem.c
> @@ -306,11 +306,17 @@ again:
>
> ptr = __alloc_memory_core_early(MAX_NUMNODES, size, align,
> goal, -1ULL);
> - if (!ptr && goal) {
> + if (ptr)
> + return ptr;
> +
> + if (goal) {
> goal = 0;
> goto again;
> }
> - return ptr;
> +
> + printk(KERN_ALERT "bootmem alloc of %lu bytes failed!\n", size);
> + panic("Out of memory");
> + return NULL;
> }
>
> void * __init __alloc_bootmem_node_high(pg_data_t *pgdat, unsigned long size,
> @@ -408,6 +414,12 @@ void * __init __alloc_bootmem_low_node(pg_data_t *pgdat, unsigned long size,
> if (ptr)
> return ptr;
>
> - return __alloc_memory_core_early(MAX_NUMNODES, size, align,
> - goal, ARCH_LOW_ADDRESS_LIMIT);
> + ptr = __alloc_memory_core_early(MAX_NUMNODES, size, align,
> + goal, ARCH_LOW_ADDRESS_LIMIT);
> + if (ptr)
> + return ptr;
> +
> + printk(KERN_ALERT "bootmem alloc of %lu bytes failed!\n", size);
> + panic("Out of memory");
> + return NULL;
> }
Acked-by: Yinghai Lu <yinghai@xxxxxxxxxx>
--
To unsubscribe, send a message with 'unsubscribe linux-mm' in
the body to majordomo@xxxxxxxxx. For more info on Linux MM,
see: http://www.linux-mm.org/ .
Fight unfair telecom internet charges in Canada: sign http://stopthemeter.ca/
Don't email: <a href