Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc

* 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc:
  [POWERPC] Fix crashkernel= handling when no crashkernel= specified
  [POWERPC] Make emergency stack safe for current_thread_info() use
  [POWERPC] spufs: add .gitignore for spu_save_dump.h & spu_restore_dump.h
  [POWERPC] spufs: trace spu_acquire_saved events
  [POWERPC] spufs: fix marker name for find_victim
  [POWERPC] spufs: add marker for destroy_spu_context
  [POWERPC] spufs: add sputrace marker parameter names
  [POWERPC] spufs: add context switch notification log
  [POWERPC] mpc5200: defconfigs for CM5200, Lite5200B, Motion-PRO and TQM5200
  [POWERPC] mpc5200: Switch mpc5200 dts files to dts-v1 format
  [POWERPC] mpc5200: Fix FEC error handling on FIFO errors
  [POWERPC] mpc5200: add Phytec pcm030 board support
  [POWERPC] mpc5200: add gpiolib support for mpc5200
  [POWERPC] mpc5200: add interrupt type function
  [POWERPC] mpc5200: Fix unterminated of_device_id table

diff --combined arch/powerpc/platforms/cell/spufs/sched.c
index 45dcd269350234173d862f5ea62b4c2c5df3a9fb,62280c292aac88b481291757a7e78aa094c3cf8f..7298e7db2c8365cf83f8519350f917a01a35c8c3
--- 1/arch/powerpc/platforms/cell/spufs/sched.c
--- 2/arch/powerpc/platforms/cell/spufs/sched.c
+++ b/arch/powerpc/platforms/cell/spufs/sched.c
@@@ -240,6 -240,7 +240,7 @@@ static void spu_bind_context(struct sp
        spu->mfc_callback = spufs_mfc_callback;
        mb();
        spu_unmap_mappings(ctx);
+       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());
@@@ -419,6 -420,7 +420,7 @@@ static void spu_unbind_context(struct s
        spu_switch_notify(spu, NULL);
        spu_unmap_mappings(ctx);
        spu_save(&ctx->csa, spu);
+       spu_switch_log_notify(spu, ctx, SWITCH_LOG_STOP, 0);
        spu->timestamp = jiffies;
        ctx->state = SPU_STATE_SAVED;
        spu->ibox_callback = NULL;
@@@ -591,7 -593,7 +593,7 @@@ static struct spu *find_victim(struct s
        struct spu *spu;
        int node, n;
  
-       spu_context_nospu_trace(spu_find_vitim__enter, ctx);
+       spu_context_nospu_trace(spu_find_victim__enter, ctx);
  
        /*
         * Look for a possible preemption candidate on the local node first.
@@@ -1063,9 -1065,10 +1065,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);

diff --combined arch/powerpc/platforms/cell/spufs/sputrace.c
index aea5286f1245c0d99ddd786b7ceb710d44c39136,b9c79eda3359bb083bf8b0da8cf5763f3a58ccab..53202422ba727c8ec9a9f95a80fb1db95181e12c
--- 1/arch/powerpc/platforms/cell/spufs/sputrace.c
--- 2/arch/powerpc/platforms/cell/spufs/sputrace.c
+++ b/arch/powerpc/platforms/cell/spufs/sputrace.c
@@@ -171,24 -171,24 +171,24 @@@ static void spu_context_nospu_event(voi
  }
  
  struct spu_probe spu_probes[] = {
-       { "spu_bind_context__enter", "%p %p", spu_context_event },
-       { "spu_unbind_context__enter", "%p %p", spu_context_event },
-       { "spu_get_idle__enter", "%p", spu_context_nospu_event },
-       { "spu_get_idle__found", "%p %p", spu_context_event },
-       { "spu_get_idle__not_found", "%p", spu_context_nospu_event },
-       { "spu_find_victim__enter", "%p", spu_context_nospu_event },
-       { "spusched_tick__preempt", "%p %p", spu_context_event },
-       { "spusched_tick__newslice", "%p", spu_context_nospu_event },
-       { "spu_yield__enter", "%p", spu_context_nospu_event },
-       { "spu_deactivate__enter", "%p", spu_context_nospu_event },
-       { "__spu_deactivate__unload", "%p %p", spu_context_event },
-       { "spufs_ps_nopfn__enter", "%p", spu_context_nospu_event },
-       { "spufs_ps_nopfn__sleep", "%p", spu_context_nospu_event },
-       { "spufs_ps_nopfn__wake", "%p %p", spu_context_event },
-       { "spufs_ps_nopfn__insert", "%p %p", spu_context_event },
-       { "spu_acquire_saved__enter", "%p", spu_context_nospu_event },
-       { "destroy_spu_context__enter", "%p", spu_context_nospu_event },
-       { "spufs_stop_callback__enter", "%p %p", spu_context_event },
+       { "spu_bind_context__enter", "ctx %p spu %p", spu_context_event },
+       { "spu_unbind_context__enter", "ctx %p spu %p", spu_context_event },
+       { "spu_get_idle__enter", "ctx %p", spu_context_nospu_event },
+       { "spu_get_idle__found", "ctx %p spu %p", spu_context_event },
+       { "spu_get_idle__not_found", "ctx %p", spu_context_nospu_event },
+       { "spu_find_victim__enter", "ctx %p", spu_context_nospu_event },
+       { "spusched_tick__preempt", "ctx %p spu %p", spu_context_event },
+       { "spusched_tick__newslice", "ctx %p", spu_context_nospu_event },
+       { "spu_yield__enter", "ctx %p", spu_context_nospu_event },
+       { "spu_deactivate__enter", "ctx %p", spu_context_nospu_event },
+       { "__spu_deactivate__unload", "ctx %p spu %p", spu_context_event },
+       { "spufs_ps_nopfn__enter", "ctx %p", spu_context_nospu_event },
+       { "spufs_ps_nopfn__sleep", "ctx %p", spu_context_nospu_event },
+       { "spufs_ps_nopfn__wake", "ctx %p spu %p", spu_context_event },
+       { "spufs_ps_nopfn__insert", "ctx %p spu %p", spu_context_event },
+       { "spu_acquire_saved__enter", "ctx %p", spu_context_nospu_event },
+       { "destroy_spu_context__enter", "ctx %p", spu_context_nospu_event },
+       { "spufs_stop_callback__enter", "ctx %p spu %p", spu_context_event },
  };
  
  static int __init sputrace_init(void)
@@@ -201,9 -201,10 +201,9 @@@
        if (!sputrace_log)
                goto out;
  
 -      entry = create_proc_entry("sputrace", S_IRUSR, NULL);
 +      entry = proc_create("sputrace", S_IRUSR, NULL, &sputrace_fops);
        if (!entry)
                goto out_free_log;
 -      entry->proc_fops = &sputrace_fops;
  
        for (i = 0; i < ARRAY_SIZE(spu_probes); i++) {
                struct spu_probe *p = &spu_probes[i];