lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source 
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: Jamie Iles <jamie.iles@picochip.com>
Signed-off-by: Will Deacon <will.deacon@arm.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
This commit is contained in:
Will Deacon
2010-08-16 15:15:14 +01:00
committed by Russell King
parent 2bfc96a127
commit 25d3584797
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
arch/arm/include/asm/perf_event.h
View File

@@ -17,7 +17,7 @@
* counter interrupts are regular interrupts and not an NMI. This * counter interrupts are regular interrupts and not an NMI. This
* means that when we receive the interrupt we can call * means that when we receive the interrupt we can call
* perf_event_do_pending() that handles all of the work with * perf_event_do_pending() that handles all of the work with
* interrupts enabled. * interrupts disabled.
*/ */
static inline void static inline void
set_perf_event_pending(void) set_perf_event_pending(void)

8
arch/arm/kernel/perf_event.c
View File

@@ -1041,8 +1041,8 @@ armv6pmu_handle_irq(int irq_num,
/* /*
* Handle the pending perf events. * Handle the pending perf events.
* *
* Note: this call *must* be run with interrupts enabled. For * Note: this call *must* be run with interrupts disabled. For
* platforms that can have the PMU interrupts raised as a PMI, this * platforms that can have the PMU interrupts raised as an NMI, this
* will not work. * will not work.
*/ */
perf_event_do_pending(); perf_event_do_pending();
@@ -2017,8 +2017,8 @@ static irqreturn_t armv7pmu_handle_irq(int irq_num, void *dev)
/* /*
* Handle the pending perf events. * Handle the pending perf events.
* *
* Note: this call *must* be run with interrupts enabled. For * Note: this call *must* be run with interrupts disabled. For
* platforms that can have the PMU interrupts raised as a PMI, this * platforms that can have the PMU interrupts raised as an NMI, this
* will not work. * will not work.
*/ */
perf_event_do_pending(); perf_event_do_pending();