diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2005-08-03 06:40:16 +0200 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2005-08-29 02:53:35 +0200 |
| commit | 8d15a3e55f49678b0900dcf5c1cddb322a129325 (patch) | |
| tree | c86205bde42833c25bf2f3b51f8b67f9d4e52a22 /arch/ppc64/kernel/time.c | |
| parent | [PATCH] ppc64: create firmware_has_feature() (diff) | |
| download | linux-8d15a3e55f49678b0900dcf5c1cddb322a129325.tar.xz linux-8d15a3e55f49678b0900dcf5c1cddb322a129325.zip | |
[PATCH] ppc64: make firmware_has_feature() stronger
Make firmware_has_feature() evaluate at compile time for the non pSeries
case and tidy up code where possible.
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Paul Mackerras <paulus@samba.org>
Diffstat (limited to 'arch/ppc64/kernel/time.c')
| -rw-r--r-- | arch/ppc64/kernel/time.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/arch/ppc64/kernel/time.c b/arch/ppc64/kernel/time.c index d523056fd660..1696e1b05bb9 100644 --- a/arch/ppc64/kernel/time.c +++ b/arch/ppc64/kernel/time.c @@ -371,13 +371,11 @@ int timer_interrupt(struct pt_regs * regs) process_hvlpevents(regs); #endif -/* collect purr register values often, for accurate calculations */ -#if defined(CONFIG_PPC_PSERIES) + /* collect purr register values often, for accurate calculations */ if (firmware_has_feature(FW_FEATURE_SPLPAR)) { struct cpu_usage *cu = &__get_cpu_var(cpu_usage_array); cu->current_tb = mfspr(SPRN_PURR); } -#endif irq_exit(); |