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

Conflicts:
	arch/arm64/kernel/Makefile

diff --cc arch/arm64/Kconfig
index eac27c22b87467c2fd10e7f6c6255fcfe6cc3f60,a11651758cc4b8f985508c8f218a2b9de7e74a14..82c0fa378253b7638f2b6dce91609a1cf5eb4556
--- 1/arch/arm64/Kconfig
--- 2/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/include/asm/compat.h
Simple merge

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

diff --cc arch/arm64/kernel/Makefile
index 1a708c2e3bb0f4ed394e13578acd059fa37d3bab,db74e559d2ee5b4c54071fcb255169d8ec7eb455..990d3541de94c8a689c85686687d71886aba35e3
--- 1/arch/arm64/kernel/Makefile
--- 2/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)

diff --cc arch/arm64/kernel/perf_event.c
Simple merge