net: macb: Probe MDIO bus before registering netdev

[deliverable/linux.git] / mm / bootmem.c

diff --git a/mm/bootmem.c b/mm/bootmem.c
index 91e32bc8517ffe458f667a19a346ebd16ff2d0aa..0aa7dda5240291b87cc8d43e7795cb1078a4507f 100644 (file)
--- a/mm/bootmem.c
+++ b/mm/bootmem.c
@@ -50,8 +50,7 @@ early_param("bootmem_debug", bootmem_debug_setup);
 
 #define bdebug(fmt, args...) ({                                \
        if (unlikely(bootmem_debug))                    \
-               printk(KERN_INFO                        \
-                       "bootmem::%s " fmt,             \
+               pr_info("bootmem::%s " fmt,             \
                        __func__, ## args);             \
 })
 
@@ -680,7 +679,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;
 }
@@ -755,7 +754,7 @@ 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;
 }