--- driver/ntoskernel.h.old	2007-01-28 17:14:51.000000000 +0100
+++ driver/ntoskernel.h	2007-01-28 17:34:14.000000000 +0100
@@ -348,12 +348,6 @@
 #define pci_choose_state(dev, state) (state)
 #endif
 
-#if defined(CONFIG_SOFTWARE_SUSPEND2) || defined(CONFIG_SUSPEND2)
-#define KTHREAD_RUN(a,b,c) kthread_run(a,b,0,c)
-#else
-#define KTHREAD_RUN(a,b,c) kthread_run(a,b,c)
-#endif
-
 #if !defined(HAVE_NETDEV_PRIV)
 #define netdev_priv(dev)  ((dev)->priv)
 #endif
--- driver/ntoskernel.c.old	2007-01-28 16:09:21.000000000 +0100
+++ driver/ntoskernel.c	2007-01-28 17:22:03.000000000 +0100
@@ -1911,7 +1911,7 @@
 	}
 	DBGTRACE2("created task: %d", pid);
 #else
-	task = KTHREAD_RUN(thread_trampoline, &thread_info, "windisdrvr");
+	task = kthread_run(thread_trampoline, &thread_info, "windisdrvr");
 	if (IS_ERR(task)) {
 		free_object(thread_info.thread);
 		TRACEEXIT2(return STATUS_FAILURE);