diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-08-22 14:46:03 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-08-22 14:46:03 +0200 |
| commit | e6556b08f85d1486879c612fce5567889c5de77f (patch) | |
| tree | 846e5f662c580f3fd1705bce4970ad3ec0214b7e /drivers/char | |
| parent | 59e73a479abc224e4e06b0a7cf67650c5939976e (diff) | |
| parent | ee7686bc043921a488d9bf89fe93241c5457a74e (diff) | |
manual merge of x86/xen
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'drivers/char')
| -rw-r--r-- | drivers/char/hvc_xen.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/char/hvc_xen.c b/drivers/char/hvc_xen.c index 6b70aa66a587..538ceea5e7df 100644 --- a/drivers/char/hvc_xen.c +++ b/drivers/char/hvc_xen.c @@ -108,8 +108,8 @@ 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; @@ -142,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); |