Merge master.kernel.org:/pub/scm/linux/kernel/git/lethal/sh-2.6

* master.kernel.org:/pub/scm/linux/kernel/git/lethal/sh-2.6: (108 commits)
  sh: Fix occasional flush_cache_4096() stack corruption.
  sh: Calculate shm alignment at runtime.
  sh: dma-mapping compile fixes.
  sh: Initial vsyscall page support.
  sh: Clean up PAGE_SIZE definition for assembly use.
  sh: Selective flush_cache_mm() flushing.
  sh: More intelligent entry_mask/way_size calculation.
  sh: Support for L2 cache on newer SH-4A CPUs.
  sh: Update kexec support for API changes.
  sh: Optimized readsl()/writesl() support.
  sh: Report movli.l/movco.l capabilities.
  sh: CPU flags in AT_HWCAP in ELF auxvt.
  sh: Add support for 4K stacks.
  sh: Enable /proc/kcore support.
  sh: stack debugging support.
  sh: select CONFIG_EMBEDDED.
  sh: machvec rework.
  sh: Solution Engine SH7343 board support.
  sh: SH7710VoIPGW board support.
  sh: Enable verbose BUG() support.
  ...

1 files changed, 16 insertions, 1 deletions

diff --git a/arch/sh/mm/ioremap.c b/arch/sh/mm/ioremap.c
index 96fa4a999e2a..a9fe80cfc233 100644
--- a/arch/sh/mm/ioremap.c
+++ b/arch/sh/mm/ioremap.c
@@ -15,6 +15,7 @@
 #include <linux/vmalloc.h>
 #include <linux/module.h>
 #include <linux/mm.h>
+#include <linux/pci.h>
 #include <asm/io.h>
 #include <asm/page.h>
 #include <asm/pgalloc.h>
@@ -135,6 +136,20 @@ void __iomem *__ioremap(unsigned long phys_addr, unsigned long size,
                 return (void __iomem *)phys_to_virt(phys_addr);
 
         /*
+         * If we're on an SH7751 or SH7780 PCI controller, PCI memory is
+         * mapped at the end of the address space (typically 0xfd000000)
+         * in a non-translatable area, so mapping through page tables for
+         * this area is not only pointless, but also fundamentally
+         * broken. Just return the physical address instead.
+         *
+         * For boards that map a small PCI memory aperture somewhere in
+         * P1/P2 space, ioremap() will already do the right thing,
+         * and we'll never get this far.
+         */
+        if (is_pci_memaddr(phys_addr) && is_pci_memaddr(last_addr))
+                return (void __iomem *)phys_addr;
+
+        /*
          * Don't allow anybody to remap normal RAM that we're using..
          */
         if (phys_addr < virt_to_phys(high_memory))
@@ -192,7 +207,7 @@ void __iounmap(void __iomem *addr)
         unsigned long vaddr = (unsigned long __force)addr;
         struct vm_struct *p;
 
-        if (PXSEG(vaddr) < P3SEG)
+        if (PXSEG(vaddr) < P3SEG || is_pci_memaddr(vaddr))
                 return;
 
 #ifdef CONFIG_32BIT