xen: clean up domain mode predicates

[linux-2.6-omap-h63xx.git] / drivers / char / hvc_xen.c

diff --git a/drivers/char/hvc_xen.c b/drivers/char/hvc_xen.c
index db2ae4216279377e7cc092a63ff2e5c0e6db691b..538ceea5e7df364a1f059a482b6cc0adc1d68bc6 100644 (file)
--- a/drivers/char/hvc_xen.c
+++ b/drivers/char/hvc_xen.c
@@ -100,14 +100,16 @@ static int read_console(uint32_t vtermno, char *buf, int len)
 static struct hv_ops hvc_ops = {
        .get_chars = read_console,
        .put_chars = write_console,
+       .notifier_add = notifier_add_irq,
+       .notifier_del = notifier_del_irq,
 };
 
 static int __init xen_init(void)
 {
        struct hvc_struct *hp;
 
-       if (!is_running_on_xen() ||
-           is_initial_xendomain() ||
+       if (!xen_pv_domain() ||
+           xen_initial_domain() ||
            !xen_start_info->console.domU.evtchn)
                return -ENODEV;
 
@@ -140,7 +142,7 @@ static void __exit xen_fini(void)
 
 static int xen_cons_init(void)
 {
-       if (!is_running_on_xen())
+       if (!xen_pv_domain())
                return 0;
 
        hvc_instantiate(HVC_COOKIE, 0, &hvc_ops);