Skip to contentSkip to conversation

arm64: mark __system_matches_cap as __maybe_unused

PATCH Applied Mark Rutland 2 participants 2 messages Dec 3, 2020 arm64

lore
Share & tools
lore

Mark Rutland

author reviewer
#0 lore raw

PATCH 1/1 arm64: mark __system_matches_cap as __maybe_unused

Hi Catalin,

Qian Cai reports the uaccess rework introduced a build-time warning in some configurations; the below is a trivial fix -- could you please queue this atop the other uaccess patches?

Thanks,
Mark.

---->8----
Now that the PAN toggling has been removed, the only user of __system_matches_cap() is has_generic_auth(), which is only built when CONFIG_ARM64_PTR_AUTH is selected, and Qian reports that this results in a build-time warning when CONFIG_ARM64_PTR_AUTH is not selected:

| arch/arm64/kernel/cpufeature.c:2649:13: warning: '__system_matches_cap' defined but not used [-Wunused-function]
|  static bool __system_matches_cap(unsigned int n)
|              ^~~~~~~~~~~~~~~~~~~~

It's tricky to restructure things to prevent this, so let's mark __system_matches_cap() as __maybe_unused, as we used to do for the other user of __system_matches_cap() which we just removed.

---
 arch/arm64/kernel/cpufeature.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm64/kernel/cpufeature.c +1 -1
index cf09bac80adb..cffcb0198bae 100644
@@ -2634,7 +2634,7 @@ bool this_cpu_has_cap(unsigned int n)
  * - The SYSTEM_FEATURE cpu_hwcaps may not have been set.
  * In all other cases cpus_have_{const_}cap() should be used.
  */
-static bool __system_matches_cap(unsigned int n)
+static bool __maybe_unused __system_matches_cap(unsigned int n)
 {
 	if (n < ARM64_NCAPS) {
 		const struct arm64_cpu_capabilities *cap = cpu_hwcaps_ptrs[n];
Signature · 7 lines
2.11.0


_______________________________________________
linux-arm-kernel mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
maintainer Applied
#1 lore raw
Quoted 8 lines · Mark Rutland

Qian Cai reports the uaccess rework introduced a build-time warning in some configurations; the below is a trivial fix -- could you please queue this atop the other uaccess patches?

Thanks,
Mark.

[...]

Applied to arm64 (for-next/uaccess), thanks!

[1/1] arm64: mark __system_matches_cap as __maybe_unused

      https://git.kernel.org/arm64/c/701f49065e68
Signature · 7 lines
Catalin


_______________________________________________
linux-arm-kernel mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel