1 files changed, 3 insertions, 3 deletions

diff --git a/drivers/xen/tmem.c b/drivers/xen/tmem.c
index 3ee836d42581..7a01a5fd0f63 100644
--- a/drivers/xen/tmem.c
+++ b/drivers/xen/tmem.c
@@ -362,7 +362,7 @@ static int __init no_frontswap(char *s)
 }
 __setup("nofrontswap", no_frontswap);
 
-static struct frontswap_ops __initdata tmem_frontswap_ops = {
+static struct frontswap_ops tmem_frontswap_ops = {
         .store = tmem_frontswap_store,
         .load = tmem_frontswap_load,
         .invalidate_page = tmem_frontswap_flush_page,
@@ -378,11 +378,11 @@ static int __init xen_tmem_init(void)
 #ifdef CONFIG_FRONTSWAP
         if (tmem_enabled && use_frontswap) {
                 char *s = "";
-                struct frontswap_ops old_ops =
+                struct frontswap_ops *old_ops =
                         frontswap_register_ops(&tmem_frontswap_ops);
 
                 tmem_frontswap_poolid = -1;
-                if (old_ops.init != NULL)
+                if (old_ops)
                         s = " (WARNING: frontswap_ops overridden)";
                 printk(KERN_INFO "frontswap enabled, RAM provided by "
                                  "Xen Transcendent Memory%s\n", s);