From a60ac83c7bd5097a3f894aeee4a2dc9cc0ba5f22 Mon Sep 17 00:00:00 2001 From: Josh Boyer Date: Sat, 17 Nov 2007 04:29:56 +1100 Subject: [PATCH] --- yaml --- r: 73947 b: refs/heads/master c: 3d1d662ef423adf6947a37e230f4d7e8ed7c9544 h: refs/heads/master i: 73945: 5525429a2b9c66ef383eca5e294bcd2a1c392f33 73943: 633653d301e652f016fc3f20d5eab30febade2b2 v: v3 --- [refs] | 2 +- trunk/arch/ppc/kernel/setup.c | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index fc05821b60ed..99622d17ce18 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b8b799a497e4a4bfd5fca8abc526e908b26c71e8 +refs/heads/master: 3d1d662ef423adf6947a37e230f4d7e8ed7c9544 diff --git a/trunk/arch/ppc/kernel/setup.c b/trunk/arch/ppc/kernel/setup.c index aac88c2f3db9..5255bd80aa6b 100644 --- a/trunk/arch/ppc/kernel/setup.c +++ b/trunk/arch/ppc/kernel/setup.c @@ -312,7 +312,14 @@ early_init(int r3, int r4, int r5) * Identify the CPU type and fix up code sections * that depend on which cpu we have. */ +#if defined(CONFIG_440EP) && defined(CONFIG_PPC_FPU) + /* We pass the virtual PVR here for 440EP as 440EP and 440GR have + * identical PVRs and there is no reliable way to check for the FPU + */ + spec = identify_cpu(offset, (mfspr(SPRN_PVR) | 0x8)); +#else spec = identify_cpu(offset, mfspr(SPRN_PVR)); +#endif do_feature_fixups(spec->cpu_features, PTRRELOC(&__start___ftr_fixup), PTRRELOC(&__stop___ftr_fixup));