mm: don't implictly include linux/mm.h in linux/sched.h

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>

diff --git a/arch/unicore32/include/asm/mmu_context.h b/arch/unicore32/include/asm/mmu_context.h
index 2dcd03719ace6be0d696c0428c4472c5e698d7f0..ab474c8b8269f1d3a7abe08c14b2ac69255282e2 100644 (file)
--- a/arch/unicore32/include/asm/mmu_context.h
+++ b/arch/unicore32/include/asm/mmu_context.h
@@ -15,6 +15,7 @@
 #include <linux/compiler.h>
 #include <linux/sched.h>
 #include <linux/io.h>
+#include <linux/vmacache.h>
 
 #include <asm/cacheflush.h>
 #include <asm/cpu-single.h>

diff --git a/fs/exec.c b/fs/exec.c
index 60e36e9b5a1bf8459655ca245029a25e241e5027..1b75ab04c7872cceec0760c1f53cae919104a151 100644 (file)
--- a/fs/exec.c
+++ b/fs/exec.c
@@ -55,6 +55,7 @@
 #include <linux/pipe_fs_i.h>
 #include <linux/oom.h>
 #include <linux/compat.h>
+#include <linux/vmacache.h>
 
 #include <asm/uaccess.h>
 #include <asm/mmu_context.h>

diff --git a/include/linux/sched.h b/include/linux/sched.h
index d718fd5048de5d6d67c6a61c64f7e67c97350dc1..07fa6c2c4a9a4e11dd26297a76bb501aff3356c5 100644 (file)
--- a/include/linux/sched.h
+++ b/include/linux/sched.h
@@ -25,7 +25,7 @@ struct sched_param {
 #include <linux/errno.h>
 #include <linux/nodemask.h>
 #include <linux/mm_types.h>
-#include <linux/vmacache.h>
+#include <linux/vmacachedefs.h>
 #include <linux/preempt_mask.h>
 
 #include <asm/page.h>

diff --git a/include/linux/vmacache.h b/include/linux/vmacache.h
index 40e4eb829d484aa2cc1f318df8d0e7bdb4bd2d53..e22a6b6a488919c59971d24b927c20817106aaaa 100644 (file)
--- a/include/linux/vmacache.h
+++ b/include/linux/vmacache.h
@@ -2,10 +2,8 @@
 #define __LINUX_VMACACHE_H
 
 #include <linux/mm.h>
+#include <linux/vmacachedefs.h>
 
-#define VMACACHE_BITS 2
-#define VMACACHE_SIZE (1U << VMACACHE_BITS)
-#define VMACACHE_MASK (VMACACHE_SIZE - 1)
 /*
  * Hash based on the page number. Provides a good hit rate for
  * workloads with good locality and those with random accesses as well.

diff --git a/include/linux/vmacachedefs.h b/include/linux/vmacachedefs.h
new file mode 100644 (file)
index 0000000..670f335
--- /dev/null
+++ b/include/linux/vmacachedefs.h
@@ -0,0 +1,9 @@
+
+#ifndef __LINUX_VMACACHEDEFS_H
+#define __LINUX_VMACACHEDEFS_H
+
+#define VMACACHE_BITS 2
+#define VMACACHE_SIZE (1U << VMACACHE_BITS)
+#define VMACACHE_MASK (VMACACHE_SIZE - 1)
+
+#endif /* __LINUX_VMACACHEDEFS_H */

diff --git a/kernel/debug/debug_core.c b/kernel/debug/debug_core.c
index 289996f4902ec0b5ab4c05bf2dddef095f264bb0..6d0b47f421cacc8d63c2cbe2e3d45c300e81117a 100644 (file)
--- a/kernel/debug/debug_core.c
+++ b/kernel/debug/debug_core.c
@@ -50,6 +50,7 @@
 #include <linux/smp.h>
 #include <linux/mm.h>
 #include <linux/rcupdate.h>
+#include <linux/vmacache.h>
 
 #include <asm/cacheflush.h>
 #include <asm/byteorder.h>

diff --git a/kernel/fork.c b/kernel/fork.c
index bf36e8d2de0e2a1a2cbc0557d22129807d3982bb..24d37ebe7157c4fcef331bd262bfa611a8ea7720 100644 (file)
--- a/kernel/fork.c
+++ b/kernel/fork.c
@@ -71,6 +71,7 @@
 #include <linux/signalfd.h>
 #include <linux/uprobes.h>
 #include <linux/aio.h>
+#include <linux/vmacache.h>
 
 #include <asm/pgtable.h>
 #include <asm/pgalloc.h>

diff --git a/mm/mmap.c b/mm/mmap.c
index 211b7c6ce80924b0b7bf6d2072d666e324436b04..f2fe012ca2a5055b96545ff5a72ab90f49c8a9b3 100644 (file)
--- a/mm/mmap.c
+++ b/mm/mmap.c
@@ -36,6 +36,7 @@
 #include <linux/sched/sysctl.h>
 #include <linux/notifier.h>
 #include <linux/memory.h>
+#include <linux/vmacache.h>
 
 #include <asm/uaccess.h>
 #include <asm/cacheflush.h>

diff --git a/mm/nommu.c b/mm/nommu.c
index c58f82044fa1e135e8492ae8fc9e4c1352c1fea2..fd7d7a0c3943f11e90eb88e26936ac089919823d 100644 (file)
--- a/mm/nommu.c
+++ b/mm/nommu.c
@@ -31,6 +31,7 @@
 #include <linux/syscalls.h>
 #include <linux/audit.h>
 #include <linux/sched/sysctl.h>
+#include <linux/vmacache.h>
 
 #include <asm/uaccess.h>
 #include <asm/tlb.h>