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

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

diff --cc arch/arm64/Kconfig
index 62a2b7243b794b6dfa4359264eb8bb99f9b009fa,20f25572218e9bfe6fc0e7552609166cdd270f21..d5b813ed86a12cb489a258505315ef1e0ff335af
--- 1/arch/arm64/Kconfig
--- 2/arch/arm64/Kconfig
+++ b/arch/arm64/Kconfig
@@@ -17,10 -14,9 +17,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_KGDB
        select HAVE_ARCH_TRACEHOOK
        select HAVE_DEBUG_BUGVERBOSE
        select HAVE_DEBUG_KMEMLEAK

diff --cc arch/arm64/kernel/Makefile
Simple merge

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