* [PATCH] jump_label: move guard #endif down where it belongs
@ 2017-01-18 17:38 Luis R. Rodriguez
2017-01-19 9:10 ` [tip:locking/core] jump_labels: Move header " tip-bot for Luis R. Rodriguez
0 siblings, 1 reply; 2+ messages in thread
From: Luis R. Rodriguez @ 2017-01-18 17:38 UTC (permalink / raw)
To: peterz, tony.luck, mingo, tglx, jbaron, pbonzini
Cc: catalin.marinas, bp, bp, linux-kernel, Luis R. Rodriguez
The ending header guard is misplaced. This has no
functional change, this is just an eye-sore.
Signed-off-by: Luis R. Rodriguez <mcgrof@kernel.org>
---
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/20170115211057.17167-1-mcgrof@kernel.org
include/linux/jump_label.h | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/include/linux/jump_label.h b/include/linux/jump_label.h
index a0547c571800..b63d6b7b0db0 100644
--- a/include/linux/jump_label.h
+++ b/include/linux/jump_label.h
@@ -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 */
--
2.11.0
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [tip:locking/core] jump_labels: Move header guard #endif down where it belongs
2017-01-18 17:38 [PATCH] jump_label: move guard #endif down where it belongs Luis R. Rodriguez
@ 2017-01-19 9:10 ` tip-bot for Luis R. Rodriguez
0 siblings, 0 replies; 2+ messages in thread
From: tip-bot for Luis R. Rodriguez @ 2017-01-19 9:10 UTC (permalink / raw)
To: linux-tip-commits
Cc: tglx, mcgrof, hpa, peterz, mingo, torvalds, linux-kernel
Commit-ID: 85b36c931ff328297572a3e6136fac573795ad79
Gitweb: http://git.kernel.org/tip/85b36c931ff328297572a3e6136fac573795ad79
Author: Luis R. Rodriguez <mcgrof@kernel.org>
AuthorDate: Wed, 18 Jan 2017 09:38:04 -0800
Committer: Ingo Molnar <mingo@kernel.org>
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 <mcgrof@kernel.org>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: bp@alien8.de
Cc: bp@suse.de
Cc: catalin.marinas@arm.com
Cc: jbaron@akamai.com
Cc: pbonzini@redhat.com
Cc: tony.luck@intel.com
Link: http://lkml.kernel.org/r/20170118173804.16281-1-mcgrof@kernel.org
Signed-off-by: Ingo Molnar <mingo@kernel.org>
---
include/linux/jump_label.h | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/include/linux/jump_label.h b/include/linux/jump_label.h
index a0547c5..b63d6b7 100644
--- a/include/linux/jump_label.h
+++ b/include/linux/jump_label.h
@@ -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 */
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2017-01-19 10:47 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-01-18 17:38 [PATCH] jump_label: move guard #endif down where it belongs Luis R. Rodriguez
2017-01-19 9:10 ` [tip:locking/core] jump_labels: Move header " tip-bot for Luis R. Rodriguez
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox