diff options
| author | Arnaldo Carvalho de Melo <acme@redhat.com> | 2017-06-16 16:39:15 +0200 |
|---|---|---|
| committer | Arnaldo Carvalho de Melo <acme@redhat.com> | 2017-06-19 20:14:58 +0200 |
| commit | 6c3466435b03fb84647f5ad413f98f2ccb12b5c2 (patch) | |
| tree | 55e93240208b072307f144520766a4fd75dd15d5 /tools/perf/util/util.h | |
| parent | perf script: Allow adding and removing fields (diff) | |
| download | linux-6c3466435b03fb84647f5ad413f98f2ccb12b5c2.tar.xz linux-6c3466435b03fb84647f5ad413f98f2ccb12b5c2.zip | |
tools: Adopt __noreturn from kernel sources
To have a more compact way to specify that a function doesn't return,
instead of the open coded:
__attribute__((noreturn))
And use it instead of the tools/perf/ specific variation, NORETURN.
Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Wang Nan <wangnan0@huawei.com>
Link: http://lkml.kernel.org/n/tip-l0y144qzixcy5t4c6i7pdiqj@git.kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Diffstat (limited to 'tools/perf/util/util.h')
| -rw-r--r-- | tools/perf/util/util.h | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/tools/perf/util/util.h b/tools/perf/util/util.h index 5dfb9bb6482d..024b108dbbf6 100644 --- a/tools/perf/util/util.h +++ b/tools/perf/util/util.h @@ -11,20 +11,18 @@ #include <stddef.h> #include <stdlib.h> #include <stdarg.h> +#include <linux/compiler.h> #include <linux/types.h> -#ifdef __GNUC__ -#define NORETURN __attribute__((__noreturn__)) -#else -#define NORETURN +#ifndef __GNUC__ #ifndef __attribute__ #define __attribute__(x) #endif #endif /* General helper functions */ -void usage(const char *err) NORETURN; -void die(const char *err, ...) NORETURN __attribute__((format (printf, 1, 2))); +void usage(const char *err) __noreturn; +void die(const char *err, ...) __noreturn __attribute__((format (printf, 1, 2))); int error(const char *err, ...) __attribute__((format (printf, 1, 2))); void warning(const char *err, ...) __attribute__((format (printf, 1, 2))); |