patch-2.3.4 linux/include/linux/wait.h

Next file: linux/include/net/decnet_call.h
Previous file: linux/include/linux/sysctl.h
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.3.3/linux/include/linux/wait.h linux/include/linux/wait.h
@@ -8,11 +8,14 @@
 
 #ifdef __KERNEL__
 
-#include <asm/page.h>
-#include <asm/spinlock.h>
+#include <linux/kernel.h>
 #include <linux/list.h>
 #include <linux/stddef.h>
 
+#include <asm/page.h>
+#include <asm/spinlock.h>
+#include <asm/processor.h>
+
 /*
  * Temporary debugging help until all code is converted to the new
  * waitqueue usage.
@@ -118,7 +121,6 @@
 static inline void init_waitqueue_head(wait_queue_head_t *q)
 {
 #if WAITQUEUE_DEBUG
-	__label__ __x;
 	if (!q)
 		WQ_BUG();
 #endif
@@ -126,7 +128,7 @@
 	INIT_LIST_HEAD(&q->task_list);
 #if WAITQUEUE_DEBUG
 	q->__magic = (long)&q->__magic;
-	__x: q->__creator = (long)&&__x;
+	q->__creator = (long)current_text_addr();
 #endif
 }
 

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)