Merge branch 'for-2.6.26' of master.kernel.org:/pub/scm/linux/kernel/git/jwboyer...

diff --combined arch/powerpc/platforms/cell/spufs/sched.c
index 8a05ac863a27b0f614e01816dbd97508c7666f3c,7298e7db2c8365cf83f8519350f917a01a35c8c3..2e411f23462b47417e50f965905a62f947c73f8f
--- 1/arch/powerpc/platforms/cell/spufs/sched.c
--- 2/arch/powerpc/platforms/cell/spufs/sched.c
+++ b/arch/powerpc/platforms/cell/spufs/sched.c
@@@ -140,9 -140,6 +140,9 @@@ void __spu_update_sched_info(struct spu
         * if it is timesliced or preempted.
         */
        ctx->cpus_allowed = current->cpus_allowed;
 +
 +      /* Save the current cpu id for spu interrupt routing. */
 +      ctx->last_ran = raw_smp_processor_id();
  }
  
  void spu_update_sched_info(struct spu_context *ctx)
@@@ -246,6 -243,7 +246,6 @@@ static void spu_bind_context(struct sp
        spu_switch_log_notify(spu, ctx, SWITCH_LOG_START, 0);
        spu_restore(&ctx->csa, spu);
        spu->timestamp = jiffies;
 -      spu_cpu_affinity_set(spu, raw_smp_processor_id());
        spu_switch_notify(spu, ctx);
        ctx->state = SPU_STATE_RUNNABLE;
  
@@@ -659,8 -657,7 +659,8 @@@ static struct spu *find_victim(struct s
  
                        victim->stats.invol_ctx_switch++;
                        spu->stats.invol_ctx_switch++;
 -                      spu_add_to_rq(victim);
 +                      if (test_bit(SPU_SCHED_SPU_RUN, &ctx->sched_flags))
 +                              spu_add_to_rq(victim);
  
                        mutex_unlock(&victim->state_mutex);
  
@@@ -1068,10 -1065,9 +1068,9 @@@ int __init spu_sched_init(void
  
        mod_timer(&spuloadavg_timer, 0);
  
-       entry = create_proc_entry("spu_loadavg", 0, NULL);
+       entry = proc_create("spu_loadavg", 0, NULL, &spu_loadavg_fops);
        if (!entry)
                goto out_stop_kthread;
-       entry->proc_fops = &spu_loadavg_fops;
  
        pr_debug("spusched: tick: %d, min ticks: %d, default ticks: %d\n",
                        SPUSCHED_TICK, MIN_SPU_TIMESLICE, DEF_SPU_TIMESLICE);