Patched in Tegra support.

11 files changed, 189 insertions, 282 deletions

diff --git a/arch/s390/lib/Makefile b/arch/s390/lib/Makefile
index 6ab0d0b5cec..761ab8b56af 100644
--- a/arch/s390/lib/Makefile
+++ b/arch/s390/lib/Makefile
@@ -4,7 +4,6 @@
 
 lib-y += delay.o string.o uaccess_std.o uaccess_pt.o
 obj-y += usercopy.o
-obj-$(CONFIG_32BIT) += div64.o qrnnd.o ucmpdi2.o mem32.o
-obj-$(CONFIG_64BIT) += mem64.o
+obj-$(CONFIG_32BIT) += div64.o qrnnd.o ucmpdi2.o
 lib-$(CONFIG_64BIT) += uaccess_mvcos.o
 lib-$(CONFIG_SMP) += spinlock.o
diff --git a/arch/s390/lib/delay.c b/arch/s390/lib/delay.c
index 42d0cf89121..a65229d91c9 100644
--- a/arch/s390/lib/delay.c
+++ b/arch/s390/lib/delay.c
@@ -1,7 +1,7 @@
 /*
  *    Precise Delay Loops for S390
  *
- *    Copyright IBM Corp. 1999, 2008
+ *    Copyright IBM Corp. 1999,2008
  *    Author(s): Martin Schwidefsky <schwidefsky@de.ibm.com>,
  *               Heiko Carstens <heiko.carstens@de.ibm.com>,
  */
@@ -12,7 +12,6 @@
 #include <linux/module.h>
 #include <linux/irqflags.h>
 #include <linux/interrupt.h>
-#include <asm/vtimer.h>
 #include <asm/div64.h>
 
 void __delay(unsigned long loops)
