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/pci_sun4v.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/pci_sun4v.c')
-rw-r--r-- | arch/sparc/kernel/pci_sun4v.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/sparc/kernel/pci_sun4v.c b/arch/sparc/kernel/pci_sun4v.c index 629160772a9..6cf53468178 100644 --- a/arch/sparc/kernel/pci_sun4v.c +++ b/arch/sparc/kernel/pci_sun4v.c | |||
@@ -580,7 +580,7 @@ static int __devinit pci_sun4v_iommu_init(struct pci_pbm_info *pbm) | |||
580 | { | 580 | { |
581 | static const u32 vdma_default[] = { 0x80000000, 0x80000000 }; | 581 | static const u32 vdma_default[] = { 0x80000000, 0x80000000 }; |
582 | struct iommu *iommu = pbm->iommu; | 582 | struct iommu *iommu = pbm->iommu; |
583 | unsigned long num_tsb_entries, sz, tsbsize; | 583 | unsigned long num_tsb_entries, sz; |
584 | u32 dma_mask, dma_offset; | 584 | u32 dma_mask, dma_offset; |
585 | const u32 *vdma; | 585 | const u32 *vdma; |
586 | 586 | ||
@@ -596,7 +596,6 @@ static int __devinit pci_sun4v_iommu_init(struct pci_pbm_info *pbm) | |||
596 | 596 | ||
597 | dma_mask = (roundup_pow_of_two(vdma[1]) - 1UL); | 597 | dma_mask = (roundup_pow_of_two(vdma[1]) - 1UL); |
598 | num_tsb_entries = vdma[1] / IO_PAGE_SIZE; | 598 | num_tsb_entries = vdma[1] / IO_PAGE_SIZE; |
599 | tsbsize = num_tsb_entries * sizeof(iopte_t); | ||
600 | 599 | ||
601 | dma_offset = vdma[0]; | 600 | dma_offset = vdma[0]; |
602 | 601 | ||