diff options
| author | Linus Torvalds <torvalds@home.transmeta.com> | 2002-06-08 02:14:23 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@home.transmeta.com> | 2002-06-08 02:14:23 -0700 |
| commit | a4aa0f0838a20f7b0925fc85f8fab17867da16d1 (patch) | |
| tree | 60c35e689abb6e36505eb20aab5e7dd10a10c49a /include/linux | |
| parent | b28ae717120f4d9726905d0d3ef7d8e9a1c72fd0 (diff) | |
| parent | 0bcf1924f303b69b36ae159e3406af4642dc8d3d (diff) | |
Merge http://linux-isdn.bkbits.net/linux-2.5.make
into home.transmeta.com:/home/torvalds/v2.5/linux
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/bio.h | 1 | ||||
| -rw-r--r-- | include/linux/device.h | 2 | ||||
| -rw-r--r-- | include/linux/spinlock.h | 2 | ||||
| -rw-r--r-- | include/linux/vmalloc.h | 29 |
4 files changed, 8 insertions, 26 deletions
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/device.h b/include/linux/device.h index 1c35f87abc9e..053572009fa1 100644 --- a/include/linux/device.h +++ b/include/linux/device.h @@ -64,7 +64,7 @@ struct bus_type { struct driver_dir_entry device_dir; struct driver_dir_entry driver_dir; - int (*bind) (struct device * dev, struct device_driver * drv); + int (*match) (struct device * dev, struct device_driver * drv); }; 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 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 |