diff options
| author | Ingo Molnar <mingo@kernel.org> | 2013-09-26 20:49:53 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2013-09-26 20:49:53 +0200 |
| commit | 474a83b76f6bde8a5f8f8e39d90181ca85d39f46 (patch) | |
| tree | a9f8e2e790b74de50d85469ec79fb1c841c3da90 /tools/perf/builtin-script.c | |
| parent | 16c21ae5ca636cfd38e581ebcf709c49d78ea56d (diff) | |
| parent | 654fdd041227d7de1594baa61c58f2c87bd0640f (diff) | |
Merge branch 'linus'
Merge in the relevant upstream merge point to queue up dependent patch.
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'tools/perf/builtin-script.c')
| -rw-r--r-- | tools/perf/builtin-script.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/tools/perf/builtin-script.c b/tools/perf/builtin-script.c index 7f31a3ded1b..9c333ff3dfe 100644 --- a/tools/perf/builtin-script.c +++ b/tools/perf/builtin-script.c @@ -553,8 +553,6 @@ static struct perf_tool perf_script = { .ordering_requires_timestamps = true, }; -extern volatile int session_done; - static void sig_handler(int sig __maybe_unused) { session_done = 1; |