diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-07-10 17:25:03 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-07-10 17:25:03 -0400 |
| commit | 85be928c4101670f99cdd7c927798aa4dcbb3168 (patch) | |
| tree | 91befa19ca6da9edf74040bd1fd0cf68ab0cea4c /arch/powerpc | |
| parent | d86ee4809d0329d4aa0d0f2c76c2295a16862799 (diff) | |
| parent | 805d127d62472f17c7d79baa001a7651afe2fa47 (diff) | |
Merge branch 'perfcounters-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'perfcounters-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (50 commits)
perf report: Add "Fractal" mode output - support callchains with relative overhead rate
perf_counter tools: callchains: Manage the cumul hits on the fly
perf report: Change default callchain parameters
perf report: Use a modifiable string for default callchain options
perf report: Warn on callchain output request from non-callchain file
x86: atomic64: Inline atomic64_read() again
x86: atomic64: Clean up atomic64_sub_and_test() and atomic64_add_negative()
x86: atomic64: Improve atomic64_xchg()
x86: atomic64: Export APIs to modules
x86: atomic64: Improve atomic64_read()
x86: atomic64: Code atomic(64)_read and atomic(64)_set in C not CPP
x86: atomic64: Fix unclean type use in atomic64_xchg()
x86: atomic64: Make atomic_read() type-safe
x86: atomic64: Reduce size of functions
x86: atomic64: Improve atomic64_add_return()
x86: atomic64: Improve cmpxchg8b()
x86: atomic64: Improve atomic64_read()
x86: atomic64: Move the 32-bit atomic64_t implementation to a .c file
x86: atomic64: The atomic64_t data type should be 8 bytes aligned on 32-bit too
perf report: Annotate variable initialization
...
Diffstat (limited to 'arch/powerpc')
| -rw-r--r-- | arch/powerpc/kernel/power7-pmu.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/powerpc/kernel/power7-pmu.c b/arch/powerpc/kernel/power7-pmu.c index 5d755ef7ac8f..5a9f5cbd40a4 100644 --- a/arch/powerpc/kernel/power7-pmu.c +++ b/arch/powerpc/kernel/power7-pmu.c | |||
| @@ -358,6 +358,7 @@ static struct power_pmu power7_pmu = { | |||
| 358 | .get_constraint = power7_get_constraint, | 358 | .get_constraint = power7_get_constraint, |
| 359 | .get_alternatives = power7_get_alternatives, | 359 | .get_alternatives = power7_get_alternatives, |
| 360 | .disable_pmc = power7_disable_pmc, | 360 | .disable_pmc = power7_disable_pmc, |
| 361 | .flags = PPMU_ALT_SIPR, | ||
| 361 | .n_generic = ARRAY_SIZE(power7_generic_events), | 362 | .n_generic = ARRAY_SIZE(power7_generic_events), |
| 362 | .generic_events = power7_generic_events, | 363 | .generic_events = power7_generic_events, |
| 363 | .cache_events = &power7_cache_events, | 364 | .cache_events = &power7_cache_events, |