Merge branch 'for-next' of git://git.samba.org/sfrench/cifs-2.6

[deliverable/linux.git] / include / linux / nodemask.h

diff --git a/include/linux/nodemask.h b/include/linux/nodemask.h
index 58b9a02c38d29b118d98d7bbd22ac82dde9ec342..83a6aeda899d564843a8a6ea9a4bf090d3da1fe1 100644 (file)
--- a/include/linux/nodemask.h
+++ b/include/linux/nodemask.h
@@ -430,7 +430,15 @@ static inline int num_node_state(enum node_states state)
        for_each_node_mask((__node), node_states[__state])
 
 #define first_online_node      first_node(node_states[N_ONLINE])
-#define next_online_node(nid)  next_node((nid), node_states[N_ONLINE])
+#define first_memory_node      first_node(node_states[N_MEMORY])
+static inline int next_online_node(int nid)
+{
+       return next_node(nid, node_states[N_ONLINE]);
+}
+static inline int next_memory_node(int nid)
+{
+       return next_node(nid, node_states[N_MEMORY]);
+}
 
 extern int nr_node_ids;
 extern int nr_online_nodes;
@@ -471,6 +479,7 @@ static inline int num_node_state(enum node_states state)
        for ( (node) = 0; (node) == 0; (node) = 1)
 
 #define first_online_node      0
+#define first_memory_node      0
 #define next_online_node(nid)  (MAX_NUMNODES)
 #define nr_node_ids            1
 #define nr_online_nodes                1