linux-stable.git/arch/arm/kernel/perf_event.c, branch linux-3.1.y

Merge branch 'devel-stable' into for-next

2011-07-22T22:09:07+00:00

Conflicts:
	arch/arm/kernel/entry-armv.S

Merge branches 'btc', 'dma', 'entry', 'fixes', 'linker-layout', 'misc', 'mmci', 'suspend' and 'vfp' into for-next

2011-07-22T22:08:48+00:00

Merge branch 'kprobes-thumb' of git://git.yxit.co.uk/linux into devel-stable

2011-07-15T09:06:42+00:00

ARM: perf: add support for the Cortex-A15 PMU

2011-07-07T18:20:53+00:00

This patch adds support for the Cortex-A15 PMU to the ARMv7
perf-event backend.

Signed-off-by: Will Deacon

ARM: perf: add support for the Cortex-A5 PMU

2011-07-07T18:20:53+00:00

This patch adds support for the Cortex-A5 PMU to the ARMv7 perf-event
backend.

Signed-off-by: Will Deacon

ARM: 6989/1: perf: do not start the PMU when no events are present

2011-07-05T11:37:23+00:00

armpmu_enable can be called in situations where no events are present
(for example, from the event rotation tick after a profiled task has
exited). In this case, we currently start the PMU anyway which may
leave it active inevitably without any events being monitored.

This patch adds a simple check to the enabling code so that we avoid
starting the PMU when no events are present.

Cc: 
Reported-by: Ashwin Chaugle 
Signed-off-by: Will Deacon 
Signed-off-by: Russell King

ARM: 6974/1: pmu: refactor reservation

2011-06-29T09:27:08+00:00

Currently, PMU platform_device reservation relies on some minor abuse
of the platform_device::id field for determining the type of PMU. This
is problematic for device tree based probing, where the ID cannot be
controlled.

This patch removes reliance on the id field, and depends on each PMU's
platform driver to figure out which type it is. As all PMUs handled by
the current platform_driver name "arm-pmu" are CPU PMUs, this
convention is hardcoded. New PMU types can be supported through the use
of {of,platform}_device_id tables

Signed-off-by: Mark Rutland 
Acked-by: Jamie Iles 
Acked-by: Will Deacon 
Cc: Rob Herring 
Cc: Mathieu Desnoyers 
Signed-off-by: Russell King

ARM: 6902/1: perf: Remove erroneous check on active_events

2011-05-20T21:39:17+00:00

When initialising a PMU, there is a check to protect against races with
other CPUs filling all of the available event slots. Since armpmu_add
checks that an event can be scheduled, we do not need to do this at
initialisation time. Furthermore the current code is broken because it
assumes that atomic_inc_not_zero will unconditionally increment
active_counts and then tries to decrement it again on failure.

This patch removes the broken, redundant code.

Signed-off-by: Mark Rutland 
Acked-by: Will Deacon 
Cc: Jamie Iles 
Signed-off-by: Russell King

ARM: 6884/1: Fix infinite loop in ARM user perf_event backtrace code

2011-04-27T21:02:46+00:00

The ARM user backtrace code can get into an infinite loop if it
runs into an invalid stack frame which points back to itself.
This situation has been observed in practice.  Fix it by capping
the number of entries in the backtrace.  This is also what other
architectures do in their backtrace code.

Signed-off-by: Sonny Rao 
Acked-by: Jamie Iles 
Acked-by: Olof Johansson 
Signed-off-by: Russell King

ARM: 6865/1: perf: ensure pass through zero is counted on overflow

2011-04-10T20:13:35+00:00

Commit a737823d ("ARM: perf: ensure overflows aren't missed due to IRQ
latency") changed the way that event deltas are calculated on overflow
so that we don't miss events when the new count value overtakes the
previous one.

Unfortunately, we forget to count the event that passes through zero so
we end up being off by 1. This patch adds on the correction.

Reported-by: Chris Moore 
Signed-off-by: Will Deacon 
Signed-off-by: Russell King