diff options
author | 2006-11-04 22:42:39 -0500 | |
---|---|---|
committer | 2006-11-04 22:42:39 -0500 | |
commit | 752c58a471c108d64da1676b2925dfbd83eb177e (patch) | |
tree | fbffa0d7c54cd812950dffc16d642c9d449f4faf /arch/sparc64/kernel/pci_iommu.c | |
parent | Input: drivers/char/keyboard.c - small cleanup in k_cur() (diff) | |
parent | Make sure "user->sigpending" count is in sync (diff) | |
download | linux-dev-752c58a471c108d64da1676b2925dfbd83eb177e.tar.xz linux-dev-752c58a471c108d64da1676b2925dfbd83eb177e.zip |
Merge rsync://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'arch/sparc64/kernel/pci_iommu.c')
-rw-r--r-- | arch/sparc64/kernel/pci_iommu.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/sparc64/kernel/pci_iommu.c b/arch/sparc64/kernel/pci_iommu.c index 82e5455134c6..2e7f1427088a 100644 --- a/arch/sparc64/kernel/pci_iommu.c +++ b/arch/sparc64/kernel/pci_iommu.c @@ -281,7 +281,7 @@ static void pci_4u_free_consistent(struct pci_dev *pdev, size_t size, void *cpu, spin_lock_irqsave(&iommu->lock, flags); - free_npages(iommu, dvma, npages); + free_npages(iommu, dvma - iommu->page_table_map_base, npages); spin_unlock_irqrestore(&iommu->lock, flags); |