diff options
author | Jeremy Fitzhardinge | 2010-08-04 23:49:16 +0200 |
---|---|---|
committer | Jeremy Fitzhardinge | 2010-08-04 23:49:16 +0200 |
commit | ca50a5f39041497253c6362f2ba4da1b56d3e6cb (patch) | |
tree | 482f1607d12b60f6ef482bb4af2c9c58d7814d5f /drivers/xen/xenfs/xenbus.c | |
parent | Merge branch 'upstream/core' into upstream/xen (diff) | |
parent | Introduce CONFIG_XEN_PVHVM compile option (diff) | |
download | kernel-qcow2-linux-ca50a5f39041497253c6362f2ba4da1b56d3e6cb.tar.gz kernel-qcow2-linux-ca50a5f39041497253c6362f2ba4da1b56d3e6cb.tar.xz kernel-qcow2-linux-ca50a5f39041497253c6362f2ba4da1b56d3e6cb.zip |
Merge branch 'upstream/pvhvm' into upstream/xen
* upstream/pvhvm:
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.
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.
Conflicts:
arch/x86/xen/enlighten.c
arch/x86/xen/time.c
Diffstat (limited to 'drivers/xen/xenfs/xenbus.c')
0 files changed, 0 insertions, 0 deletions