projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'pm-merge' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
[firefly-linux-kernel-4.4.55.git]
/
mm
/
vmalloc.c
diff --git
a/mm/vmalloc.c
b/mm/vmalloc.c
index 78e08300db21c6707dc1a69d6e8212f332ae68a0..5123a169ab7b0cbcb45776aef162b13c5d089455 100644
(file)
--- a/
mm/vmalloc.c
+++ b/
mm/vmalloc.c
@@
-2550,7
+2550,7
@@
static void s_stop(struct seq_file *m, void *p)
static void show_numa_info(struct seq_file *m, struct vm_struct *v)
{
static void show_numa_info(struct seq_file *m, struct vm_struct *v)
{
- if (
NUMA_BUILD
) {
+ if (
IS_ENABLED(CONFIG_NUMA)
) {
unsigned int nr, *counters = m->private;
if (!counters)
unsigned int nr, *counters = m->private;
if (!counters)
@@
-2615,7
+2615,7
@@
static int vmalloc_open(struct inode *inode, struct file *file)
unsigned int *ptr = NULL;
int ret;
unsigned int *ptr = NULL;
int ret;
- if (
NUMA_BUILD
) {
+ if (
IS_ENABLED(CONFIG_NUMA)
) {
ptr = kmalloc(nr_node_ids * sizeof(unsigned int), GFP_KERNEL);
if (ptr == NULL)
return -ENOMEM;
ptr = kmalloc(nr_node_ids * sizeof(unsigned int), GFP_KERNEL);
if (ptr == NULL)
return -ENOMEM;