Merge branch 'slab/next' into slab/for-linus

[firefly-linux-kernel-4.4.55.git] / drivers / xen / tmem.c

diff --git a/drivers/xen/tmem.c b/drivers/xen/tmem.c
index 144564e5eb29e1ef59200fd079647656195280c8..3ee836d425819df808fb905483b8e6993de98fcd 100644 (file)
--- a/drivers/xen/tmem.c
+++ b/drivers/xen/tmem.c
@@ -385,7 +385,7 @@ static int __init xen_tmem_init(void)
                if (old_ops.init != NULL)
                        s = " (WARNING: frontswap_ops overridden)";
                printk(KERN_INFO "frontswap enabled, RAM provided by "
-                                "Xen Transcendent Memory\n");
+                                "Xen Transcendent Memory%s\n", s);
        }
 #endif
 #ifdef CONFIG_CLEANCACHE