lkml.org 
[lkml]   [2002]   [Jun]   [6]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
Date
From
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.

--
Tom Rini (TR1265)
http://gate.crashing.org/~trini/

===== include/linux/vmalloc.h 1.2 vs edited =====
--- 1.2/include/linux/vmalloc.h Fri Feb 8 20:10:55 2002
+++ edited/include/linux/vmalloc.h Thu Jun 6 09:54:55 2002
@@ -24,33 +24,13 @@
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
===== mm/vmalloc.c 1.14 vs edited =====
--- 1.14/mm/vmalloc.c Fri May 3 04:27:09 2002
+++ edited/mm/vmalloc.c Thu Jun 6 09:50:13 2002
@@ -232,6 +232,33 @@
printk(KERN_ERR "Trying to vfree() nonexistent vm area (%p)\n", addr);
}

+/*
+ * Allocate any pages
+ */
+
+void * vmalloc (unsigned long size)
+{
+ return __vmalloc(size, GFP_KERNEL | __GFP_HIGHMEM, PAGE_KERNEL);
+}
+
+/*
+ * Allocate ISA addressable pages for broke crap
+ */
+
+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
+ */
+
+void * vmalloc_32(unsigned long size)
+{
+ return __vmalloc(size, GFP_KERNEL, PAGE_KERNEL);
+}
+
void * __vmalloc (unsigned long size, int gfp_mask, pgprot_t prot)
{
void * addr;
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
\
 
 \ /
  Last update: 2005-03-22 13:22    [W:0.185 / U:0.400 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site