diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2013-03-13 09:55:02 +1100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-03-20 13:04:59 -0700 |
| commit | e55005034b11c0dd52ac08b7f769ec410b6bfa1f (patch) | |
| tree | ecb7ca5c21191bb2248c5989f72c5034e28a5dc3 /arch/powerpc | |
| parent | 9d4a6f2cee36dab61a3bd58d1f197f733738995f (diff) | |
| download | linux-3.10-e55005034b11c0dd52ac08b7f769ec410b6bfa1f.tar.gz linux-3.10-e55005034b11c0dd52ac08b7f769ec410b6bfa1f.tar.bz2 linux-3.10-e55005034b11c0dd52ac08b7f769ec410b6bfa1f.zip | |
powerpc: Fix cputable entry for 970MP rev 1.0
commit d63ac5f6cf31c8a83170a9509b350c1489a7262b upstream.
Commit 44ae3ab3358e962039c36ad4ae461ae9fb29596c forgot to update
the entry for the 970MP rev 1.0 processor when moving some CPU
features bits to the MMU feature bit mask. This breaks booting
on some rare G5 models using that chip revision.
Reported-by: Phileas Fogg <phileas-fogg@mail.ru>
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'arch/powerpc')
| -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 455faa38987..31a3dd020f5 100644 --- a/arch/powerpc/kernel/cputable.c +++ b/arch/powerpc/kernel/cputable.c @@ -269,7 +269,7 @@ static struct cpu_spec __initdata cpu_specs[] = { .cpu_features = CPU_FTRS_PPC970, .cpu_user_features = COMMON_USER_POWER4 | PPC_FEATURE_HAS_ALTIVEC_COMP, - .mmu_features = MMU_FTR_HPTE_TABLE, + .mmu_features = MMU_FTRS_PPC970, .icache_bsize = 128, .dcache_bsize = 128, .num_pmcs = 8, |