projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm
[powerpc.git]
/
arch
/
x86_64
/
kernel
/
pci-swiotlb.c
diff --git
a/arch/x86_64/kernel/pci-swiotlb.c
b/arch/x86_64/kernel/pci-swiotlb.c
index
990ed67
..
697f0aa
100644
(file)
--- a/
arch/x86_64/kernel/pci-swiotlb.c
+++ b/
arch/x86_64/kernel/pci-swiotlb.c
@@
-3,7
+3,8
@@
#include <linux/pci.h>
#include <linux/cache.h>
#include <linux/module.h>
#include <linux/pci.h>
#include <linux/cache.h>
#include <linux/module.h>
-#include <asm/dma-mapping.h>
+#include <linux/dma-mapping.h>
+
#include <asm/proto.h>
#include <asm/swiotlb.h>
#include <asm/dma.h>
#include <asm/proto.h>
#include <asm/swiotlb.h>
#include <asm/dma.h>
@@
-31,9
+32,10
@@
struct dma_mapping_ops swiotlb_dma_ops = {
void pci_swiotlb_init(void)
{
/* don't initialize swiotlb if iommu=off (no_iommu=1) */
void pci_swiotlb_init(void)
{
/* don't initialize swiotlb if iommu=off (no_iommu=1) */
- if (!iommu_aperture && !no_iommu &&
- (end_pfn > MAX_DMA32_PFN || force_iommu))
+ if (!iommu_detected && !no_iommu && end_pfn > MAX_DMA32_PFN)
swiotlb = 1;
swiotlb = 1;
+ if (swiotlb_force)
+ swiotlb = 1;
if (swiotlb) {
printk(KERN_INFO "PCI-DMA: Using software bounce buffering for IO (SWIOTLB)\n");
swiotlb_init();
if (swiotlb) {
printk(KERN_INFO "PCI-DMA: Using software bounce buffering for IO (SWIOTLB)\n");
swiotlb_init();