diff options
| author | Mark Brown <broonie@linaro.org> | 2014-01-27 14:57:42 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2014-01-27 14:57:42 +0000 |
| commit | 0f3550b731084e2790caf1d73bfe0e3a454aafae (patch) | |
| tree | 96e387b7ae0da48c3ac13dd5ce922c983bc5debb /arch/x86/kernel/entry_64.S | |
| parent | b7e46105cae50b29ac0b08e2e3c04b5ca34bc2a5 (diff) | |
| parent | 51ad557e21b8713f3abc286c14bca4ed01b8e56d (diff) | |
Merge branch 'linux-linaro-lsk' into linux-linaro-lsk-androidlsk-android-14.01
Diffstat (limited to 'arch/x86/kernel/entry_64.S')
| -rw-r--r-- | arch/x86/kernel/entry_64.S | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/kernel/entry_64.S b/arch/x86/kernel/entry_64.S index 727208941030..7ac938a4bfab 100644 --- a/arch/x86/kernel/entry_64.S +++ b/arch/x86/kernel/entry_64.S @@ -88,7 +88,7 @@ END(function_hook) MCOUNT_SAVE_FRAME \skip /* Load the ftrace_ops into the 3rd parameter */ - leaq function_trace_op, %rdx + movq function_trace_op(%rip), %rdx /* Load ip into the first parameter */ movq RIP(%rsp), %rdi |