From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751259AbbKNJcw (ORCPT ); Sat, 14 Nov 2015 04:32:52 -0500 Received: from mail-pa0-f52.google.com ([209.85.220.52]:33286 "EHLO mail-pa0-f52.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751100AbbKNJct (ORCPT ); Sat, 14 Nov 2015 04:32:49 -0500 From: Namhyung Kim To: Steven Rostedt Cc: x86@kernel.org, Thomas Gleixner , Ingo Molnar , "H. Peter Anvin" , LKML Subject: [PATCH] ftrace/x86: Fix missing ops arg on static function tracing Date: Sat, 14 Nov 2015 18:32:28 +0900 Message-Id: <1447493548-31978-1-git-send-email-namhyung@kernel.org> X-Mailer: git-send-email 2.6.2 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The commit f1ab00af816e ("ftrace/x86: Get rid of ftrace_caller_setup") moved code that loads ftrace_ops into 3rd parameter but it missed to do for static tracing. Signed-off-by: Namhyung Kim --- arch/x86/kernel/mcount_64.S | 3 +++ 1 file changed, 3 insertions(+) diff --git a/arch/x86/kernel/mcount_64.S b/arch/x86/kernel/mcount_64.S index 94ea120fa21f..6c1ccf9e5427 100644 --- a/arch/x86/kernel/mcount_64.S +++ b/arch/x86/kernel/mcount_64.S @@ -278,6 +278,9 @@ trace: /* save_mcount_regs fills in first two parameters */ save_mcount_regs + /* Load the ftrace_ops into the 3rd parameter */ + movq function_trace_op(%rip), %rdx + call *ftrace_trace_function restore_mcount_regs -- 2.6.2