Messages in this thread Patch in this message | | | Date | Thu, 17 Feb 2022 18:56:23 -0000 | From | "tip-bot2 for Masahiro Yamada" <> | Subject | [tip: locking/core] jump_label: Refactor #ifdef of struct static_key |
| |
The following commit has been merged into the locking/core branch of tip:
Commit-ID: cd27ccfc727e99352321c0c75012ab9c5a90321e Gitweb: https://git.kernel.org/tip/cd27ccfc727e99352321c0c75012ab9c5a90321e Author: Masahiro Yamada <masahiroy@kernel.org> AuthorDate: Mon, 14 Feb 2022 01:57:17 +09:00 Committer: Peter Zijlstra <peterz@infradead.org> CommitterDate: Wed, 16 Feb 2022 15:57:58 +01:00
jump_label: Refactor #ifdef of struct static_key
Move #ifdef CONFIG_JUMP_LABEL inside the struct static_key.
Signed-off-by: Masahiro Yamada <masahiroy@kernel.org> Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org> Link: https://lkml.kernel.org/r/20220213165717.2354046-2-masahiroy@kernel.org --- include/linux/jump_label.h | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-)
diff --git a/include/linux/jump_label.h b/include/linux/jump_label.h index 6924e68..107751c 100644 --- a/include/linux/jump_label.h +++ b/include/linux/jump_label.h @@ -82,10 +82,9 @@ extern bool static_key_initialized; "%s(): static key '%pS' used before call to jump_label_init()", \ __func__, (key)) -#ifdef CONFIG_JUMP_LABEL - struct static_key { atomic_t enabled; +#ifdef CONFIG_JUMP_LABEL /* * Note: * To make anonymous unions work with old compilers, the static @@ -104,13 +103,9 @@ struct static_key { struct jump_entry *entries; struct static_key_mod *next; }; +#endif /* CONFIG_JUMP_LABEL */ }; -#else -struct static_key { - atomic_t enabled; -}; -#endif /* CONFIG_JUMP_LABEL */ #endif /* __ASSEMBLY__ */ #ifdef CONFIG_JUMP_LABEL
| |