X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=net%2Ftipc%2Fdbg.c;fp=net%2Ftipc%2Fdbg.c;h=4f4beefa783037f772cb4c49eb4fe02b253990dd;hb=64ba3f394c830ec48a1c31b53dcae312c56f1604;hp=55130655e1edbe306a484f552c2a20080496cb15;hpb=be1e6109ac94a859551f8e1774eb9a8469fe055c;p=linux-2.6.git

diff --git a/net/tipc/dbg.c b/net/tipc/dbg.c
index 55130655e..4f4beefa7 100644
--- a/net/tipc/dbg.c
+++ b/net/tipc/dbg.c
@@ -41,7 +41,7 @@
 #define MAX_STRING 512
 
 static char print_string[MAX_STRING];
-static DEFINE_SPINLOCK(print_lock);
+static spinlock_t print_lock = SPIN_LOCK_UNLOCKED;
 
 static struct print_buf cons_buf = { NULL, 0, NULL, NULL };
 struct print_buf *TIPC_CONS = &cons_buf;
@@ -81,7 +81,7 @@ void tipc_printbuf_init(struct print_buf *pb, char *raw, u32 sz)
 
 	pb->crs = pb->buf = raw;
 	pb->size = sz;
-	pb->next = NULL;
+	pb->next = 0;
 	pb->buf[0] = 0;
 	pb->buf[sz-1] = ~0;
 }
@@ -216,7 +216,7 @@ void tipc_printf(struct print_buf *pb, const char *fmt, ...)
                         }
                 }
 		pb_next = pb->next;
-		pb->next = NULL;
+		pb->next = 0;
 		pb = pb_next;
 	}
 	spin_unlock_bh(&print_lock);