OSDN Git Service

jump_label: Refactor #ifdef of struct static_key
authorMasahiro Yamada <masahiroy@kernel.org>
Sun, 13 Feb 2022 16:57:17 +0000 (01:57 +0900)
committerPeter Zijlstra <peterz@infradead.org>
Wed, 16 Feb 2022 14:57:58 +0000 (15:57 +0100)
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

index 6924e68..107751c 100644 (file)
@@ -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