Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf

[karo-tx-linux.git] / drivers / xen / tmem.c

diff --git a/drivers/xen/tmem.c b/drivers/xen/tmem.c
index 8a65423bc696b4eac607012437b3af8e1161458e..c4211a31612d447d3f40ad61f11c10e4cb4d0e5d 100644 (file)
--- a/drivers/xen/tmem.c
+++ b/drivers/xen/tmem.c
@@ -397,13 +397,15 @@ static int __init xen_tmem_init(void)
 #ifdef CONFIG_CLEANCACHE
        BUG_ON(sizeof(struct cleancache_filekey) != sizeof(struct tmem_oid));
        if (tmem_enabled && cleancache) {
-               char *s = "";
-               struct cleancache_ops *old_ops =
-                       cleancache_register_ops(&tmem_cleancache_ops);
-               if (old_ops)
-                       s = " (WARNING: cleancache_ops overridden)";
-               pr_info("cleancache enabled, RAM provided by Xen Transcendent Memory%s\n",
-                       s);
+               int err;
+
+               err = cleancache_register_ops(&tmem_cleancache_ops);
+               if (err)
+                       pr_warn("xen-tmem: failed to enable cleancache: %d\n",
+                               err);
+               else
+                       pr_info("cleancache enabled, RAM provided by "
+                               "Xen Transcendent Memory\n");
        }
 #endif
 #ifdef CONFIG_XEN_SELFBALLOONING