diff options
| author | David S. Miller <davem@davemloft.net> | 2012-02-10 23:32:28 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-02-10 23:32:28 -0500 |
| commit | d5ef8a4d87ab21d575ac86366599c9152a28028d (patch) | |
| tree | 8b1be85ad1af7ee6a0e3e36c77ae738c966c1f21 /tools/perf/util/trace-event-parse.c | |
| parent | d9dd966d7fc088a6bed991c2b1e2fba4485e0a31 (diff) | |
| parent | 8df54d622a120058ee8bec38743c9b8f091c8e58 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
drivers/infiniband/hw/nes/nes_cm.c
Simple whitespace conflict.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'tools/perf/util/trace-event-parse.c')
| -rw-r--r-- | tools/perf/util/trace-event-parse.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/tools/perf/util/trace-event-parse.c b/tools/perf/util/trace-event-parse.c index 6c164dc9ee9..1a8d4dc4f38 100644 --- a/tools/perf/util/trace-event-parse.c +++ b/tools/perf/util/trace-event-parse.c @@ -21,14 +21,13 @@ * The parts for function graph printing was taken and modified from the * Linux Kernel that were written by Frederic Weisbecker. */ -#define _GNU_SOURCE + #include <stdio.h> #include <stdlib.h> #include <string.h> #include <ctype.h> #include <errno.h> -#undef _GNU_SOURCE #include "../perf.h" #include "util.h" #include "trace-event.h" |