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

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

diff --cc arch/arm64/Kconfig
index bd3a4e1f4ff682193bb5ef5dddbfe6b637b9b8a3,8a3aa8f7729fa941fb2a316704a01e303ecc26c0..05c86d8dfb572c953a9a24307cee2228a401fb7f
--- 1/arch/arm64/Kconfig
--- 2/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 79008f6315aab06de59ab62f84d12614f3566063,b7db65ea2971e400f123f1f91bf028aa88d41c58..274d287fce644315b09a16ca089f48591bcd27af
--- 1/arch/arm64/kernel/Makefile
--- 2/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)