Skip to content

Commit 96b1280

Browse files
Thomas Richtergregkh
authored andcommitted
s390/cpum_sf: Remove WARN_ON_ONCE statements
[ Upstream commit b495e71 ] Remove WARN_ON_ONCE statements. These have not triggered in the past. Signed-off-by: Thomas Richter <[email protected]> Acked-by: Sumanth Korikkar <[email protected]> Cc: Heiko Carstens <[email protected]> Cc: Vasily Gorbik <[email protected]> Cc: Alexander Gordeev <[email protected]> Signed-off-by: Vasily Gorbik <[email protected]> Signed-off-by: Sasha Levin <[email protected]>
1 parent e789b7f commit 96b1280

File tree

1 file changed

+4
-8
lines changed

1 file changed

+4
-8
lines changed

arch/s390/kernel/perf_cpum_sf.c

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1463,7 +1463,7 @@ static int aux_output_begin(struct perf_output_handle *handle,
14631463
unsigned long range, i, range_scan, idx, head, base, offset;
14641464
struct hws_trailer_entry *te;
14651465

1466-
if (WARN_ON_ONCE(handle->head & ~PAGE_MASK))
1466+
if (handle->head & ~PAGE_MASK)
14671467
return -EINVAL;
14681468

14691469
aux->head = handle->head >> PAGE_SHIFT;
@@ -1642,7 +1642,7 @@ static void hw_collect_aux(struct cpu_hw_sf *cpuhw)
16421642
unsigned long num_sdb;
16431643

16441644
aux = perf_get_aux(handle);
1645-
if (WARN_ON_ONCE(!aux))
1645+
if (!aux)
16461646
return;
16471647

16481648
/* Inform user space new data arrived */
@@ -1661,7 +1661,7 @@ static void hw_collect_aux(struct cpu_hw_sf *cpuhw)
16611661
num_sdb);
16621662
break;
16631663
}
1664-
if (WARN_ON_ONCE(!aux))
1664+
if (!aux)
16651665
return;
16661666

16671667
/* Update head and alert_mark to new position */
@@ -1896,12 +1896,8 @@ static void cpumsf_pmu_start(struct perf_event *event, int flags)
18961896
{
18971897
struct cpu_hw_sf *cpuhw = this_cpu_ptr(&cpu_hw_sf);
18981898

1899-
if (WARN_ON_ONCE(!(event->hw.state & PERF_HES_STOPPED)))
1899+
if (!(event->hw.state & PERF_HES_STOPPED))
19001900
return;
1901-
1902-
if (flags & PERF_EF_RELOAD)
1903-
WARN_ON_ONCE(!(event->hw.state & PERF_HES_UPTODATE));
1904-
19051901
perf_pmu_disable(event->pmu);
19061902
event->hw.state = 0;
19071903
cpuhw->lsctl.cs = 1;

0 commit comments

Comments
 (0)