From: Mark Brown Date: Wed, 21 May 2014 16:35:46 +0000 (+0100) Subject: Merge remote-tracking branch 'lsk/v3.10/topic/arm64-kgdb' into linux-linaro-lsk X-Git-Tag: firefly_0821_release~3680^2~123^2~2 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=d8e72f6b168e8f91d2fae7902c7c43eae9c4c880;p=firefly-linux-kernel-4.4.55.git 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 --- d8e72f6b168e8f91d2fae7902c7c43eae9c4c880 diff --cc arch/arm64/Kconfig index 05c86d8dfb57,20f25572218e..a07c0a407258 --- a/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/kernel/Makefile index 274d287fce64,69613bbe4345..1a708c2e3bb0 --- a/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)