[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <tip-24b1e5d7f552eb6da430d5264d671ba45d634804@git.kernel.org>
Date: Wed, 13 Jan 2016 01:41:06 -0800
From: tip-bot for Josh Poimboeuf <tipbot@...or.com>
To: linux-tip-commits@...r.kernel.org
Cc: tglx@...utronix.de, bp@...en8.de, torvalds@...ux-foundation.org,
jslaby@...e.cz, mingo@...nel.org, mmarek@...e.cz, acme@...hat.com,
andi@...stfloor.org, linux-kernel@...r.kernel.org,
akpm@...ux-foundation.org, luto@...nel.org,
chris.j.arges@...onical.com, palves@...hat.com,
jpoimboe@...hat.com, peterz@...radead.org, namhyung@...il.com,
hpa@...or.com, bernd@...rovitsch.priv.at
Subject: [tip:perf/urgent] tools subcmd:
Add missing NORETURN define for parse-options.h
Commit-ID: 24b1e5d7f552eb6da430d5264d671ba45d634804
Gitweb: http://git.kernel.org/tip/24b1e5d7f552eb6da430d5264d671ba45d634804
Author: Josh Poimboeuf <jpoimboe@...hat.com>
AuthorDate: Fri, 18 Dec 2015 06:39:17 -0600
Committer: Arnaldo Carvalho de Melo <acme@...hat.com>
CommitDate: Tue, 12 Jan 2016 12:42:07 -0300
tools subcmd: Add missing NORETURN define for parse-options.h
parse-options.h uses the NORETURN macro without defining it. perf
doesn't see a build error because it defines the macro in util.h before
including parse-options.h. But any other tool including it will see an
error.
Define the macro in parse-options.h (if not already defined) so that
other tools can include it.
Signed-off-by: Josh Poimboeuf <jpoimboe@...hat.com>
Cc: "H. Peter Anvin" <hpa@...or.com>
Cc: Andi Kleen <andi@...stfloor.org>
Cc: Andrew Morton <akpm@...ux-foundation.org>
Cc: Andy Lutomirski <luto@...nel.org>
Cc: Bernd Petrovitsch <bernd@...rovitsch.priv.at>
Cc: Borislav Petkov <bp@...en8.de>
Cc: Chris J Arges <chris.j.arges@...onical.com>
Cc: Jiri Slaby <jslaby@...e.cz>
Cc: Linus Torvalds <torvalds@...ux-foundation.org>
Cc: Michal Marek <mmarek@...e.cz>
Cc: Namhyung Kim <namhyung@...il.com>
Cc: Pedro Alves <palves@...hat.com>
Cc: Peter Zijlstra <peterz@...radead.org>
Cc: Thomas Gleixner <tglx@...utronix.de>
Cc: live-patching@...r.kernel.org
Cc: x86@...nel.org
Link: http://lkml.kernel.org/r/6c16294ac6dbe5e2ca28fd935fe4389996588564.1450442274.git.jpoimboe@redhat.com
Signed-off-by: Arnaldo Carvalho de Melo <acme@...hat.com>
---
tools/lib/subcmd/parse-options.h | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/tools/lib/subcmd/parse-options.h b/tools/lib/subcmd/parse-options.h
index 13a2cc1..d60cab2 100644
--- a/tools/lib/subcmd/parse-options.h
+++ b/tools/lib/subcmd/parse-options.h
@@ -4,6 +4,10 @@
#include <stdbool.h>
#include <stdint.h>
+#ifndef NORETURN
+#define NORETURN __attribute__((__noreturn__))
+#endif
+
enum parse_opt_type {
/* special types */
OPTION_END,
Powered by blists - more mailing lists