2 files changed, 5 insertions, 5 deletions

diff --git a/arch/s390/include/asm/bug.h b/arch/s390/include/asm/bug.h
index 9beeb9db9b23..bf90d1fd97a5 100644
--- a/arch/s390/include/asm/bug.h
+++ b/arch/s390/include/asm/bug.h
@@ -46,18 +46,18 @@
         unreachable();                                  \
 } while (0)
 
-#define __WARN() do {                                   \
-        __EMIT_BUG(BUGFLAG_WARNING);                    \
+#define __WARN_TAINT(taint) do {                        \
+        __EMIT_BUG(BUGFLAG_TAINT(taint));               \
 } while (0)
 
 #define WARN_ON(x) ({                                   \
         int __ret_warn_on = !!(x);                      \
         if (__builtin_constant_p(__ret_warn_on)) {      \
                 if (__ret_warn_on)                      \
-                        __EMIT_BUG(BUGFLAG_WARNING);    \
+                        __WARN();                       \
         } else {                                        \
                 if (unlikely(__ret_warn_on))            \
-                        __EMIT_BUG(BUGFLAG_WARNING);    \
+                        __WARN();                       \
         }                                               \
         unlikely(__ret_warn_on);                        \
 })
diff --git a/arch/s390/include/asm/thread_info.h b/arch/s390/include/asm/thread_info.h
index be3d3f91d86c..5baf0230b29b 100644
--- a/arch/s390/include/asm/thread_info.h
+++ b/arch/s390/include/asm/thread_info.h
@@ -97,7 +97,7 @@ static inline struct thread_info *current_thread_info(void)
 #define TIF_POLLING_NRFLAG      16      /* true if poll_idle() is polling
                                            TIF_NEED_RESCHED */
 #define TIF_31BIT               17      /* 32bit process */
-#define TIF_MEMDIE              18
+#define TIF_MEMDIE              18      /* is terminating due to OOM killer */
 #define TIF_RESTORE_SIGMASK     19      /* restore signal mask in do_signal() */
 #define TIF_FREEZE              20      /* thread is freezing for suspend */