projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Pull thermal into release branch
[powerpc.git]
/
mm
/
vmalloc.c
diff --git
a/mm/vmalloc.c
b/mm/vmalloc.c
index
3cee76a
..
af77e17
100644
(file)
--- 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;
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;
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);
/**
EXPORT_SYMBOL_GPL(__get_vm_area);
/**
- * get_vm_area - reserve a conti
ng
ous kernel virtual area
+ * get_vm_area - reserve a conti
gu
ous kernel virtual area
* @size: size of the area
* @flags: %VM_IOREMAP for I/O mappings or VM_ALLOC
*
* @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 contin
g
ous kernel virtual area
+ * remove_vm_area - find and remove a contin
u
ous kernel virtual area
* @addr: base address
*
* Search for the kernel VM area starting at @addr, and remove it.
* @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
*
* vfree - release memory allocated by vmalloc()
* @addr: memory base address
*
- * Free the virtually conti
g
uous memory area starting at @addr, as
+ * Free the virtually conti
n
uous memory area starting at @addr, as
* obtained from vmalloc(), vmalloc_32() or __vmalloc(). If @addr is
* NULL, no operation is performed.
*
* 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,
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;
node);
}
area->pages = pages;