diff options
Diffstat (limited to 'mm')
-rw-r--r-- | mm/page_alloc.c | 3 | ||||
-rw-r--r-- | mm/vmalloc.c | 8 |
2 files changed, 5 insertions, 6 deletions
diff --git a/mm/page_alloc.c b/mm/page_alloc.c index 80ce7f2104df..fc1b1064c505 100644 --- a/mm/page_alloc.c +++ b/mm/page_alloc.c | |||
@@ -1355,8 +1355,7 @@ static int __init build_zonelists_node(pg_data_t *pgdat, struct zonelist *zoneli | |||
1355 | #define MAX_NODE_LOAD (num_online_nodes()) | 1355 | #define MAX_NODE_LOAD (num_online_nodes()) |
1356 | static int __initdata node_load[MAX_NUMNODES]; | 1356 | static int __initdata node_load[MAX_NUMNODES]; |
1357 | /** | 1357 | /** |
1358 | * find_next_best_node - find the next node that should appear in a given | 1358 | * find_next_best_node - find the next node that should appear in a given node's fallback list |
1359 | * node's fallback list | ||
1360 | * @node: node whose fallback list we're appending | 1359 | * @node: node whose fallback list we're appending |
1361 | * @used_node_mask: nodemask_t of already used nodes | 1360 | * @used_node_mask: nodemask_t of already used nodes |
1362 | * | 1361 | * |
diff --git a/mm/vmalloc.c b/mm/vmalloc.c index c6182f6f1305..2bd83e5c2bbf 100644 --- a/mm/vmalloc.c +++ b/mm/vmalloc.c | |||
@@ -475,6 +475,10 @@ void *vmalloc(unsigned long size) | |||
475 | 475 | ||
476 | EXPORT_SYMBOL(vmalloc); | 476 | EXPORT_SYMBOL(vmalloc); |
477 | 477 | ||
478 | #ifndef PAGE_KERNEL_EXEC | ||
479 | # define PAGE_KERNEL_EXEC PAGE_KERNEL | ||
480 | #endif | ||
481 | |||
478 | /** | 482 | /** |
479 | * vmalloc_exec - allocate virtually contiguous, executable memory | 483 | * vmalloc_exec - allocate virtually contiguous, executable memory |
480 | * | 484 | * |
@@ -488,10 +492,6 @@ EXPORT_SYMBOL(vmalloc); | |||
488 | * use __vmalloc() instead. | 492 | * use __vmalloc() instead. |
489 | */ | 493 | */ |
490 | 494 | ||
491 | #ifndef PAGE_KERNEL_EXEC | ||
492 | # define PAGE_KERNEL_EXEC PAGE_KERNEL | ||
493 | #endif | ||
494 | |||
495 | void *vmalloc_exec(unsigned long size) | 495 | void *vmalloc_exec(unsigned long size) |
496 | { | 496 | { |
497 | return __vmalloc(size, GFP_KERNEL | __GFP_HIGHMEM, PAGE_KERNEL_EXEC); | 497 | return __vmalloc(size, GFP_KERNEL | __GFP_HIGHMEM, PAGE_KERNEL_EXEC); |