Merge branch 'fixes' of git://ftp.arm.linux.org.uk/~rmk/linux-arm

Pull ARM fixes from Russell King:
 "A number of fixes for the merge window, fixing a number of cases
  missed when testing the uaccess code, particularly cases which only
  show up with certain compiler versions"

* 'fixes' of git://ftp.arm.linux.org.uk/~rmk/linux-arm:
  ARM: 8431/1: fix alignement of __bug_table section entries
  arm/xen: Enable user access to the kernel before issuing a privcmd call
  ARM: domains: add memory dependencies to get_domain/set_domain
  ARM: domains: thread_info.h no longer needs asm/domains.h
  ARM: uaccess: fix undefined instruction on ARMv7M/noMMU
  ARM: uaccess: remove unneeded uaccess_save_and_disable macro
  ARM: swpan: fix nwfpe for uaccess changes
  ARM: 8429/1: disable GCC SRA optimization

8 files changed, 32 insertions, 9 deletions

diff --git a/arch/arm/Makefile b/arch/arm/Makefile
index 7451b447cc2d..2c2b28ee4811 100644
--- a/arch/arm/Makefile
+++ b/arch/arm/Makefile
@@ -54,6 +54,14 @@ AS		+= -EL
 LD              += -EL
 endif
 
+#
+# The Scalar Replacement of Aggregates (SRA) optimization pass in GCC 4.9 and
+# later may result in code being generated that handles signed short and signed
+# char struct members incorrectly. So disable it.
+# (https://gcc.gnu.org/bugzilla/show_bug.cgi?id=65932)
+#
+KBUILD_CFLAGS   += $(call cc-option,-fno-ipa-sra)
+
 # This selects which instruction set is used.
 # Note that GCC does not numerically define an architecture version
 # macro, but instead defines a whole series of macros which makes
diff --git a/arch/arm/include/asm/assembler.h b/arch/arm/include/asm/assembler.h
index 7bbf325a4f31..b2bc8e11471d 100644
--- a/arch/arm/include/asm/assembler.h
+++ b/arch/arm/include/asm/assembler.h
@@ -491,11 +491,6 @@ THUMB(	orr	\reg , \reg , #PSR_T_BIT	)
 #endif
         .endm
 
-        .macro  uaccess_save_and_disable, tmp
-        uaccess_save \tmp
-        uaccess_disable \tmp
-        .endm
-
         .irp    c,,eq,ne,cs,cc,mi,pl,vs,vc,hi,ls,ge,lt,gt,le,hs,lo
         .macro  ret\c, reg
 #if __LINUX_ARM_ARCH__ < 6
diff --git a/arch/arm/include/asm/bug.h b/arch/arm/include/asm/bug.h
index b274bde24905..e7335a92144e 100644
--- a/arch/arm/include/asm/bug.h
+++ b/arch/arm/include/asm/bug.h
@@ -40,6 +40,7 @@ do {								\
                 "2:\t.asciz " #__file "\n"                      \
                 ".popsection\n"                                 \
                 ".pushsection __bug_table,\"a\"\n"              \
+                ".align 2\n"                                    \
                 "3:\t.word 1b, 2b\n"                            \
                 "\t.hword " #__line ", 0\n"                     \
                 ".popsection");                                 \
diff --git a/arch/arm/include/asm/domain.h b/arch/arm/include/asm/domain.h
index e878129f2fee..fc8ba1663601 100644
--- a/arch/arm/include/asm/domain.h
+++ b/arch/arm/include/asm/domain.h
@@ -12,6 +12,7 @@
 
 #ifndef __ASSEMBLY__
 #include <asm/barrier.h>
+#include <asm/thread_info.h>
 #endif
 
 /*
@@ -89,7 +90,8 @@ static inline unsigned int get_domain(void)
 
         asm(
         "mrc    p15, 0, %0, c3, c0      @ get domain"
-         : "=r" (domain));
+         : "=r" (domain)
+         : "m" (current_thread_info()->cpu_domain));
 
         return domain;
 }
@@ -98,7 +100,7 @@ static inline void set_domain(unsigned val)
 {
         asm volatile(
         "mcr    p15, 0, %0, c3, c0      @ set domain"
-          : : "r" (val));
+          : : "r" (val) : "memory");
         isb();
 }
 
diff --git a/arch/arm/include/asm/thread_info.h b/arch/arm/include/asm/thread_info.h
index d0a1119dcaf3..776757d1604a 100644
--- a/arch/arm/include/asm/thread_info.h
+++ b/arch/arm/include/asm/thread_info.h
@@ -25,7 +25,6 @@
 struct task_struct;
 
 #include <asm/types.h>
-#include <asm/domain.h>
 
 typedef unsigned long mm_segment_t;
 
diff --git a/arch/arm/kernel/process.c b/arch/arm/kernel/process.c
index a3089bacb8d8..7a7c4cea5523 100644
--- a/arch/arm/kernel/process.c
+++ b/arch/arm/kernel/process.c
@@ -226,6 +226,7 @@ copy_thread(unsigned long clone_flags, unsigned long stack_start,
 
         memset(&thread->cpu_context, 0, sizeof(struct cpu_context_save));
 
+#ifdef CONFIG_CPU_USE_DOMAINS
         /*
          * Copy the initial value of the domain access control register
          * from the current thread: thread->addr_limit will have been
@@ -233,6 +234,7 @@ copy_thread(unsigned long clone_flags, unsigned long stack_start,
          * kernel/fork.c
          */
         thread->cpu_domain = get_domain();
+#endif
 
         if (likely(!(p->flags & PF_KTHREAD))) {
                 *childregs = *current_pt_regs();
diff --git a/arch/arm/nwfpe/entry.S b/arch/arm/nwfpe/entry.S
index 71df43547659..39c20afad7ed 100644
--- a/arch/arm/nwfpe/entry.S
+++ b/arch/arm/nwfpe/entry.S
@@ -95,9 +95,10 @@ emulate:
         reteq   r4                      @ no, return failure
 
 next:
+        uaccess_enable r3
 .Lx1:   ldrt    r6, [r5], #4            @ get the next instruction and
                                         @ increment PC
-
+        uaccess_disable r3
         and     r2, r6, #0x0F000000     @ test for FP insns
         teq     r2, #0x0C000000
         teqne   r2, #0x0D000000
diff --git a/arch/arm/xen/hypercall.S b/arch/arm/xen/hypercall.S
index f00e08075938..10fd99c568c6 100644
--- a/arch/arm/xen/hypercall.S
+++ b/arch/arm/xen/hypercall.S
@@ -98,8 +98,23 @@ ENTRY(privcmd_call)
         mov r1, r2
         mov r2, r3
         ldr r3, [sp, #8]
+        /*
+         * Privcmd calls are issued by the userspace. We need to allow the
+         * kernel to access the userspace memory before issuing the hypercall.
+         */
+        uaccess_enable r4
+
+        /* r4 is loaded now as we use it as scratch register before */
         ldr r4, [sp, #4]
         __HVC(XEN_IMM)
+
+        /*
+         * Disable userspace access from kernel. This is fine to do it
+         * unconditionally as no set_fs(KERNEL_DS)/set_fs(get_ds()) is
+         * called before.
+         */
+        uaccess_disable r4
+
         ldm sp!, {r4}
         ret lr
 ENDPROC(privcmd_call);