From 3f77edfe88b59b70bc538f835cec0a7b797face1 Mon Sep 17 00:00:00 2001
From: Tom Rini <trini@kernel.crashing.org>
Date: Sat, 8 Jun 2002 02:12:09 -0700
Subject: [PATCH] Move vmalloc wrappers out of include/linux/vmalloc.h

This moves the vmalloc wrappers from <linux/vmalloc.h> into mm/vmalloc.c.

Doing this will later allow us to remove <linux/mm.h> from <linux/vmalloc.h>,
along with some other #include fixups.
---
 include/linux/vmalloc.h | 28 ++++------------------------
 1 file changed, 4 insertions(+), 24 deletions(-)

(limited to 'include/linux/vmalloc.h')

diff --git a/include/linux/vmalloc.h b/include/linux/vmalloc.h
index e08fcf85c24f..a40c2064832b 100644
--- a/include/linux/vmalloc.h
+++ b/include/linux/vmalloc.h
@@ -24,33 +24,13 @@ extern long vread(char *buf, char *addr, unsigned long count);
 extern void vmfree_area_pages(unsigned long address, unsigned long size);
 extern int vmalloc_area_pages(unsigned long address, unsigned long size,
                               int gfp_mask, pgprot_t prot);
-
-/*
- *	Allocate any pages
- */
- 
-static inline void * vmalloc (unsigned long size)
-{
-	return __vmalloc(size, GFP_KERNEL | __GFP_HIGHMEM, PAGE_KERNEL);
-}
-
 /*
- *	Allocate ISA addressable pages for broke crap
+ * Various ways to allocate pages.
  */
 
-static inline void * vmalloc_dma (unsigned long size)
-{
-	return __vmalloc(size, GFP_KERNEL|GFP_DMA, PAGE_KERNEL);
-}
-
-/*
- *	vmalloc 32bit PA addressable pages - eg for PCI 32bit devices
- */
- 
-static inline void * vmalloc_32(unsigned long size)
-{
-	return __vmalloc(size, GFP_KERNEL, PAGE_KERNEL);
-}
+extern void * vmalloc(unsigned long size);
+extern void * vmalloc_dma(unsigned long size);
+extern void * vmalloc_32(unsigned long size);
 
 /*
  * vmlist_lock is a read-write spinlock that protects vmlist
-- 
cgit v1.2.3


From 0bcf1924f303b69b36ae159e3406af4642dc8d3d Mon Sep 17 00:00:00 2001
From: Tom Rini <trini@kernel.crashing.org>
Date: Sat, 8 Jun 2002 02:13:15 -0700
Subject: [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.
---
 arch/i386/kernel/microcode.c | 1 +
 fs/mpage.c                   | 1 -
 include/asm-i386/pci.h       | 1 +
 include/asm-i386/pgalloc.h   | 1 +
 include/linux/bio.h          | 1 +
 include/linux/spinlock.h     | 2 ++
 include/linux/vmalloc.h      | 1 -
 7 files changed, 6 insertions(+), 2 deletions(-)

(limited to 'include/linux/vmalloc.h')

diff --git a/arch/i386/kernel/microcode.c b/arch/i386/kernel/microcode.c
index 328febf1f679..f48bd676ab80 100644
--- 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 3b014df61d35..238b7d608925 100644
--- 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 1d957c02e541..57100de26c0c 100644
--- 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 10e7021c33a6..f2d63db16cf5 100644
--- 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 de52fa8f15e3..b244108a27a8 100644
--- 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 a78cd80f4ab6..e46232e8e126 100644
--- 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 a40c2064832b..18cce6c6526a 100644
--- 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>
-- 
cgit v1.2.3