diff options
author | Kirill A. Shutemov <kirill.shutemov@linux.intel.com> | 2012-12-11 19:00:29 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-12-11 20:22:22 -0500 |
commit | e5adfffc857788c8b7eca0e98cf1e26f1964b292 (patch) | |
tree | 8d1ac37aa649a060055162b59cb06e8ca63f7a68 /mm/vmalloc.c | |
parent | 19965460e31c73a934d2c19c152f876a75bdff3e (diff) |
mm: use IS_ENABLED(CONFIG_NUMA) instead of NUMA_BUILD
We don't need custom NUMA_BUILD anymore, since we have handy
IS_ENABLED().
Signed-off-by: Kirill A. Shutemov <kirill.shutemov@linux.intel.com>
Acked-by: KOSAKI Motohiro <kosaki.motohiro@jp.fujitsu.com>
Acked-by: David Rientjes <rientjes@google.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'mm/vmalloc.c')
-rw-r--r-- | mm/vmalloc.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mm/vmalloc.c b/mm/vmalloc.c index 78e08300db21..5123a169ab7b 100644 --- a/mm/vmalloc.c +++ b/mm/vmalloc.c | |||
@@ -2550,7 +2550,7 @@ static void s_stop(struct seq_file *m, void *p) | |||
2550 | 2550 | ||
2551 | static void show_numa_info(struct seq_file *m, struct vm_struct *v) | 2551 | static void show_numa_info(struct seq_file *m, struct vm_struct *v) |
2552 | { | 2552 | { |
2553 | if (NUMA_BUILD) { | 2553 | if (IS_ENABLED(CONFIG_NUMA)) { |
2554 | unsigned int nr, *counters = m->private; | 2554 | unsigned int nr, *counters = m->private; |
2555 | 2555 | ||
2556 | if (!counters) | 2556 | if (!counters) |
@@ -2615,7 +2615,7 @@ static int vmalloc_open(struct inode *inode, struct file *file) | |||
2615 | unsigned int *ptr = NULL; | 2615 | unsigned int *ptr = NULL; |
2616 | int ret; | 2616 | int ret; |
2617 | 2617 | ||
2618 | if (NUMA_BUILD) { | 2618 | if (IS_ENABLED(CONFIG_NUMA)) { |
2619 | ptr = kmalloc(nr_node_ids * sizeof(unsigned int), GFP_KERNEL); | 2619 | ptr = kmalloc(nr_node_ids * sizeof(unsigned int), GFP_KERNEL); |
2620 | if (ptr == NULL) | 2620 | if (ptr == NULL) |
2621 | return -ENOMEM; | 2621 | return -ENOMEM; |