Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc

[powerpc.git] / include / asm-mips / thread_info.h

diff --git a/include/asm-mips/thread_info.h b/include/asm-mips/thread_info.h
index 9676e7d..b2772df 100644 (file)
--- a/include/asm-mips/thread_info.h
+++ b/include/asm-mips/thread_info.h
@@ -87,9 +87,8 @@ register struct thread_info *__current_thread_info __asm__("$28");
 ({                                                             \
        struct thread_info *ret;                                \
                                                                \
-       ret = kmalloc(THREAD_SIZE, GFP_KERNEL);                 \
-       if (ret)                                                \
-               memset(ret, 0, THREAD_SIZE);                    \
+       ret = kzalloc(THREAD_SIZE, GFP_KERNEL);                 \
+                                                               \
        ret;                                                    \
 })
 #else
@@ -109,11 +108,10 @@ register struct thread_info *__current_thread_info __asm__("$28");
  * - pending work-to-be-done flags are in LSW
  * - other flags in MSW
  */
-#define TIF_NOTIFY_RESUME      1       /* resumption notification requested */
-#define TIF_SIGPENDING         2       /* signal pending */
-#define TIF_NEED_RESCHED       3       /* rescheduling necessary */
-#define TIF_SYSCALL_AUDIT      4       /* syscall auditing active */
-#define TIF_SECCOMP            5       /* secure computing */
+#define TIF_SIGPENDING         1       /* signal pending */
+#define TIF_NEED_RESCHED       2       /* rescheduling necessary */
+#define TIF_SYSCALL_AUDIT      3       /* syscall auditing active */
+#define TIF_SECCOMP            4       /* secure computing */
 #define TIF_RESTORE_SIGMASK    9       /* restore signal mask in do_signal() */
 #define TIF_USEDFPU            16      /* FPU was used by this task this quantum (SMP) */
 #define TIF_POLLING_NRFLAG     17      /* true if poll_idle() is polling TIF_NEED_RESCHED */
@@ -127,7 +125,6 @@ register struct thread_info *__current_thread_info __asm__("$28");
 #define TIF_SYSCALL_TRACE      31      /* syscall trace active */
 
 #define _TIF_SYSCALL_TRACE     (1<<TIF_SYSCALL_TRACE)
-#define _TIF_NOTIFY_RESUME     (1<<TIF_NOTIFY_RESUME)
 #define _TIF_SIGPENDING                (1<<TIF_SIGPENDING)
 #define _TIF_NEED_RESCHED      (1<<TIF_NEED_RESCHED)
 #define _TIF_SYSCALL_AUDIT     (1<<TIF_SYSCALL_AUDIT)