From: Andrew Morton <akpm@osdl.org>

Use a forward declaration to avoid worsening the include tangliness.

Cc: Martin Schwidefsky <schwidefsky@de.ibm.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
---

 include/linux/swap.h |    4 ++--
 mm/oom_kill.c        |    1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

diff -puN include/linux/swap.h~out-of-memory-notifier-tidy include/linux/swap.h
--- a/include/linux/swap.h~out-of-memory-notifier-tidy
+++ a/include/linux/swap.h
@@ -6,11 +6,12 @@
 #include <linux/mmzone.h>
 #include <linux/list.h>
 #include <linux/sched.h>
-#include <linux/notifier.h>
 
 #include <asm/atomic.h>
 #include <asm/page.h>
 
+struct notifier_block;
+
 #define SWAP_FLAG_PREFER	0x8000	/* set if swap priority specified */
 #define SWAP_FLAG_PRIO_MASK	0x7fff
 #define SWAP_FLAG_PRIO_SHIFT	0
@@ -160,7 +161,6 @@ extern void out_of_memory(struct zonelis
 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 -puN mm/oom_kill.c~out-of-memory-notifier-tidy mm/oom_kill.c
--- a/mm/oom_kill.c~out-of-memory-notifier-tidy
+++ a/mm/oom_kill.c
@@ -22,6 +22,7 @@
 #include <linux/jiffies.h>
 #include <linux/cpuset.h>
 #include <linux/module.h>
+#include <linux/notifier.h>
 
 int sysctl_panic_on_oom;
 /* #define DEBUG */
_