Merge with Linux 2.3.32.

1 files changed, 5 insertions, 1 deletions

diff --git a/include/linux/vmalloc.h b/include/linux/vmalloc.h
index 0aba8360c..d360d41bc 100644
--- a/include/linux/vmalloc.h
+++ b/include/linux/vmalloc.h
@@ -6,6 +6,10 @@
 
 #include <asm/pgtable.h>
 
+/* bits in vm_struct->flags */
+#define VM_IOREMAP	0x00000001	/* ioremap() and friends */
+#define VM_ALLOC	0x00000002	/* vmalloc() */
+
 struct vm_struct {
 	unsigned long flags;
 	void * addr;
@@ -13,7 +17,7 @@ struct vm_struct {
 	struct vm_struct * next;
 };
 
-struct vm_struct * get_vm_area(unsigned long size);
+struct vm_struct * get_vm_area(unsigned long size, unsigned long flags);
 void vfree(void * addr);
 void * vmalloc_prot(unsigned long size, pgprot_t prot);
 void * vmalloc_uncached(unsigned long size);