diff options
| author | Paul Mackerras | 2005-11-10 03:37:51 +0100 |
|---|---|---|
| committer | Paul Mackerras | 2005-11-10 03:37:51 +0100 |
| commit | 799d6046d3fb557006e6d7c9767fdb96479b0e0a (patch) | |
| tree | fff321e3c0c0e6d1192f453aab23ad204f350851 /arch/powerpc/kernel/prom_init.c | |
| parent | [PATCH] powerpc: Consolidate asm compatibility macros (diff) | |
| download | kernel-qcow2-linux-799d6046d3fb557006e6d7c9767fdb96479b0e0a.tar.gz kernel-qcow2-linux-799d6046d3fb557006e6d7c9767fdb96479b0e0a.tar.xz kernel-qcow2-linux-799d6046d3fb557006e6d7c9767fdb96479b0e0a.zip | |
[PATCH] powerpc: merge code values for identifying platforms
This patch merges platform codes. systemcfg->platform is no longer used,
systemcfg use in general is deprecated as much as possible (and renamed
_systemcfg before it gets completely moved elsewhere in a future patch),
_machine is now used on ppc64 along as ppc32. Platform codes aren't gone
yet but we are getting a step closer. A bunch of asm code in head[_64].S
is also turned into C code.
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Paul Mackerras <paulus@samba.org>
Diffstat (limited to 'arch/powerpc/kernel/prom_init.c')
| -rw-r--r-- | arch/powerpc/kernel/prom_init.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/arch/powerpc/kernel/prom_init.c b/arch/powerpc/kernel/prom_init.c index 09db1bb9ec91..4ce0105c308e 100644 --- a/arch/powerpc/kernel/prom_init.c +++ b/arch/powerpc/kernel/prom_init.c @@ -117,11 +117,6 @@ int of_workarounds; #define prom_debug(x...) #endif -#ifdef CONFIG_PPC32 -#define PLATFORM_POWERMAC _MACH_Pmac -#define PLATFORM_CHRP _MACH_chrp -#endif - typedef u32 prom_arg_t; @@ -2078,7 +2073,8 @@ unsigned long __init prom_init(unsigned long r3, unsigned long r4, /* * On pSeries, inform the firmware about our capabilities */ - if (RELOC(of_platform) & PLATFORM_PSERIES) + if (RELOC(of_platform) == PLATFORM_PSERIES || + RELOC(of_platform) == PLATFORM_PSERIES_LPAR) prom_send_capabilities(); #endif |