|
@@ -1655,7 +1655,7 @@ static void *__vmalloc_area_node(struct vm_struct *area, gfp_t gfp_mask,
|
|
|
struct page **pages;
|
|
|
unsigned int nr_pages, array_size, i;
|
|
|
const gfp_t nested_gfp = (gfp_mask & GFP_RECLAIM_MASK) | __GFP_ZERO;
|
|
|
- const gfp_t alloc_mask = gfp_mask | __GFP_NOWARN;
|
|
|
+ const gfp_t alloc_mask = gfp_mask | __GFP_HIGHMEM | __GFP_NOWARN;
|
|
|
|
|
|
nr_pages = get_vm_area_size(area) >> PAGE_SHIFT;
|
|
|
array_size = (nr_pages * sizeof(struct page *));
|
|
@@ -1818,7 +1818,7 @@ EXPORT_SYMBOL(__vmalloc);
|
|
|
void *vmalloc(unsigned long size)
|
|
|
{
|
|
|
return __vmalloc_node_flags(size, NUMA_NO_NODE,
|
|
|
- GFP_KERNEL | __GFP_HIGHMEM);
|
|
|
+ GFP_KERNEL);
|
|
|
}
|
|
|
EXPORT_SYMBOL(vmalloc);
|
|
|
|
|
@@ -1835,7 +1835,7 @@ EXPORT_SYMBOL(vmalloc);
|
|
|
void *vzalloc(unsigned long size)
|
|
|
{
|
|
|
return __vmalloc_node_flags(size, NUMA_NO_NODE,
|
|
|
- GFP_KERNEL | __GFP_HIGHMEM | __GFP_ZERO);
|
|
|
+ GFP_KERNEL | __GFP_ZERO);
|
|
|
}
|
|
|
EXPORT_SYMBOL(vzalloc);
|
|
|
|
|
@@ -1852,7 +1852,7 @@ void *vmalloc_user(unsigned long size)
|
|
|
void *ret;
|
|
|
|
|
|
ret = __vmalloc_node(size, SHMLBA,
|
|
|
- GFP_KERNEL | __GFP_HIGHMEM | __GFP_ZERO,
|
|
|
+ GFP_KERNEL | __GFP_ZERO,
|
|
|
PAGE_KERNEL, NUMA_NO_NODE,
|
|
|
__builtin_return_address(0));
|
|
|
if (ret) {
|
|
@@ -1876,7 +1876,7 @@ EXPORT_SYMBOL(vmalloc_user);
|
|
|
*/
|
|
|
void *vmalloc_node(unsigned long size, int node)
|
|
|
{
|
|
|
- return __vmalloc_node(size, 1, GFP_KERNEL | __GFP_HIGHMEM, PAGE_KERNEL,
|
|
|
+ return __vmalloc_node(size, 1, GFP_KERNEL, PAGE_KERNEL,
|
|
|
node, __builtin_return_address(0));
|
|
|
}
|
|
|
EXPORT_SYMBOL(vmalloc_node);
|
|
@@ -1896,7 +1896,7 @@ EXPORT_SYMBOL(vmalloc_node);
|
|
|
void *vzalloc_node(unsigned long size, int node)
|
|
|
{
|
|
|
return __vmalloc_node_flags(size, node,
|
|
|
- GFP_KERNEL | __GFP_HIGHMEM | __GFP_ZERO);
|
|
|
+ GFP_KERNEL | __GFP_ZERO);
|
|
|
}
|
|
|
EXPORT_SYMBOL(vzalloc_node);
|
|
|
|
|
@@ -1918,7 +1918,7 @@ EXPORT_SYMBOL(vzalloc_node);
|
|
|
|
|
|
void *vmalloc_exec(unsigned long size)
|
|
|
{
|
|
|
- return __vmalloc_node(size, 1, GFP_KERNEL | __GFP_HIGHMEM, PAGE_KERNEL_EXEC,
|
|
|
+ return __vmalloc_node(size, 1, GFP_KERNEL, PAGE_KERNEL_EXEC,
|
|
|
NUMA_NO_NODE, __builtin_return_address(0));
|
|
|
}
|
|
|
|