Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1c789859 authored by Thomas Richter's avatar Thomas Richter Committed by Greg Kroah-Hartman
Browse files

s390/cpum_sf: Remove WARN_ON_ONCE statements 



[ Upstream commit b495e710157606889f2d8bdc62aebf2aa02f67a7 ]

Remove WARN_ON_ONCE statements. These have not triggered in the
past.

Signed-off-by: default avatarThomas Richter <tmricht@linux.ibm.com>
Acked-by: default avatarSumanth Korikkar <sumanthk@linux.ibm.com>
Cc: Heiko Carstens <hca@linux.ibm.com>
Cc: Vasily Gorbik <gor@linux.ibm.com>
Cc: Alexander Gordeev <agordeev@linux.ibm.com>
Signed-off-by: default avatarVasily Gorbik <gor@linux.ibm.com>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent c0f57dd0

arch/s390/kernel/perf_cpum_sf.c

+4 −8
Original line number Diff line number Diff line
@@ -1360,7 +1360,7 @@ static int aux_output_begin(struct perf_output_handle *handle, 
	unsigned long head, base, offset;

	struct hws_trailer_entry *te;



	if (WARN_ON_ONCE(handle->head & ~PAGE_MASK))

	if (handle->head & ~PAGE_MASK)

		return -EINVAL;



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



	aux = perf_get_aux(handle);

	if (WARN_ON_ONCE(!aux))

	if (!aux)

		return;



	/* Inform user space new data arrived */
@@ -1547,7 +1547,7 @@ static void hw_collect_aux(struct cpu_hw_sf *cpuhw) 
			debug_sprintf_event(sfdbg, 1, "AUX buffer used up\n");

			break;

		}

		if (WARN_ON_ONCE(!aux))

		if (!aux)

			return;



		/* Update head and alert_mark to new position */
@@ -1746,12 +1746,8 @@ static void cpumsf_pmu_start(struct perf_event *event, int flags) 
{

	struct cpu_hw_sf *cpuhw = this_cpu_ptr(&cpu_hw_sf);



	if (WARN_ON_ONCE(!(event->hw.state & PERF_HES_STOPPED)))

	if (!(event->hw.state & PERF_HES_STOPPED))

		return;



	if (flags & PERF_EF_RELOAD)

		WARN_ON_ONCE(!(event->hw.state & PERF_HES_UPTODATE));



	perf_pmu_disable(event->pmu);

	event->hw.state = 0;

	cpuhw->lsctl.cs = 1;