diff options
author | Ralf Baechle <ralf@linux-mips.org> | 2007-07-10 12:33:02 -0400 |
---|---|---|
committer | Ralf Baechle <ralf@linux-mips.org> | 2007-07-10 12:33:02 -0400 |
commit | d223a86154f8c66f5a380b17e1c8091d56f47cf8 (patch) | |
tree | 97155684a16f2fe1477653b49aec152bcea6cd41 /arch/mips/kernel/mips-mt.c | |
parent | e7c4782f92fc4b83d953ce53f77f05ae65dcd773 (diff) |
[MIPS] FP affinity: Coding style cleanups
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Diffstat (limited to 'arch/mips/kernel/mips-mt.c')
-rw-r--r-- | arch/mips/kernel/mips-mt.c | 40 |
1 files changed, 22 insertions, 18 deletions
diff --git a/arch/mips/kernel/mips-mt.c b/arch/mips/kernel/mips-mt.c index ba01800b6018..b1b994dd41db 100644 --- a/arch/mips/kernel/mips-mt.c +++ b/arch/mips/kernel/mips-mt.c | |||
@@ -109,7 +109,7 @@ asmlinkage long mipsmt_sys_sched_setaffinity(pid_t pid, unsigned int len, | |||
109 | read_unlock(&tasklist_lock); | 109 | read_unlock(&tasklist_lock); |
110 | 110 | ||
111 | /* Compute new global allowed CPU set if necessary */ | 111 | /* Compute new global allowed CPU set if necessary */ |
112 | if( (p->thread.mflags & MF_FPUBOUND) | 112 | if ((p->thread.mflags & MF_FPUBOUND) |
113 | && cpus_intersects(new_mask, mt_fpu_cpumask)) { | 113 | && cpus_intersects(new_mask, mt_fpu_cpumask)) { |
114 | cpus_and(effective_mask, new_mask, mt_fpu_cpumask); | 114 | cpus_and(effective_mask, new_mask, mt_fpu_cpumask); |
115 | retval = set_cpus_allowed(p, effective_mask); | 115 | retval = set_cpus_allowed(p, effective_mask); |
@@ -195,27 +195,31 @@ void mips_mt_regdump(unsigned long mvpctl) | |||
195 | nvpe = ((mvpconf0 & MVPCONF0_PVPE) >> MVPCONF0_PVPE_SHIFT) + 1; | 195 | nvpe = ((mvpconf0 & MVPCONF0_PVPE) >> MVPCONF0_PVPE_SHIFT) + 1; |
196 | ntc = ((mvpconf0 & MVPCONF0_PTC) >> MVPCONF0_PTC_SHIFT) + 1; | 196 | ntc = ((mvpconf0 & MVPCONF0_PTC) >> MVPCONF0_PTC_SHIFT) + 1; |
197 | printk("-- per-VPE State --\n"); | 197 | printk("-- per-VPE State --\n"); |
198 | for(i = 0; i < nvpe; i++) { | 198 | for (i = 0; i < nvpe; i++) { |
199 | for(tc = 0; tc < ntc; tc++) { | 199 | for (tc = 0; tc < ntc; tc++) { |
200 | settc(tc); | 200 | settc(tc); |
201 | if((read_tc_c0_tcbind() & TCBIND_CURVPE) == i) { | 201 | if ((read_tc_c0_tcbind() & TCBIND_CURVPE) == i) { |
202 | printk(" VPE %d\n", i); | 202 | printk(" VPE %d\n", i); |
203 | printk(" VPEControl : %08lx\n", read_vpe_c0_vpecontrol()); | 203 | printk(" VPEControl : %08lx\n", |
204 | printk(" VPEConf0 : %08lx\n", read_vpe_c0_vpeconf0()); | 204 | read_vpe_c0_vpecontrol()); |
205 | printk(" VPE%d.Status : %08lx\n", | 205 | printk(" VPEConf0 : %08lx\n", |
206 | i, read_vpe_c0_status()); | 206 | read_vpe_c0_vpeconf0()); |
207 | printk(" VPE%d.EPC : %08lx\n", i, read_vpe_c0_epc()); | 207 | printk(" VPE%d.Status : %08lx\n", |
208 | printk(" VPE%d.Cause : %08lx\n", i, read_vpe_c0_cause()); | 208 | i, read_vpe_c0_status()); |
209 | printk(" VPE%d.Config7 : %08lx\n", | 209 | printk(" VPE%d.EPC : %08lx\n", |
210 | i, read_vpe_c0_config7()); | 210 | i, read_vpe_c0_epc()); |
211 | break; /* Next VPE */ | 211 | printk(" VPE%d.Cause : %08lx\n", |
212 | i, read_vpe_c0_cause()); | ||
213 | printk(" VPE%d.Config7 : %08lx\n", | ||
214 | i, read_vpe_c0_config7()); | ||
215 | break; /* Next VPE */ | ||
216 | } | ||
212 | } | 217 | } |
213 | } | ||
214 | } | 218 | } |
215 | printk("-- per-TC State --\n"); | 219 | printk("-- per-TC State --\n"); |
216 | for(tc = 0; tc < ntc; tc++) { | 220 | for (tc = 0; tc < ntc; tc++) { |
217 | settc(tc); | 221 | settc(tc); |
218 | if(read_tc_c0_tcbind() == read_c0_tcbind()) { | 222 | if (read_tc_c0_tcbind() == read_c0_tcbind()) { |
219 | /* Are we dumping ourself? */ | 223 | /* Are we dumping ourself? */ |
220 | haltval = 0; /* Then we're not halted, and mustn't be */ | 224 | haltval = 0; /* Then we're not halted, and mustn't be */ |
221 | tcstatval = flags; /* And pre-dump TCStatus is flags */ | 225 | tcstatval = flags; /* And pre-dump TCStatus is flags */ |
@@ -384,7 +388,7 @@ void mips_mt_set_cpuoptions(void) | |||
384 | mt_fpemul_threshold = fpaff_threshold; | 388 | mt_fpemul_threshold = fpaff_threshold; |
385 | } else { | 389 | } else { |
386 | mt_fpemul_threshold = | 390 | mt_fpemul_threshold = |
387 | (FPUSEFACTOR * (loops_per_jiffy/(500000/HZ))) / HZ; | 391 | (FPUSEFACTOR * (loops_per_jiffy / (500000 / HZ))) / HZ; |
388 | } | 392 | } |
389 | printk("FPU Affinity set after %ld emulations\n", | 393 | printk("FPU Affinity set after %ld emulations\n", |
390 | mt_fpemul_threshold); | 394 | mt_fpemul_threshold); |