Merge master.kernel.org:/pub/scm/linux/kernel/git/lenb/to-linus

[linux-2.6] / include / asm-sparc / thread_info.h

diff --git a/include/asm-sparc/thread_info.h b/include/asm-sparc/thread_info.h
index 104f03c554167ebcdf5b7d784545aa86543e74ba..ff6ccb3d24c6121bb1c1da217ee3075f3da033a2 100644 (file)
--- a/include/asm-sparc/thread_info.h
+++ b/include/asm-sparc/thread_info.h
@@ -30,9 +30,9 @@ struct thread_info {
        struct task_struct      *task;          /* main task structure */
        struct exec_domain      *exec_domain;   /* execution domain */
        unsigned long           flags;          /* low level flags */
-
        int                     cpu;            /* cpu we're on */
-       int                     preempt_count;
+       int                     preempt_count;  /* 0 => preemptable,
+                                                  <0 => BUG */
        int                     softirq_count;
        int                     hardirq_count;