diff options
| author | Mark Brown <broonie@linaro.org> | 2014-05-30 18:18:44 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2014-05-30 18:18:44 +0100 |
| commit | 25210066633a868e52dc23f680111b23b974eba3 (patch) | |
| tree | c59d6f014dc5ee9315b6a88004c2964f71507d95 /arch/arm64/kernel/stacktrace.c | |
| parent | 94902fbebbf07994103678d5f58fc350a67fc6e9 (diff) | |
| parent | 0cc5286fc3ca12ec0d388e4d8c08a66b40d52233 (diff) | |
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
Diffstat (limited to 'arch/arm64/kernel/stacktrace.c')
| -rw-r--r-- | arch/arm64/kernel/stacktrace.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm64/kernel/stacktrace.c b/arch/arm64/kernel/stacktrace.c index 38f0558f0c0a..55437ba1f5a4 100644 --- a/arch/arm64/kernel/stacktrace.c +++ b/arch/arm64/kernel/stacktrace.c @@ -35,7 +35,7 @@ * ldp x29, x30, [sp] * add sp, sp, #0x10 */ -int unwind_frame(struct stackframe *frame) +int notrace unwind_frame(struct stackframe *frame) { unsigned long high, low; unsigned long fp = frame->fp; |