Merge watchdog driver updates

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

diff --git a/include/asm-ppc/thread_info.h b/include/asm-ppc/thread_info.h
index e3b5284a6f91c0be27f766d4aaf0fe2671c8d2f1..27903db42efc7829309831c635c9889d244e6747 100644 (file)
--- a/include/asm-ppc/thread_info.h
+++ b/include/asm-ppc/thread_info.h
@@ -20,7 +20,8 @@ struct thread_info {
        unsigned long           flags;          /* low level flags */
        unsigned long           local_flags;    /* non-racy flags */
        int                     cpu;            /* cpu we're on */
-       int                     preempt_count;
+       int                     preempt_count;  /* 0 => preemptable,
+                                                  <0 => BUG */
        struct restart_block    restart_block;
 };