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/process.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/process.c')
| -rw-r--r-- | arch/ppc64/kernel/process.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/arch/ppc64/kernel/process.c b/arch/ppc64/kernel/process.c index 9bad983333b1..7a7e027653ad 100644 --- a/arch/ppc64/kernel/process.c +++ b/arch/ppc64/kernel/process.c @@ -203,10 +203,9 @@ struct task_struct *__switch_to(struct task_struct *prev, new_thread = &new->thread; old_thread = ¤t->thread; -/* Collect purr utilization data per process and per processor wise */ -/* purr is nothing but processor time base */ - -#if defined(CONFIG_PPC_PSERIES) + /* Collect purr utilization data per process and per processor + * wise purr is nothing but processor time base + */ if (firmware_has_feature(FW_FEATURE_SPLPAR)) { struct cpu_usage *cu = &__get_cpu_var(cpu_usage_array); long unsigned start_tb, current_tb; @@ -215,8 +214,6 @@ struct task_struct *__switch_to(struct task_struct *prev, old_thread->accum_tb += (current_tb - start_tb); new_thread->start_tb = current_tb; } -#endif - local_irq_save(flags); last = _switch(old_thread, new_thread); |