diff -r b28ae5f00553 extras/mini-os/xenbus/xenbus.c
--- a/extras/mini-os/xenbus/xenbus.c	Tue Oct 23 09:26:43 2007 +0100
+++ b/extras/mini-os/xenbus/xenbus.c	Wed Oct 24 14:27:10 2007 +0100
@@ -79,6 +79,7 @@ void wait_for_watch(void)
     schedule();
     remove_waiter(w);
     wake(current);
+    remove_wait_queue(&w);
 }
 
 char* xenbus_wait_for_value(const char* path,const char* value)