diff options
| author | Ingo Molnar <mingo@kernel.org> | 2017-03-01 09:02:26 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2017-03-01 09:02:26 +0100 |
| commit | 0871d5a66da5c41151e0896a90298b163e42f2e0 (patch) | |
| tree | 1ba71fab9016cb28bb9d18ffd62b6b744f2f761c /arch/s390/kernel/perf_cpum_cf_events.c | |
| parent | e22af0be2cf654bb225f19750c6b9aab1627dc9e (diff) | |
| parent | 2d6be4abf514fc26c83d239c7f31da1f95e4a31d (diff) | |
| download | blackbird-obmc-linux-0871d5a66da5c41151e0896a90298b163e42f2e0.tar.gz blackbird-obmc-linux-0871d5a66da5c41151e0896a90298b163e42f2e0.zip | |
Merge branch 'linus' into WIP.x86/boot, to fix up conflicts and to pick up updates
Conflicts:
arch/x86/xen/setup.c
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/s390/kernel/perf_cpum_cf_events.c')
| -rw-r--r-- | arch/s390/kernel/perf_cpum_cf_events.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/s390/kernel/perf_cpum_cf_events.c b/arch/s390/kernel/perf_cpum_cf_events.c index 4554a4bae39e..c343ac2cf6c5 100644 --- a/arch/s390/kernel/perf_cpum_cf_events.c +++ b/arch/s390/kernel/perf_cpum_cf_events.c @@ -309,7 +309,7 @@ __init const struct attribute_group **cpumf_cf_event_group(void) default: model = NULL; break; - }; + } if (!model) goto out; |
