diff options
Diffstat (limited to 'arch/x86/kernel/cpu/perf_event_amd_ibs.c')
-rw-r--r-- | arch/x86/kernel/cpu/perf_event_amd_ibs.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/arch/x86/kernel/cpu/perf_event_amd_ibs.c b/arch/x86/kernel/cpu/perf_event_amd_ibs.c index 34dfa853f6df..29a1bffe1dfb 100644 --- a/arch/x86/kernel/cpu/perf_event_amd_ibs.c +++ b/arch/x86/kernel/cpu/perf_event_amd_ibs.c | |||
@@ -62,7 +62,7 @@ struct perf_ibs_data { | |||
62 | }; | 62 | }; |
63 | 63 | ||
64 | static int | 64 | static int |
65 | perf_event_set_period(struct hw_perf_event *hwc, u64 min, u64 max, u64 *count) | 65 | perf_event_set_period(struct hw_perf_event *hwc, u64 min, u64 max, u64 *hw_period) |
66 | { | 66 | { |
67 | s64 left = local64_read(&hwc->period_left); | 67 | s64 left = local64_read(&hwc->period_left); |
68 | s64 period = hwc->sample_period; | 68 | s64 period = hwc->sample_period; |
@@ -91,7 +91,7 @@ perf_event_set_period(struct hw_perf_event *hwc, u64 min, u64 max, u64 *count) | |||
91 | if (left > max) | 91 | if (left > max) |
92 | left = max; | 92 | left = max; |
93 | 93 | ||
94 | *count = (u64)left; | 94 | *hw_period = (u64)left; |
95 | 95 | ||
96 | return overflow; | 96 | return overflow; |
97 | } | 97 | } |
@@ -262,13 +262,13 @@ static int perf_ibs_init(struct perf_event *event) | |||
262 | static int perf_ibs_set_period(struct perf_ibs *perf_ibs, | 262 | static int perf_ibs_set_period(struct perf_ibs *perf_ibs, |
263 | struct hw_perf_event *hwc, u64 *period) | 263 | struct hw_perf_event *hwc, u64 *period) |
264 | { | 264 | { |
265 | int ret; | 265 | int overflow; |
266 | 266 | ||
267 | /* ignore lower 4 bits in min count: */ | 267 | /* ignore lower 4 bits in min count: */ |
268 | ret = perf_event_set_period(hwc, 1<<4, perf_ibs->max_period, period); | 268 | overflow = perf_event_set_period(hwc, 1<<4, perf_ibs->max_period, period); |
269 | local64_set(&hwc->prev_count, 0); | 269 | local64_set(&hwc->prev_count, 0); |
270 | 270 | ||
271 | return ret; | 271 | return overflow; |
272 | } | 272 | } |
273 | 273 | ||
274 | static u64 get_ibs_fetch_count(u64 config) | 274 | static u64 get_ibs_fetch_count(u64 config) |