Merge branch 'for-linus' of git://twin.jikos.cz/jikos/hid

[firefly-linux-kernel-4.4.55.git] / include / linux / numa.h

diff --git a/include/linux/numa.h b/include/linux/numa.h
index f0c539bd3cfc44e07eaafc26bcf358c29c0fc65f..3aaa31603a861a98d44f0d2b7862c582c589d934 100644 (file)
--- a/include/linux/numa.h
+++ b/include/linux/numa.h
@@ -1,16 +1,15 @@
 #ifndef _LINUX_NUMA_H
 #define _LINUX_NUMA_H
 
-#include <linux/config.h>
 
-#ifndef CONFIG_FLATMEM
-#include <asm/numnodes.h>
-#endif
-
-#ifndef NODES_SHIFT
+#ifdef CONFIG_NODES_SHIFT
+#define NODES_SHIFT     CONFIG_NODES_SHIFT
+#else
 #define NODES_SHIFT     0
 #endif
 
 #define MAX_NUMNODES    (1 << NODES_SHIFT)
 
+#define        NUMA_NO_NODE    (-1)
+
 #endif /* _LINUX_NUMA_H */