diff options
author | Ingo Molnar <mingo@kernel.org> | 2015-05-17 07:57:31 +0200 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2015-05-17 07:57:31 +0200 |
commit | 75d95d84888cbd0024eb62ca7e72b3f7fe67dbdd (patch) | |
tree | 7167fa30a5c46766c10c4b9a37d7bf9373c26c6d /drivers/bus/arm-cci.c | |
parent | 52648e83c9a6b9f7fc3dd272d4d10175e93aa62a (diff) | |
parent | c0655fe9b0901a968800f56687be3c62b4cce5d2 (diff) |
Merge branch 'linus' into x86/asm, to resolve conflicts
Conflicts:
tools/testing/selftests/x86/Makefile
tools/testing/selftests/x86/run_x86_tests.sh
Diffstat (limited to 'drivers/bus/arm-cci.c')
-rw-r--r-- | drivers/bus/arm-cci.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/bus/arm-cci.c b/drivers/bus/arm-cci.c index b854125e4831..5340604b23a4 100644 --- a/drivers/bus/arm-cci.c +++ b/drivers/bus/arm-cci.c @@ -660,7 +660,7 @@ validate_group(struct perf_event *event) * Initialise the fake PMU. We only need to populate the * used_mask for the purposes of validation. */ - .used_mask = CPU_BITS_NONE, + .used_mask = { 0 }, }; if (!validate_event(event->pmu, &fake_pmu, leader)) |