lmk: fix conflict of kernel minor upgrade of 4.14.113

Change-Id: If125f3ee34cdc141bfd0c92628ecc289787793e5
Signed-off-by: Youngmin Nam <youngmin.nam@samsung.com>

diff --git a/include/linux/sched.h b/include/linux/sched.h
index 5843fa71f7111d2ace7ae697213f060c5c5a0bdd..9cefc9f646b24221ebe4e61485d1070c88ddc589 100644 (file)
--- a/include/linux/sched.h
+++ b/include/linux/sched.h
@@ -1529,6 +1529,7 @@ static inline bool is_percpu_thread(void)
 #define PFA_SPEC_SSB_FORCE_DISABLE     4       /* Speculative Store Bypass force disabled*/
 #define PFA_SPEC_IB_DISABLE            5       /* Indirect branch speculation restricted */
 #define PFA_SPEC_IB_FORCE_DISABLE      6       /* Indirect branch speculation permanently restricted */
+#define PFA_LMK_WAITING                        7       /* Lowmemorykiller is waiting */
 
 #define TASK_PFA_TEST(name, func)                                      \
        static inline bool task_##func(struct task_struct *p)           \
@@ -1567,6 +1568,9 @@ TASK_PFA_CLEAR(SPEC_IB_DISABLE, spec_ib_disable)
 TASK_PFA_TEST(SPEC_IB_FORCE_DISABLE, spec_ib_force_disable)
 TASK_PFA_SET(SPEC_IB_FORCE_DISABLE, spec_ib_force_disable)
 
+TASK_PFA_TEST(LMK_WAITING, lmk_waiting)
+TASK_PFA_SET(LMK_WAITING, lmk_waiting)
+
 static inline void
 current_restore_flags(unsigned long orig_flags, unsigned long flags)
 {