summaryrefslogtreecommitdiffstats
path: root/tools/lib
diff options
context:
space:
mode:
authorJosh Poimboeuf <jpoimboe@redhat.com>2015-12-18 06:39:17 -0600
committerArnaldo Carvalho de Melo <acme@redhat.com>2016-01-12 12:42:07 -0300
commit24b1e5d7f552eb6da430d5264d671ba45d634804 (patch)
tree9ca6a9a925d2d8c01de236fc4a7864ba3684aa0a /tools/lib
parent20a7add8ca2165de909d430b9874eacc26a2166c (diff)
downloadlinux-stable-24b1e5d7f552eb6da430d5264d671ba45d634804.tar.gz
linux-stable-24b1e5d7f552eb6da430d5264d671ba45d634804.tar.bz2
linux-stable-24b1e5d7f552eb6da430d5264d671ba45d634804.zip
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@redhat.com> Cc: "H. Peter Anvin" <hpa@zytor.com> Cc: Andi Kleen <andi@firstfloor.org> Cc: Andrew Morton <akpm@linux-foundation.org> Cc: Andy Lutomirski <luto@kernel.org> Cc: Bernd Petrovitsch <bernd@petrovitsch.priv.at> Cc: Borislav Petkov <bp@alien8.de> Cc: Chris J Arges <chris.j.arges@canonical.com> Cc: Jiri Slaby <jslaby@suse.cz> Cc: Linus Torvalds <torvalds@linux-foundation.org> Cc: Michal Marek <mmarek@suse.cz> Cc: Namhyung Kim <namhyung@gmail.com> Cc: Pedro Alves <palves@redhat.com> Cc: Peter Zijlstra <peterz@infradead.org> Cc: Thomas Gleixner <tglx@linutronix.de> Cc: live-patching@vger.kernel.org Cc: x86@kernel.org Link: http://lkml.kernel.org/r/6c16294ac6dbe5e2ca28fd935fe4389996588564.1450442274.git.jpoimboe@redhat.com Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Diffstat (limited to 'tools/lib')
-rw-r--r--tools/lib/subcmd/parse-options.h4
1 files changed, 4 insertions, 0 deletions
diff --git a/tools/lib/subcmd/parse-options.h b/tools/lib/subcmd/parse-options.h
index 13a2cc1d6140..d60cab2726da 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,