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

Conflicts:
	arch/arm64/Kconfig
	arch/arm64/include/asm/debug-monitors.h
	arch/arm64/kernel/Makefile
	arch/arm64/kernel/debug-monitors.c

diff --cc arch/arm64/Kconfig
index 05c86d8dfb572c953a9a24307cee2228a401fb7f,20f25572218e9bfe6fc0e7552609166cdd270f21..a07c0a407258d723ea22fad8ec9c2c1a0b1c4764
--- 1/arch/arm64/Kconfig
--- 2/arch/arm64/Kconfig
+++ b/arch/arm64/Kconfig
@@@ -20,11 -14,9 +20,12 @@@ 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_KGDB
        select HAVE_ARCH_TRACEHOOK
        select HAVE_DEBUG_BUGVERBOSE
        select HAVE_DEBUG_KMEMLEAK

diff --cc arch/arm64/include/asm/ptrace.h
Simple merge

diff --cc arch/arm64/kernel/Makefile
index 274d287fce644315b09a16ca089f48591bcd27af,69613bbe434531492e0e48db28a17c7f27a748db..1a708c2e3bb0f4ed394e13578acd059fa37d3bab
--- 1/arch/arm64/kernel/Makefile
--- 2/arch/arm64/kernel/Makefile
+++ b/arch/arm64/kernel/Makefile
@@@ -19,9 -18,7 +19,10 @@@ 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
+ arm64-obj-$(CONFIG_KGDB)              += kgdb.o
  
  obj-y                                 += $(arm64-obj-y) vdso/
  obj-m                                 += $(arm64-obj-m)

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