diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-12-09 01:14:38 -0500 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-12-09 01:14:38 -0500 |
| commit | bcd6acd51f3d4d1ada201e9bc5c40a31d6d80c71 (patch) | |
| tree | 2f6dffd2d3e4dd67355a224de7e7a960335a92fd /arch/ia64/kernel/pci-swiotlb.c | |
| parent | 11c34c7deaeeebcee342cbc35e1bb2a6711b2431 (diff) | |
| parent | 3ff6a468b45b5dfeb0e903e56f4eb27d34b2437c (diff) | |
Merge commit 'origin/master' into next
Conflicts:
include/linux/kvm.h
Diffstat (limited to 'arch/ia64/kernel/pci-swiotlb.c')
| -rw-r--r-- | arch/ia64/kernel/pci-swiotlb.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/ia64/kernel/pci-swiotlb.c b/arch/ia64/kernel/pci-swiotlb.c index 285aae8431c..53292abf846 100644 --- a/arch/ia64/kernel/pci-swiotlb.c +++ b/arch/ia64/kernel/pci-swiotlb.c | |||
| @@ -41,7 +41,7 @@ struct dma_map_ops swiotlb_dma_ops = { | |||
| 41 | void __init swiotlb_dma_init(void) | 41 | void __init swiotlb_dma_init(void) |
| 42 | { | 42 | { |
| 43 | dma_ops = &swiotlb_dma_ops; | 43 | dma_ops = &swiotlb_dma_ops; |
| 44 | swiotlb_init(); | 44 | swiotlb_init(1); |
| 45 | } | 45 | } |
| 46 | 46 | ||
| 47 | void __init pci_swiotlb_init(void) | 47 | void __init pci_swiotlb_init(void) |
| @@ -51,7 +51,7 @@ void __init pci_swiotlb_init(void) | |||
| 51 | swiotlb = 1; | 51 | swiotlb = 1; |
| 52 | printk(KERN_INFO "PCI-DMA: Re-initialize machine vector.\n"); | 52 | printk(KERN_INFO "PCI-DMA: Re-initialize machine vector.\n"); |
| 53 | machvec_init("dig"); | 53 | machvec_init("dig"); |
| 54 | swiotlb_init(); | 54 | swiotlb_init(1); |
| 55 | dma_ops = &swiotlb_dma_ops; | 55 | dma_ops = &swiotlb_dma_ops; |
| 56 | #else | 56 | #else |
| 57 | panic("Unable to find Intel IOMMU"); | 57 | panic("Unable to find Intel IOMMU"); |