From: Mark Brown <broonie@linaro.org>
Date: Wed, 21 May 2014 23:11:30 +0000 (+0100)
Subject: Merge remote-tracking branch 'lsk/v3.10/topic/arm64-perf' into linux-linaro-lsk
X-Git-Tag: firefly_0821_release~3680^2~122^2~4
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=fbd2e1536621360dada43a0e2af8f99b1e4c22ec;p=firefly-linux-kernel-4.4.55.git

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

Conflicts:
	arch/arm64/kernel/Makefile
---

fbd2e1536621360dada43a0e2af8f99b1e4c22ec
diff --cc arch/arm64/Kconfig
index eac27c22b874,a11651758cc4..82c0fa378253
--- a/arch/arm64/Kconfig
+++ b/arch/arm64/Kconfig
@@@ -37,8 -25,9 +37,10 @@@ config ARM6
  	select HAVE_GENERIC_HARDIRQS
  	select HAVE_HW_BREAKPOINT if PERF_EVENTS
  	select HAVE_MEMBLOCK
 +	select HAVE_PATA_PLATFORM
  	select HAVE_PERF_EVENTS
+ 	select HAVE_PERF_REGS
+ 	select HAVE_PERF_USER_STACK_DUMP
  	select IRQ_DOMAIN
  	select MODULES_USE_ELF_RELA
  	select NO_BOOTMEM
diff --cc arch/arm64/kernel/Makefile
index 1a708c2e3bb0,db74e559d2ee..990d3541de94
--- a/arch/arm64/kernel/Makefile
+++ b/arch/arm64/kernel/Makefile
@@@ -14,15 -14,11 +14,16 @@@ arm64-obj-y		:= cputable.o debug-monito
  arm64-obj-$(CONFIG_COMPAT)		+= sys32.o kuser32.o signal32.o 	\
  					   sys_compat.o
  arm64-obj-$(CONFIG_MODULES)		+= arm64ksyms.o module.o
 -arm64-obj-$(CONFIG_SMP)			+= smp.o smp_spin_table.o smp_psci.o
 +arm64-obj-$(CONFIG_SMP)			+= smp.o smp_spin_table.o
 +arm64-obj-$(CONFIG_SMP)			+= topology.o
+ arm64-obj-$(CONFIG_PERF_EVENTS)		+= perf_regs.o
  arm64-obj-$(CONFIG_HW_PERF_EVENTS)	+= perf_event.o
- arm64-obj-$(CONFIG_HAVE_HW_BREAKPOINT)+= hw_breakpoint.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)