Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jwessel...

[linux-2.6-omap-h63xx.git] / include / asm-powerpc / thread_info.h

diff --git a/include/asm-powerpc/thread_info.h b/include/asm-powerpc/thread_info.h
index 9d9aeca8ad225f631f6f5e5343801a0ce043158c..b705c2a7651a929a42780163d6bd303a412f998b 100644 (file)
--- a/include/asm-powerpc/thread_info.h
+++ b/include/asm-powerpc/thread_info.h
@@ -80,12 +80,8 @@ struct thread_info {
 
 #else /* THREAD_SHIFT < PAGE_SHIFT */
 
-#ifdef CONFIG_DEBUG_STACK_USAGE
-#define alloc_thread_info(tsk) kzalloc(THREAD_SIZE, GFP_KERNEL)
-#else
-#define alloc_thread_info(tsk) kmalloc(THREAD_SIZE, GFP_KERNEL)
-#endif
-#define free_thread_info(ti)   kfree(ti)
+extern struct thread_info *alloc_thread_info(struct task_struct *tsk);
+extern void free_thread_info(struct thread_info *ti);
 
 #endif /* THREAD_SHIFT < PAGE_SHIFT */
 
@@ -107,28 +103,25 @@ static inline struct thread_info *current_thread_info(void)
  * thread information flag bit numbers
  */
 #define TIF_SYSCALL_TRACE      0       /* syscall trace active */
-#define TIF_NOTIFY_RESUME      1       /* resumption notification requested */
-#define TIF_SIGPENDING         2       /* signal pending */
-#define TIF_NEED_RESCHED       3       /* rescheduling necessary */
-#define TIF_POLLING_NRFLAG     4       /* true if poll_idle() is polling
+#define TIF_SIGPENDING         1       /* signal pending */
+#define TIF_NEED_RESCHED       2       /* rescheduling necessary */
+#define TIF_POLLING_NRFLAG     3       /* true if poll_idle() is polling
                                           TIF_NEED_RESCHED */
-#define TIF_32BIT              5       /* 32 bit binary */
-#define TIF_PERFMON_WORK       6       /* work for pfm_handle_work() */
-#define TIF_PERFMON_CTXSW      7       /* perfmon needs ctxsw calls */
-#define TIF_SYSCALL_AUDIT      8       /* syscall auditing active */
-#define TIF_SINGLESTEP         9       /* singlestepping active */
-#define TIF_MEMDIE             10
-#define TIF_SECCOMP            11      /* secure computing */
-#define TIF_RESTOREALL         12      /* Restore all regs (implies NOERROR) */
-#define TIF_NOERROR            14      /* Force successful syscall return */
-#define TIF_RESTORE_SIGMASK    15      /* Restore signal mask in do_signal */
-#define TIF_FREEZE             16      /* Freezing for suspend */
-#define TIF_RUNLATCH           17      /* Is the runlatch enabled? */
-#define TIF_ABI_PENDING                18      /* 32/64 bit switch needed */
+#define TIF_32BIT              4       /* 32 bit binary */
+#define TIF_PERFMON_WORK       5       /* work for pfm_handle_work() */
+#define TIF_PERFMON_CTXSW      6       /* perfmon needs ctxsw calls */
+#define TIF_SYSCALL_AUDIT      7       /* syscall auditing active */
+#define TIF_SINGLESTEP         8       /* singlestepping active */
+#define TIF_MEMDIE             9
+#define TIF_SECCOMP            10      /* secure computing */
+#define TIF_RESTOREALL         11      /* Restore all regs (implies NOERROR) */
+#define TIF_NOERROR            12      /* Force successful syscall return */
+#define TIF_FREEZE             14      /* Freezing for suspend */
+#define TIF_RUNLATCH           15      /* Is the runlatch enabled? */
+#define TIF_ABI_PENDING                16      /* 32/64 bit switch needed */
 
 /* as above, but as bit values */
 #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_POLLING_NRFLAG    (1<<TIF_POLLING_NRFLAG)
@@ -140,21 +133,33 @@ static inline struct thread_info *current_thread_info(void)
 #define _TIF_SECCOMP           (1<<TIF_SECCOMP)
 #define _TIF_RESTOREALL                (1<<TIF_RESTOREALL)
 #define _TIF_NOERROR           (1<<TIF_NOERROR)
-#define _TIF_RESTORE_SIGMASK   (1<<TIF_RESTORE_SIGMASK)
 #define _TIF_FREEZE            (1<<TIF_FREEZE)
 #define _TIF_RUNLATCH          (1<<TIF_RUNLATCH)
 #define _TIF_ABI_PENDING       (1<<TIF_ABI_PENDING)
 #define _TIF_SYSCALL_T_OR_A    (_TIF_SYSCALL_TRACE|_TIF_SYSCALL_AUDIT|_TIF_SECCOMP)
 
-#define _TIF_USER_WORK_MASK    (_TIF_NOTIFY_RESUME | _TIF_SIGPENDING | \
-                                _TIF_NEED_RESCHED | _TIF_RESTORE_SIGMASK)
+#define _TIF_USER_WORK_MASK    (_TIF_SIGPENDING | _TIF_NEED_RESCHED)
 #define _TIF_PERSYSCALL_MASK   (_TIF_RESTOREALL|_TIF_NOERROR)
 
 /* Bits in local_flags */
 /* Don't move TLF_NAPPING without adjusting the code in entry_32.S */
 #define TLF_NAPPING            0       /* idle thread enabled NAP mode */
+#define TLF_SLEEPING           1       /* suspend code enabled SLEEP mode */
+#define TLF_RESTORE_SIGMASK    2       /* Restore signal mask in do_signal */
 
 #define _TLF_NAPPING           (1 << TLF_NAPPING)
+#define _TLF_SLEEPING          (1 << TLF_SLEEPING)
+#define _TLF_RESTORE_SIGMASK   (1 << TLF_RESTORE_SIGMASK)
+
+#ifndef __ASSEMBLY__
+#define HAVE_SET_RESTORE_SIGMASK       1
+static inline void set_restore_sigmask(void)
+{
+       struct thread_info *ti = current_thread_info();
+       ti->local_flags |= _TLF_RESTORE_SIGMASK;
+       set_bit(TIF_SIGPENDING, &ti->flags);
+}
+#endif /* !__ASSEMBLY__ */
 
 #endif /* __KERNEL__ */