diff options
| author | Mark Brown <broonie@kernel.org> | 2018-06-01 11:40:46 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2018-06-01 11:40:46 +0100 |
| commit | 1e82572e5f806782cc1bf06e6d22905c28b0a9f5 (patch) | |
| tree | c428a640fca2ee5c6bfe259482b941f5e0ece927 /arch/x86/events/perf_event.h | |
| parent | 29e8549d35499289ce6211a553f956a2ab9a3905 (diff) | |
| parent | 86a04ba0955e3c806ed301cf178f1e130f1cb785 (diff) | |
Merge branch 'linux-linaro-lsk-v4.9' into linux-linaro-lsk-v4.9-rtlsk-v4.9-18.05-rt
Diffstat (limited to 'arch/x86/events/perf_event.h')
| -rw-r--r-- | arch/x86/events/perf_event.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/events/perf_event.h b/arch/x86/events/perf_event.h index bcbb1d2ae10b..f3563179290b 100644 --- a/arch/x86/events/perf_event.h +++ b/arch/x86/events/perf_event.h @@ -548,7 +548,7 @@ struct x86_pmu { struct x86_pmu_quirk *quirks; int perfctr_second_write; bool late_ack; - unsigned (*limit_period)(struct perf_event *event, unsigned l); + u64 (*limit_period)(struct perf_event *event, u64 l); /* * sysfs attrs |