diff --git a/[refs] b/[refs] index aa2cbb64a678..63312662d7fa 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 268a207563f933ff8e3d876866c324b4247f234e +refs/heads/master: 22230c18ab3bb0b997144687fcd9bd6ababa72bd diff --git a/trunk/drivers/xen/tmem.c b/trunk/drivers/xen/tmem.c index 144564e5eb29..3ee836d42581 100644 --- a/trunk/drivers/xen/tmem.c +++ b/trunk/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