From: Mark Brown <broonie@linaro.org>
Date: Tue, 20 May 2014 12:03:38 +0000 (+0100)
Subject: Merge remote-tracking branch 'lsk/v3.10/topic/arm64-insn' into linux-linaro-lsk
X-Git-Tag: firefly_0821_release~3680^2~123^2~4
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=0ae60b6553a4933483ac32247bcc0cfb313fd48f;p=firefly-linux-kernel-4.4.55.git

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

Conflicts:
	arch/arm64/kernel/Makefile
	arch/arm64/kernel/module.c
---

0ae60b6553a4933483ac32247bcc0cfb313fd48f
diff --cc arch/arm64/Kconfig
index bd3a4e1f4ff6,8a3aa8f7729f..05c86d8dfb57
--- a/arch/arm64/Kconfig
+++ b/arch/arm64/Kconfig
@@@ -20,10 -14,9 +20,11 @@@ config ARM6
  	select GENERIC_IRQ_PROBE
  	select GENERIC_IRQ_SHOW
  	select GENERIC_SMP_IDLE_THREAD
 +	select GENERIC_STRNCPY_FROM_USER
 +	select GENERIC_STRNLEN_USER
  	select GENERIC_TIME_VSYSCALL
  	select HARDIRQS_SW_RESEND
+ 	select HAVE_ARCH_JUMP_LABEL
  	select HAVE_ARCH_TRACEHOOK
  	select HAVE_DEBUG_BUGVERBOSE
  	select HAVE_DEBUG_KMEMLEAK
diff --cc arch/arm64/kernel/Makefile
index 79008f6315aa,b7db65ea2971..274d287fce64
--- a/arch/arm64/kernel/Makefile
+++ b/arch/arm64/kernel/Makefile
@@@ -9,7 -9,7 +9,7 @@@ AFLAGS_head.o		:= -DTEXT_OFFSET=$(TEXT_
  arm64-obj-y		:= cputable.o debug-monitors.o entry.o irq.o fpsimd.o	\
  			   entry-fpsimd.o process.o ptrace.o setup.o signal.o	\
  			   sys.o stacktrace.o time.o traps.o io.o vdso.o	\
- 			   hyp-stub.o psci.o cpu_ops.o
 -			   hyp-stub.o psci.o insn.o
++			   hyp-stub.o psci.o cpu_ops.o insn.o
  
  arm64-obj-$(CONFIG_COMPAT)		+= sys32.o kuser32.o signal32.o 	\
  					   sys_compat.o
@@@ -19,8 -18,7 +19,9 @@@ arm64-obj-$(CONFIG_SMP)			+= topology.
  arm64-obj-$(CONFIG_HW_PERF_EVENTS)	+= perf_event.o
  arm64-obj-$(CONFIG_HAVE_HW_BREAKPOINT)+= hw_breakpoint.o
  arm64-obj-$(CONFIG_EARLY_PRINTK)	+= early_printk.o
 +arm64-obj-$(CONFIG_ARM_CPU_TOPOLOGY)  += topology.o
 +arm64-obj-$(CONFIG_ARM64_CPU_SUSPEND)	+= sleep.o suspend.o
+ arm64-obj-$(CONFIG_JUMP_LABEL)		+= jump_label.o
  
  obj-y					+= $(arm64-obj-y) vdso/
  obj-m					+= $(arm64-obj-m)