@@ -29,33 +28,35 @@ void __delay(unsigned long loops)
 
 static void __udelay_disabled(unsigned long long usecs)
 {
-        unsigned long cr0, cr6, new;
-        u64 clock_saved, end;
+        unsigned long mask, cr0, cr0_saved;
+        u64 clock_saved;
+        u64 end;
 
+        mask = psw_kernel_bits | PSW_MASK_WAIT | PSW_MASK_EXT;
         end = get_clock() + (usecs << 12);
         clock_saved = local_tick_disable();
-        __ctl_store(cr0, 0, 0);
-        __ctl_store(cr6, 6, 6);
-        new = (cr0 &  0xffff00e0) | 0x00000800;
-        __ctl_load(new , 0, 0);
-        new = 0;
-        __ctl_load(new, 6, 6);
+        __ctl_store(cr0_saved, 0, 0);
+        cr0 = (cr0_saved & 0xffff00e0) | 0x00000800;
+        __ctl_load(cr0 , 0, 0);
         lockdep_off();
         do {
                 set_clock_comparator(end);
-                vtime_stop_cpu();
+                trace_hardirqs_on();
+                __load_psw_mask(mask);
                 local_irq_disable();
         } while (get_clock() < end);
         lockdep_on();
-        __ctl_load(cr0, 0, 0);
-        __ctl_load(cr6, 6, 6);
+        __ctl_load(cr0_saved, 0, 0);
         local_tick_enable(clock_saved);
 }
 
 static void __udelay_enabled(unsigned long long usecs)
 {
-        u64 clock_saved, end;
+        unsigned long mask;
+        u64 clock_saved;
+        u64 end;
 
+        mask = psw_kernel_bits | PSW_MASK_WAIT | PSW_MASK_EXT | PSW_MASK_IO;
         end = get_clock() + (usecs << 12);
         do {
                 clock_saved = 0;
@@ -63,7 +64,8 @@ static void __udelay_enabled(unsigned long long usecs)
                         clock_saved = local_tick_disable();
                         set_clock_comparator(end);
                 }
-                vtime_stop_cpu();
+                trace_hardirqs_on();
+                __load_psw_mask(mask);
                 local_irq_disable();
                 if (clock_saved)
                         local_tick_enable(clock_saved);
diff --git a/arch/s390/lib/div64.c b/arch/s390/lib/div64.c
index 261152f8324..d9e62c0b576 100644
--- a/arch/s390/lib/div64.c
+++ b/arch/s390/lib/div64.c
@@ -1,7 +1,9 @@
 /*
+ *  arch/s390/lib/div64.c
+ *
  *  __div64_32 implementation for 31 bit.
  *
- *    Copyright IBM Corp. 2006
+ *    Copyright (C) IBM Corp. 2006
  *    Author(s): Martin Schwidefsky (schwidefsky@de.ibm.com),
  */
 
diff --git a/arch/s390/lib/mem32.S b/arch/s390/lib/mem32.S
deleted file mode 100644
index 14ca9244b61..00000000000
--- a/arch/s390/lib/mem32.S
+++ /dev/null
@@ -1,92 +0,0 @@
-/*
- * String handling functions.
- *
- * Copyright IBM Corp. 2012
- */
-
-#include <linux/linkage.h>
-
-/*
- * memset implementation
- *
- * This code corresponds to the C construct below. We do distinguish
- * between clearing (c == 0) and setting a memory array (c != 0) simply
- * because nearly all memset invocations in the kernel clear memory and
- * the xc instruction is preferred in such cases.
- *
- * void *memset(void *s, int c, size_t n)
- * {
- *      if (likely(c == 0))
- *              return __builtin_memset(s, 0, n);
- *      return __builtin_memset(s, c, n);
- * }
- */
-ENTRY(memset)
-        basr    %r5,%r0
-.Lmemset_base:
-        ltr     %r4,%r4
-        bzr     %r14
-        ltr     %r3,%r3
-        jnz     .Lmemset_fill
-        ahi     %r4,-1
-        lr      %r3,%r4
-        srl     %r3,8
-        ltr     %r3,%r3
-        lr      %r1,%r2
-        je      .Lmemset_clear_rest
-.Lmemset_clear_loop:
-        xc      0(256,%r1),0(%r1)
-        la      %r1,256(%r1)
-        brct    %r3,.Lmemset_clear_loop
-.Lmemset_clear_rest:
-        ex      %r4,.Lmemset_xc-.Lmemset_base(%r5)
-        br      %r14
-.Lmemset_fill:
-        stc     %r3,0(%r2)
-        chi     %r4,1
-        lr      %r1,%r2
-        ber     %r14
-        ahi     %r4,-2
-        lr      %r3,%r4
-        srl     %r3,8
-        ltr     %r3,%r3
-        je      .Lmemset_fill_rest
-.Lmemset_fill_loop:
-        mvc     1(256,%r1),0(%r1)
-        la      %r1,256(%r1)
-        brct    %r3,.Lmemset_fill_loop
-.Lmemset_fill_rest:
-        ex      %r4,.Lmemset_mvc-.Lmemset_base(%r5)
-        br      %r14
-.Lmemset_xc:
-        xc      0(1,%r1),0(%r1)
-.Lmemset_mvc:
-        mvc     1(1,%r1),0(%r1)
-
-/*
- * memcpy implementation
- *
- * void *memcpy(void *dest, const void *src, size_t n)
- */
-ENTRY(memcpy)
-        basr    %r5,%r0
-.Lmemcpy_base:
-        ltr     %r4,%r4
-        bzr     %r14
-        ahi     %r4,-1
-        lr      %r0,%r4
-        srl     %r0,8
-        ltr     %r0,%r0
-        lr      %r1,%r2
-        jnz     .Lmemcpy_loop
-.Lmemcpy_rest:
-        ex      %r4,.Lmemcpy_mvc-.Lmemcpy_base(%r5)
-        br      %r14
-.Lmemcpy_loop:
-        mvc     0(256,%r1),0(%r3)
-        la      %r1,256(%r1)
-        la      %r3,256(%r3)
-        brct    %r0,.Lmemcpy_loop
-        j       .Lmemcpy_rest
-.Lmemcpy_mvc:
-        mvc     0(1,%r1),0(%r3)
diff --git a/arch/s390/lib/mem64.S b/arch/s390/lib/mem64.S
deleted file mode 100644
index c6d553e85ab..00000000000
--- a/arch/s390/lib/mem64.S
+++ /dev/null
@@ -1,88 +0,0 @@
-/*
- * String handling functions.
- *
- * Copyright IBM Corp. 2012
- */
-
-#include <linux/linkage.h>
-
-/*
- * memset implementation
- *
- * This code corresponds to the C construct below. We do distinguish
- * between clearing (c == 0) and setting a memory array (c != 0) simply
- * because nearly all memset invocations in the kernel clear memory and
- * the xc instruction is preferred in such cases.
- *
- * void *memset(void *s, int c, size_t n)
- * {
- *      if (likely(c == 0))
- *              return __builtin_memset(s, 0, n);
- *      return __builtin_memset(s, c, n);
- * }
- */
-ENTRY(memset)
-        ltgr    %r4,%r4
-        bzr     %r14
-        ltgr    %r3,%r3
-        jnz     .Lmemset_fill
-        aghi    %r4,-1
-        srlg    %r3,%r4,8
-        ltgr    %r3,%r3
-        lgr     %r1,%r2
-        jz      .Lmemset_clear_rest
-.Lmemset_clear_loop:
-        xc      0(256,%r1),0(%r1)
-        la      %r1,256(%r1)
-        brctg   %r3,.Lmemset_clear_loop
-.Lmemset_clear_rest:
-        larl    %r3,.Lmemset_xc
-        ex      %r4,0(%r3)
-        br      %r14
-.Lmemset_fill:
-        stc     %r3,0(%r2)
-        cghi    %r4,1
-        lgr     %r1,%r2
-        ber     %r14
-        aghi    %r4,-2
-        srlg    %r3,%r4,8
-        ltgr    %r3,%r3
-        jz      .Lmemset_fill_rest
-.Lmemset_fill_loop:
-        mvc     1(256,%r1),0(%r1)
-        la      %r1,256(%r1)
-        brctg   %r3,.Lmemset_fill_loop
-.Lmemset_fill_rest:
-        larl    %r3,.Lmemset_mvc
-        ex      %r4,0(%r3)
-        br      %r14
-.Lmemset_xc:
-        xc      0(1,%r1),0(%r1)
-.Lmemset_mvc:
-        mvc     1(1,%r1),0(%r1)
-
-/*
- * memcpy implementation
- *
- * void *memcpy(void *dest, const void *src, size_t n)
- */
-ENTRY(memcpy)
-        ltgr    %r4,%r4
-        bzr     %r14
-        aghi    %r4,-1
-        srlg    %r5,%r4,8
-        ltgr    %r5,%r5
-        lgr     %r1,%r2
-        jnz     .Lmemcpy_loop
-.Lmemcpy_rest:
-        larl    %r5,.Lmemcpy_mvc
-        ex      %r4,0(%r5)
-        br      %r14
-.Lmemcpy_loop:
-        mvc     0(256,%r1),0(%r3)
-        la      %r1,256(%r1)
-        la      %r3,256(%r3)
-        brctg   %r5,.Lmemcpy_loop
-        j       .Lmemcpy_rest
-.Lmemcpy_mvc:
-        mvc     0(1,%r1),0(%r3)
diff --git a/arch/s390/lib/spinlock.c b/arch/s390/lib/spinlock.c
index f709983f41f..91754ffb920 100644
--- a/arch/s390/lib/spinlock.c
+++ b/arch/s390/lib/spinlock.c
@@ -1,7 +1,8 @@
 /*
+ *  arch/s390/lib/spinlock.c
  *    Out of line spinlock code.
  *
- *    Copyright IBM Corp. 2004, 2006
+ *    Copyright (C) IBM Corp. 2004, 2006
  *    Author(s): Martin Schwidefsky (schwidefsky@de.ibm.com)
  */
 
@@ -9,7 +10,6 @@
 #include <linux/module.h>
 #include <linux/spinlock.h>
 #include <linux/init.h>
-#include <linux/smp.h>
 #include <asm/io.h>
 
 int spin_retry = 1000;
@@ -24,6 +24,21 @@ static int __init spin_retry_setup(char *str)
 }
 __setup("spin_retry=", spin_retry_setup);
 
