diff options
| author | Steve French <sfrench@hera.kernel.org> | 2005-06-02 17:42:23 -0400 |
|---|---|---|
| committer | Steve French <sfrench@hera.kernel.org> | 2005-06-02 17:42:23 -0400 |
| commit | 467ca22d3371f132ee225a5591a1ed0cd518cb3d (patch) | |
| tree | 0e3d6de84b4ffa379c2c7ddcebd3f55de52b9844 /arch/sparc64/kernel/pci_schizo.c | |
| parent | 12725675e26d52c39e856d341035b94bf7802458 (diff) | |
| parent | 1e86d1c648508fd50e6c9960576b87906a7906ad (diff) | |
Merge with rsync://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Diffstat (limited to 'arch/sparc64/kernel/pci_schizo.c')
| -rw-r--r-- | arch/sparc64/kernel/pci_schizo.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/sparc64/kernel/pci_schizo.c b/arch/sparc64/kernel/pci_schizo.c index e93fcadc3722..5753175b94e6 100644 --- a/arch/sparc64/kernel/pci_schizo.c +++ b/arch/sparc64/kernel/pci_schizo.c | |||
| @@ -1753,7 +1753,7 @@ static void schizo_pbm_iommu_init(struct pci_pbm_info *pbm) | |||
| 1753 | 1753 | ||
| 1754 | /* Setup initial software IOMMU state. */ | 1754 | /* Setup initial software IOMMU state. */ |
| 1755 | spin_lock_init(&iommu->lock); | 1755 | spin_lock_init(&iommu->lock); |
| 1756 | iommu->iommu_cur_ctx = 0; | 1756 | iommu->ctx_lowest_free = 1; |
| 1757 | 1757 | ||
| 1758 | /* Register addresses, SCHIZO has iommu ctx flushing. */ | 1758 | /* Register addresses, SCHIZO has iommu ctx flushing. */ |
| 1759 | iommu->iommu_control = pbm->pbm_regs + SCHIZO_IOMMU_CONTROL; | 1759 | iommu->iommu_control = pbm->pbm_regs + SCHIZO_IOMMU_CONTROL; |