--- zzzz-none-000/linux-2.6.19.2/mm/vmalloc.c	2007-01-10 19:10:37.000000000 +0000
+++ davinci-8020-5505/linux-2.6.19.2/mm/vmalloc.c	2007-01-19 14:42:56.000000000 +0000
@@ -160,15 +160,13 @@
 	return err;
 }
 
-static struct vm_struct *__get_vm_area_node(unsigned long size, unsigned long flags,
-					    unsigned long start, unsigned long end,
-					    int node, gfp_t gfp_mask)
+struct vm_struct *__get_vm_area_node(unsigned long size, unsigned long flags,
+				unsigned long start, unsigned long end, int node)
 {
 	struct vm_struct **p, *tmp, *area;
 	unsigned long align = 1;
 	unsigned long addr;
 
-	BUG_ON(in_interrupt());
 	if (flags & VM_IOREMAP) {
 		int bit = fls(size);
 
@@ -181,13 +179,16 @@
 	}
 	addr = ALIGN(start, align);
 	size = PAGE_ALIGN(size);
-	if (unlikely(!size))
-		return NULL;
 
-	area = kmalloc_node(sizeof(*area), gfp_mask & GFP_LEVEL_MASK, node);
+	area = kmalloc_node(sizeof(*area), GFP_KERNEL, node);
 	if (unlikely(!area))
 		return NULL;
 
+	if (unlikely(!size)) {
+		kfree (area);
+		return NULL;
+	}
+
 	/*
 	 * We always allocate a guard page.
 	 */
@@ -195,6 +196,8 @@
 
 	write_lock(&vmlist_lock);
 	for (p = &vmlist; (tmp = *p) != NULL ;p = &tmp->next) {
+		if (addr > end - size)
+			goto out;
 		if ((unsigned long)tmp->addr < addr) {
 			if((unsigned long)tmp->addr + tmp->size >= addr)
 				addr = ALIGN(tmp->size + 
@@ -206,8 +209,6 @@
 		if (size + addr <= (unsigned long)tmp->addr)
 			goto found;
 		addr = ALIGN(tmp->size + (unsigned long)tmp->addr, align);
-		if (addr > end - size)
-			goto out;
 	}
 
 found:
@@ -235,7 +236,7 @@
 struct vm_struct *__get_vm_area(unsigned long size, unsigned long flags,
 				unsigned long start, unsigned long end)
 {
-	return __get_vm_area_node(size, flags, start, end, -1, GFP_KERNEL);
+	return __get_vm_area_node(size, flags, start, end, -1);
 }
 
 /**
@@ -252,11 +253,9 @@
 	return __get_vm_area(size, flags, VMALLOC_START, VMALLOC_END);
 }
 
-struct vm_struct *get_vm_area_node(unsigned long size, unsigned long flags,
-				   int node, gfp_t gfp_mask)
+struct vm_struct *get_vm_area_node(unsigned long size, unsigned long flags, int node)
 {
-	return __get_vm_area_node(size, flags, VMALLOC_START, VMALLOC_END, node,
-				  gfp_mask);
+	return __get_vm_area_node(size, flags, VMALLOC_START, VMALLOC_END, node);
 }
 
 /* Caller must hold vmlist_lock */
@@ -488,7 +487,7 @@
 	if (!size || (size >> PAGE_SHIFT) > num_physpages)
 		return NULL;
 
-	area = get_vm_area_node(size, VM_ALLOC, node, gfp_mask);
+	area = get_vm_area_node(size, VM_ALLOC, node);
 	if (!area)
 		return NULL;
 
@@ -529,12 +528,11 @@
 	void *ret;
 
 	ret = __vmalloc(size, GFP_KERNEL | __GFP_HIGHMEM | __GFP_ZERO, PAGE_KERNEL);
-	if (ret) {
-		write_lock(&vmlist_lock);
-		area = __find_vm_area(ret);
-		area->flags |= VM_USERMAP;
-		write_unlock(&vmlist_lock);
-	}
+	write_lock(&vmlist_lock);
+	area = __find_vm_area(ret);
+	area->flags |= VM_USERMAP;
+	write_unlock(&vmlist_lock);
+
 	return ret;
 }
 EXPORT_SYMBOL(vmalloc_user);
@@ -603,12 +601,11 @@
 	void *ret;
 
 	ret = __vmalloc(size, GFP_KERNEL | __GFP_ZERO, PAGE_KERNEL);
-	if (ret) {
-		write_lock(&vmlist_lock);
-		area = __find_vm_area(ret);
-		area->flags |= VM_USERMAP;
-		write_unlock(&vmlist_lock);
-	}
+	write_lock(&vmlist_lock);
+	area = __find_vm_area(ret);
+	area->flags |= VM_USERMAP;
+	write_unlock(&vmlist_lock);
+
 	return ret;
 }
 EXPORT_SYMBOL(vmalloc_32_user);