Commit 66e586c6 authored by Andi Kleen's avatar Andi Kleen Committed by Linus Torvalds

[PATCH] x86-64: Fix UP build warning

Fix warning:

In file included from include/asm/numa.h:5,
                 from arch/x86_64/kernel/setup64.c:27:
include/asm/numnodes.h:6:1: warning: "NODES_SHIFT" redefined
In file included from include/linux/mmzone.h:13,
                 from include/linux/gfp.h:4,
                 from include/linux/slab.h:15,
                 from include/linux/percpu.h:4,
                 from include/linux/sched.h:33,
                 from arch/x86_64/kernel/setup64.c:11:
include/linux/numa.h:11:1: warning: this is the location of the previous definition

in UP builds.
Signed-off-by: default avatarAndi Kleen <ak@suse.de>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 28019bca
...@@ -3,6 +3,10 @@ ...@@ -3,6 +3,10 @@
#include <linux/config.h> #include <linux/config.h>
#ifdef CONFIG_NUMA
#define NODES_SHIFT 6 #define NODES_SHIFT 6
#else
#define NODES_SHIFT 0
#endif
#endif #endif
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment