diff options
| author | Alexey Dobriyan <adobriyan@gmail.com> | 2009-09-21 20:03:09 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-09-22 10:17:38 -0400 |
| commit | 1a8670a29b5277cbe601f74ab63d2c5211fb3005 (patch) | |
| tree | 1b2ca94009c1f3d7ff05bbda3b8956631e3f38d9 /include/linux/gfp.h | |
| parent | 0b21767637c3c99890a248fe47ac414e51cf5eb7 (diff) | |
oom: move oom_killer_enable()/oom_killer_disable to where they belong
Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com>
Acked-by: David Rientjes <rientjes@google.com>
Reviewed-by: KOSAKI Motohiro <kosaki.motohiro@jp.fujitsu.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'include/linux/gfp.h')
| -rw-r--r-- | include/linux/gfp.h | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/include/linux/gfp.h b/include/linux/gfp.h index c32bfa8e7f1e..f53e9b868c26 100644 --- a/include/linux/gfp.h +++ b/include/linux/gfp.h | |||
| @@ -335,18 +335,6 @@ void drain_zone_pages(struct zone *zone, struct per_cpu_pages *pcp); | |||
| 335 | void drain_all_pages(void); | 335 | void drain_all_pages(void); |
| 336 | void drain_local_pages(void *dummy); | 336 | void drain_local_pages(void *dummy); |
| 337 | 337 | ||
| 338 | extern bool oom_killer_disabled; | ||
| 339 | |||
| 340 | static inline void oom_killer_disable(void) | ||
| 341 | { | ||
| 342 | oom_killer_disabled = true; | ||
| 343 | } | ||
| 344 | |||
| 345 | static inline void oom_killer_enable(void) | ||
| 346 | { | ||
| 347 | oom_killer_disabled = false; | ||
| 348 | } | ||
| 349 | |||
| 350 | extern gfp_t gfp_allowed_mask; | 338 | extern gfp_t gfp_allowed_mask; |
| 351 | 339 | ||
| 352 | static inline void set_gfp_allowed_mask(gfp_t mask) | 340 | static inline void set_gfp_allowed_mask(gfp_t mask) |
