From cec16c2dcfb0bddb0d9dc11fb63793c4ca9a53e0 Mon Sep 17 00:00:00 2001
From: Pawel Dziepak <pdziepak@quarnos.org>
Date: Sun, 24 Nov 2013 22:54:14 +0100
Subject: [PATCH] spinlock: Fix panic messages
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Thanks Jérôme for pointing this out.
---
 src/system/kernel/smp.cpp | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/src/system/kernel/smp.cpp b/src/system/kernel/smp.cpp
index 08203ef201..a07df3f290 100644
--- a/src/system/kernel/smp.cpp
+++ b/src/system/kernel/smp.cpp
@@ -532,13 +532,13 @@ try_acquire_write_spinlock(rw_spinlock* lock)
 {
 #if DEBUG_SPINLOCKS
 	if (are_interrupts_enabled()) {
-		panic("try_acquire_write_spinlock: attempt to acquire lock %p with"
-			" interrupts enabled", lock);
+		panic("try_acquire_write_spinlock: attempt to acquire lock %p with "
+			"interrupts enabled", lock);
 	}
 
 	if (sNumCPUs < 2 && lock->lock != 0) {
-		panic("acquire_spinlock_cpu(): attempt to acquire lock %p twice on "
-			"non-SMP system", lock);
+		panic("try_acquire_write_spinlock(): attempt to acquire lock %p twice "
+			"on non-SMP system", lock);
 	}
 #endif
 
@@ -551,8 +551,8 @@ acquire_write_spinlock(rw_spinlock* lock)
 {
 #if DEBUG_SPINLOCKS
 	if (are_interrupts_enabled()) {
-		panic("acquire_write_spinlock: attempt to acquire lock %p with"
-			" interrupts enabled", lock);
+		panic("acquire_write_spinlock: attempt to acquire lock %p with "
+			"interrupts enabled", lock);
 	}
 #endif
 
@@ -582,8 +582,8 @@ release_write_spinlock(rw_spinlock* lock)
 #if DEBUG_SPINLOCKS
 	uint32 previous = atomic_get_and_set(&lock->lock, 0);
 	if ((previous & 1u << 31) == 0) {
-		panic("release_write_spinlock: lock %p was already released (value:"
-			" %x)\n", lock, previous);
+		panic("release_write_spinlock: lock %p was already released (value: "
+			"%x)\n", lock, previous);
 	}
 #else
 	atomic_set(&lock->lock, 0);
@@ -596,13 +596,13 @@ try_acquire_read_spinlock(rw_spinlock* lock)
 {
 #if DEBUG_SPINLOCKS
 	if (are_interrupts_enabled()) {
-		panic("try_acquire_read_spinlock: attempt to acquire lock %p with"
-			" interrupts enabled", lock);
+		panic("try_acquire_read_spinlock: attempt to acquire lock %p with "
+			"interrupts enabled", lock);
 	}
 
 	if (sNumCPUs < 2 && lock->lock != 0) {
-		panic("acquire_spinlock_cpu(): attempt to acquire lock %p twice on "
-			"non-SMP system", lock);
+		panic("try_acquire_read_spinlock(): attempt to acquire lock %p twice "
+			"on non-SMP system", lock);
 	}
 #endif
 
@@ -620,8 +620,8 @@ acquire_read_spinlock(rw_spinlock* lock)
 {
 #if DEBUG_SPINLOCKS
 	if (are_interrupts_enabled()) {
-		panic("acquire_read_spinlock: attempt to acquire lock %p with"
-			" interrupts enabled", lock);
+		panic("acquire_read_spinlock: attempt to acquire lock %p with "
+			"interrupts enabled", lock);
 	}
 #endif