summaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorWill Deacon <will.deacon@arm.com>2019-05-03 12:18:08 +0300
committerWill Deacon <will.deacon@arm.com>2019-05-03 12:18:08 +0300
commitb33f908811b7627015238e0dee9baf2b4c9d720d (patch)
treeff201aa98d4c4f2e70ede315363229ddde771150 /arch
parent24cf262da1ad303fc940c798aab0bd1bd50e3fc2 (diff)
parent9bcb929f969e4054732158908b1d70e787ef780f (diff)
downloadlinux-b33f908811b7627015238e0dee9baf2b4c9d720d.tar.xz
Merge branch 'for-next/perf' of git://git.kernel.org/pub/scm/linux/kernel/git/will/linux into for-next/core
Diffstat (limited to 'arch')
-rw-r--r--arch/arm64/kernel/perf_event.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm64/kernel/perf_event.c b/arch/arm64/kernel/perf_event.c
index 4addb38bc250..6164d389eed6 100644
--- a/arch/arm64/kernel/perf_event.c
+++ b/arch/arm64/kernel/perf_event.c
@@ -431,7 +431,7 @@ static inline u64 armv8pmu_read_hw_counter(struct perf_event *event)
return val;
}
-static inline u64 armv8pmu_read_counter(struct perf_event *event)
+static u64 armv8pmu_read_counter(struct perf_event *event)
{
struct arm_pmu *cpu_pmu = to_arm_pmu(event->pmu);
struct hw_perf_event *hwc = &event->hw;
@@ -468,7 +468,7 @@ static inline void armv8pmu_write_hw_counter(struct perf_event *event,
}
}
-static inline void armv8pmu_write_counter(struct perf_event *event, u64 value)
+static void armv8pmu_write_counter(struct perf_event *event, u64 value)
{
struct arm_pmu *cpu_pmu = to_arm_pmu(event->pmu);
struct hw_perf_event *hwc = &event->hw;