git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge to Fedora kernel-2.6.18-1.2224_FC5 patched with stable patch-2.6.18.1-vs2.0...
[linux-2.6.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
bf652cd
..
1350294
100644
(file)
--- a/
arch/powerpc/platforms/cell/spufs/sched.c
+++ b/
arch/powerpc/platforms/cell/spufs/sched.c
@@
-26,7
+26,6
@@
#undef DEBUG
#undef DEBUG
-#include <linux/config.h>
#include <linux/module.h>
#include <linux/errno.h>
#include <linux/sched.h>
#include <linux/module.h>
#include <linux/errno.h>
#include <linux/sched.h>
@@
-43,6
+42,7
@@
#include <asm/mmu_context.h>
#include <asm/spu.h>
#include <asm/spu_csa.h>
#include <asm/mmu_context.h>
#include <asm/spu.h>
#include <asm/spu_csa.h>
+#include <asm/spu_priv1.h>
#include "spufs.h"
#define SPU_MIN_TIMESLICE (100 * HZ / 1000)
#include "spufs.h"
#define SPU_MIN_TIMESLICE (100 * HZ / 1000)
@@
-363,7
+363,7
@@
int spu_activate(struct spu_context *ctx, u64 flags)
* We're likely to wait for interrupts on the same
* CPU that we are now on, so send them here.
*/
* We're likely to wait for interrupts on the same
* CPU that we are now on, so send them here.
*/
- spu_
irq_setaffinity
(spu, raw_smp_processor_id());
+ spu_
cpu_affinity_set
(spu, raw_smp_processor_id());
put_active_spu(spu);
return 0;
}
put_active_spu(spu);
return 0;
}