linux/include/xen/interface
Linus Torvalds 18cb657ca1 Merge branch 'stable/xen-pcifront-0.8.2' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen
and branch 'for-linus' of git://xenbits.xen.org/people/sstabellini/linux-pvhvm

* 'for-linus' of git://xenbits.xen.org/people/sstabellini/linux-pvhvm:
  xen: register xen pci notifier
  xen: initialize cpu masks for pv guests in xen_smp_init
  xen: add a missing #include to arch/x86/pci/xen.c
  xen: mask the MTRR feature from the cpuid
  xen: make hvc_xen console work for dom0.
  xen: add the direct mapping area for ISA bus access
  xen: Initialize xenbus for dom0.
  xen: use vcpu_ops to setup cpu masks
  xen: map a dummy page for local apic and ioapic in xen_set_fixmap
  xen: remap MSIs into pirqs when running as initial domain
  xen: remap GSIs as pirqs when running as initial domain
  xen: introduce XEN_DOM0 as a silent option
  xen: map MSIs into pirqs
  xen: support GSI -> pirq remapping in PV on HVM guests
  xen: add xen hvm acpi_register_gsi variant
  acpi: use indirect call to register gsi in different modes
  xen: implement xen_hvm_register_pirq
  xen: get the maximum number of pirqs from xen
  xen: support pirq != irq

* 'stable/xen-pcifront-0.8.2' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen: (27 commits)
  X86/PCI: Remove the dependency on isapnp_disable.
  xen: Update Makefile with CONFIG_BLOCK dependency for biomerge.c
  MAINTAINERS: Add myself to the Xen Hypervisor Interface and remove Chris Wright.
  x86: xen: Sanitse irq handling (part two)
  swiotlb-xen: On x86-32 builts, select SWIOTLB instead of depending on it.
  MAINTAINERS: Add myself for Xen PCI and Xen SWIOTLB maintainer.
  xen/pci: Request ACS when Xen-SWIOTLB is activated.
  xen-pcifront: Xen PCI frontend driver.
  xenbus: prevent warnings on unhandled enumeration values
  xenbus: Xen paravirtualised PCI hotplug support.
  xen/x86/PCI: Add support for the Xen PCI subsystem
  x86: Introduce x86_msi_ops
  msi: Introduce default_[teardown|setup]_msi_irqs with fallback.
  x86/PCI: Export pci_walk_bus function.
  x86/PCI: make sure _PAGE_IOMAP it set on pci mappings
  x86/PCI: Clean up pci_cache_line_size
  xen: fix shared irq device passthrough
  xen: Provide a variant of xen_poll_irq with timeout.
  xen: Find an unbound irq number in reverse order (high to low).
  xen: statically initialize cpu_evtchn_mask_p
  ...

Fix up trivial conflicts in drivers/pci/Makefile
2010-10-28 17:11:17 -07:00
..
hvm x86: Call HVMOP_pagetable_dying on exit_mmap. 2010-07-26 23:13:26 -07:00
io xen-pcifront: Xen PCI frontend driver. 2010-10-18 10:49:37 -04:00
callback.h xen64: define asm/xen/interface for 64-bit 2008-07-16 10:56:18 +02:00
elfnote.h xen: add new Xen elfnote types and use them appropriately 2008-06-02 13:25:51 +02:00
event_channel.h xen: clean up asm/xen/hypervisor.h 2008-12-16 21:50:31 +01:00
features.h xen: support GSI -> pirq remapping in PV on HVM guests 2010-10-22 21:25:42 +01:00
grant_table.h xen: Xen PCI platform device driver. 2010-07-22 16:46:09 -07:00
memory.h xen: Use host-provided E820 map 2010-10-22 12:57:27 -07:00
physdev.h xen: register xen pci notifier 2010-10-27 18:56:07 +01:00
sched.h xen: Add Xen interface header files 2007-07-18 08:47:42 -07:00
vcpu.h xen: add missing definitions in include/xen/interface/vcpu.h which ia64/xen needs 2008-04-24 23:57:32 +02:00
version.h xen: add /sys/hypervisor support 2009-03-30 09:27:06 -07:00
xen.h xen: implement ptep_modify_prot_start/commit 2008-06-25 15:17:23 +02:00
xencomm.h xen: import arch generic part of xencomm 2008-04-24 23:57:32 +02:00