8 files changed, 42 insertions, 24 deletions

diff --git a/arch/mips/include/asm/uaccess.h b/arch/mips/include/asm/uaccess.h
index 5305d694ffe5..095ecafe6bd3 100644
--- a/arch/mips/include/asm/uaccess.h
+++ b/arch/mips/include/asm/uaccess.h
@@ -599,7 +599,7 @@ extern void __put_user_unknown(void);
  * On error, the variable @x is set to zero.
  */
 #define __get_user_unaligned(x,ptr) \
-        __get_user__unalignednocheck((x),(ptr),sizeof(*(ptr)))
+        __get_user_unaligned_nocheck((x),(ptr),sizeof(*(ptr)))
 
 /*
  * Yuck.  We need two variants, one for 64bit operation and one
@@ -620,8 +620,8 @@ extern void __get_user_unaligned_unknown(void);
 do {                                                                    \
         switch (size) {                                                 \
         case 1: __get_data_asm(val, "lb", ptr); break;                  \
-        case 2: __get_user_unaligned_asm(val, "ulh", ptr); break;       \
-        case 4: __get_user_unaligned_asm(val, "ulw", ptr); break;       \
+        case 2: __get_data_unaligned_asm(val, "ulh", ptr); break;       \
+        case 4: __get_data_unaligned_asm(val, "ulw", ptr); break;       \
         case 8: __GET_USER_UNALIGNED_DW(val, ptr); break;               \
         default: __get_user_unaligned_unknown(); break;                 \
         }                                                               \
@@ -1122,9 +1122,15 @@ extern size_t __copy_in_user_eva(void *__to, const void *__from, size_t __n);
         __cu_to = (to);                                                 \
         __cu_from = (from);                                             \
         __cu_len = (n);                                                 \
-        might_fault();                                                  \
-        __cu_len = __invoke_copy_from_user(__cu_to, __cu_from,          \
-                                           __cu_len);                   \
+        if (eva_kernel_access()) {                                      \
+                __cu_len = __invoke_copy_from_kernel(__cu_to,           \
+                                                     __cu_from,         \
+                                                     __cu_len);         \
+        } else {                                                        \
+                might_fault();                                          \
+                __cu_len = __invoke_copy_from_user(__cu_to, __cu_from,  \
+                                                   __cu_len);           \
+        }                                                               \
         __cu_len;                                                       \
 })
 
@@ -1229,16 +1235,28 @@ __clear_user(void __user *addr, __kernel_size_t size)
 {
         __kernel_size_t res;
 
-        might_fault();
-        __asm__ __volatile__(
-                "move\t$4, %1\n\t"
-                "move\t$5, $0\n\t"
-                "move\t$6, %2\n\t"
-                __MODULE_JAL(__bzero)
-                "move\t%0, $6"
-                : "=r" (res)
-                : "r" (addr), "r" (size)
-                : "$4", "$5", "$6", __UA_t0, __UA_t1, "$31");
+        if (eva_kernel_access()) {
+                __asm__ __volatile__(
+                        "move\t$4, %1\n\t"
+                        "move\t$5, $0\n\t"
+                        "move\t$6, %2\n\t"
+                        __MODULE_JAL(__bzero_kernel)
+                        "move\t%0, $6"
+                        : "=r" (res)
+                        : "r" (addr), "r" (size)
+                        : "$4", "$5", "$6", __UA_t0, __UA_t1, "$31");
+        } else {
+                might_fault();
+                __asm__ __volatile__(
+                        "move\t$4, %1\n\t"
+                        "move\t$5, $0\n\t"
+                        "move\t$6, %2\n\t"
+                        __MODULE_JAL(__bzero)
+                        "move\t%0, $6"
+                        : "=r" (res)
+                        : "r" (addr), "r" (size)
+                        : "$4", "$5", "$6", __UA_t0, __UA_t1, "$31");
+        }
 
         return res;
 }
@@ -1384,7 +1402,7 @@ static inline long strlen_user(const char __user *s)
                 might_fault();
                 __asm__ __volatile__(
                         "move\t$4, %1\n\t"
-                        __MODULE_JAL(__strlen_kernel_asm)
+                        __MODULE_JAL(__strlen_user_asm)
                         "move\t%0, $2"
                         : "=r" (res)
                         : "r" (s)
diff --git a/arch/mips/kernel/cps-vec.S b/arch/mips/kernel/cps-vec.S
index 8fd5a276cad2..ac81edd44563 100644
--- a/arch/mips/kernel/cps-vec.S
+++ b/arch/mips/kernel/cps-vec.S
@@ -257,7 +257,6 @@ LEAF(mips_cps_core_init)
         has_mt  t0, 3f
 
         .set    push
-        .set    mips64r2
         .set    mt
 
         /* Only allow 1 TC per VPE to execute... */
