X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=include%2Flinux%2Fnodemask.h;h=7afc36334d52ba7a188e15713ae46f52ed0fa28d;hb=fc23af34b00ef444eec088f744983b9ca6c7f5d1;hp=8a8f1d09c1336dce6076335b5a181c5bfc131120;hpb=c5617b200ac52e35f7e8cf05a17b0a2d50f6b3e9;p=pandora-kernel.git

diff --git a/include/linux/nodemask.h b/include/linux/nodemask.h
index 8a8f1d09c133..7afc36334d52 100644
--- a/include/linux/nodemask.h
+++ b/include/linux/nodemask.h
@@ -433,9 +433,6 @@ static inline void node_set_offline(int nid)
 	nr_online_nodes = num_node_state(N_ONLINE);
 }
 
-#define node_random(mask) __node_random(&(mask))
-extern int __node_random(const nodemask_t *maskp);
-
 #else
 
 static inline int node_state(int node, enum node_states state)
@@ -467,7 +464,15 @@ static inline int num_node_state(enum node_states state)
 #define node_set_online(node)	   node_set_state((node), N_ONLINE)
 #define node_set_offline(node)	   node_clear_state((node), N_ONLINE)
 
-static inline int node_random(const nodemask_t mask) { return 0; }
+#endif
+
+#if defined(CONFIG_NUMA) && (MAX_NUMNODES > 1)
+extern int node_random(const nodemask_t *maskp);
+#else
+static inline int node_random(const nodemask_t *mask)
+{
+	return 0;
+}
 #endif
 
 #define node_online_map 	node_states[N_ONLINE]