leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity
1d5f066e0b
linux/arch/x86/include/asm/xen
History
Linus Torvalds 26f0cf9181 Merge branch 'stable/xen-swiotlb-0.8.6' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen 
* 'stable/xen-swiotlb-0.8.6' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen:
  x86: Detect whether we should use Xen SWIOTLB.
  pci-swiotlb-xen: Add glue code to setup dma_ops utilizing xen_swiotlb_* functions.
  swiotlb-xen: SWIOTLB library for Xen PV guest with PCI passthrough.
  xen/mmu: inhibit vmap aliases rather than trying to clear them out
  vmap: add flag to allow lazy unmap to be disabled at runtime
  xen: Add xen_create_contiguous_region
  xen: Rename the balloon lock
  xen: Allow unprivileged Xen domains to create iomap pages
  xen: use _PAGE_IOMAP in ioremap to do machine mappings

Fix up trivial conflicts (adding both xen swiotlb and xen pci platform
driver setup close to each other) in drivers/xen/{Kconfig,Makefile} and
include/xen/xen-ops.h
2010-08-12 09:09:41 -07:00
..
events.h xen: use our own eventchannel->irq path 2009-02-09 12:17:30 +01:00
grant_table.h x86: drop double underscores from header guards 2008-10-23 00:01:39 -07:00
hypercall.h xen: Add support for HVM hypercalls. 2010-07-22 16:45:31 -07:00
hypervisor.h xen: move Xen-testing predicates to common header 2009-11-04 08:47:24 -08:00
interface_32.h x86: drop double underscores from header guards 2008-10-23 00:01:39 -07:00
interface_64.h x86: drop double underscores from header guards 2008-10-23 00:01:39 -07:00
interface.h x86: drop double underscores from header guards 2008-10-23 00:01:39 -07:00
page.h xen: use _PAGE_IOMAP in ioremap to do machine mappings 2010-06-07 14:32:33 -04:00
swiotlb-xen.h pci-swiotlb-xen: Add glue code to setup dma_ops utilizing xen_swiotlb_* 2010-07-27 11:51:02 -04:00