Merge remote-tracking branches 'spi/fix/omap2' and 'spi/fix/rockchip' into spi-linus

[mirror_ubuntu-artful-kernel.git] / mm / swap_cgroup.c

diff --git a/mm/swap_cgroup.c b/mm/swap_cgroup.c
index b5f7f24b8dd15aca941cf7896f806a3dbe16584f..310ac0b8f9746c53eff9306be52585fb9094fc00 100644 (file)
--- a/mm/swap_cgroup.c
+++ b/mm/swap_cgroup.c
@@ -174,9 +174,8 @@ int swap_cgroup_swapon(int type, unsigned long max_pages)
 
        return 0;
 nomem:
-       printk(KERN_INFO "couldn't allocate enough memory for swap_cgroup.\n");
-       printk(KERN_INFO
-               "swap_cgroup can be disabled by swapaccount=0 boot option\n");
+       pr_info("couldn't allocate enough memory for swap_cgroup\n");
+       pr_info("swap_cgroup can be disabled by swapaccount=0 boot option\n");
        return -ENOMEM;
 }