aboutsummaryrefslogtreecommitdiffstats
path: root/mm/mempolicy.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2014-06-06 19:35:10 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2014-06-06 19:35:10 -0400
commit57d326169e878a1a37b2bccd1cf81f6809ee67b9 (patch)
tree86ed74ae4dc2beaebce1c67b8459f1873b777d3a /mm/mempolicy.c
parent7b215de3d0abbc4f6daf2efd19e8809af0564490 (diff)
parent0244756edc4b98c129e92c7061d9f383708cf786 (diff)
Merge branch 'akpm' (patches from Andrew Morton) into next
Merge more updates from Andrew Morton: - Most of the rest of MM. This includes "mark remap_file_pages syscall as deprecated" but the actual "replace remap_file_pages syscall with emulation" is held back. I guess we'll need to work out when to pull the trigger on that one. - various minor cleanups to obscure filesystems - the drivers/rtc queue - hfsplus updates - ufs, hpfs, fatfs, affs, reiserfs - Documentation/ - signals - procfs - cpu hotplug - lib/idr.c - rapidio - sysctl - ipc updates * emailed patches from Andrew Morton <akpm@linux-foundation.org>: (171 commits) ufs: sb mutex merge + mutex_destroy powerpc: update comments for generic idle conversion cris: update comments for generic idle conversion idle: remove cpu_idle() forward declarations nbd: zero from and len fields in NBD_CMD_DISCONNECT. mm: convert some level-less printks to pr_* MAINTAINERS: adi-buildroot-devel is moderated MAINTAINERS: add linux-api for review of API/ABI changes mm/kmemleak-test.c: use pr_fmt for logging fs/dlm/debug_fs.c: replace seq_printf by seq_puts fs/dlm/lockspace.c: convert simple_str to kstr fs/dlm/config.c: convert simple_str to kstr mm: mark remap_file_pages() syscall as deprecated mm: memcontrol: remove unnecessary memcg argument from soft limit functions mm: memcontrol: clean up memcg zoneinfo lookup mm/memblock.c: call kmemleak directly from memblock_(alloc|free) mm/mempool.c: update the kmemleak stack trace for mempool allocations lib/radix-tree.c: update the kmemleak stack trace for radix tree allocations mm: introduce kmemleak_update_trace() mm/kmemleak.c: use %u to print ->checksum ...
Diffstat (limited to 'mm/mempolicy.c')
-rw-r--r--mm/mempolicy.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/mm/mempolicy.c b/mm/mempolicy.c
index 16bc9fa42998..1c16c228f35a 100644
--- a/mm/mempolicy.c
+++ b/mm/mempolicy.c
@@ -65,6 +65,8 @@
65 kernel is not always grateful with that. 65 kernel is not always grateful with that.
66*/ 66*/
67 67
68#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
69
68#include <linux/mempolicy.h> 70#include <linux/mempolicy.h>
69#include <linux/mm.h> 71#include <linux/mm.h>
70#include <linux/highmem.h> 72#include <linux/highmem.h>
@@ -91,6 +93,7 @@
91#include <linux/ctype.h> 93#include <linux/ctype.h>
92#include <linux/mm_inline.h> 94#include <linux/mm_inline.h>
93#include <linux/mmu_notifier.h> 95#include <linux/mmu_notifier.h>
96#include <linux/printk.h>
94 97
95#include <asm/tlbflush.h> 98#include <asm/tlbflush.h>
96#include <asm/uaccess.h> 99#include <asm/uaccess.h>
@@ -2645,7 +2648,7 @@ void __init numa_policy_init(void)
2645 node_set(prefer, interleave_nodes); 2648 node_set(prefer, interleave_nodes);
2646 2649
2647 if (do_set_mempolicy(MPOL_INTERLEAVE, 0, &interleave_nodes)) 2650 if (do_set_mempolicy(MPOL_INTERLEAVE, 0, &interleave_nodes))
2648 printk("numa_policy_init: interleaving failed\n"); 2651 pr_err("%s: interleaving failed\n", __func__);
2649 2652
2650 check_numabalancing_enable(); 2653 check_numabalancing_enable();
2651} 2654}