Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1a8670a2 authored by Alexey Dobriyan's avatar Alexey Dobriyan Committed by Linus Torvalds
Browse files

oom: move oom_killer_enable()/oom_killer_disable to where they belong 



Signed-off-by: default avatarAlexey Dobriyan <adobriyan@gmail.com>
Acked-by: default avatarDavid Rientjes <rientjes@google.com>
Reviewed-by: default avatarKOSAKI Motohiro <kosaki.motohiro@jp.fujitsu.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 0b217676

include/linux/gfp.h

+0 −12
Original line number Diff line number Diff line
@@ -335,18 +335,6 @@ void drain_zone_pages(struct zone *zone, struct per_cpu_pages *pcp); 
void drain_all_pages(void);

void drain_local_pages(void *dummy);



extern bool oom_killer_disabled;



static inline void oom_killer_disable(void)

{

	oom_killer_disabled = true;

}



static inline void oom_killer_enable(void)

{

	oom_killer_disabled = false;

}



extern gfp_t gfp_allowed_mask;



static inline void set_gfp_allowed_mask(gfp_t mask)

include/linux/oom.h

+11 −0
Original line number Diff line number Diff line
@@ -30,5 +30,16 @@ extern void out_of_memory(struct zonelist *zonelist, gfp_t gfp_mask, int order); 
extern int register_oom_notifier(struct notifier_block *nb);

extern int unregister_oom_notifier(struct notifier_block *nb);



extern bool oom_killer_disabled;



static inline void oom_killer_disable(void)

{

	oom_killer_disabled = true;

}



static inline void oom_killer_enable(void)

{

	oom_killer_disabled = false;

}

#endif /* __KERNEL__*/

#endif /* _INCLUDE_LINUX_OOM_H */

kernel/power/process.c

+1 −0
Original line number Diff line number Diff line
@@ -9,6 +9,7 @@ 
#undef DEBUG



#include <linux/interrupt.h>

#include <linux/oom.h>

#include <linux/suspend.h>

#include <linux/module.h>

#include <linux/syscalls.h>