[PATCH] Remove <linux/mm.h> from <linux/vmalloc.h>

This removes <linux/mm.h> from <linux/vmalloc.h>.

This then goes and fixes all of the files (x86 and PPC) which relied on
implicit includes which don't happen anymore.  This also takes
<linux/kdev_t.h> out of fs/mpage.c and puts it into include/linux/bio.h
where it belongs since <linux/bio.h> references 'kdev_t' directly.

A quick summary of the of the added includes:
arch/i386/kernel/microcode.c: needs extern for num_physpages, in linux/mm.h
include/linux/spinlock.h: local_irq* is defined in <asm/system.h> but
this was never directly included.

diff --git a/arch/i386/kernel/microcode.c b/arch/i386/kernel/microcode.c
index 328febf1f679f009e344ad7c78d69bfb1779c1c7..f48bd676ab804957740c2a36ef72e0b52c2b30d6 100644 (file)
--- a/arch/i386/kernel/microcode.c
+++ b/arch/i386/kernel/microcode.c
@@ -67,6 +67,7 @@
 #include <linux/miscdevice.h>
 #include <linux/devfs_fs_kernel.h>
 #include <linux/spinlock.h>
+#include <linux/mm.h>
 
 #include <asm/msr.h>
 #include <asm/uaccess.h>

diff --git a/fs/mpage.c b/fs/mpage.c
index 3b014df61d354a4c7118c2b88d5b890462883c4a..238b7d608925e855047426b9661673c4e57a398d 100644 (file)
--- a/fs/mpage.c
+++ b/fs/mpage.c
@@ -12,7 +12,6 @@
 
 #include <linux/kernel.h>
 #include <linux/module.h>
-#include <linux/kdev_t.h>
 #include <linux/bio.h>
 #include <linux/fs.h>
 #include <linux/buffer_head.h>

diff --git a/include/asm-i386/pci.h b/include/asm-i386/pci.h
index 1d957c02e54141668d0f9a15fb6426c9c55be0a8..57100de26c0c61653362e9fea546bb6d0ae92522 100644 (file)
--- a/include/asm-i386/pci.h
+++ b/include/asm-i386/pci.h
@@ -4,6 +4,7 @@
 #include <linux/config.h>
 
 #ifdef __KERNEL__
+#include <linux/mm.h>          /* for struct page */
 
 /* Can be used to override the logic in pci_scan_bus for skipping
    already-configured bus numbers - to be used for buggy BIOSes

diff --git a/include/asm-i386/pgalloc.h b/include/asm-i386/pgalloc.h
index 10e7021c33a65443e8ad940afaaa419b484138c4..f2d63db16cf54e83997944648d7580629be91a3f 100644 (file)
--- a/include/asm-i386/pgalloc.h
+++ b/include/asm-i386/pgalloc.h
@@ -5,6 +5,7 @@
 #include <asm/processor.h>
 #include <asm/fixmap.h>
 #include <linux/threads.h>
+#include <linux/mm.h>          /* for struct page */
 
 #define pmd_populate_kernel(mm, pmd, pte) \
                set_pmd(pmd, __pmd(_PAGE_TABLE + __pa(pte)))

diff --git a/include/linux/bio.h b/include/linux/bio.h
index de52fa8f15e3b0ccddbce4887a910dd70e5348ae..b244108a27a879ef95e31f41b2918d16cd94c611 100644 (file)
--- a/include/linux/bio.h
+++ b/include/linux/bio.h
@@ -20,6 +20,7 @@
 #ifndef __LINUX_BIO_H
 #define __LINUX_BIO_H
 
+#include <linux/kdev_t.h>
 /* Platforms may set this to teach the BIO layer about IOMMU hardware. */
 #include <asm/io.h>
 #ifndef BIO_VMERGE_BOUNDARY

diff --git a/include/linux/spinlock.h b/include/linux/spinlock.h
index a78cd80f4ab638bb7f839ee74d8731b92fc51e67..e46232e8e126962447a1448666721871d469bdaf 100644 (file)
--- a/include/linux/spinlock.h
+++ b/include/linux/spinlock.h
@@ -7,6 +7,8 @@
 #include <linux/thread_info.h>
 #include <linux/kernel.h>
 
+#include <asm/system.h>
+
 /*
  * These are the generic versions of the spinlocks and read-write
  * locks..

diff --git a/include/linux/vmalloc.h b/include/linux/vmalloc.h
index a40c2064832b822ca311adfe12dadfccdab4a42a..18cce6c6526a1225ad13de1e0700e933a893c90e 100644 (file)
--- a/include/linux/vmalloc.h
+++ b/include/linux/vmalloc.h
@@ -1,7 +1,6 @@
 #ifndef __LINUX_VMALLOC_H
 #define __LINUX_VMALLOC_H
 
-#include <linux/mm.h>
 #include <linux/spinlock.h>
 
 #include <asm/pgtable.h>