Merge branch 'sched/urgent' into sched/core

Merge reason: Pick up fixes that did not make it into .32.0

Signed-off-by: Ingo Molnar <mingo@elte.hu>

3 files changed, 6 insertions, 4 deletions

diff --git a/sound/oss/dmasound/dmasound_core.c b/sound/oss/dmasound/dmasound_core.c
index 793b7f478433..3f3c3f71db4b 100644
--- a/sound/oss/dmasound/dmasound_core.c
+++ b/sound/oss/dmasound/dmasound_core.c
@@ -219,7 +219,9 @@ static int shared_resources_initialised;
      *  Mid level stuff
      */
 
-struct sound_settings dmasound = { .lock = SPIN_LOCK_UNLOCKED };
+struct sound_settings dmasound = {
+        .lock = __SPIN_LOCK_UNLOCKED(dmasound.lock)
+};
 
 static inline void sound_silence(void)
 {
diff --git a/sound/oss/sb_common.c b/sound/oss/sb_common.c
index 77d0e5efda76..ce4db49291f7 100644
--- a/sound/oss/sb_common.c
+++ b/sound/oss/sb_common.c
@@ -157,7 +157,7 @@ static void sb_intr (sb_devc *devc)
                                 break;
 
                         default:
-                                /* printk(KERN_WARN "Sound Blaster: Unexpected interrupt\n"); */
+                                /* printk(KERN_WARNING "Sound Blaster: Unexpected interrupt\n"); */
                                 ;
                 }
         }
@@ -177,7 +177,7 @@ static void sb_intr (sb_devc *devc)
                                 break;
 
                         default:
-                                /* printk(KERN_WARN "Sound Blaster: Unexpected interrupt\n"); */
+                                /* printk(KERN_WARNING "Sound Blaster: Unexpected interrupt\n"); */
                                 ;
                 }
         }
diff --git a/sound/oss/sb_ess.c b/sound/oss/sb_ess.c
index 180e95c87e3e..51a3d381a59e 100644
--- a/sound/oss/sb_ess.c
+++ b/sound/oss/sb_ess.c
@@ -782,7 +782,7 @@ printk(KERN_INFO "FKS: ess_handle_channel %s irq_mode=%d\n", channel, irq_mode);
                         break;
 
                 default:;
-                        /* printk(KERN_WARN "ESS: Unexpected interrupt\n"); */
+                        /* printk(KERN_WARNING "ESS: Unexpected interrupt\n"); */
         }
 }