+static inline void _raw_yield(void)
+{
+        if (MACHINE_HAS_DIAG44)
+                asm volatile("diag 0,0,0x44");
+}
+
+static inline void _raw_yield_cpu(int cpu)
+{
+        if (MACHINE_HAS_DIAG9C)
+                asm volatile("diag %0,0,0x9c"
+                             : : "d" (cpu_logical_map(cpu)));
+        else
+                _raw_yield();
+}
+
 void arch_spin_lock_wait(arch_spinlock_t *lp)
 {
         int count = spin_retry;
@@ -45,7 +60,7 @@ void arch_spin_lock_wait(arch_spinlock_t *lp)
                 }
                 owner = lp->owner_cpu;
                 if (owner)
-                        smp_yield_cpu(~owner);
+                        _raw_yield_cpu(~owner);
                 if (_raw_compare_and_swap(&lp->owner_cpu, 0, cpu) == 0)
                         return;
         }
@@ -76,7 +91,7 @@ void arch_spin_lock_wait_flags(arch_spinlock_t *lp, unsigned long flags)
                 }
                 owner = lp->owner_cpu;
                 if (owner)
-                        smp_yield_cpu(~owner);
+                        _raw_yield_cpu(~owner);
                 local_irq_disable();
                 if (_raw_compare_and_swap(&lp->owner_cpu, 0, cpu) == 0)
                         return;
@@ -106,7 +121,7 @@ void arch_spin_relax(arch_spinlock_t *lock)
         if (cpu != 0) {
                 if (MACHINE_IS_VM || MACHINE_IS_KVM ||
                     !smp_vcpu_scheduled(~cpu))
-                        smp_yield_cpu(~cpu);
+                        _raw_yield_cpu(~cpu);
         }
 }
 EXPORT_SYMBOL(arch_spin_relax);
@@ -118,7 +133,7 @@ void _raw_read_lock_wait(arch_rwlock_t *rw)
 
         while (1) {
                 if (count-- <= 0) {
-                        smp_yield();
+                        _raw_yield();
                         count = spin_retry;
                 }
                 if (!arch_read_can_lock(rw))
@@ -138,7 +153,7 @@ void _raw_read_lock_wait_flags(arch_rwlock_t *rw, unsigned long flags)
         local_irq_restore(flags);
         while (1) {
                 if (count-- <= 0) {
-                        smp_yield();
+                        _raw_yield();
                         count = spin_retry;
                 }
                 if (!arch_read_can_lock(rw))
@@ -173,7 +188,7 @@ void _raw_write_lock_wait(arch_rwlock_t *rw)
 
         while (1) {
                 if (count-- <= 0) {
-                        smp_yield();
+                        _raw_yield();
                         count = spin_retry;
                 }
                 if (!arch_write_can_lock(rw))
@@ -191,7 +206,7 @@ void _raw_write_lock_wait_flags(arch_rwlock_t *rw, unsigned long flags)
         local_irq_restore(flags);
         while (1) {
                 if (count-- <= 0) {
-                        smp_yield();
+                        _raw_yield();
                         count = spin_retry;
                 }
                 if (!arch_write_can_lock(rw))
diff --git a/arch/s390/lib/string.c b/arch/s390/lib/string.c
index b647d5ff0ad..4143b7c1909 100644
--- a/arch/s390/lib/string.c
+++ b/arch/s390/lib/string.c
@@ -1,8 +1,9 @@
 /*
+ *  arch/s390/lib/string.c
  *    Optimized string functions
  *
  *  S390 version
- *    Copyright IBM Corp. 2004
+ *    Copyright (C) 2004 IBM Deutschland Entwicklung GmbH, IBM Corporation
  *    Author(s): Martin Schwidefsky (schwidefsky@de.ibm.com)
  */
 
@@ -43,7 +44,11 @@ static inline char *__strnend(const char *s, size_t n)
  */
 size_t strlen(const char *s)
 {
+#if __GNUC__ < 4
         return __strend(s) - s;
+#else
+        return __builtin_strlen(s);
+#endif
 }
 EXPORT_SYMBOL(strlen);
 
@@ -69,6 +74,7 @@ EXPORT_SYMBOL(strnlen);
  */
 char *strcpy(char *dest, const char *src)
 {
+#if __GNUC__ < 4
         register int r0 asm("0") = 0;
         char *ret = dest;
 
@@ -77,6 +83,9 @@ char *strcpy(char *dest, const char *src)
                       : "+&a" (dest), "+&a" (src) : "d" (r0)
                       : "cc", "memory" );
         return ret;
+#else
+        return __builtin_strcpy(dest, src);
+#endif
 }
 EXPORT_SYMBOL(strcpy);
 
@@ -98,7 +107,7 @@ size_t strlcpy(char *dest, const char *src, size_t size)
         if (size) {
                 size_t len = (ret >= size) ? size-1 : ret;
                 dest[len] = '\0';
-                memcpy(dest, src, len);
+                __builtin_memcpy(dest, src, len);
         }
         return ret;
 }
@@ -116,8 +125,8 @@ EXPORT_SYMBOL(strlcpy);
 char *strncpy(char *dest, const char *src, size_t n)
 {
         size_t len = __strnend(src, n) - src;
-        memset(dest + len, 0, n - len);
-        memcpy(dest, src, len);
+        __builtin_memset(dest + len, 0, n - len);
+        __builtin_memcpy(dest, src, len);
         return dest;
 }
 EXPORT_SYMBOL(strncpy);
@@ -163,7 +172,7 @@ size_t strlcat(char *dest, const char *src, size_t n)
                 if (len >= n)
                         len = n - 1;
                 dest[len] = '\0';
-                memcpy(dest, src, len);
+                __builtin_memcpy(dest, src, len);
         }
         return res;
 }
