diff options
| author |   Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2013-08-09 16:01:40 +1000 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2013-08-09 16:01:40 +1000 |
| commit | a12e4537ada6cbe0730cb0c5cf8ed5ff687e2c06 (patch) | |
| tree | 4dac427bef6f88bfde344615bac0d4875b775c78 /arch/powerpc/kernel/cputable.c | |
| parent | Merge tag 'trace-fixes-3.11-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace (diff) | |
| parent | powerpc/e500: Update compilation flags with core specific options (diff) | |
| download | linux-dev-a12e4537ada6cbe0730cb0c5cf8ed5ff687e2c06.tar.xz linux-dev-a12e4537ada6cbe0730cb0c5cf8ed5ff687e2c06.zip | |
Merge remote-tracking branch 'scott/next' into next
Merge some Freescale updates from Scott Wood
Diffstat (limited to 'arch/powerpc/kernel/cputable.c')
| -rw-r--r-- | arch/powerpc/kernel/cputable.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/kernel/cputable.c b/arch/powerpc/kernel/cputable.c index 22973a74df73..597d954e5860 100644 --- a/arch/powerpc/kernel/cputable.c +++ b/arch/powerpc/kernel/cputable.c @@ -2105,7 +2105,7 @@ static struct cpu_spec __initdata cpu_specs[] = { MMU_FTR_USE_TLBILX, .icache_bsize = 64, .dcache_bsize = 64, - .num_pmcs = 4, + .num_pmcs = 6, .oprofile_cpu_type = "ppc/e6500", .oprofile_type = PPC_OPROFILE_FSL_EMB, .cpu_setup = __setup_cpu_e6500, |