diff options
| author | Thomas Richter <tmricht@linux.ibm.com> | 2019-11-22 15:29:54 +0100 |
|---|---|---|
| committer | Vasily Gorbik <gor@linux.ibm.com> | 2019-11-30 10:52:46 +0100 |
| commit | 7dd6b199df46e871e6e0d0cd7e4f71dc07dfd53c (patch) | |
| tree | 4a291ec8ace5c517912921a03d6e283ef028d2ee /arch/s390 | |
| parent | c17a7c6ee8177e0da998784c06f37fc093507c5b (diff) | |
| download | linux-7dd6b199df46e871e6e0d0cd7e4f71dc07dfd53c.tar.gz linux-7dd6b199df46e871e6e0d0cd7e4f71dc07dfd53c.tar.bz2 linux-7dd6b199df46e871e6e0d0cd7e4f71dc07dfd53c.zip | |
s390/cpum_sf: Use TEAR_REG macro consistantly
The macro TEAR_REG() saves the last used SDBT address
in the perf_hw_event structure. This is also done
by function hw_reset_registers() which is a one-liner
and simply uses macro TEAR_REG(). Remove function
hw_reset_registers(), which is only used one time and use
macro TEAR_REG() instead. This macro is used throughout
the code anyway.
Signed-off-by: Thomas Richter <tmricht@linux.ibm.com>
Signed-off-by: Vasily Gorbik <gor@linux.ibm.com>
Diffstat (limited to 'arch/s390')
| -rw-r--r-- | arch/s390/kernel/perf_cpum_sf.c | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/arch/s390/kernel/perf_cpum_sf.c b/arch/s390/kernel/perf_cpum_sf.c index dc0ac098a465..cd9fb45eebd2 100644 --- a/arch/s390/kernel/perf_cpum_sf.c +++ b/arch/s390/kernel/perf_cpum_sf.c @@ -602,13 +602,6 @@ static void hw_init_period(struct hw_perf_event *hwc, u64 period) local64_set(&hwc->period_left, hwc->sample_period); } -static void hw_reset_registers(struct hw_perf_event *hwc, - unsigned long *sdbt_origin) -{ - /* (Re)set to first sample-data-block-table */ - TEAR_REG(hwc) = (unsigned long) sdbt_origin; -} - static unsigned long hw_limit_rate(const struct hws_qsi_info_block *si, unsigned long rate) { @@ -1879,7 +1872,7 @@ static int cpumsf_pmu_add(struct perf_event *event, int flags) if (!SAMPL_DIAG_MODE(&event->hw)) { cpuhw->lsctl.tear = (unsigned long) cpuhw->sfb.sdbt; cpuhw->lsctl.dear = *(unsigned long *) cpuhw->sfb.sdbt; - hw_reset_registers(&event->hw, cpuhw->sfb.sdbt); + TEAR_REG(&event->hw) = (unsigned long) cpuhw->sfb.sdbt; } /* Ensure sampling functions are in the disabled state. If disabled, |