@@ -186,7 +195,7 @@ char *strncat(char *dest, const char *src, size_t n)
         char *p = __strend(dest);
 
         p[len] = '\0';
-        memcpy(p, src, len);
+        __builtin_memcpy(p, src, len);
         return dest;
 }
 EXPORT_SYMBOL(strncat);
@@ -340,3 +349,41 @@ void *memscan(void *s, int c, size_t n)
         return (void *) ret;
 }
 EXPORT_SYMBOL(memscan);
+
+/**
+ * memcpy - Copy one area of memory to another
+ * @dest: Where to copy to
+ * @src: Where to copy from
+ * @n: The size of the area.
+ *
+ * returns a pointer to @dest
+ */
+void *memcpy(void *dest, const void *src, size_t n)
+{
+        return __builtin_memcpy(dest, src, n);
+}
+EXPORT_SYMBOL(memcpy);
+
+/**
+ * memset - Fill a region of memory with the given value
+ * @s: Pointer to the start of the area.
+ * @c: The byte to fill the area with
+ * @n: The size of the area.
+ *
+ * returns a pointer to @s
+ */
+void *memset(void *s, int c, size_t n)
+{
+        char *xs;
+
+        if (c == 0)
+                return __builtin_memset(s, 0, n);
+
+        xs = (char *) s;
+        if (n > 0)
+                do {
+                        *xs++ = c;
+                } while (--n > 0);
+        return s;
+}
+EXPORT_SYMBOL(memset);
diff --git a/arch/s390/lib/uaccess.h b/arch/s390/lib/uaccess.h
index 315dbe09983..1d2536cb630 100644
--- a/arch/s390/lib/uaccess.h
+++ b/arch/s390/lib/uaccess.h
@@ -1,4 +1,6 @@
 /*
+ *  arch/s390/uaccess.h
+ *
  *    Copyright IBM Corp. 2007
  *
  */
diff --git a/arch/s390/lib/uaccess_mvcos.c b/arch/s390/lib/uaccess_mvcos.c
index 2443ae476e3..60455f104ea 100644
--- a/arch/s390/lib/uaccess_mvcos.c
+++ b/arch/s390/lib/uaccess_mvcos.c
@@ -1,7 +1,9 @@
 /*
+ *  arch/s390/lib/uaccess_mvcos.c
+ *
  *  Optimized user space space access functions based on mvcos.
  *
- *    Copyright IBM Corp. 2006
+ *    Copyright (C) IBM Corp. 2006
  *    Author(s): Martin Schwidefsky (schwidefsky@de.ibm.com),
  *               Gerald Schaefer (gerald.schaefer@de.ibm.com)
  */
@@ -12,7 +14,7 @@
 #include <asm/futex.h>
 #include "uaccess.h"
 
-#ifndef CONFIG_64BIT
+#ifndef __s390x__
 #define AHI     "ahi"
 #define ALR     "alr"
 #define CLR     "clr"
diff --git a/arch/s390/lib/uaccess_pt.c b/arch/s390/lib/uaccess_pt.c
index 9017a63dda3..74833831417 100644
--- a/arch/s390/lib/uaccess_pt.c
+++ b/arch/s390/lib/uaccess_pt.c
@@ -1,83 +1,72 @@
 /*
+ *  arch/s390/lib/uaccess_pt.c
+ *
  *  User access functions based on page table walks for enhanced
  *  system layout without hardware support.
  *
- *    Copyright IBM Corp. 2006, 2012
+ *    Copyright IBM Corp. 2006
  *    Author(s): Gerald Schaefer (gerald.schaefer@de.ibm.com)
  */
 
 #include <linux/errno.h>
 #include <linux/hardirq.h>
 #include <linux/mm.h>
