summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJordi Caubet2006-04-12 17:44:27 +0200
committerPaul Mackerras2006-04-13 18:38:46 +0200
commit183b73ae7c9e4e19fa95d88e1778481899a65210 (patch)
treefc428c7de0612de1ae941a32c172a8c07b8d35fd
parent[PATCH] powerpc32: Set cpu explicitly in kernel compiles (diff)
downloadkernel-qcow2-linux-183b73ae7c9e4e19fa95d88e1778481899a65210.tar.gz
kernel-qcow2-linux-183b73ae7c9e4e19fa95d88e1778481899a65210.tar.xz
kernel-qcow2-linux-183b73ae7c9e4e19fa95d88e1778481899a65210.zip
[PATCH] spufs: fix context-switch decrementer code
We found that when the 'decrementer' is saved, the PPE saves the current time 'csa->suspend_time'. When restoring the 'decrementer', (Step 34) decrementer seems to be adjusted with the number of cycles th= at a spu thread has not been running. In that code it is missing a substract ('-') because 'delta_time' is assigned a not substracted(see bellow). Acked-by: Mark Nutter <mnutter@us.ibm.com> Signed-off-by: Arnd Bergmann <arnd.bergmann@de.ibm.com> Signed-off-by: Paul Mackerras <paulus@samba.org>
-rw-r--r--arch/powerpc/platforms/cell/spufs/switch.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/platforms/cell/spufs/switch.c b/arch/powerpc/platforms/cell/spufs/switch.c
index 97898d5d34e5..1726bfe38ee0 100644
--- a/arch/powerpc/platforms/cell/spufs/switch.c
+++ b/arch/powerpc/platforms/cell/spufs/switch.c
@@ -1297,7 +1297,7 @@ static inline void setup_decr(struct spu_state *csa, struct spu *spu)
cycles_t resume_time = get_cycles();
cycles_t delta_time = resume_time - csa->suspend_time;
- csa->lscsa->decr.slot[0] = delta_time;
+ csa->lscsa->decr.slot[0] -= delta_time;
}
}