Please pull powerpc.git 'merge' branch

[Olof Johansson]

Add check for 970GX for __cpu_preinit_ppc970.


Signed-off-by: Olof Johansson <olof at lixom.net>

---

On Thu, 26 Oct 2006 07:34:31 +1000 Paul Mackerras <paulus at samba.org> wrote:

> There was no "issue", there was a possible further optimization, but
> that's not a reason not to put in the cputable entry in the first
> place.


For the deep nap stuff, yes. But the below was what I meant. Only
really needed on firmware that will never ship with a 970GX chip, but
for correctness sake it should still be in there.


diff --git a/arch/powerpc/kernel/head_64.S b/arch/powerpc/kernel/head_64.S
index 645c7f1..d528641 100644
--- a/arch/powerpc/kernel/head_64.S
+++ b/arch/powerpc/kernel/head_64.S
@@ -1646,6 +1646,8 @@ #endif
 	cmpwi	r0,0x3c		/* 970FX */
 	beq	1f
 	cmpwi	r0,0x44		/* 970MP */
+	beq	1f
+	cmpwi	r0,0x45		/* 970GX */
 	bne	2f
 1:	bl	.__cpu_preinit_ppc970
 2: