Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus

* 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus:
  [MIPS] Cobalt: Fix UART I/O type
  [MIPS] Fixup copy_from_user_inatomic
  [MIPS] Fix struct sigcontext for N32 userland
  [MIPS] Make some __setup functions static
  [MIPS] Declare highstart_pfn, highend_pfn only if CONFIG_HIGHMEM=y
  [MIPS] Allow selection of KGDB only on platforms where it's supported.

2 files changed, 65 insertions, 19 deletions

diff --git a/include/asm-mips/sigcontext.h b/include/asm-mips/sigcontext.h
index 3c175a7e4345..972947474eb7 100644
--- a/include/asm-mips/sigcontext.h
+++ b/include/asm-mips/sigcontext.h
@@ -42,6 +42,7 @@ struct sigcontext {
 
 #if _MIPS_SIM == _MIPS_SIM_ABI64 || _MIPS_SIM == _MIPS_SIM_NABI32
 
+#include <linux/posix_types.h>
 /*
  * Keep this struct definition in sync with the sigcontext fragment
  * in arch/mips/tools/offset.c
@@ -53,27 +54,25 @@ struct sigcontext {
  * entries, add sc_dsp and sc_reserved for padding.  No prisoners.
  */
 struct sigcontext {
-        unsigned long   sc_regs[32];
-        unsigned long   sc_fpregs[32];
-        unsigned long   sc_mdhi;
-        unsigned long   sc_hi1;
-        unsigned long   sc_hi2;
-        unsigned long   sc_hi3;
-        unsigned long   sc_mdlo;
-        unsigned long   sc_lo1;
-        unsigned long   sc_lo2;
-        unsigned long   sc_lo3;
-        unsigned long   sc_pc;
-        unsigned int    sc_fpc_csr;
-        unsigned int    sc_used_math;
-        unsigned int    sc_dsp;
-        unsigned int    sc_reserved;
+        __u64   sc_regs[32];
+        __u64   sc_fpregs[32];
+        __u64   sc_mdhi;
+        __u64   sc_hi1;
+        __u64   sc_hi2;
+        __u64   sc_hi3;
+        __u64   sc_mdlo;
+        __u64   sc_lo1;
+        __u64   sc_lo2;
+        __u64   sc_lo3;
+        __u64   sc_pc;
+        __u32   sc_fpc_csr;
+        __u32   sc_used_math;
+        __u32   sc_dsp;
+        __u32   sc_reserved;
 };
 
 #ifdef __KERNEL__
 
-#include <linux/posix_types.h>
-
 struct sigcontext32 {
         __u32           sc_regmask;     /* Unused */
         __u32           sc_status;      /* Unused */
diff --git a/include/asm-mips/uaccess.h b/include/asm-mips/uaccess.h
index 3eff8d8fe28a..c62c20e7b5c6 100644
--- a/include/asm-mips/uaccess.h
+++ b/include/asm-mips/uaccess.h
@@ -435,8 +435,32 @@ extern size_t __copy_user(void *__to, const void *__from, size_t __n);
         __cu_len;                                                       \
 })
 
-#define __copy_to_user_inatomic __copy_to_user
-#define __copy_from_user_inatomic __copy_from_user
+#define __copy_to_user_inatomic(to,from,n)                              \
+({                                                                      \
+        void __user *__cu_to;                                           \
+        const void *__cu_from;                                          \
+        long __cu_len;                                                  \
+                                                                        \
+        __cu_to = (to);                                                 \
+        __cu_from = (from);                                             \
+        __cu_len = (n);                                                 \
+        __cu_len = __invoke_copy_to_user(__cu_to, __cu_from, __cu_len); \
+        __cu_len;                                                       \
+})
+
+#define __copy_from_user_inatomic(to,from,n)                            \
+({                                                                      \
+        void *__cu_to;                                                  \
+        const void __user *__cu_from;                                   \
+        long __cu_len;                                                  \
+                                                                        \
+        __cu_to = (to);                                                 \
+        __cu_from = (from);                                             \
+        __cu_len = (n);                                                 \
+        __cu_len = __invoke_copy_from_user_inatomic(__cu_to, __cu_from, \
+                                                    __cu_len);          \
+        __cu_len;                                                       \
+})
 
 /*
  * copy_to_user: - Copy a block of data into user space.
@@ -490,6 +514,29 @@ extern size_t __copy_user(void *__to, const void *__from, size_t __n);
         __cu_len_r;                                                     \
 })
 
+#define __invoke_copy_from_user_inatomic(to,from,n)                     \
+({                                                                      \
+        register void *__cu_to_r __asm__ ("$4");                        \
+        register const void __user *__cu_from_r __asm__ ("$5");         \
+        register long __cu_len_r __asm__ ("$6");                        \
+                                                                        \
+        __cu_to_r = (to);                                               \
+        __cu_from_r = (from);                                           \
+        __cu_len_r = (n);                                               \
+        __asm__ __volatile__(                                           \
+        ".set\tnoreorder\n\t"                                           \
+        __MODULE_JAL(__copy_user_inatomic)                              \
+        ".set\tnoat\n\t"                                                \
+        __UA_ADDU "\t$1, %1, %2\n\t"                                    \
+        ".set\tat\n\t"                                                  \
+        ".set\treorder"                                                 \
+        : "+r" (__cu_to_r), "+r" (__cu_from_r), "+r" (__cu_len_r)       \
+        :                                                               \
+        : "$8", "$9", "$10", "$11", "$12", "$15", "$24", "$31",         \
+          "memory");                                                    \
+        __cu_len_r;                                                     \
+})
+
 /*
  * __copy_from_user: - Copy a block of data from user space, with less checking.
  * @to:   Destination address, in kernel space.