vserver 1.9.5.x5

[linux-2.6.git] / include / asm-um / current.h

diff --git a/include/asm-um/current.h b/include/asm-um/current.h
index 72a4cbd..8fd72f6 100644 (file)
--- a/include/asm-um/current.h
+++ b/include/asm-um/current.h
@@ -8,18 +8,13 @@
 
 #ifndef __ASSEMBLY__
 
-struct thread_info;
-
-#include "linux/config.h"
 #include "asm/page.h"
+#include "linux/thread_info.h"
 
-#define CURRENT_THREAD(dummy) (((unsigned long) &dummy) & \
-                               (PAGE_MASK << CONFIG_KERNEL_STACK_ORDER))
-
-#define current_thread \
-       ({ int dummy; ((struct thread_info *) CURRENT_THREAD(dummy)); })
+#define current (current_thread_info()->task)
 
-#define current (current_thread->task)
+/*Backward compatibility - it's used inside arch/um.*/
+#define current_thread current_thread_info()
 
 #endif /* __ASSEMBLY__ */