diff options
| author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2008-03-08 11:49:24 -0500 |
|---|---|---|
| committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2008-03-08 11:49:24 -0500 |
| commit | 9446389ef612096704fdf18fa79bab423d4110f0 (patch) | |
| tree | 3e4fda7270be58ae176d20d318e61fb115b325b5 /include/linux/iommu-helper.h | |
| parent | cdd0972945dbcb8ea24db365d9b0e100af2a27bb (diff) | |
| parent | 84c6f6046c5a2189160a8f0dca8b90427bf690ea (diff) | |
Merge commit 'origin' into devel
Diffstat (limited to 'include/linux/iommu-helper.h')
| -rw-r--r-- | include/linux/iommu-helper.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/include/linux/iommu-helper.h b/include/linux/iommu-helper.h index 4dd4c04ff2f4..c975caf75385 100644 --- a/include/linux/iommu-helper.h +++ b/include/linux/iommu-helper.h | |||
| @@ -1,3 +1,6 @@ | |||
| 1 | extern int iommu_is_span_boundary(unsigned int index, unsigned int nr, | ||
| 2 | unsigned long shift, | ||
| 3 | unsigned long boundary_size); | ||
| 1 | extern unsigned long iommu_area_alloc(unsigned long *map, unsigned long size, | 4 | extern unsigned long iommu_area_alloc(unsigned long *map, unsigned long size, |
| 2 | unsigned long start, unsigned int nr, | 5 | unsigned long start, unsigned int nr, |
| 3 | unsigned long shift, | 6 | unsigned long shift, |