VServer 1.9.2 (patch-2.6.8.1-vs1.9.2.diff)

[linux-2.6.git] / mm / vmalloc.c

diff --git a/mm/vmalloc.c b/mm/vmalloc.c
index 16e6f88..a4c7c0a 100644 (file)
--- a/mm/vmalloc.c
+++ b/mm/vmalloc.c
@@ -17,7 +17,6 @@
 #include <linux/vmalloc.h>
 
 #include <asm/uaccess.h>
-#include <asm/pgalloc.h>
 #include <asm/tlbflush.h>
 
 
@@ -200,7 +199,7 @@ struct vm_struct *__get_vm_area(unsigned long size, unsigned long flags,
        }
 
        write_lock(&vmlist_lock);
-       for (p = &vmlist; (tmp = *p) ;p = &tmp->next) {
+       for (p = &vmlist; (tmp = *p) != NULL ;p = &tmp->next) {
                if ((unsigned long)tmp->addr < addr)
                        continue;
                if ((size + addr) < addr)
@@ -261,7 +260,7 @@ struct vm_struct *remove_vm_area(void *addr)
        struct vm_struct **p, *tmp;
 
        write_lock(&vmlist_lock);
-       for (p = &vmlist ; (tmp = *p) ;p = &tmp->next) {
+       for (p = &vmlist ; (tmp = *p) != NULL ;p = &tmp->next) {
                 if (tmp->addr == addr)
                         goto found;
        }
@@ -455,6 +454,28 @@ void *vmalloc(unsigned long size)
 
 EXPORT_SYMBOL(vmalloc);
 
+/**
+ *     vmalloc_exec  -  allocate virtually contiguous, executable memory
+ *
+ *     @size:          allocation size
+ *
+ *     Kernel-internal function to allocate enough pages to cover @size
+ *     the page level allocator and map them into contiguous and
+ *     executable kernel virtual space.
+ *
+ *     For tight cotrol over page level allocator and protection flags
+ *     use __vmalloc() instead.
+ */
+
+#ifndef PAGE_KERNEL_EXEC
+# define PAGE_KERNEL_EXEC PAGE_KERNEL
+#endif
+
+void *vmalloc_exec(unsigned long size)
+{
+       return __vmalloc(size, GFP_KERNEL | __GFP_HIGHMEM, PAGE_KERNEL_EXEC);
+}
+
 /**
  *     vmalloc_32  -  allocate virtually contiguous memory (32bit addressable)
  *