diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-09-22 08:11:04 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-09-22 08:11:04 -0700 |
| commit | 7fa07729e439a6184bd824746d06a49cca553f15 (patch) | |
| tree | 9037f5c36d64f842a030a1284f76a354ef6f76e6 /arch/powerpc/include/asm | |
| parent | 991d79b0d1255f89267a350b0048eca59f100cbb (diff) | |
| parent | a8f90e906783f1f815120eefe813b23cb396e9bd (diff) | |
| download | op-kernel-dev-7fa07729e439a6184bd824746d06a49cca553f15.zip op-kernel-dev-7fa07729e439a6184bd824746d06a49cca553f15.tar.gz | |
Merge branch 'perf-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'perf-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
perf_event, powerpc: Fix compilation after big perf_counter rename
Diffstat (limited to 'arch/powerpc/include/asm')
| -rw-r--r-- | arch/powerpc/include/asm/perf_event.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/powerpc/include/asm/perf_event.h b/arch/powerpc/include/asm/perf_event.h index 2499aaa..3288ce3 100644 --- a/arch/powerpc/include/asm/perf_event.h +++ b/arch/powerpc/include/asm/perf_event.h @@ -14,7 +14,7 @@ #define MAX_HWEVENTS 8 #define MAX_EVENT_ALTERNATIVES 8 -#define MAX_LIMITED_HWEVENTS 2 +#define MAX_LIMITED_HWCOUNTERS 2 /* * This struct provides the constants and functions needed to @@ -22,7 +22,7 @@ */ struct power_pmu { const char *name; - int n_event; + int n_counter; int max_alternatives; unsigned long add_fields; unsigned long test_adder; |
