diff options
| author | Paul Mackerras <paulus@samba.org> | 2005-11-10 13:37:51 +1100 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2005-11-10 13:37:51 +1100 |
| commit | 799d6046d3fb557006e6d7c9767fdb96479b0e0a (patch) | |
| tree | fff321e3c0c0e6d1192f453aab23ad204f350851 /arch/powerpc/oprofile | |
| parent | 3ddfbcf19b15ccd25a0b4b2dc2e38000e08de739 (diff) | |
| download | kernel_goldelico_gta04-799d6046d3fb557006e6d7c9767fdb96479b0e0a.zip kernel_goldelico_gta04-799d6046d3fb557006e6d7c9767fdb96479b0e0a.tar.gz kernel_goldelico_gta04-799d6046d3fb557006e6d7c9767fdb96479b0e0a.tar.bz2 | |
[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/oprofile')
| -rw-r--r-- | arch/powerpc/oprofile/op_model_power4.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/powerpc/oprofile/op_model_power4.c b/arch/powerpc/oprofile/op_model_power4.c index c4ee547..e3a024e 100644 --- a/arch/powerpc/oprofile/op_model_power4.c +++ b/arch/powerpc/oprofile/op_model_power4.c @@ -233,8 +233,7 @@ static unsigned long get_pc(struct pt_regs *regs) mmcra = mfspr(SPRN_MMCRA); /* Were we in the hypervisor? */ - if ((systemcfg->platform == PLATFORM_PSERIES_LPAR) && - (mmcra & MMCRA_SIHV)) + if (platform_is_lpar() && (mmcra & MMCRA_SIHV)) /* function descriptor madness */ return *((unsigned long *)hypervisor_bucket); |