Merge branch 'acpi-battery'

[linux-2.6-block.git] / mm / nobootmem.c

diff --git a/mm/nobootmem.c b/mm/nobootmem.c
index 99feb2b07fc541a9e79ea92018f7aeadf14d68a9..bd05a70f44b96c81d4d7c119fd4a807f1af15bd6 100644 (file)
--- a/mm/nobootmem.c
+++ b/mm/nobootmem.c
@@ -288,7 +288,7 @@ static void * __init ___alloc_bootmem(unsigned long size, unsigned long align,
        /*
         * Whoops, we cannot satisfy the allocation request.
         */
-       printk(KERN_ALERT "bootmem alloc of %lu bytes failed!\n", size);
+       pr_alert("bootmem alloc of %lu bytes failed!\n", size);
        panic("Out of memory");
        return NULL;
 }
@@ -360,7 +360,7 @@ static void * __init ___alloc_bootmem_node(pg_data_t *pgdat, unsigned long size,
        if (ptr)
                return ptr;
 
-       printk(KERN_ALERT "bootmem alloc of %lu bytes failed!\n", size);
+       pr_alert("bootmem alloc of %lu bytes failed!\n", size);
        panic("Out of memory");
        return NULL;
 }