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

Commit 25d35847 authored by Will Deacon's avatar Will Deacon Committed by Russell King
Browse files

ARM: 6330/1: perf: reword comments relating to perf_event_do_pending 



This is purely a cosmetic change to the ARM perf backend because the current
comments about the relationship between NMIs, interrupt context and
perf_event_do_pending are misleading.

This patch updates the comments so that they reflect what the code
actually does (which is in line with other architectures).

Acked-by: default avatarJamie Iles <jamie.iles@picochip.com>
Signed-off-by: default avatarWill Deacon <will.deacon@arm.com>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent 2bfc96a1

arch/arm/include/asm/perf_event.h

+1 −1
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ 
 * counter interrupts are regular interrupts and not an NMI. This

 * means that when we receive the interrupt we can call

 * perf_event_do_pending() that handles all of the work with

 * interrupts enabled.

 * interrupts disabled.

 */

static inline void

set_perf_event_pending(void)

arch/arm/kernel/perf_event.c

+4 −4
Original line number Diff line number Diff line
@@ -1041,8 +1041,8 @@ armv6pmu_handle_irq(int irq_num, 
	/*

	 * Handle the pending perf events.

	 *

	 * Note: this call *must* be run with interrupts enabled. For

	 * platforms that can have the PMU interrupts raised as a PMI, this

	 * Note: this call *must* be run with interrupts disabled. For

	 * platforms that can have the PMU interrupts raised as an NMI, this

	 * will not work.

	 */

	perf_event_do_pending();
@@ -2017,8 +2017,8 @@ static irqreturn_t armv7pmu_handle_irq(int irq_num, void *dev) 
	/*

	 * Handle the pending perf events.

	 *

	 * Note: this call *must* be run with interrupts enabled. For

	 * platforms that can have the PMU interrupts raised as a PMI, this

	 * Note: this call *must* be run with interrupts disabled. For

	 * platforms that can have the PMU interrupts raised as an NMI, this

	 * will not work.

	 */

	perf_event_do_pending();