linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] sched: label attributes require a ';'
@ 2018-02-27  7:47 Norbert Manthey
  2018-03-09  8:59 ` [tip:sched/core] sched/fair: Add ';' after label attributes tip-bot for Norbert Manthey
  0 siblings, 1 reply; 2+ messages in thread
From: Norbert Manthey @ 2018-02-27  7:47 UTC (permalink / raw)
  Cc: Norbert Manthey, Michael Tautschnig, Ingo Molnar, Peter Zijlstra,
	linux-kernel, stable

Due to using gcc defines for configuration, some labels might be unused in
certain configurations. While adding a __maybe_unused to the label is
fine in general, the line has to be terminated with ';'. This is also
reflected in the gcc documentation, but gcc parsed the previous variant
without an error message.

This has been spotted while compiling with goto-cc, the compiler for the
CPROVER tool suite.

Signed-off-by: Norbert Manthey <nmanthey@amazon.de>
Signed-off-by: Michael Tautschnig <tautschn@amazon.co.uk>

Cc: Ingo Molnar <mingo@redhat.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: linux-kernel@vger.kernel.org
Cc: stable@vger.kernel.org
---
 kernel/sched/fair.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kernel/sched/fair.c b/kernel/sched/fair.c
index 26a71eb..3af8fb6 100644
--- a/kernel/sched/fair.c
+++ b/kernel/sched/fair.c
@@ -6716,7 +6716,7 @@ pick_next_task_fair(struct rq *rq, struct task_struct *prev, struct rq_flags *rf
 
 	p = task_of(se);
 
-done: __maybe_unused
+done: __maybe_unused;
 #ifdef CONFIG_SMP
 	/*
 	 * Move the next running task to the front of
-- 
2.7.4

Amazon Development Center Germany GmbH
Berlin - Dresden - Aachen
main office: Krausenstr. 38, 10117 Berlin
Geschaeftsfuehrer: Dr. Ralf Herbrich, Christian Schlaeger
Ust-ID: DE289237879
Eingetragen am Amtsgericht Charlottenburg HRB 149173 B

^ permalink raw reply related	[flat|nested] 2+ messages in thread

* [tip:sched/core] sched/fair: Add ';' after label attributes
  2018-02-27  7:47 [PATCH] sched: label attributes require a ';' Norbert Manthey
@ 2018-03-09  8:59 ` tip-bot for Norbert Manthey
  0 siblings, 0 replies; 2+ messages in thread
From: tip-bot for Norbert Manthey @ 2018-03-09  8:59 UTC (permalink / raw)
  To: linux-tip-commits
  Cc: peterz, torvalds, mingo, tglx, hpa, linux-kernel, tautschn, nmanthey

Commit-ID:  13a453c241b78934a945b1af572d0533612c9bd1
Gitweb:     https://git.kernel.org/tip/13a453c241b78934a945b1af572d0533612c9bd1
Author:     Norbert Manthey <nmanthey@amazon.de>
AuthorDate: Tue, 27 Feb 2018 08:47:40 +0100
Committer:  Ingo Molnar <mingo@kernel.org>
CommitDate: Fri, 9 Mar 2018 07:59:13 +0100

sched/fair: Add ';' after label attributes

Due to using GCC defines for configuration, some labels might be unused in
certain configurations. While adding a __maybe_unused to the label is
fine in general, the line has to be terminated with ';'. This is also
reflected in the GCC documentation, but GCC parsed the previous variant
without an error message.

This has been spotted while compiling with goto-cc, the compiler for the
CPROVER tool suite.

Signed-off-by: Norbert Manthey <nmanthey@amazon.de>
Signed-off-by: Michael Tautschnig <tautschn@amazon.co.uk>
Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Link: http://lkml.kernel.org/r/1519717660-16157-1-git-send-email-nmanthey@amazon.de
Signed-off-by: Ingo Molnar <mingo@kernel.org>
---
 kernel/sched/fair.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kernel/sched/fair.c b/kernel/sched/fair.c
index f5591071ae98..097db34d5ba2 100644
--- a/kernel/sched/fair.c
+++ b/kernel/sched/fair.c
@@ -6797,7 +6797,7 @@ simple:
 
 	p = task_of(se);
 
-done: __maybe_unused
+done: __maybe_unused;
 #ifdef CONFIG_SMP
 	/*
 	 * Move the next running task to the front of

^ permalink raw reply related	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2018-03-09  8:59 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-02-27  7:47 [PATCH] sched: label attributes require a ';' Norbert Manthey
2018-03-09  8:59 ` [tip:sched/core] sched/fair: Add ';' after label attributes tip-bot for Norbert Manthey

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).