Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6

* master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6:
  [SERIAL] sunsu: Fix section mismatch warnings.
  [SPARC64]: pgtable_cache_init() should be __init.
  [SPARC64]: Fix section mismatch warnings in arch/sparc64/kernel/prom.c
  [SPARC64]: Fix section mismatch warnings in arch/sparc64/kernel/pci.c
  [SPARC64]: Fix section mismatch warnings in arch/sparc64/kernel/console.c
  [MM]: sparse_init() should be __init.
  [SPARC64]: Update defconfig.
  [VIDEO]: Add Sun XVR-2500 framebuffer driver.
  [VIDEO]: Add Sun XVR-500 framebuffer driver.
  [SPARC64]: SUN4U PCI-E controller support.
  [SPARC]: Fix comment typo in smp4m_blackbox_current().
  [SCSI] SUNESP: sun_esp.c needs linux/delay.h

Fix up conflict in arch/sparc64/mm/init.c manually due to removal of
pgtable_cache_init() through the -mm patches (even though that patch was
also by David ;)

Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

1 files changed, 13 insertions, 9 deletions

diff --git a/arch/sparc64/kernel/pci_iommu.c b/arch/sparc64/kernel/pci_iommu.c
index 66712772f494..9e405cbbcb0d 100644
--- a/arch/sparc64/kernel/pci_iommu.c
+++ b/arch/sparc64/kernel/pci_iommu.c
@@ -37,17 +37,21 @@
 /* Must be invoked under the IOMMU lock. */
 static void __iommu_flushall(struct iommu *iommu)
 {
-        unsigned long tag;
-        int entry;
+        if (iommu->iommu_flushinv) {
+                pci_iommu_write(iommu->iommu_flushinv, ~(u64)0);
+        } else {
+                unsigned long tag;
+                int entry;
 
-        tag = iommu->iommu_flush + (0xa580UL - 0x0210UL);
-        for (entry = 0; entry < 16; entry++) {
-                pci_iommu_write(tag, 0);
-                tag += 8;
-        }
+                tag = iommu->iommu_flush + (0xa580UL - 0x0210UL);
+                for (entry = 0; entry < 16; entry++) {
+                        pci_iommu_write(tag, 0);
+                        tag += 8;
+                }
 
-        /* Ensure completion of previous PIO writes. */
-        (void) pci_iommu_read(iommu->write_complete_reg);
+                /* Ensure completion of previous PIO writes. */
+                (void) pci_iommu_read(iommu->write_complete_reg);
+        }
 }
 
 #define IOPTE_CONSISTENT(CTX) \