diff options
author | David S. Miller <davem@davemloft.net> | 2011-02-27 02:40:02 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2011-03-16 21:19:15 -0400 |
commit | c6fee0810df4e0f4cf9c4834d2569ca01c02cffc (patch) | |
tree | 7b6adabf750ca0279895f8b9aa8a42eb9837e4e2 /arch/sparc/kernel/iommu.c | |
parent | 0399bb5b918bd8ffbf065a3db142ff121aaa18e0 (diff) |
sparc64: Fix build errors with gcc-4.6.0
Most of the warnings emitted (we fail arch/sparc file
builds with -Werror) were legitimate but harmless, however
one case (n2_pcr_write) was a genuine bug.
Based almost entirely upon a patch by Sam Ravnborg.
Reported-by: Dennis Gilmore <dennis@ausil.us>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'arch/sparc/kernel/iommu.c')
-rw-r--r-- | arch/sparc/kernel/iommu.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/arch/sparc/kernel/iommu.c b/arch/sparc/kernel/iommu.c index 72509d0e34be..6f01e8c83197 100644 --- a/arch/sparc/kernel/iommu.c +++ b/arch/sparc/kernel/iommu.c | |||
@@ -333,13 +333,10 @@ static void dma_4u_free_coherent(struct device *dev, size_t size, | |||
333 | void *cpu, dma_addr_t dvma) | 333 | void *cpu, dma_addr_t dvma) |
334 | { | 334 | { |
335 | struct iommu *iommu; | 335 | struct iommu *iommu; |
336 | iopte_t *iopte; | ||
337 | unsigned long flags, order, npages; | 336 | unsigned long flags, order, npages; |
338 | 337 | ||
339 | npages = IO_PAGE_ALIGN(size) >> IO_PAGE_SHIFT; | 338 | npages = IO_PAGE_ALIGN(size) >> IO_PAGE_SHIFT; |
340 | iommu = dev->archdata.iommu; | 339 | iommu = dev->archdata.iommu; |
341 | iopte = iommu->page_table + | ||
342 | ((dvma - iommu->page_table_map_base) >> IO_PAGE_SHIFT); | ||
343 | 340 | ||
344 | spin_lock_irqsave(&iommu->lock, flags); | 341 | spin_lock_irqsave(&iommu->lock, flags); |
345 | 342 | ||