From: Mark Brown <broonie@linaro.org>
Date: Thu, 19 Jun 2014 12:17:52 +0000 (+0100)
Subject: Merge remote-tracking branch 'lsk/v3.10/topic/arm64-fpsimd' into linux-linaro-lsk
X-Git-Tag: firefly_0821_release~3680^2~36^2~55
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=b621c22123dc6b6facafe115f6364cf80172d551;p=firefly-linux-kernel-4.4.55.git

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
---

b621c22123dc6b6facafe115f6364cf80172d551
diff --cc arch/arm64/Kconfig
index bb6571607c6f,46ba68084359..8b0c1829be89
--- a/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 59f151f8241d,5e95a6ce074a..c09cbf6ce34a
--- a/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 */