From: Mark Rutland <mark.rutland@arm.com>
To: linux-arm-kernel@lists.infradead.org, will@kernel.org
Cc: catalin.marinas@arm.com, james.morse@arm.com, joey.gouly@arm.com,
mark.rutland@arm.com, maz@kernel.org
Subject: [PATCH v4 18/20] arm64: entry: make NMI entry/exit functions static
Date: Mon, 7 Jun 2021 10:46:22 +0100 [thread overview]
Message-ID: <20210607094624.34689-19-mark.rutland@arm.com> (raw)
In-Reply-To: <20210607094624.34689-1-mark.rutland@arm.com>
Now that we only call arm64_enter_nmi() and arm64_exit_nmi() from within
entry-common.c, let's make these static to ensure this remains the case.
Signed-off-by: Mark Rutland <mark.rutland@arm.com>
Acked-by: Catalin Marinas <catalin.marinas@arm.com>
Acked-by: Marc Zyngier <maz@kernel.org>
Reviewed-by: Joey Gouly <joey.gouly@arm.com>
Cc: James Morse <james.morse@arm.com>
Cc: Will Deacon <will@kernel.org>
---
arch/arm64/include/asm/exception.h | 2 --
arch/arm64/kernel/entry-common.c | 4 ++--
2 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/arch/arm64/include/asm/exception.h b/arch/arm64/include/asm/exception.h
index 0113b9242b67..4afbc45b8bb0 100644
--- a/arch/arm64/include/asm/exception.h
+++ b/arch/arm64/include/asm/exception.h
@@ -57,8 +57,6 @@ asmlinkage void call_on_irq_stack(struct pt_regs *regs,
void (*func)(struct pt_regs *));
asmlinkage void enter_from_user_mode(void);
asmlinkage void exit_to_user_mode(void);
-void arm64_enter_nmi(struct pt_regs *regs);
-void arm64_exit_nmi(struct pt_regs *regs);
void do_mem_abort(unsigned long far, unsigned int esr, struct pt_regs *regs);
void do_undefinstr(struct pt_regs *regs);
void do_bti(struct pt_regs *regs);
diff --git a/arch/arm64/kernel/entry-common.c b/arch/arm64/kernel/entry-common.c
index 1b32ca3848f5..12ce14a98b7c 100644
--- a/arch/arm64/kernel/entry-common.c
+++ b/arch/arm64/kernel/entry-common.c
@@ -75,7 +75,7 @@ static void noinstr exit_to_kernel_mode(struct pt_regs *regs)
}
}
-void noinstr arm64_enter_nmi(struct pt_regs *regs)
+static void noinstr arm64_enter_nmi(struct pt_regs *regs)
{
regs->lockdep_hardirqs = lockdep_hardirqs_enabled();
@@ -88,7 +88,7 @@ void noinstr arm64_enter_nmi(struct pt_regs *regs)
ftrace_nmi_enter();
}
-void noinstr arm64_exit_nmi(struct pt_regs *regs)
+static void noinstr arm64_exit_nmi(struct pt_regs *regs)
{
bool restore = regs->lockdep_hardirqs;
--
2.11.0
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
next prev parent reply other threads:[~2021-06-07 10:28 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-06-07 9:46 [PATCH v4 00/20] arm64: entry: migrate more code to C Mark Rutland
2021-06-07 9:46 ` [PATCH v4 01/20] arm64: remove redundant local_daif_mask() in bad_mode() Mark Rutland
2021-06-07 9:46 ` [PATCH v4 02/20] arm64: entry: unmask IRQ+FIQ after EL0 handling Mark Rutland
2021-06-07 9:46 ` [PATCH v4 03/20] arm64: entry: convert SError handlers to C Mark Rutland
2021-06-07 9:46 ` [PATCH v4 04/20] arm64: entry: move arm64_preempt_schedule_irq to entry-common.c Mark Rutland
2021-06-07 9:46 ` [PATCH v4 05/20] arm64: entry: move NMI preempt logic to C Mark Rutland
2021-06-07 9:46 ` [PATCH v4 06/20] arm64: entry: add a call_on_irq_stack helper Mark Rutland
2021-06-07 9:46 ` [PATCH v4 07/20] arm64: entry: convert IRQ+FIQ handlers to C Mark Rutland
2021-06-07 9:46 ` [PATCH v4 08/20] arm64: entry: organise entry handlers consistently Mark Rutland
2021-06-07 9:46 ` [PATCH v4 09/20] arm64: entry: organise entry vectors consistently Mark Rutland
2021-06-07 9:46 ` [PATCH v4 10/20] arm64: entry: consolidate EL1 exception returns Mark Rutland
2021-06-07 9:46 ` [PATCH v4 11/20] arm64: entry: move bad_mode() to entry-common.c Mark Rutland
2021-06-07 9:46 ` [PATCH v4 12/20] arm64: entry: improve bad_mode() Mark Rutland
2021-06-07 9:46 ` [PATCH v4 13/20] arm64: entry: template the entry asm functions Mark Rutland
2021-06-07 9:46 ` [PATCH v4 14/20] arm64: entry: handle all vectors with C Mark Rutland
2021-06-07 9:46 ` [PATCH v4 15/20] arm64: entry: fold el1_inv() into el1h_64_sync_handler() Mark Rutland
2021-06-07 9:46 ` [PATCH v4 16/20] arm64: entry: split bad stack entry Mark Rutland
2021-06-07 9:46 ` [PATCH v4 17/20] arm64: entry: split SDEI entry Mark Rutland
2021-06-07 9:46 ` Mark Rutland [this message]
2021-06-07 9:46 ` [PATCH v4 19/20] arm64: entry: don't instrument entry code with KCOV Mark Rutland
2021-06-07 9:46 ` [PATCH v4 20/20] arm64: idle: don't instrument idle " Mark Rutland
2021-06-07 13:35 ` [PATCH v4 00/20] arm64: entry: migrate more code to C Will Deacon
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=20210607094624.34689-19-mark.rutland@arm.com \
--to=mark.rutland@arm.com \
--cc=catalin.marinas@arm.com \
--cc=james.morse@arm.com \
--cc=joey.gouly@arm.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=maz@kernel.org \
--cc=will@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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.