diff options
Diffstat (limited to 'arch')
-rw-r--r-- | arch/powerpc/kernel/perf_counter.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/arch/powerpc/kernel/perf_counter.c b/arch/powerpc/kernel/perf_counter.c index bb202388170e..e6dc1850191c 100644 --- a/arch/powerpc/kernel/perf_counter.c +++ b/arch/powerpc/kernel/perf_counter.c | |||
@@ -913,6 +913,8 @@ const struct pmu *hw_perf_counter_init(struct perf_counter *counter) | |||
913 | case PERF_TYPE_RAW: | 913 | case PERF_TYPE_RAW: |
914 | ev = counter->attr.config; | 914 | ev = counter->attr.config; |
915 | break; | 915 | break; |
916 | default: | ||
917 | return ERR_PTR(-EINVAL); | ||
916 | } | 918 | } |
917 | counter->hw.config_base = ev; | 919 | counter->hw.config_base = ev; |
918 | counter->hw.idx = 0; | 920 | counter->hw.idx = 0; |
@@ -1013,7 +1015,7 @@ static void record_and_restart(struct perf_counter *counter, long val, | |||
1013 | u64 period = counter->hw.sample_period; | 1015 | u64 period = counter->hw.sample_period; |
1014 | s64 prev, delta, left; | 1016 | s64 prev, delta, left; |
1015 | int record = 0; | 1017 | int record = 0; |
1016 | u64 addr, mmcra, sdsync; | 1018 | u64 mmcra, sdsync; |
1017 | 1019 | ||
1018 | /* we don't have to worry about interrupts here */ | 1020 | /* we don't have to worry about interrupts here */ |
1019 | prev = atomic64_read(&counter->hw.prev_count); | 1021 | prev = atomic64_read(&counter->hw.prev_count); |