Merge branch 'for-3.5' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup

[platform/adaptation/renesas_rcar/renesas_kernel.git] / net / core / netprio_cgroup.c

diff --git a/net/core/netprio_cgroup.c b/net/core/netprio_cgroup.c
index b2a5986..5b8aa2f 100644 (file)
--- a/net/core/netprio_cgroup.c
+++ b/net/core/netprio_cgroup.c
@@ -9,6 +9,8 @@
  * Authors:    Neil Horman <nhorman@tuxdriver.com>
  */
 
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
 #include <linux/module.h>
 #include <linux/slab.h>
 #include <linux/types.h>
@@ -73,7 +75,7 @@ static void extend_netdev_table(struct net_device *dev, u32 new_len)
        old_priomap  = rtnl_dereference(dev->priomap);
 
        if (!new_priomap) {
-               printk(KERN_WARNING "Unable to alloc new priomap!\n");
+               pr_warn("Unable to alloc new priomap!\n");
                return;
        }
 
@@ -121,7 +123,7 @@ static struct cgroup_subsys_state *cgrp_create(struct cgroup *cgrp)
 
        ret = get_prioidx(&cs->prioidx);
        if (ret != 0) {
-               printk(KERN_WARNING "No space in priority index array\n");
+               pr_warn("No space in priority index array\n");
                kfree(cs);
                return ERR_PTR(ret);
        }