diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-07-24 03:38:13 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-07-24 03:38:13 -0400 |
| commit | b71426eb10d904d421b36f51f93c8d0ba558edac (patch) | |
| tree | a8c7088a6b89499134e01750652aa55f2baa890f /arch/sparc/mm/io-unit.c | |
| parent | 8419dc8a34d765f2ff1aa4051084d54cfeff09cf (diff) | |
| parent | abb5a5cc6bba1516403146c5b79036fe843beb70 (diff) | |
Merge branch 'master' into upstream-fixes
Diffstat (limited to 'arch/sparc/mm/io-unit.c')
| -rw-r--r-- | arch/sparc/mm/io-unit.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/sparc/mm/io-unit.c b/arch/sparc/mm/io-unit.c index 42c1c700c0a7..2bb1309003dd 100644 --- a/arch/sparc/mm/io-unit.c +++ b/arch/sparc/mm/io-unit.c | |||
| @@ -64,6 +64,7 @@ iounit_init(int sbi_node, int io_node, struct sbus_bus *sbus) | |||
| 64 | 64 | ||
| 65 | sbus->iommu = (struct iommu_struct *)iounit; | 65 | sbus->iommu = (struct iommu_struct *)iounit; |
| 66 | iounit->page_table = xpt; | 66 | iounit->page_table = xpt; |
| 67 | spin_lock_init(&iounit->lock); | ||
| 67 | 68 | ||
| 68 | for (xptend = iounit->page_table + (16 * PAGE_SIZE) / sizeof(iopte_t); | 69 | for (xptend = iounit->page_table + (16 * PAGE_SIZE) / sizeof(iopte_t); |
| 69 | xpt < xptend;) | 70 | xpt < xptend;) |