Merge ath-next from ath.git

[deliverable/linux.git] / include / linux / sched.h

diff --git a/include/linux/sched.h b/include/linux/sched.h
index 34495d2d2d7bf4aefc2ba4b931000ad2fa133df1..60bba7e032dc33c57156751c6a5270e1f72a0feb 100644 (file)
--- a/include/linux/sched.h
+++ b/include/linux/sched.h
@@ -426,6 +426,7 @@ extern signed long schedule_timeout(signed long timeout);
 extern signed long schedule_timeout_interruptible(signed long timeout);
 extern signed long schedule_timeout_killable(signed long timeout);
 extern signed long schedule_timeout_uninterruptible(signed long timeout);
+extern signed long schedule_timeout_idle(signed long timeout);
 asmlinkage void schedule(void);
 extern void schedule_preempt_disabled(void);
 
@@ -1848,6 +1849,9 @@ struct task_struct {
        unsigned long   task_state_change;
 #endif
        int pagefault_disabled;
+#ifdef CONFIG_MMU
+       struct task_struct *oom_reaper_list;
+#endif
 /* CPU-specific state of this task */
        struct thread_struct thread;
 /*
@@ -2870,10 +2874,18 @@ static inline unsigned long stack_not_used(struct task_struct *p)
        unsigned long *n = end_of_stack(p);
 
        do {    /* Skip over canary */
+# ifdef CONFIG_STACK_GROWSUP
+               n--;
+# else
                n++;
+# endif
        } while (!*n);
 
+# ifdef CONFIG_STACK_GROWSUP
+       return (unsigned long)end_of_stack(p) - (unsigned long)n;
+# else
        return (unsigned long)n - (unsigned long)end_of_stack(p);
+# endif
 }
 #endif
 extern void set_task_stack_end_magic(struct task_struct *tsk);