diff options
| author | Oleg Drokin <green@angband.namesys.com> | 2002-06-10 17:52:30 +0400 |
|---|---|---|
| committer | Oleg Drokin <green@angband.namesys.com> | 2002-06-10 17:52:30 +0400 |
| commit | 70c452adfd781d98ffe5f91c3652f8f1468282fa (patch) | |
| tree | 966bbcc565d7a3f131bbc6bd3e3289b6e6ef0bb3 /include/linux/vmalloc.h | |
| parent | eed2a0261b039da58d35e15582358cb8cfb2db05 (diff) | |
| parent | 3150c862b5b885c929d1300b9a39d4d3b76ba3df (diff) | |
Merge angband.namesys.com:/home/green/bk/linux-2.5
into angband.namesys.com:/home/green/bk_work/reiser3-linux-2.5-test
Diffstat (limited to 'include/linux/vmalloc.h')
| -rw-r--r-- | include/linux/vmalloc.h | 29 |
1 files changed, 4 insertions, 25 deletions
diff --git a/include/linux/vmalloc.h b/include/linux/vmalloc.h index e08fcf85c24f..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> @@ -24,33 +23,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 |