git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge master.kernel.org:/pub/scm/linux/kernel/git/steve/gfs2-2.6-nmw
[pandora-kernel.git]
/
arch
/
x86_64
/
kernel
/
pci-dma.c
diff --git
a/arch/x86_64/kernel/pci-dma.c
b/arch/x86_64/kernel/pci-dma.c
index
f8d8574
..
683b7a5
100644
(file)
--- a/
arch/x86_64/kernel/pci-dma.c
+++ b/
arch/x86_64/kernel/pci-dma.c
@@
-296,6
+296,11
@@
__init int iommu_setup(char *p)
gart_parse_options(p);
#endif
gart_parse_options(p);
#endif
+#ifdef CONFIG_CALGARY_IOMMU
+ if (!strncmp(p, "calgary", 7))
+ use_calgary = 1;
+#endif /* CONFIG_CALGARY_IOMMU */
+
p += strcspn(p, ",");
if (*p == ',')
++p;
p += strcspn(p, ",");
if (*p == ',')
++p;