diff options
| author | David Rientjes <rientjes@google.com> | 2007-10-16 23:25:53 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-17 08:42:45 -0700 |
| commit | 5a3135c2e77fe88cdea20b5e3f4761068b799ac2 (patch) | |
| tree | d82b0568722d285673251210716801e6fc4a90ed | |
| parent | 4ba9b9d0ba0a49d91fa6417c7510ee36f48cf957 (diff) | |
| download | linux-3.10-5a3135c2e77fe88cdea20b5e3f4761068b799ac2.tar.gz linux-3.10-5a3135c2e77fe88cdea20b5e3f4761068b799ac2.tar.bz2 linux-3.10-5a3135c2e77fe88cdea20b5e3f4761068b799ac2.zip | |
oom: move prototypes to appropriate header file
Move the OOM killer's extern function prototypes to include/linux/oom.h and
include it where necessary.
[clg@fr.ibm.com: build fix]
Cc: Andrea Arcangeli <andrea@suse.de>
Acked-by: Christoph Lameter <clameter@sgi.com>
Signed-off-by: David Rientjes <rientjes@google.com>
Signed-off-by: Cedric Le Goater <clg@fr.ibm.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
| -rw-r--r-- | arch/s390/mm/cmm.c | 1 | ||||
| -rw-r--r-- | drivers/char/sysrq.c | 1 | ||||
| -rw-r--r-- | include/linux/oom.h | 11 | ||||
| -rw-r--r-- | include/linux/swap.h | 5 | ||||
| -rw-r--r-- | mm/page_alloc.c | 1 |
5 files changed, 13 insertions, 6 deletions
diff --git a/arch/s390/mm/cmm.c b/arch/s390/mm/cmm.c index fabc50adc46..d4ed93dfb9c 100644 --- a/arch/s390/mm/cmm.c +++ b/arch/s390/mm/cmm.c @@ -17,6 +17,7 @@ #include <linux/ctype.h> #include <linux/swap.h> #include <linux/kthread.h> +#include <linux/oom.h> #include <asm/pgalloc.h> #include <asm/uaccess.h> diff --git a/drivers/char/sysrq.c b/drivers/char/sysrq.c index 39cc318011e..179fa36ce48 100644 --- a/drivers/char/sysrq.c +++ b/drivers/char/sysrq.c @@ -36,6 +36,7 @@ #include <linux/kexec.h> #include <linux/irq.h> #include <linux/hrtimer.h> +#include <linux/oom.h> #include <asm/ptrace.h> #include <asm/irq_regs.h> diff --git a/include/linux/oom.h b/include/linux/oom.h index ad76463629a..b40bb4e32c2 100644 --- a/include/linux/oom.h +++ b/include/linux/oom.h @@ -1,10 +1,19 @@ #ifndef __INCLUDE_LINUX_OOM_H #define __INCLUDE_LINUX_OOM_H +#include <linux/sched.h> + /* /proc/<pid>/oom_adj set to -17 protects from the oom-killer */ #define OOM_DISABLE (-17) /* inclusive */ #define OOM_ADJUST_MIN (-16) #define OOM_ADJUST_MAX 15 -#endif +#ifdef __KERNEL__ + +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); + +#endif /* __KERNEL__*/ +#endif /* _INCLUDE_LINUX_OOM_H */ diff --git a/include/linux/swap.h b/include/linux/swap.h index edf681a7fd8..4f3838adbb3 100644 --- a/include/linux/swap.h +++ b/include/linux/swap.h @@ -158,11 +158,6 @@ struct swap_list_t { /* Swap 50% full? Release swapcache more aggressively.. */ #define vm_swap_full() (nr_swap_pages*2 < total_swap_pages) -/* linux/mm/oom_kill.c */ -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); - /* linux/mm/memory.c */ extern void swapin_readahead(swp_entry_t, unsigned long, struct vm_area_struct *); diff --git a/mm/page_alloc.c b/mm/page_alloc.c index d315e1127dc..0e3a05fd473 100644 --- a/mm/page_alloc.c +++ b/mm/page_alloc.c @@ -27,6 +27,7 @@ #include <linux/pagevec.h> #include <linux/blkdev.h> #include <linux/slab.h> +#include <linux/oom.h> #include <linux/notifier.h> #include <linux/topology.h> #include <linux/sysctl.h> |