Jeremy Fitzhardinge ca50a5f390 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		2010-08-04 14:49:16 -07:00
..
debugfs.c	include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h	2010-03-30 22:02:32 +09:00
debugfs.h
enlighten.c	Merge branch 'upstream/pvhvm' into upstream/xen	2010-08-04 14:49:16 -07:00
grant-table.c
irq.c
Kconfig	Introduce CONFIG_XEN_PVHVM compile option	2010-07-29 11:11:33 -07:00
Makefile	x86: Unplug emulated disks and nics.	2010-07-26 23:13:25 -07:00
mmu.c	Introduce CONFIG_XEN_PVHVM compile option	2010-07-29 11:11:33 -07:00
mmu.h	x86: Call HVMOP_pagetable_dying on exit_mmap.	2010-07-26 23:13:26 -07:00
multicalls.c
multicalls.h
platform-pci-unplug.c	Introduce CONFIG_XEN_PVHVM compile option	2010-07-29 11:11:33 -07:00
setup.c	Xen: register panic notifier to take crashes of xen guests on panic	2010-08-04 14:47:31 -07:00
smp.c	xen/panic: use xen_reboot and fix smp_send_stop	2010-08-04 14:47:31 -07:00
spinlock.c	include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h	2010-03-30 22:02:32 +09:00
suspend.c	x86: Use xen_vcpuop_clockevent, xen_clocksource and xen wallclock.	2010-07-26 23:13:25 -07:00
time.c	Merge branch 'upstream/pvhvm' into upstream/xen	2010-08-04 14:49:16 -07:00
vdso.h
xen-asm_32.S
xen-asm_64.S
xen-asm.h
xen-asm.S
xen-head.S
xen-ops.h	Merge branch 'upstream/pvhvm' into upstream/xen	2010-08-04 14:49:16 -07:00