Merge remote-tracking branch 'lsk/v3.10/topic/arm64-fpsimd' into linux-linaro-lsk

Conflicts:
	arch/arm64/Kconfig
	arch/arm64/include/asm/thread_info.h
	arch/arm64/kernel/fpsimd.c

diff --cc arch/arm64/Kconfig
index bb6571607c6ff278dce2072d8db720234eec41cf,46ba68084359ff4b3807323f5100c033f3778834..8b0c1829be894eb4c3cd5231c503c2dff0c8d91c
--- 1/arch/arm64/Kconfig
--- 2/arch/arm64/Kconfig
+++ b/arch/arm64/Kconfig
@@@ -115,9 -95,9 +115,12 @@@ config SWIOTL
  config IOMMU_HELPER
        def_bool SWIOTLB
  
 +config FIX_EARLYCON_MEM
 +      def_bool y
 +
+ config KERNEL_MODE_NEON
+       def_bool y
+ 
  source "init/Kconfig"
  
  source "kernel/Kconfig.freezer"

diff --cc arch/arm64/include/asm/thread_info.h
index 59f151f8241d599724d0317dad48fc3437c76080,5e95a6ce074a7968cd76fdc5f8d9a06f1f56fa6c..c09cbf6ce34ac607cbc83994a493dc5f4e084d3f
--- 1/arch/arm64/include/asm/thread_info.h
--- 2/arch/arm64/include/asm/thread_info.h
+++ b/arch/arm64/include/asm/thread_info.h
@@@ -109,10 -106,8 +109,11 @@@ static inline struct thread_info *curre
  #define TIF_SIGPENDING                0
  #define TIF_NEED_RESCHED      1
  #define TIF_NOTIFY_RESUME     2       /* callback before returning to user */
+ #define TIF_FOREIGN_FPSTATE   3       /* CPU's FP state is not current's */
  #define TIF_SYSCALL_TRACE     8
 +#define TIF_SYSCALL_AUDIT     9
 +#define TIF_SYSCALL_TRACEPOINT        10
 +#define TIF_SECCOMP           11
  #define TIF_POLLING_NRFLAG    16
  #define TIF_MEMDIE            18      /* is terminating due to OOM killer */
  #define TIF_FREEZE            19
@@@ -124,17 -119,11 +125,18 @@@
  #define _TIF_SIGPENDING               (1 << TIF_SIGPENDING)
  #define _TIF_NEED_RESCHED     (1 << TIF_NEED_RESCHED)
  #define _TIF_NOTIFY_RESUME    (1 << TIF_NOTIFY_RESUME)
+ #define _TIF_FOREIGN_FPSTATE  (1 << TIF_FOREIGN_FPSTATE)
 +#define _TIF_SYSCALL_TRACE    (1 << TIF_SYSCALL_TRACE)
 +#define _TIF_SYSCALL_AUDIT    (1 << TIF_SYSCALL_AUDIT)
 +#define _TIF_SYSCALL_TRACEPOINT       (1 << TIF_SYSCALL_TRACEPOINT)
 +#define _TIF_SECCOMP          (1 << TIF_SECCOMP)
  #define _TIF_32BIT            (1 << TIF_32BIT)
  
  #define _TIF_WORK_MASK                (_TIF_NEED_RESCHED | _TIF_SIGPENDING | \
-                                _TIF_NOTIFY_RESUME)
+                                _TIF_NOTIFY_RESUME | _TIF_FOREIGN_FPSTATE)
  
 +#define _TIF_SYSCALL_WORK     (_TIF_SYSCALL_TRACE | _TIF_SYSCALL_AUDIT | \
 +                               _TIF_SYSCALL_TRACEPOINT | _TIF_SECCOMP)
 +
  #endif /* __KERNEL__ */
  #endif /* __ASM_THREAD_INFO_H */

diff --cc arch/arm64/kernel/entry.S
Simple merge

diff --cc arch/arm64/kernel/process.c
Simple merge

diff --cc arch/arm64/kernel/ptrace.c
Simple merge

diff --cc arch/arm64/kernel/signal.c
Simple merge

diff --cc arch/arm64/kernel/signal32.c
Simple merge