From: Arnd Bergmann <arnd@kernel.org>
To: Catalin Marinas <catalin.marinas@arm.com>, Will Deacon <will@kernel.org>
Cc: Arnd Bergmann <arnd@arndb.de>, Ard Biesheuvel <ardb@kernel.org>,
Mark Rutland <mark.rutland@arm.com>,
Marc Zyngier <maz@kernel.org>,
Oliver Upton <oliver.upton@linux.dev>,
James Morse <james.morse@arm.com>,
Suzuki K Poulose <suzuki.poulose@arm.com>,
Zenghui Yu <yuzenghui@huawei.com>,
Anshuman Khandual <anshuman.khandual@arm.com>,
Kees Cook <keescook@chromium.org>,
Suren Baghdasaryan <surenb@google.com>,
linux-arm-kernel@lists.infradead.org,
linux-kernel@vger.kernel.org, linux-efi@vger.kernel.org,
kvmarm@lists.linux.dev
Subject: [PATCH 04/15] arm64: move cpu_suspend_set_dbg_restorer() prototype to header
Date: Tue, 16 May 2023 18:06:31 +0200 [thread overview]
Message-ID: <20230516160642.523862-5-arnd@kernel.org> (raw)
In-Reply-To: <20230516160642.523862-1-arnd@kernel.org>
From: Arnd Bergmann <arnd@arndb.de>
The cpu_suspend_set_dbg_restorer() function is called by the hw_breakpoint
code but defined in another file. Since the declaration is in the
same file as the caller, the compiler warns about the definition
without a prior prototype:
arch/arm64/kernel/suspend.c:35:13: error: no previous prototype for 'cpu_suspend_set_dbg_restorer' [-Werror=missing-prototypes]
Move it into the corresponding header instead to avoid the warning.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---
arch/arm64/include/asm/hw_breakpoint.h | 8 ++++++++
arch/arm64/kernel/hw_breakpoint.c | 8 --------
2 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/arch/arm64/include/asm/hw_breakpoint.h b/arch/arm64/include/asm/hw_breakpoint.h
index fa4c6ff3aa9b..84055329cd8b 100644
--- a/arch/arm64/include/asm/hw_breakpoint.h
+++ b/arch/arm64/include/asm/hw_breakpoint.h
@@ -154,4 +154,12 @@ static inline int get_num_wrps(void)
ID_AA64DFR0_EL1_WRPs_SHIFT);
}
+#ifdef CONFIG_CPU_PM
+extern void cpu_suspend_set_dbg_restorer(int (*hw_bp_restore)(unsigned int));
+#else
+static inline void cpu_suspend_set_dbg_restorer(int (*hw_bp_restore)(unsigned int))
+{
+}
+#endif
+
#endif /* __ASM_BREAKPOINT_H */
diff --git a/arch/arm64/kernel/hw_breakpoint.c b/arch/arm64/kernel/hw_breakpoint.c
index b29a311bb055..db2a1861bb97 100644
--- a/arch/arm64/kernel/hw_breakpoint.c
+++ b/arch/arm64/kernel/hw_breakpoint.c
@@ -973,14 +973,6 @@ static int hw_breakpoint_reset(unsigned int cpu)
return 0;
}
-#ifdef CONFIG_CPU_PM
-extern void cpu_suspend_set_dbg_restorer(int (*hw_bp_restore)(unsigned int));
-#else
-static inline void cpu_suspend_set_dbg_restorer(int (*hw_bp_restore)(unsigned int))
-{
-}
-#endif
-
/*
* One-time initialisation.
*/
--
2.39.2
_______________________________________________
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:[~2023-05-16 16:07 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-05-16 16:06 [PATCH 00/15] arm64: address -Wmissing-prototype warnings Arnd Bergmann
2023-05-16 16:06 ` [PATCH 01/15] arm64: xor-neon: mark xor_arm64_neon_*() static Arnd Bergmann
2023-05-16 16:06 ` [PATCH 02/15] arm64: add scs_patch_vmlinux prototype Arnd Bergmann
2023-05-16 16:06 ` [PATCH 03/15] arm64: avoid prototype warnings for syscalls Arnd Bergmann
2023-05-16 16:06 ` Arnd Bergmann [this message]
2023-05-16 16:06 ` [PATCH 05/15] arm64: spectre: provide prototypes for internal functions Arnd Bergmann
2023-05-16 16:06 ` [PATCH 06/15] arm64: kvm: add prototypes for functions called in asm Arnd Bergmann
2023-05-16 16:06 ` [PATCH 07/15] arm64: cpuidle: fix #ifdef for acpi functions Arnd Bergmann
2023-05-16 16:06 ` [PATCH 08/15] arm64: efi: add efi_handle_corrupted_x18 prototype Arnd Bergmann
2023-05-16 16:06 ` [PATCH 09/15] arm64: hide unused is_valid_bugaddr() Arnd Bergmann
2023-05-16 16:06 ` [PATCH 10/15] arm64: module-plts: inline linux/moduleloader.h Arnd Bergmann
2023-05-16 16:06 ` [PATCH 11/15] arm64: flush: include linux/libnvdimm.h Arnd Bergmann
2023-05-16 16:06 ` [PATCH 12/15] arm64: kaslr: add kaslr_early_init() declaration Arnd Bergmann
2023-05-16 16:06 ` [PATCH 13/15] arm64: signal: include asm/exception.h Arnd Bergmann
2023-05-16 16:06 ` [PATCH 14/15] arm64: move early_brk64 prototype to header Arnd Bergmann
2023-05-16 16:06 ` [PATCH 15/15] arm64: add alt_cb_patch_nops prototype Arnd Bergmann
2023-05-16 17:17 ` [PATCH 00/15] arm64: address -Wmissing-prototype warnings Ard Biesheuvel
2023-05-16 19:53 ` Kees Cook
2023-05-25 18:25 ` Catalin Marinas
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=20230516160642.523862-5-arnd@kernel.org \
--to=arnd@kernel.org \
--cc=anshuman.khandual@arm.com \
--cc=ardb@kernel.org \
--cc=arnd@arndb.de \
--cc=catalin.marinas@arm.com \
--cc=james.morse@arm.com \
--cc=keescook@chromium.org \
--cc=kvmarm@lists.linux.dev \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-efi@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mark.rutland@arm.com \
--cc=maz@kernel.org \
--cc=oliver.upton@linux.dev \
--cc=surenb@google.com \
--cc=suzuki.poulose@arm.com \
--cc=will@kernel.org \
--cc=yuzenghui@huawei.com \
/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;
as well as URLs for NNTP newsgroup(s).