kernel/git/stable/linux.git/include/asm-x86/dma-mapping.h, branch master

x86, um: ... and asm-x86 move

2008-10-23T05:55:20+00:00

Signed-off-by: Al Viro Signed-off-by: H. Peter Anvin

Merge branches 'core/iommu', 'x86/amd-iommu' and 'x86/iommu' into x86-v28-for-linus-phase3-B

2008-10-10T17:47:12+00:00

Conflicts: arch/x86/kernel/pci-gart_64.c include/asm-x86/dma-mapping.h

Merge branch 'x86/header-guards' into x86-v28-for-linus-phase1

2008-10-06T14:15:57+00:00

Conflicts: include/asm-x86/dma-mapping.h include/asm-x86/gpio.h include/asm-x86/idle.h include/asm-x86/kvm_host.h include/asm-x86/namei.h include/asm-x86/uaccess.h Signed-off-by: Ingo Molnar

x86: export pci-nommu's alloc_coherent

2008-09-25T09:02:25+00:00

This patch exports nommu_alloc_coherent (renamed dma_generic_alloc_coherent). GART needs this function. Signed-off-by: FUJITA Tomonori Signed-off-by: Ingo Molnar

x86: convert dma_alloc_coherent to use is_device_dma_capable

2008-09-10T11:57:02+00:00

Signed-off-by: FUJITA Tomonori Signed-off-by: Ingo Molnar

x86: remove duplicated extern force_iommu

2008-09-10T11:57:01+00:00

Both iommu.h and dma-mapping.h have extern force_iommu. The latter doesn't need to do. Signed-off-by: FUJITA Tomonori Signed-off-by: Ingo Molnar

x86: unused variable in dma_alloc_coherent_gfp_flags()

2008-09-09T06:57:09+00:00

Fixed a warning caused by a badly placed ifdef. Signed-off-by: Steven Noonan Signed-off-by: Ingo Molnar

x86: dma_alloc_coherent sets gfp flags properly

2008-09-08T13:50:07+00:00

Non real IOMMU implemenations (which doesn't do virtual mappings, e.g. swiotlb, pci-nommu, etc) need to use proper gfp flags and dma_mask to allocate pages in their own dma_alloc_coherent() (allocated page need to be suitable for device's coherent_dma_mask). This patch makes dma_alloc_coherent do this job so that IOMMUs don't need to take care of it any more. Real IOMMU implemenataions can simply ignore the gfp flags. Signed-off-by: FUJITA Tomonori Acked-by: Joerg Roedel Signed-off-by: Ingo Molnar

x86: fix nommu_alloc_coherent allocation with NULL device argument

2008-09-08T13:50:06+00:00

We need to use __GFP_DMA for NULL device argument (fallback_dev) with pci-nommu. It's a hack for ISA (and some old code) so we need to use GFP_DMA. Signed-off-by: FUJITA Tomonori Acked-by: Joerg Roedel Signed-off-by: Ingo Molnar

x86: move pci-nommu's dma_mask check to common code

2008-09-08T13:50:06+00:00

The check to see if dev->dma_mask is NULL in pci-nommu is more appropriate for dma_alloc_coherent(). Signed-off-by: FUJITA Tomonori Acked-by: Joerg Roedel Signed-off-by: Ingo Molnar