summaryrefslogtreecommitdiffstats
path: root/arch/powerpc
diff options
context:
space:
mode:
authorBenjamin Herrenschmidt <benh@kernel.crashing.org>2013-03-13 09:55:02 +1100
committerBenjamin Herrenschmidt <benh@kernel.crashing.org>2013-03-13 10:06:46 +1100
commitd63ac5f6cf31c8a83170a9509b350c1489a7262b (patch)
treedcc6e23d213df6fadbe55bde2b2f1046fb61fd73 /arch/powerpc
parent13938117a57f88a22f0df9722a5db7271fda85cd (diff)
downloadlinux-stable-d63ac5f6cf31c8a83170a9509b350c1489a7262b.tar.gz
linux-stable-d63ac5f6cf31c8a83170a9509b350c1489a7262b.tar.bz2
linux-stable-d63ac5f6cf31c8a83170a9509b350c1489a7262b.zip
powerpc: Fix cputable entry for 970MP rev 1.0
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> CC: <stable@vger.kernel.org> [v3.0+]
Diffstat (limited to 'arch/powerpc')
-rw-r--r--arch/powerpc/kernel/cputable.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/kernel/cputable.c b/arch/powerpc/kernel/cputable.c
index 75a3d71b895d..19599ef352bc 100644
--- a/arch/powerpc/kernel/cputable.c
+++ b/arch/powerpc/kernel/cputable.c
@@ -275,7 +275,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,