summaryrefslogtreecommitdiffstats
path: root/arch/powerpc/kernel
diff options
context:
space:
mode:
authorBenjamin Herrenschmidt <benh@kernel.crashing.org>2013-03-13 09:55:02 +1100
committerBen Hutchings <ben@decadent.org.uk>2013-03-27 02:41:02 +0000
commit037c144f928456efae95d57bc0530fa61d87987c (patch)
tree9ed09e0f311bcea498c6636b25ce9e1dd6d58255 /arch/powerpc/kernel
parentaec826e01921621c929983540ab1f3a0738fc743 (diff)
downloadlinux-stable-037c144f928456efae95d57bc0530fa61d87987c.tar.gz
linux-stable-037c144f928456efae95d57bc0530fa61d87987c.tar.bz2
linux-stable-037c144f928456efae95d57bc0530fa61d87987c.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: Ben Hutchings <ben@decadent.org.uk>
Diffstat (limited to 'arch/powerpc/kernel')
-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 edae5bb06f1f..b92b7569f9a9 100644
--- a/arch/powerpc/kernel/cputable.c
+++ b/arch/powerpc/kernel/cputable.c
@@ -268,7 +268,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,