git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'dev' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4
[pandora-kernel.git]
/
arch
/
powerpc
/
platforms
/
cell
/
spufs
/
sched.c
diff --git
a/arch/powerpc/platforms/cell/spufs/sched.c
b/arch/powerpc/platforms/cell/spufs/sched.c
index
6520385
..
965d381
100644
(file)
--- a/
arch/powerpc/platforms/cell/spufs/sched.c
+++ b/
arch/powerpc/platforms/cell/spufs/sched.c
@@
-22,7
+22,6
@@
#undef DEBUG
#undef DEBUG
-#include <linux/module.h>
#include <linux/errno.h>
#include <linux/sched.h>
#include <linux/kernel.h>
#include <linux/errno.h>
#include <linux/sched.h>
#include <linux/kernel.h>
@@
-141,7
+140,7
@@
void __spu_update_sched_info(struct spu_context *ctx)
* runqueue. The context will be rescheduled on the proper node
* if it is timesliced or preempted.
*/
* runqueue. The context will be rescheduled on the proper node
* if it is timesliced or preempted.
*/
- c
tx->cpus_allowed = current->cpus_allowed
;
+ c
pumask_copy(&ctx->cpus_allowed, tsk_cpus_allowed(current))
;
/* Save the current cpu id for spu interrupt routing. */
ctx->last_ran = raw_smp_processor_id();
/* Save the current cpu id for spu interrupt routing. */
ctx->last_ran = raw_smp_processor_id();