vserver 1.9.5.x5

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

diff --git a/include/asm-um/thread_info.h b/include/asm-um/thread_info.h
index c528307..bffb577 100644 (file)
--- a/include/asm-um/thread_info.h
+++ b/include/asm-um/thread_info.h
@@ -8,6 +8,7 @@
 
 #ifndef __ASSEMBLY__
 
+#include <linux/config.h>
 #include <asm/processor.h>
 #include <asm/types.h>
 
@@ -46,7 +47,7 @@ static inline struct thread_info *current_thread_info(void)
        struct thread_info *ti;
        unsigned long mask = PAGE_SIZE *
                (1 << CONFIG_KERNEL_STACK_ORDER) - 1;
-       __asm__("andl %%esp,%0; ":"=r" (ti) : "0" (~mask));
+        ti = (struct thread_info *) (((unsigned long) &ti) & ~mask);
        return ti;
 }
 
@@ -70,6 +71,7 @@ static inline struct thread_info *current_thread_info(void)
                                         * TIF_NEED_RESCHED 
                                         */
 #define TIF_RESTART_BLOCK      4
+#define TIF_MEMDIE             5
 
 #define _TIF_SYSCALL_TRACE     (1 << TIF_SYSCALL_TRACE)
 #define _TIF_SIGPENDING                (1 << TIF_SIGPENDING)