Merge tag 'sound-4.7-rc1-2' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai...

[deliverable/linux.git] / include / linux / oom.h

diff --git a/include/linux/oom.h b/include/linux/oom.h
index d3f533f2f4817a2157039408c25e9066888f8e3c..83469522690a8882f1c8e131d7ad95bad3a2ef95 100644 (file)
--- a/include/linux/oom.h
+++ b/include/linux/oom.h
@@ -50,24 +50,21 @@ enum oom_scan_t {
        OOM_SCAN_SELECT,        /* always select this thread first */
 };
 
-/* Thread is the potential origin of an oom condition; kill first on oom */
-#define OOM_FLAG_ORIGIN                ((__force oom_flags_t)0x1)
-
 extern struct mutex oom_lock;
 
 static inline void set_current_oom_origin(void)
 {
-       current->signal->oom_flags |= OOM_FLAG_ORIGIN;
+       current->signal->oom_flag_origin = true;
 }
 
 static inline void clear_current_oom_origin(void)
 {
-       current->signal->oom_flags &= ~OOM_FLAG_ORIGIN;
+       current->signal->oom_flag_origin = false;
 }
 
 static inline bool oom_task_origin(const struct task_struct *p)
 {
-       return !!(p->signal->oom_flags & OOM_FLAG_ORIGIN);
+       return p->signal->oom_flag_origin;
 }
 
 extern void mark_oom_victim(struct task_struct *tsk);