git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
dm: fix printk() rate limiting code
[pandora-kernel.git]
/
include
/
linux
/
nodemask.h
diff --git
a/include/linux/nodemask.h
b/include/linux/nodemask.h
index
8a8f1d0
..
7afc363
100644
(file)
--- 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);
}
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)
#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)
#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]
#endif
#define node_online_map node_states[N_ONLINE]