1 files changed, 3 insertions, 1 deletions

diff --git a/include/asm-s390/thread_info.h b/include/asm-s390/thread_info.h
index aade85c53a63..6c18a3f24316 100644
--- a/include/asm-s390/thread_info.h
+++ b/include/asm-s390/thread_info.h
@@ -50,7 +50,7 @@ struct thread_info {
         struct exec_domain      *exec_domain;   /* execution domain */
         unsigned long           flags;          /* low level flags */
         unsigned int            cpu;            /* current CPU */
-        unsigned int            preempt_count; /* 0 => preemptable */
+        int                     preempt_count;  /* 0 => preemptable, <0 => BUG */
         struct restart_block    restart_block;
 };
 
@@ -96,6 +96,7 @@ static inline struct thread_info *current_thread_info(void)
 #define TIF_RESTART_SVC         4       /* restart svc with new svc number */
 #define TIF_SYSCALL_AUDIT       5       /* syscall auditing active */
 #define TIF_SINGLE_STEP         6       /* deliver sigtrap on return to user */
+#define TIF_MCCK_PENDING        7       /* machine check handling is pending */
 #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 */
@@ -109,6 +110,7 @@ static inline struct thread_info *current_thread_info(void)
 #define _TIF_RESTART_SVC        (1<<TIF_RESTART_SVC)
 #define _TIF_SYSCALL_AUDIT      (1<<TIF_SYSCALL_AUDIT)
 #define _TIF_SINGLE_STEP        (1<<TIF_SINGLE_STEP)
+#define _TIF_MCCK_PENDING       (1<<TIF_MCCK_PENDING)
 #define _TIF_USEDFPU            (1<<TIF_USEDFPU)
 #define _TIF_POLLING_NRFLAG     (1<<TIF_POLLING_NRFLAG)
 #define _TIF_31BIT              (1<<TIF_31BIT)