Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/jk/spufs

diff --combined arch/powerpc/platforms/cell/spufs/file.c
index f14d3a0a861598e1834a5c50108b431cbdc076bb,189933e3a94d43eaf2bf68675920d75f0cca9c86..ba791e931bd645f427cc108c8628be0ee00949a5
--- 1/arch/powerpc/platforms/cell/spufs/file.c
--- 2/arch/powerpc/platforms/cell/spufs/file.c
+++ b/arch/powerpc/platforms/cell/spufs/file.c
@@@ -1337,7 -1337,7 +1337,7 @@@ static u64 spufs_signal1_type_get(struc
        return ctx->ops->signal1_type_get(ctx);
  }
  DEFINE_SPUFS_ATTRIBUTE(spufs_signal1_type, spufs_signal1_type_get,
-                      spufs_signal1_type_set, "%llu", SPU_ATTR_ACQUIRE);
+                      spufs_signal1_type_set, "%llu\n", SPU_ATTR_ACQUIRE);
  
  
  static int spufs_signal2_type_set(void *data, u64 val)
@@@ -1359,7 -1359,7 +1359,7 @@@ static u64 spufs_signal2_type_get(struc
        return ctx->ops->signal2_type_get(ctx);
  }
  DEFINE_SPUFS_ATTRIBUTE(spufs_signal2_type, spufs_signal2_type_get,
-                      spufs_signal2_type_set, "%llu", SPU_ATTR_ACQUIRE);
+                      spufs_signal2_type_set, "%llu\n", SPU_ATTR_ACQUIRE);
  
  #if SPUFS_MMAP_4K
  static unsigned long spufs_mss_mmap_nopfn(struct vm_area_struct *vma,
@@@ -1556,7 -1556,7 +1556,7 @@@ void spufs_mfc_callback(struct spu *spu
  
        wake_up_all(&ctx->mfc_wq);
  
 -      pr_debug("%s %s\n", __FUNCTION__, spu->name);
 +      pr_debug("%s %s\n", __func__, spu->name);
        if (ctx->mfc_fasync) {
                u32 free_elements, tagstatus;
                unsigned int mask;
@@@ -1790,7 -1790,7 +1790,7 @@@ static unsigned int spufs_mfc_poll(stru
        if (tagstatus & ctx->tagwait)
                mask |= POLLIN | POLLRDNORM;
  
 -      pr_debug("%s: free %d tagstatus %d tagwait %d\n", __FUNCTION__,
 +      pr_debug("%s: free %d tagstatus %d tagwait %d\n", __func__,
                free_elements, tagstatus, ctx->tagwait);
  
        return mask;

diff --combined arch/powerpc/platforms/cell/spufs/run.c
index 5986d08115afb0da9bb97659352deba51f177cfc,2619f14546a3dd620046c2f80a6145c8d89f0bbf..96bf7c2b86fcf61ca6d241e9d222853ed7ba883b
--- 1/arch/powerpc/platforms/cell/spufs/run.c
--- 2/arch/powerpc/platforms/cell/spufs/run.c
+++ b/arch/powerpc/platforms/cell/spufs/run.c
@@@ -98,7 -98,7 +98,7 @@@ static int spu_setup_isolated(struct sp
                        != MFC_CNTL_PURGE_DMA_COMPLETE) {
                if (time_after(jiffies, timeout)) {
                        printk(KERN_ERR "%s: timeout flushing MFC DMA queue\n",
 -                                      __FUNCTION__);
 +                                      __func__);
                        ret = -EIO;
                        goto out;
                }
@@@ -124,7 -124,7 +124,7 @@@
                                status_loading) {
                if (time_after(jiffies, timeout)) {
                        printk(KERN_ERR "%s: timeout waiting for loader\n",
 -                                      __FUNCTION__);
 +                                      __func__);
                        ret = -EIO;
                        goto out_drop_priv;
                }
@@@ -134,7 -134,7 +134,7 @@@
        if (!(status & SPU_STATUS_RUNNING)) {
                /* If isolated LOAD has failed: run SPU, we will get a stop-and
                 * signal later. */
 -              pr_debug("%s: isolated LOAD failed\n", __FUNCTION__);
 +              pr_debug("%s: isolated LOAD failed\n", __func__);
                ctx->ops->runcntl_write(ctx, SPU_RUNCNTL_RUNNABLE);
                ret = -EACCES;
                goto out_drop_priv;
@@@ -142,7 -142,7 +142,7 @@@
  
        if (!(status & SPU_STATUS_ISOLATED_STATE)) {
                /* This isn't allowed by the CBEA, but check anyway */
 -              pr_debug("%s: SPU fell out of isolated mode?\n", __FUNCTION__);
 +              pr_debug("%s: SPU fell out of isolated mode?\n", __func__);
                ctx->ops->runcntl_write(ctx, SPU_RUNCNTL_STOP);
                ret = -EINVAL;
                goto out_drop_priv;
@@@ -282,7 -282,7 +282,7 @@@ static int spu_handle_restartsys(struc
                break;
        default:
                printk(KERN_WARNING "%s: unexpected return code %ld\n",
 -                      __FUNCTION__, *spu_ret);
 +                      __func__, *spu_ret);
                ret = 0;
        }
        return ret;
@@@ -323,6 -323,10 +323,10 @@@ static int spu_process_callback(struct 
                        return -EINTR;
        }
  
+       /* need to re-get the ls, as it may have changed when we released the
+        * spu */
+       ls = (void __iomem *)ctx->ops->get_ls(ctx);
+ 
        /* write result, jump over indirect pointer */
        memcpy_toio(ls + ls_pointer, &spu_ret, sizeof(spu_ret));
        ctx->ops->npc_write(ctx, npc);