@@ -376,7 +375,6 @@ LEAF(mips_cps_boot_vpes)
          nop
 
         .set    push
-        .set    mips64r2
         .set    mt
 
 1:      /* Enter VPE configuration state */
diff --git a/arch/mips/kernel/mips_ksyms.c b/arch/mips/kernel/mips_ksyms.c
index 291af0b5c482..e2b6ab74643d 100644
--- a/arch/mips/kernel/mips_ksyms.c
+++ b/arch/mips/kernel/mips_ksyms.c
@@ -17,6 +17,7 @@
 #include <asm/fpu.h>
 #include <asm/msa.h>
 
+extern void *__bzero_kernel(void *__s, size_t __count);
 extern void *__bzero(void *__s, size_t __count);
 extern long __strncpy_from_kernel_nocheck_asm(char *__to,
                                               const char *__from, long __len);
@@ -64,6 +65,7 @@ EXPORT_SYMBOL(__copy_from_user_eva);
 EXPORT_SYMBOL(__copy_in_user_eva);
 EXPORT_SYMBOL(__copy_to_user_eva);
 EXPORT_SYMBOL(__copy_user_inatomic_eva);
+EXPORT_SYMBOL(__bzero_kernel);
 #endif
 EXPORT_SYMBOL(__bzero);
 EXPORT_SYMBOL(__strncpy_from_kernel_nocheck_asm);
diff --git a/arch/mips/lib/memset.S b/arch/mips/lib/memset.S
index b8e63fd00375..8f0019a2e5c8 100644
--- a/arch/mips/lib/memset.S
+++ b/arch/mips/lib/memset.S
@@ -283,6 +283,8 @@ LEAF(memset)
 1:
 #ifndef CONFIG_EVA
 FEXPORT(__bzero)
+#else
+FEXPORT(__bzero_kernel)
 #endif
         __BUILD_BZERO LEGACY_MODE
 
diff --git a/arch/mips/pci/pci-rt2880.c b/arch/mips/pci/pci-rt2880.c
index dbbeccc3d714..a245cad4372a 100644
--- a/arch/mips/pci/pci-rt2880.c
+++ b/arch/mips/pci/pci-rt2880.c
@@ -221,7 +221,6 @@ int __init pcibios_map_irq(const struct pci_dev *dev, u8 slot, u8 pin)
 static int rt288x_pci_probe(struct platform_device *pdev)
 {
         void __iomem *io_map_base;
-        int i;
 
         rt2880_pci_base = ioremap_nocache(RT2880_PCI_BASE, PAGE_SIZE);
 
diff --git a/arch/mips/pmcs-msp71xx/msp_setup.c b/arch/mips/pmcs-msp71xx/msp_setup.c
index 78b2ef49dbc7..9d293b3e9130 100644
--- a/arch/mips/pmcs-msp71xx/msp_setup.c
+++ b/arch/mips/pmcs-msp71xx/msp_setup.c
@@ -39,7 +39,6 @@ extern void msp_serial_setup(void);
 void msp7120_reset(void)
 {
         void *start, *end, *iptr;
-        register int i;
 
         /* Diasble all interrupts */
         local_irq_disable();
diff --git a/arch/mips/sni/reset.c b/arch/mips/sni/reset.c
index db8f88b6a3af..6afa34346b81 100644
--- a/arch/mips/sni/reset.c
+++ b/arch/mips/sni/reset.c
@@ -26,7 +26,7 @@ static inline void kb_wait(void)
 /* XXX This ends up at the ARC firmware prompt ...  */
 void sni_machine_restart(char *command)
 {
-        int i, j;
+        int i;
 
         /* This does a normal via the keyboard controller like a PC.
            We can do that easier ...  */
diff --git a/arch/mips/vdso/Makefile b/arch/mips/vdso/Makefile
index ef5f348f386a..018f8c7b94f2 100644
--- a/arch/mips/vdso/Makefile
+++ b/arch/mips/vdso/Makefile
@@ -26,8 +26,8 @@ aflags-vdso := $(ccflags-vdso) \
 # the comments on that file.
 #
 ifndef CONFIG_CPU_MIPSR6
-  ifeq ($(call ld-ifversion, -gt, 22400000, y),)
-    $(warning MIPS VDSO requires binutils > 2.24)
+  ifeq ($(call ld-ifversion, -lt, 22500000, y),)
+    $(warning MIPS VDSO requires binutils >= 2.25)
     obj-vdso-y := $(filter-out gettimeofday.o, $(obj-vdso-y))
     ccflags-vdso += -DDISABLE_MIPS_VDSO
   endif