diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-05 13:45:50 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-05 13:45:50 -0700 |
| commit | db7a1535d2dcf91115ba0fb940b1902c05305843 (patch) | |
| tree | 29757b0b2db0e56bc520444d7233f2462d3c199a /drivers/input | |
| parent | ab265d5cdde7133f2569e2b5f341a80907b8600e (diff) | |
| parent | 7cc88fdcff3cc7f0d5d2384ffd7f6d4ce9a745f1 (diff) | |
| download | kernel_samsung_espresso10-db7a1535d2dcf91115ba0fb940b1902c05305843.zip kernel_samsung_espresso10-db7a1535d2dcf91115ba0fb940b1902c05305843.tar.gz kernel_samsung_espresso10-db7a1535d2dcf91115ba0fb940b1902c05305843.tar.bz2 | |
Merge branch 'upstream/xen' of git://git.kernel.org/pub/scm/linux/kernel/git/jeremy/xen
* 'upstream/xen' of git://git.kernel.org/pub/scm/linux/kernel/git/jeremy/xen: (23 commits)
xen/panic: use xen_reboot and fix smp_send_stop
Xen: register panic notifier to take crashes of xen guests on panic
xen: support large numbers of CPUs with vcpu info placement
xen: drop xen_sched_clock in favour of using plain wallclock time
pvops: do not notify callers from register_xenstore_notifier
Introduce CONFIG_XEN_PVHVM compile option
blkfront: do not create a PV cdrom device if xen_hvm_guest
support multiple .discard.* sections to avoid section type conflicts
xen/pvhvm: fix build problem when !CONFIG_XEN
xenfs: enable for HVM domains too
x86: Call HVMOP_pagetable_dying on exit_mmap.
x86: Unplug emulated disks and nics.
x86: Use xen_vcpuop_clockevent, xen_clocksource and xen wallclock.
implement O_NONBLOCK for /proc/xen/xenbus
xen: Fix find_unbound_irq in presence of ioapic irqs.
xen: Add suspend/resume support for PV on HVM guests.
xen: Xen PCI platform device driver.
x86/xen: event channels delivery on HVM.
x86: early PV on HVM features initialization.
xen: Add support for HVM hypercalls.
...
Diffstat (limited to 'drivers/input')
| -rw-r--r-- | drivers/input/xen-kbdfront.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/input/xen-kbdfront.c b/drivers/input/xen-kbdfront.c index e140816..ebb1190 100644 --- a/drivers/input/xen-kbdfront.c +++ b/drivers/input/xen-kbdfront.c @@ -339,7 +339,7 @@ static struct xenbus_driver xenkbd_driver = { static int __init xenkbd_init(void) { - if (!xen_domain()) + if (!xen_pv_domain()) return -ENODEV; /* Nothing to do if running in dom0. */ |