oom: move oom_killer_enable()/oom_killer_disable to where they belong
Subsystems (6)
PATCH 1/1 oom: move oom_killer_enable()/oom_killer_disable to where they belong
---
include/linux/gfp.h | 12 ------------ include/linux/oom.h | 11 +++++++++++ kernel/power/process.c | 1 + 3 files changed, 12 insertions(+), 12 deletions(-)
include/linux/gfp.h +0 -12
@@ -336,18 +336,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
@@ -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
@@ -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>
--
To unsubscribe, send a message with 'unsubscribe linux-mm' in the body to [email protected]. For more info on Linux MM,
see: http://www.linux-mm.org/ .
Don't email: <a href=mailto:"[email protected]"> [email protected] </a>
Quoted 1 line · Alexey Dobriyan
Signed-off-by Alexey Dobriyan <[email protected]>
Although I never liked the oom_killer_{enable,disable}() solution in doing swsusp, it's definitely defined in the wrong place.
--
To unsubscribe, send a message with 'unsubscribe linux-mm' in the body to [email protected]. For more info on Linux MM,
see: http://www.linux-mm.org/ .
Don't email: <a href=mailto:"[email protected]"> [email protected] </a>
Quoted 2 lines
Signed-off-by Alexey Dobriyan <[email protected]>---
Please write proper patch description...
However, I think the code itself is right.
Quoted 58 lines
include/linux/gfp.h | 12 ------------ include/linux/oom.h | 11 +++++++++++ kernel/power/process.c | 1 + 3 files changed, 12 insertions(+), 12 deletions(-)include/linux/gfp.h +0
-12@@ -336,18 +336,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@@ -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
-1@@ -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> --
Quoted 4 lines
To unsubscribe, send a message with 'unsubscribe linux-mm' in the body to [email protected]. For more info on Linux MM,
see: http://www.linux-mm.org/ .
Don't email: <a href=mailto:"[email protected]"> [email protected] </a>
--
To unsubscribe, send a message with 'unsubscribe linux-mm' in the body to [email protected]. For more info on Linux MM,
see: http://www.linux-mm.org/ .
Don't email: <a href=mailto:"[email protected]"> [email protected] </a>