diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-11-06 10:11:46 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-11-06 10:11:46 +0100 |
| commit | 90b4d60c6103105a634c495003c2ce931f075f63 (patch) | |
| tree | 033f07fb175a5e0651f6a63fc0fe8e1860555ce5 /arch/s390/include/asm/perf_event.h | |
| parent | bac91462e8a8609d7be02a2cbf5c2b406b04ed9f (diff) | |
| parent | 8f0d8163b50e01f398b14bcd4dc039ac5ab18d64 (diff) | |
| download | blackbird-op-linux-90b4d60c6103105a634c495003c2ce931f075f63.tar.gz blackbird-op-linux-90b4d60c6103105a634c495003c2ce931f075f63.zip | |
Merge tag 'v3.7-rc3' into HEAD
Linux 3.7-rc3
Diffstat (limited to 'arch/s390/include/asm/perf_event.h')
| -rw-r--r-- | arch/s390/include/asm/perf_event.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/s390/include/asm/perf_event.h b/arch/s390/include/asm/perf_event.h index 7941968e12b4..5f0173a31693 100644 --- a/arch/s390/include/asm/perf_event.h +++ b/arch/s390/include/asm/perf_event.h @@ -9,7 +9,7 @@ #include <asm/cpu_mf.h> /* CPU-measurement counter facility */ -#define PERF_CPUM_CF_MAX_CTR 160 +#define PERF_CPUM_CF_MAX_CTR 256 /* Per-CPU flags for PMU states */ #define PMU_F_RESERVED 0x1000 |
