mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Jiri Slaby <jslaby@suse.cz>
To: mingo@redhat.com
Cc: linux-arch@vger.kernel.org, linux-kernel@vger.kernel.org,
	Jiri Slaby <jslaby@suse.cz>, Thomas Gleixner <tglx@linutronix.de>,
	"H. Peter Anvin" <hpa@zytor.com>,
	x86@kernel.org
Subject: [PATCH v5 20/27] x86: ftrace, mark function_hook as function
Date: Thu, 30 Nov 2017 15:46:46 +0100	[thread overview]
Message-ID: <20171130144653.23688-21-jslaby@suse.cz> (raw)
In-Reply-To: <20171130144653.23688-1-jslaby@suse.cz>

Relabel function_hook to be marked really as a function. It is called
from C and has the same expectations towards the stack etc.

Signed-off-by: Jiri Slaby <jslaby@suse.cz>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: "H. Peter Anvin" <hpa@zytor.com>
Cc: x86@kernel.org
---
 arch/x86/kernel/ftrace_32.S | 4 ++--
 arch/x86/kernel/ftrace_64.S | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/arch/x86/kernel/ftrace_32.S b/arch/x86/kernel/ftrace_32.S
index 8ec623798970..b9253728defd 100644
--- a/arch/x86/kernel/ftrace_32.S
+++ b/arch/x86/kernel/ftrace_32.S
@@ -30,9 +30,9 @@ EXPORT_SYMBOL(mcount)
 # define MCOUNT_FRAME			0	/* using frame = false */
 #endif
 
-ENTRY(function_hook)
+SYM_FUNC_START(function_hook)
 	ret
-END(function_hook)
+SYM_FUNC_END(function_hook)
 
 ENTRY(ftrace_caller)
 
diff --git a/arch/x86/kernel/ftrace_64.S b/arch/x86/kernel/ftrace_64.S
index e9af91bcfc05..085c74a4f98b 100644
--- a/arch/x86/kernel/ftrace_64.S
+++ b/arch/x86/kernel/ftrace_64.S
@@ -146,9 +146,9 @@ EXPORT_SYMBOL(mcount)
 
 #ifdef CONFIG_DYNAMIC_FTRACE
 
-ENTRY(function_hook)
+SYM_FUNC_START(function_hook)
 	retq
-END(function_hook)
+SYM_FUNC_END(function_hook)
 
 ENTRY(ftrace_caller)
 	/* save_mcount_regs fills in first two parameters */
-- 
2.15.0

  parent reply	other threads:[~2017-11-30 14:48 UTC|newest]

Thread overview: 28+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-11-30 14:46 [PATCH v5 00/27] New macros for assembler symbols Jiri Slaby
2017-11-30 14:46 ` [PATCH v5 01/27] linkage: new " Jiri Slaby
2017-11-30 14:46 ` [PATCH v5 02/27] x86: assembly, use SYM_DATA for data Jiri Slaby
2017-11-30 14:46 ` [PATCH v5 03/27] x86: assembly, annotate relocate_kernel Jiri Slaby
2017-11-30 14:46 ` [PATCH v5 04/27] x86: entry, annotate THUNKs Jiri Slaby
2017-11-30 14:46 ` [PATCH v5 05/27] x86: assembly, annotate local pseudo-functions Jiri Slaby
2017-11-30 14:46 ` [PATCH v5 06/27] x86: crypto, annotate local functions Jiri Slaby
2017-11-30 14:46 ` [PATCH v5 07/27] x86: boot, " Jiri Slaby
2017-11-30 14:46 ` [PATCH v5 08/27] x86: assembly, annotate aliases Jiri Slaby
2017-11-30 14:46 ` [PATCH v5 09/27] x86: entry, annotate interrupt symbols properly Jiri Slaby
2017-11-30 14:46 ` [PATCH v5 10/27] x86: head, annotate data appropriatelly Jiri Slaby
2017-11-30 14:46 ` [PATCH v5 11/27] x86: boot, " Jiri Slaby
2017-11-30 14:46 ` [PATCH v5 12/27] x86: um, " Jiri Slaby
2017-11-30 14:46 ` [PATCH v5 13/27] x86: xen-pvh, " Jiri Slaby
2017-11-30 14:46 ` [PATCH v5 14/27] x86: purgatory, start using annotations Jiri Slaby
2017-11-30 14:46 ` [PATCH v5 15/27] x86: assembly, do not annotate functions by GLOBAL Jiri Slaby
2017-11-30 14:46 ` [PATCH v5 16/27] x86: assembly, use SYM_CODE_INNER_LABEL instead of GLOBAL Jiri Slaby
2017-11-30 14:46 ` [PATCH v5 17/27] x86: realmode, use SYM_DATA_* " Jiri Slaby
2017-11-30 14:46 ` [PATCH v5 18/27] x86: assembly, remove GLOBAL macro Jiri Slaby
2017-11-30 14:46 ` [PATCH v5 19/27] x86: assembly, make some functions local Jiri Slaby
2017-11-30 14:46 ` Jiri Slaby [this message]
2017-11-30 14:46 ` [PATCH v5 21/27] x86_64: assembly, add ENDs to some functions and relabel with SYM_CODE_* Jiri Slaby
2017-11-30 14:46 ` [PATCH v5 22/27] x86_64: assembly, change all ENTRY+END to SYM_CODE_* Jiri Slaby
2017-11-30 14:46 ` [PATCH v5 23/27] x86_64: assembly, change all ENTRY+ENDPROC to SYM_FUNC_* Jiri Slaby
2017-11-30 14:46 ` [PATCH v5 24/27] x86_32: assembly, add ENDs to some functions and relabel with SYM_CODE_* Jiri Slaby
2017-11-30 14:46 ` [PATCH v5 25/27] x86_32: assembly, change all ENTRY+END to SYM_CODE_* Jiri Slaby
2017-11-30 14:46 ` [PATCH v5 26/27] x86_32: assembly, change all ENTRY+ENDPROC to SYM_FUNC_* Jiri Slaby
2017-11-30 14:46 ` [PATCH v5 27/27] x86: assembly, replace WEAK uses Jiri Slaby

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20171130144653.23688-21-jslaby@suse.cz \
    --to=jslaby@suse.cz \
    --cc=hpa@zytor.com \
    --cc=linux-arch@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=mingo@redhat.com \
    --cc=tglx@linutronix.de \
    --cc=x86@kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®