diff options
| author |   Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2020-03-23 08:01:20 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2020-03-23 08:01:20 +0100 |
| commit | 6203da9803017701da5782998157d9826215059d (patch) | |
| tree | 1d754f139ac25c643e88f429966606d3b44e431f /tools/perf/tests/bp_account.c | |
| parent | staging: vt6656: Use BIT() macro in vnt_mac_reg_bits_* functions (diff) | |
| parent | Linux 5.6-rc7 (diff) | |
| download | linux-dev-6203da9803017701da5782998157d9826215059d.tar.xz linux-dev-6203da9803017701da5782998157d9826215059d.zip | |
Merge 5.6-rc7 into staging-next
We need the staging/iio fixes in here as well
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'tools/perf/tests/bp_account.c')
| -rw-r--r-- | tools/perf/tests/bp_account.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/perf/tests/bp_account.c b/tools/perf/tests/bp_account.c index d0b935356274..489b50604cf2 100644 --- a/tools/perf/tests/bp_account.c +++ b/tools/perf/tests/bp_account.c @@ -19,7 +19,7 @@ #include "../perf-sys.h" #include "cloexec.h" -volatile long the_var; +static volatile long the_var; static noinline int test_function(void) { |