diff options
| author | Paul Mackerras <paulus@samba.org> | 2007-11-20 11:39:26 +1100 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2007-11-20 11:39:26 +1100 |
| commit | b22da92f2cf52b3c51dd9a45abb658b1414b0784 (patch) | |
| tree | 7c602fb1b2d1de588fbfde6bb53662b3a1f8cb8a /arch/ppc/kernel | |
| parent | 52142e756e9bf6485d3d53596e8aff2e816a7253 (diff) | |
| parent | 3d1d662ef423adf6947a37e230f4d7e8ed7c9544 (diff) | |
Merge branch 'for-2.6.24' of master.kernel.org:/pub/scm/linux/kernel/git/jwboyer/powerpc-4xx into merge
Diffstat (limited to 'arch/ppc/kernel')
| -rw-r--r-- | arch/ppc/kernel/setup.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/arch/ppc/kernel/setup.c b/arch/ppc/kernel/setup.c index aac88c2f3db..5255bd80aa6 100644 --- a/arch/ppc/kernel/setup.c +++ b/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)); |