arch/powerpc/Kconfig | 7 +-
arch/powerpc/include/asm/ftrace.h | 62 +++---
arch/powerpc/include/asm/livepatch.h | 12 +-
arch/powerpc/include/asm/thread_info.h | 2 +-
arch/powerpc/kernel/asm-offsets.c | 2 +-
arch/powerpc/kernel/module_32.c | 44 +++--
arch/powerpc/kernel/trace/Makefile | 7 +-
arch/powerpc/kernel/trace/ftrace.c | 32 +--
arch/powerpc/kernel/trace/ftrace_32.S | 187 ------------------
.../trace/{ftrace_64.S => ftrace_low.S} | 14 ++
...ftrace_64_mprofile.S => ftrace_mprofile.S} | 158 +++++++--------
kernel/livepatch/core.c | 4 +-
kernel/trace/trace_selftest.c | 6 +-
13 files changed, 178 insertions(+), 359 deletions(-)
delete mode 100644 arch/powerpc/kernel/trace/ftrace_32.S
rename arch/powerpc/kernel/trace/{ftrace_64.S => ftrace_low.S} (85%)
rename arch/powerpc/kernel/trace/{ftrace_64_mprofile.S => ftrace_mprofile.S} (75%)