-#include <linux/hugetlb.h>
 #include <asm/uaccess.h>
 #include <asm/futex.h>
 #include "uaccess.h"
 
-
-/*
- * Returns kernel address for user virtual address. If the returned address is
- * >= -4095 (IS_ERR_VALUE(x) returns true), a fault has occured and the address
- * contains the (negative) exception code.
- */
-static __always_inline unsigned long follow_table(struct mm_struct *mm,
-                                                  unsigned long addr, int write)
+static inline pte_t *follow_table(struct mm_struct *mm, unsigned long addr)
 {
         pgd_t *pgd;
         pud_t *pud;
         pmd_t *pmd;
-        pte_t *ptep;
 
         pgd = pgd_offset(mm, addr);
         if (pgd_none(*pgd) || unlikely(pgd_bad(*pgd)))
-                return -0x3aUL;
+                return (pte_t *) 0x3a;
 
         pud = pud_offset(pgd, addr);
         if (pud_none(*pud) || unlikely(pud_bad(*pud)))
-                return -0x3bUL;
+                return (pte_t *) 0x3b;
 
         pmd = pmd_offset(pud, addr);
-        if (pmd_none(*pmd))
-                return -0x10UL;
-        if (pmd_large(*pmd)) {
-                if (write && (pmd_val(*pmd) & _SEGMENT_ENTRY_RO))
-                        return -0x04UL;
-                return (pmd_val(*pmd) & HPAGE_MASK) + (addr & ~HPAGE_MASK);
-        }
-        if (unlikely(pmd_bad(*pmd)))
-                return -0x10UL;
+        if (pmd_none(*pmd) || unlikely(pmd_bad(*pmd)))
+                return (pte_t *) 0x10;
 
-        ptep = pte_offset_map(pmd, addr);
-        if (!pte_present(*ptep))
-                return -0x11UL;
-        if (write && !pte_write(*ptep))
-                return -0x04UL;
-
-        return (pte_val(*ptep) & PAGE_MASK) + (addr & ~PAGE_MASK);
+        return pte_offset_map(pmd, addr);
 }
 
 static __always_inline size_t __user_copy_pt(unsigned long uaddr, void *kptr,
                                              size_t n, int write_user)
 {
         struct mm_struct *mm = current->mm;
-        unsigned long offset, done, size, kaddr;
+        unsigned long offset, pfn, done, size;
+        pte_t *pte;
         void *from, *to;
 
         done = 0;
 retry:
         spin_lock(&mm->page_table_lock);
         do {
-                kaddr = follow_table(mm, uaddr, write_user);
-                if (IS_ERR_VALUE(kaddr))
+                pte = follow_table(mm, uaddr);
+                if ((unsigned long) pte < 0x1000)
+                        goto fault;
+                if (!pte_present(*pte)) {
+                        pte = (pte_t *) 0x11;
                         goto fault;
+                } else if (write_user && !pte_write(*pte)) {
+                        pte = (pte_t *) 0x04;
+                        goto fault;
+                }
 
-                offset = uaddr & ~PAGE_MASK;
+                pfn = pte_pfn(*pte);
+                offset = uaddr & (PAGE_SIZE - 1);
                 size = min(n - done, PAGE_SIZE - offset);
                 if (write_user) {
-                        to = (void *) kaddr;
+                        to = (void *)((pfn << PAGE_SHIFT) + offset);
                         from = kptr + done;
                 } else {
-                        from = (void *) kaddr;
+                        from = (void *)((pfn << PAGE_SHIFT) + offset);
                         to = kptr + done;
                 }
                 memcpy(to, from, size);
@@ -88,7 +77,7 @@ retry:
         return n - done;
 fault:
         spin_unlock(&mm->page_table_lock);
-        if (__handle_fault(uaddr, -kaddr, write_user))
+        if (__handle_fault(uaddr, (unsigned long) pte, write_user))
                 return n - done;
         goto retry;
 }
@@ -97,22 +86,27 @@ fault:
  * Do DAT for user address by page table walk, return kernel address.
  * This function needs to be called with current->mm->page_table_lock held.
  */
-static __always_inline unsigned long __dat_user_addr(unsigned long uaddr,
-                                                     int write)
+static __always_inline unsigned long __dat_user_addr(unsigned long uaddr)
 {
         struct mm_struct *mm = current->mm;
-        unsigned long kaddr;
+        unsigned long pfn;
+        pte_t *pte;
         int rc;
 
 retry:
-        kaddr = follow_table(mm, uaddr, write);
-        if (IS_ERR_VALUE(kaddr))
+        pte = follow_table(mm, uaddr);
+        if ((unsigned long) pte < 0x1000)
                 goto fault;
+        if (!pte_present(*pte)) {
+                pte = (pte_t *) 0x11;
+                goto fault;
+        }
 
-        return kaddr;
+        pfn = pte_pfn(*pte);
+        return (pfn << PAGE_SHIFT) + (uaddr & (PAGE_SIZE - 1));
 fault:
         spin_unlock(&mm->page_table_lock);
-        rc = __handle_fault(uaddr, -kaddr, write);
+        rc = __handle_fault(uaddr, (unsigned long) pte, 0);
         spin_lock(&mm->page_table_lock);
         if (!rc)
                 goto retry;
@@ -167,9 +161,11 @@ static size_t clear_user_pt(size_t n, void __user *to)
 
 static size_t strnlen_user_pt(size_t count, const char __user *src)
 {
+        char *addr;
         unsigned long uaddr = (unsigned long) src;
         struct mm_struct *mm = current->mm;
-        unsigned long offset, done, len, kaddr;
+        unsigned long offset, pfn, done, len;
+        pte_t *pte;
         size_t len_str;
 
         if (segment_eq(get_fs(), KERNEL_DS))
@@ -178,13 +174,19 @@ static size_t strnlen_user_pt(size_t count, const char __user *src)
 retry:
         spin_lock(&mm->page_table_lock);
         do {
-                kaddr = follow_table(mm, uaddr, 0);
-                if (IS_ERR_VALUE(kaddr))
+                pte = follow_table(mm, uaddr);
+                if ((unsigned long) pte < 0x1000)
+                        goto fault;
+                if (!pte_present(*pte)) {
+                        pte = (pte_t *) 0x11;
                         goto fault;
+                }
 
-                offset = uaddr & ~PAGE_MASK;
+                pfn = pte_pfn(*pte);
+                offset = uaddr & (PAGE_SIZE-1);
+                addr = (char *)(pfn << PAGE_SHIFT) + offset;
                 len = min(count - done, PAGE_SIZE - offset);
-                len_str = strnlen((char *) kaddr, len);
+                len_str = strnlen(addr, len);
                 done += len_str;
                 uaddr += len_str;
         } while ((len_str == len) && (done < count));
@@ -192,7 +194,7 @@ retry:
         return done + 1;
 fault:
         spin_unlock(&mm->page_table_lock);
-        if (__handle_fault(uaddr, -kaddr, 0))
+        if (__handle_fault(uaddr, (unsigned long) pte, 0))
                 return 0;
         goto retry;
 }
@@ -225,10 +227,11 @@ static size_t copy_in_user_pt(size_t n, void __user *to,
                               const void __user *from)
 {
         struct mm_struct *mm = current->mm;
-        unsigned long offset_max, uaddr, done, size, error_code;
+        unsigned long offset_from, offset_to, offset_max, pfn_from, pfn_to,
+                      uaddr, done, size, error_code;
         unsigned long uaddr_from = (unsigned long) from;
         unsigned long uaddr_to = (unsigned long) to;
-        unsigned long kaddr_to, kaddr_from;
+        pte_t *pte_from, *pte_to;
         int write_user;
 
         if (segment_eq(get_fs(), KERNEL_DS)) {
@@ -241,23 +244,38 @@ retry:
         do {
                 write_user = 0;
                 uaddr = uaddr_from;
-                kaddr_from = follow_table(mm, uaddr_from, 0);
-                error_code = kaddr_from;
-                if (IS_ERR_VALUE(error_code))
+                pte_from = follow_table(mm, uaddr_from);
+                error_code = (unsigned long) pte_from;
+                if (error_code < 0x1000)
+                        goto fault;
+                if (!pte_present(*pte_from)) {
+                        error_code = 0x11;
                         goto fault;
+                }
 
                 write_user = 1;
                 uaddr = uaddr_to;
-                kaddr_to = follow_table(mm, uaddr_to, 1);
-                error_code = (unsigned long) kaddr_to;
-                if (IS_ERR_VALUE(error_code))
+                pte_to = follow_table(mm, uaddr_to);
+                error_code = (unsigned long) pte_to;
+                if (error_code < 0x1000)
+                        goto fault;
+                if (!pte_present(*pte_to)) {
+                        error_code = 0x11;
                         goto fault;
+                } else if (!pte_write(*pte_to)) {
+                        error_code = 0x04;
+                        goto fault;
+                }
 
-                offset_max = max(uaddr_from & ~PAGE_MASK,
-                                 uaddr_to & ~PAGE_MASK);
+                pfn_from = pte_pfn(*pte_from);
+                pfn_to = pte_pfn(*pte_to);
+                offset_from = uaddr_from & (PAGE_SIZE-1);
+                offset_to = uaddr_from & (PAGE_SIZE-1);
+                offset_max = max(offset_from, offset_to);
                 size = min(n - done, PAGE_SIZE - offset_max);
 
-                memcpy((void *) kaddr_to, (void *) kaddr_from, size);
+                memcpy((void *)(pfn_to << PAGE_SHIFT) + offset_to,
+                       (void *)(pfn_from << PAGE_SHIFT) + offset_from, size);
                 done += size;
                 uaddr_from += size;
                 uaddr_to += size;
@@ -266,7 +284,7 @@ retry:
         return n - done;
 fault:
         spin_unlock(&mm->page_table_lock);
-        if (__handle_fault(uaddr, -error_code, write_user))
+        if (__handle_fault(uaddr, error_code, write_user))
                 return n - done;
         goto retry;
 }
@@ -324,8 +342,7 @@ int futex_atomic_op_pt(int op, u32 __user *uaddr, int oparg, int *old)
         if (segment_eq(get_fs(), KERNEL_DS))
                 return __futex_atomic_op_pt(op, uaddr, oparg, old);
         spin_lock(&current->mm->page_table_lock);
-        uaddr = (u32 __force __user *)
-                __dat_user_addr((__force unsigned long) uaddr, 1);
+        uaddr = (int __user *) __dat_user_addr((unsigned long) uaddr);
         if (!uaddr) {
                 spin_unlock(&current->mm->page_table_lock);
                 return -EFAULT;
@@ -361,8 +378,7 @@ int futex_atomic_cmpxchg_pt(u32 *uval, u32 __user *uaddr,
         if (segment_eq(get_fs(), KERNEL_DS))
                 return __futex_atomic_cmpxchg_pt(uval, uaddr, oldval, newval);
         spin_lock(&current->mm->page_table_lock);
-        uaddr = (u32 __force __user *)
-                __dat_user_addr((__force unsigned long) uaddr, 1);
+        uaddr = (int __user *) __dat_user_addr((unsigned long) uaddr);
         if (!uaddr) {
                 spin_unlock(&current->mm->page_table_lock);
                 return -EFAULT;
diff --git a/arch/s390/lib/uaccess_std.c b/arch/s390/lib/uaccess_std.c
index 6fbd0633827..bb1a7eed42c 100644
--- a/arch/s390/lib/uaccess_std.c
+++ b/arch/s390/lib/uaccess_std.c
@@ -1,8 +1,10 @@
 /*
+ *  arch/s390/lib/uaccess_std.c
+ *
  *  Standard user space access functions based on mvcp/mvcs and doing
  *  interesting things in the secondary space mode.
  *
- *    Copyright IBM Corp. 2006
+ *    Copyright (C) IBM Corp. 2006
  *    Author(s): Martin Schwidefsky (schwidefsky@de.ibm.com),
  *               Gerald Schaefer (gerald.schaefer@de.ibm.com)
  */
@@ -13,7 +15,7 @@
 #include <asm/futex.h>
 #include "uaccess.h"
 
-#ifndef CONFIG_64BIT
+#ifndef __s390x__
 #define AHI     "ahi"
 #define ALR     "alr"
 #define CLR     "clr"