jump_label: move guard #endif down where it belongs

PATCH New Luis R. Rodriguez 2 participants 2 messages Jan 18, 2017 – Jan 19, 2017 Static branch/call

lore

Share & tools

lore

Luis R. Rodriguez

author

2017-01-18 17:49 UTC #0 lore raw

PATCH 1/1 jump_label: move guard #endif down where it belongs

The ending header guard is misplaced. This has no
functional change, this is just an eye-sore.

Signed-off-by Luis R. Rodriguez <[email protected]>

---

This was part of the linker table series [0], but I'm going to split up patches further there. This is an atomic change which is independent so sending this separately now.

[0] https://lkml.kernel.org/r/[email protected]

 include/linux/jump_label.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

include/linux/jump_label.h +2 -2

index a0547c571800..b63d6b7b0db0 100644
@@ -402,6 +402,6 @@ extern bool ____wrong_branch_error(void);
 #define static_branch_enable(x)		static_key_enable(&(x)->key)
 #define static_branch_disable(x)	static_key_disable(&(x)->key)
 
-#endif	/* _LINUX_JUMP_LABEL_H */
-
 #endif /* __ASSEMBLY__ */
+
+#endif	/* _LINUX_JUMP_LABEL_H */

Signature · 1 line

2.11.0

tip-bot for Luis R. Rodriguez

merge bot

2017-01-19 10:47 UTC #1 lore raw

[tip:locking/core] jump_labels: Move header guard #endif down where it belongs

jump_labels: Move header guard #endif down where it belongs

Commit-ID:  85b36c931ff328297572a3e6136fac573795ad79
Gitweb:     http://git.kernel.org/tip/85b36c931ff328297572a3e6136fac573795ad79
Author:     Luis R. Rodriguez <[email protected]>
AuthorDate: Wed, 18 Jan 2017 09:38:04 -0800
Committer:  Ingo Molnar <[email protected]>
CommitDate: Thu, 19 Jan 2017 08:40:44 +0100

jump_labels: Move header guard #endif down where it belongs

The ending header guard is misplaced. This has no functional change, this is just an eye-sore.

Signed-off-by Luis R. Rodriguez <[email protected]>

Cc Linus Torvalds <[email protected]>

Cc Peter Zijlstra <[email protected]>

Cc Thomas Gleixner <[email protected]>

Cc [email protected]

Link http://lkml.kernel.org/r/[email protected] open here

Signed-off-by Ingo Molnar <[email protected]>

---
 include/linux/jump_label.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

include/linux/jump_label.h +2 -2

index a0547c5..b63d6b7 100644
@@ -402,6 +402,6 @@ extern bool ____wrong_branch_error(void);
 #define static_branch_enable(x)		static_key_enable(&(x)->key)
 #define static_branch_disable(x)	static_key_disable(&(x)->key)
 
-#endif	/* _LINUX_JUMP_LABEL_H */
-
 #endif /* __ASSEMBLY__ */
+
+#endif	/* _LINUX_JUMP_LABEL_H */