From: Mark Brown <broonie@linaro.org>
Date: Wed, 21 May 2014 17:39:39 +0000 (+0100)
Subject: Merge remote-tracking branch 'lsk/v3.10/topic/arm64-kgdb' into lsk-v3.10-arm64-misc
X-Git-Tag: firefly_0821_release~3680^2~35^2~1^2~46
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=7b1f792f1f89c3dc0f43ab0f9339c01e2d9f5301;p=firefly-linux-kernel-4.4.55.git

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

7b1f792f1f89c3dc0f43ab0f9339c01e2d9f5301
diff --cc arch/arm64/Kconfig
index 62a2b7243b79,20f25572218e..d5b813ed86a1
--- a/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