diff options
author | David S. Miller <davem@sunset.davemloft.net> | 2007-04-25 02:51:18 -0400 |
---|---|---|
committer | David S. Miller <davem@sunset.davemloft.net> | 2007-04-26 04:55:42 -0400 |
commit | 9b3627f389c07c5be9c86ac4d472a0d4fd47feac (patch) | |
tree | 4e00925c81102399ec57e4eefe647dc23710a66d /include/asm-sparc64/pbm.h | |
parent | 711b360d64418e88ed45f812e0ebd202073d888d (diff) |
[SPARC64]: Consolidate {sbus,pci}_iommu_arena.
Move to asm-sparc64/iommu.h and rename to plain "iommu_arena".
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/asm-sparc64/pbm.h')
-rw-r--r-- | include/asm-sparc64/pbm.h | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/include/asm-sparc64/pbm.h b/include/asm-sparc64/pbm.h index 9afcc06a575d..4a0ed2ea950c 100644 --- a/include/asm-sparc64/pbm.h +++ b/include/asm-sparc64/pbm.h | |||
@@ -35,19 +35,13 @@ struct pci_controller_info; | |||
35 | /* This contains the software state necessary to drive a PCI | 35 | /* This contains the software state necessary to drive a PCI |
36 | * controller's IOMMU. | 36 | * controller's IOMMU. |
37 | */ | 37 | */ |
38 | struct pci_iommu_arena { | ||
39 | unsigned long *map; | ||
40 | unsigned int hint; | ||
41 | unsigned int limit; | ||
42 | }; | ||
43 | |||
44 | struct pci_iommu { | 38 | struct pci_iommu { |
45 | /* This protects the controller's IOMMU and all | 39 | /* This protects the controller's IOMMU and all |
46 | * streaming buffers underneath. | 40 | * streaming buffers underneath. |
47 | */ | 41 | */ |
48 | spinlock_t lock; | 42 | spinlock_t lock; |
49 | 43 | ||
50 | struct pci_iommu_arena arena; | 44 | struct iommu_arena arena; |
51 | 45 | ||
52 | /* IOMMU page table, a linear array of ioptes. */ | 46 | /* IOMMU page table, a linear array of ioptes. */ |
53 | iopte_t *page_table; /* The page table itself. */ | 47 | iopte_t *page_table; /* The page table itself. */ |