Patched in Tegra support.

3 files changed, 65 insertions, 1 deletions

diff --git a/arch/parisc/lib/bitops.c b/arch/parisc/lib/bitops.c
index 187118841af..a8bffd8af77 100644
--- a/arch/parisc/lib/bitops.c
+++ b/arch/parisc/lib/bitops.c
@@ -8,6 +8,7 @@
 
 #include <linux/kernel.h>
 #include <linux/spinlock.h>
+#include <asm/system.h>
 #include <linux/atomic.h>
 
 #ifdef CONFIG_SMP
diff --git a/arch/parisc/lib/iomap.c b/arch/parisc/lib/iomap.c
index fb8e10a4fb3..5069e8b2ca7 100644
--- a/arch/parisc/lib/iomap.c
+++ b/arch/parisc/lib/iomap.c
@@ -5,7 +5,6 @@
 
 #include <linux/ioport.h>
 #include <linux/pci.h>
-#include <linux/export.h>
 #include <asm/io.h>
 
 /*
@@ -436,6 +435,28 @@ void ioport_unmap(void __iomem *addr)
         }
 }
 
+/* Create a virtual mapping cookie for a PCI BAR (memory or IO) */
+void __iomem *pci_iomap(struct pci_dev *dev, int bar, unsigned long maxlen)
+{
+        resource_size_t start = pci_resource_start(dev, bar);
+        resource_size_t len = pci_resource_len(dev, bar);
+        unsigned long flags = pci_resource_flags(dev, bar);
+
+        if (!len || !start)
+                return NULL;
+        if (maxlen && len > maxlen)
+                len = maxlen;
+        if (flags & IORESOURCE_IO)
+                return ioport_map(start, len);
+        if (flags & IORESOURCE_MEM) {
+                if (flags & IORESOURCE_CACHEABLE)
+                        return ioremap(start, len);
+                return ioremap_nocache(start, len);
+        }
+        /* What? */
+        return NULL;
+}
+
 void pci_iounmap(struct pci_dev *dev, void __iomem * addr)
 {
         if (!INDIRECT_ADDR(addr)) {
@@ -461,4 +482,5 @@ EXPORT_SYMBOL(iowrite16_rep);
 EXPORT_SYMBOL(iowrite32_rep);
 EXPORT_SYMBOL(ioport_map);
 EXPORT_SYMBOL(ioport_unmap);
+EXPORT_SYMBOL(pci_iomap);
 EXPORT_SYMBOL(pci_iounmap);
diff --git a/arch/parisc/lib/lusercopy.S b/arch/parisc/lib/lusercopy.S
index 6f2d9355efe..1bd23ccec17 100644
--- a/arch/parisc/lib/lusercopy.S
+++ b/arch/parisc/lib/lusercopy.S
@@ -61,6 +61,47 @@
         .endm
 
         /*
+         * long lstrncpy_from_user(char *dst, const char *src, long n)
+         *
+         * Returns -EFAULT if exception before terminator,
+         *         N if the entire buffer filled,
+         *         otherwise strlen (i.e. excludes zero byte)
+         */
+
+ENTRY(lstrncpy_from_user)
+        .proc
+        .callinfo NO_CALLS
+        .entry
+        comib,=     0,%r24,$lsfu_done
+        copy        %r24,%r23
+        get_sr
+1:      ldbs,ma     1(%sr1,%r25),%r1
+$lsfu_loop:
+        stbs,ma     %r1,1(%r26)
+        comib,=,n   0,%r1,$lsfu_done
+        addib,<>,n  -1,%r24,$lsfu_loop
+2:      ldbs,ma     1(%sr1,%r25),%r1
+$lsfu_done:
+        sub         %r23,%r24,%r28
+$lsfu_exit:
+        bv          %r0(%r2)
+        nop
+        .exit
+ENDPROC(lstrncpy_from_user)
+
+        .section .fixup,"ax"
+3:      fixup_branch $lsfu_exit
+        ldi         -EFAULT,%r28
+        .previous
+
+        .section __ex_table,"aw"
+        ASM_ULONG_INSN 1b,3b
+        ASM_ULONG_INSN 2b,3b
+        .previous
+
+        .procend
+
+        /*
          * unsigned long lclear_user(void *to, unsigned long n)
          *
          * Returns 0 for success.