Merge with /home/shaggy/git/linus-clean/

1 files changed, 20 insertions, 14 deletions

diff --git a/lib/spinlock_debug.c b/lib/spinlock_debug.c
index 906ad101eab3..c8bb8cc899d7 100644
--- a/lib/spinlock_debug.c
+++ b/lib/spinlock_debug.c
@@ -19,9 +19,11 @@ static void spin_bug(spinlock_t *lock, const char *msg)
         if (xchg(&print_once, 0)) {
                 if (lock->owner && lock->owner != SPINLOCK_OWNER_INIT)
                         owner = lock->owner;
-                printk("BUG: spinlock %s on CPU#%d, %s/%d\n",
-                        msg, smp_processor_id(), current->comm, current->pid);
-                printk(" lock: %p, .magic: %08x, .owner: %s/%d, .owner_cpu: %d\n",
+                printk(KERN_EMERG "BUG: spinlock %s on CPU#%d, %s/%d\n",
+                        msg, raw_smp_processor_id(),
+                        current->comm, current->pid);
+                printk(KERN_EMERG " lock: %p, .magic: %08x, .owner: %s/%d, "
+                                ".owner_cpu: %d\n",
                         lock, lock->magic,
                         owner ? owner->comm : "<none>",
                         owner ? owner->pid : -1,
@@ -77,9 +79,10 @@ static void __spin_lock_debug(spinlock_t *lock)
                 /* lockup suspected: */
                 if (print_once) {
                         print_once = 0;
-                        printk("BUG: spinlock lockup on CPU#%d, %s/%d, %p\n",
-                                smp_processor_id(), current->comm, current->pid,
-                                        lock);
+                        printk(KERN_EMERG "BUG: spinlock lockup on CPU#%d, "
+                                        "%s/%d, %p\n",
+                                raw_smp_processor_id(), current->comm,
+                                current->pid, lock);
                         dump_stack();
                 }
         }
@@ -119,8 +122,9 @@ static void rwlock_bug(rwlock_t *lock, const char *msg)
         static long print_once = 1;
 
         if (xchg(&print_once, 0)) {
-                printk("BUG: rwlock %s on CPU#%d, %s/%d, %p\n", msg,
-                        smp_processor_id(), current->comm, current->pid, lock);
+                printk(KERN_EMERG "BUG: rwlock %s on CPU#%d, %s/%d, %p\n",
+                        msg, raw_smp_processor_id(), current->comm,
+                        current->pid, lock);
                 dump_stack();
 #ifdef CONFIG_SMP
                 /*
@@ -147,9 +151,10 @@ static void __read_lock_debug(rwlock_t *lock)
                 /* lockup suspected: */
                 if (print_once) {
                         print_once = 0;
-                        printk("BUG: read-lock lockup on CPU#%d, %s/%d, %p\n",
-                                smp_processor_id(), current->comm, current->pid,
-                                        lock);
+                        printk(KERN_EMERG "BUG: read-lock lockup on CPU#%d, "
+                                        "%s/%d, %p\n",
+                                raw_smp_processor_id(), current->comm,
+                                current->pid, lock);
                         dump_stack();
                 }
         }
@@ -219,9 +224,10 @@ static void __write_lock_debug(rwlock_t *lock)
                 /* lockup suspected: */
                 if (print_once) {
                         print_once = 0;
-                        printk("BUG: write-lock lockup on CPU#%d, %s/%d, %p\n",
-                                smp_processor_id(), current->comm, current->pid,
-                                        lock);
+                        printk(KERN_EMERG "BUG: write-lock lockup on CPU#%d, "
+                                        "%s/%d, %p\n",
+                                raw_smp_processor_id(), current->comm,
+                                current->pid, lock);
                         dump_stack();
                 }
         }