diff options
| author | Michael Ellerman <michael@ellerman.id.au> | 2006-03-21 10:45:59 +0100 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2006-03-22 05:04:17 +0100 |
| commit | 57cfb814f698d30894bc28e22125550193ebe549 (patch) | |
| tree | 755fd11b1a528f8de7913119b457f866734cb81a /arch/powerpc/oprofile | |
| parent | [PATCH] powerpc: trivial: Cleanup whitespace in cputable.h (diff) | |
| download | linux-57cfb814f698d30894bc28e22125550193ebe549.tar.xz linux-57cfb814f698d30894bc28e22125550193ebe549.zip | |
[PATCH] powerpc: Replace platform_is_lpar() with a firmware feature
It has been decreed that platform numbers are evil, so as a step in that
direction, replace platform_is_lpar() with a FW_FEATURE_LPAR bit.
Currently FW_FEATURE_LPAR really means i/pSeries LPAR, in the future we might
have to clean that up if we need to be more specific about what LPAR actually
means. But that's another patch ...
Signed-off-by: Michael Ellerman <michael@ellerman.id.au>
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, 2 insertions, 1 deletions
diff --git a/arch/powerpc/oprofile/op_model_power4.c b/arch/powerpc/oprofile/op_model_power4.c index 659a021da0c7..4b06e53eb9b4 100644 --- a/arch/powerpc/oprofile/op_model_power4.c +++ b/arch/powerpc/oprofile/op_model_power4.c @@ -10,6 +10,7 @@ #include <linux/oprofile.h> #include <linux/init.h> #include <linux/smp.h> +#include <asm/firmware.h> #include <asm/ptrace.h> #include <asm/system.h> #include <asm/processor.h> @@ -232,7 +233,7 @@ static unsigned long get_pc(struct pt_regs *regs) mmcra = mfspr(SPRN_MMCRA); /* Were we in the hypervisor? */ - if (platform_is_lpar() && (mmcra & MMCRA_SIHV)) + if (firmware_has_feature(FW_FEATURE_LPAR) && (mmcra & MMCRA_SIHV)) /* function descriptor madness */ return *((unsigned long *)hypervisor_bucket); |