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

Conflicts:
	arch/arm64/Kconfig
	arch/arm64/kernel/Makefile
	arch/arm64/kernel/hw_breakpoint.c
	arch/arm64/kernel/ptrace.c

diff --cc arch/arm64/Kconfig
index c2dccc54f70141175358a8a83d5719de51a53edb,baefba4075f45243bb75bd54b3579f1d19413933..956445f55ead750d19cbb838d3ba67c9ac0410f7
--- 1/arch/arm64/Kconfig
--- 2/arch/arm64/Kconfig
+++ b/arch/arm64/Kconfig
@@@ -27,22 -17,22 +27,28 @@@ config ARM6
        select GENERIC_TIME_VSYSCALL
        select HARDIRQS_SW_RESEND
        select HAVE_ARCH_JUMP_LABEL
 +      select HAVE_ARCH_KGDB
        select HAVE_ARCH_TRACEHOOK
+       select HAVE_C_RECORDMCOUNT
        select HAVE_DEBUG_BUGVERBOSE
        select HAVE_DEBUG_KMEMLEAK
        select HAVE_DMA_API_DEBUG
        select HAVE_DMA_ATTRS
 +      select HAVE_DMA_CONTIGUOUS
+       select HAVE_DYNAMIC_FTRACE
 +      select HAVE_EFFICIENT_UNALIGNED_ACCESS
+       select HAVE_FTRACE_MCOUNT_RECORD
+       select HAVE_FUNCTION_TRACER
+       select HAVE_FUNCTION_GRAPH_TRACER
        select HAVE_GENERIC_DMA_COHERENT
        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 HAVE_SYSCALL_TRACEPOINTS
        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
index c7ba261dd4b37b8b1ecb1a06d5a4fe7b583a3d92,f38a8aa58d4c729f68c7b3437d7310011cfc96f7..a429b5940be2e614a8149fcc7c7acac9d2b4fad0
--- 1/arch/arm64/include/asm/ptrace.h
--- 2/arch/arm64/include/asm/ptrace.h
+++ b/arch/arm64/include/asm/ptrace.h
@@@ -133,8 -131,13 +133,13 @@@ struct pt_regs 
        (!((regs)->pstate & PSR_F_BIT))
  
  #define user_stack_pointer(regs) \
 -      ((regs)->sp)
 +      (!compat_user_mode(regs)) ? ((regs)->sp) : ((regs)->compat_sp)
  
+ static inline unsigned long regs_return_value(struct pt_regs *regs)
+ {
+       return regs->regs[0];
+ }
+ 
  /*
   * Are the current registers suitable for user mode? (used to maintain
   * security in signal handlers)

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

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

diff --cc arch/arm64/kernel/Makefile
index 990d3541de94c8a689c85686687d71886aba35e3,35cd35bb7f5460877010f2a068a92f86699471fb..6a81721f3382d436ee2c904e91e6488aeccbbb38
--- 1/arch/arm64/kernel/Makefile
--- 2/arch/arm64/kernel/Makefile
+++ b/arch/arm64/kernel/Makefile
@@@ -9,21 -13,17 +13,22 @@@ CFLAGS_REMOVE_return_address.o = -p
  arm64-obj-y           := cputable.o debug-monitors.o entry.o irq.o fpsimd.o   \
                           entry-fpsimd.o process.o ptrace.o setup.o signal.o   \
                           sys.o stacktrace.o time.o traps.o io.o vdso.o        \
-                          hyp-stub.o psci.o cpu_ops.o insn.o
 -                         hyp-stub.o psci.o insn.o return_address.o
++                         hyp-stub.o psci.o cpu_ops.o insn.o return_address.o
  
  arm64-obj-$(CONFIG_COMPAT)            += sys32.o kuser32.o signal32.o         \
                                           sys_compat.o
+ arm64-obj-$(CONFIG_FUNCTION_TRACER)   += ftrace.o entry-ftrace.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/arm64ksyms.c
Simple merge

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

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

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

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

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

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