Linux Headquarters
[ Register ]
[ About us ] [ Home Page ]

Advertisement
[ Kernel ] [ Documentation ] [ Links ] [ Books ]

Advertisement

Kernel v2.6.24 /mm/vmalloc.c

Filename:/mm/vmalloc.c
Lines Added:6
Lines Deleted:5
Also changed in: (Previous) 2.6.24-rc8  2.6.24-rc7  2.6.24-rc6  2.6.24-rc5  2.6.24-rc4  2.6.24-rc3 
(Following) 2.6.24-git15  2.6.24-git16  2.6.24-git17  2.6.24-git18  2.6.24-git19  2.6.24-git20 

Location
[  2.6.24
  [  mm
     o  vmalloc.c

Patch

diff --git a/mm/vmalloc.c b/mm/vmalloc.c
index 3cee76a..af77e17 100644
--- a/mm/vmalloc.c
+++ b/mm/vmalloc.c
@@ -190,7 +190,8 @@ static struct vm_struct *__get_vm_area_node(unsigned long size, unsigned long fl
    if (unlikely(!size))
       return NULL;
 
-   area = kmalloc_node(sizeof(*area), gfp_mask & GFP_LEVEL_MASK, node);
+   area = kmalloc_node(sizeof(*area), gfp_mask & GFP_RECLAIM_MASK, node);
+
    if (unlikely(!area))
       return NULL;
 
@@ -246,7 +247,7 @@ struct vm_struct *__get_vm_area(unsigned long size, unsigned long flags,
 EXPORT_SYMBOL_GPL(__get_vm_area);
 
 /**
- *   get_vm_area  -  reserve a contingous kernel virtual area
+ *   get_vm_area  -  reserve a contiguous kernel virtual area
  *   @size:      size of the area
  *   @flags:      %VM_IOREMAP for I/O mappings or VM_ALLOC
  *
@@ -302,7 +303,7 @@ found:
 }
 
 /**
- *   remove_vm_area  -  find and remove a contingous kernel virtual area
+ *   remove_vm_area  -  find and remove a continuous kernel virtual area
  *   @addr:      base address
  *
  *   Search for the kernel VM area starting at @addr, and remove it.
@@ -363,7 +364,7 @@ static void __vunmap(void *addr, int deallocate_pages)
  *   vfree  -  release memory allocated by vmalloc()
  *   @addr:      memory base address
  *
- *   Free the virtually contiguous memory area starting at @addr, as
+ *   Free the virtually continuous memory area starting at @addr, as
  *   obtained from vmalloc(), vmalloc_32() or __vmalloc(). If @addr is
  *   NULL, no operation is performed.
  *
@@ -439,7 +440,7 @@ void *__vmalloc_area_node(struct vm_struct *area, gfp_t gfp_mask,
       area->flags |= VM_VPAGES;
    } else {
       pages = kmalloc_node(array_size,
-            (gfp_mask & GFP_LEVEL_MASK) | __GFP_ZERO,
+            (gfp_mask & GFP_RECLAIM_MASK) | __GFP_ZERO,
             node);
    }
    area->pages = pages;


Comments: webmaster (at) linuxhq.com.
Advertising: banners (at) linuxhq.com.
Compilation ©1998-2008 Linux Headquarters, Inc.