diff options
| author | FUJITA Tomonori <tomof@acm.org> | 2008-02-05 01:27:58 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-02-05 12:44:10 -0500 |
| commit | 7c53664dcd5df7349edb56f04c743bf66510a6f1 (patch) | |
| tree | 377cd9cced6757f986806d51c6e428f5b1874e49 /include | |
| parent | a031bbcb8d7559d61f383880f23dd0e047247410 (diff) | |
iommu sg merging: alpha: make pci_iommu respect the segment size limits
This patch makes pci_iommu respect segment size limits when merging sg
lists.
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
Cc: Jeff Garzik <jeff@garzik.org>
Cc: James Bottomley <James.Bottomley@steeleye.com>
Acked-by: Jens Axboe <jens.axboe@oracle.com>
Cc: Richard Henderson <rth@twiddle.net>
Cc: Ivan Kokshaysky <ink@jurassic.park.msu.ru>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'include')
| -rw-r--r-- | include/asm-alpha/pci.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/asm-alpha/pci.h b/include/asm-alpha/pci.h index 30ee7669b19f..d5b10ef64364 100644 --- a/include/asm-alpha/pci.h +++ b/include/asm-alpha/pci.h | |||
| @@ -4,6 +4,7 @@ | |||
| 4 | #ifdef __KERNEL__ | 4 | #ifdef __KERNEL__ |
| 5 | 5 | ||
| 6 | #include <linux/spinlock.h> | 6 | #include <linux/spinlock.h> |
| 7 | #include <linux/dma-mapping.h> | ||
| 7 | #include <asm/scatterlist.h> | 8 | #include <asm/scatterlist.h> |
| 8 | #include <asm/machvec.h> | 9 | #include <asm/machvec.h> |
| 9 | 10 | ||