diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-05-30 12:00:03 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-05-30 12:00:03 -0400 |
| commit | 35926ff5fba8245bd1c6ac04155048f6f89232b1 (patch) | |
| tree | 9afc520f47e29cb3cd80462fe62858f17b1c6cfb /include/linux | |
| parent | b612a0553714c6b9744ad0d03f10cac78f3a84b1 (diff) | |
Revert "cpusets: randomize node rotor used in cpuset_mem_spread_node()"
This reverts commit 0ac0c0d0f837c499afd02a802f9cf52d3027fa3b, which
caused cross-architecture build problems for all the wrong reasons.
IA64 already added its own version of __node_random(), but the fact is,
there is nothing architectural about the function, and the original
commit was just badly done. Revert it, since no fix is forthcoming.
Requested-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/bitmap.h | 1 | ||||
| -rw-r--r-- | include/linux/nodemask.h | 8 |
2 files changed, 0 insertions, 9 deletions
diff --git a/include/linux/bitmap.h b/include/linux/bitmap.h index 6fb2720882fc..daf8c480c786 100644 --- a/include/linux/bitmap.h +++ b/include/linux/bitmap.h | |||
| @@ -141,7 +141,6 @@ extern int bitmap_find_free_region(unsigned long *bitmap, int bits, int order); | |||
| 141 | extern void bitmap_release_region(unsigned long *bitmap, int pos, int order); | 141 | extern void bitmap_release_region(unsigned long *bitmap, int pos, int order); |
| 142 | extern int bitmap_allocate_region(unsigned long *bitmap, int pos, int order); | 142 | extern int bitmap_allocate_region(unsigned long *bitmap, int pos, int order); |
| 143 | extern void bitmap_copy_le(void *dst, const unsigned long *src, int nbits); | 143 | extern void bitmap_copy_le(void *dst, const unsigned long *src, int nbits); |
| 144 | extern int bitmap_ord_to_pos(const unsigned long *bitmap, int n, int bits); | ||
| 145 | 144 | ||
| 146 | #define BITMAP_LAST_WORD_MASK(nbits) \ | 145 | #define BITMAP_LAST_WORD_MASK(nbits) \ |
| 147 | ( \ | 146 | ( \ |
diff --git a/include/linux/nodemask.h b/include/linux/nodemask.h index 8a8f1d09c133..dba35e413371 100644 --- a/include/linux/nodemask.h +++ b/include/linux/nodemask.h | |||
| @@ -66,8 +66,6 @@ | |||
| 66 | * int num_online_nodes() Number of online Nodes | 66 | * int num_online_nodes() Number of online Nodes |
| 67 | * int num_possible_nodes() Number of all possible Nodes | 67 | * int num_possible_nodes() Number of all possible Nodes |
| 68 | * | 68 | * |
| 69 | * int node_random(mask) Random node with set bit in mask | ||
| 70 | * | ||
| 71 | * int node_online(node) Is some node online? | 69 | * int node_online(node) Is some node online? |
| 72 | * int node_possible(node) Is some node possible? | 70 | * int node_possible(node) Is some node possible? |
| 73 | * | 71 | * |
| @@ -432,10 +430,6 @@ static inline void node_set_offline(int nid) | |||
| 432 | node_clear_state(nid, N_ONLINE); | 430 | node_clear_state(nid, N_ONLINE); |
| 433 | nr_online_nodes = num_node_state(N_ONLINE); | 431 | nr_online_nodes = num_node_state(N_ONLINE); |
| 434 | } | 432 | } |
| 435 | |||
| 436 | #define node_random(mask) __node_random(&(mask)) | ||
| 437 | extern int __node_random(const nodemask_t *maskp); | ||
| 438 | |||
| 439 | #else | 433 | #else |
| 440 | 434 | ||
| 441 | static inline int node_state(int node, enum node_states state) | 435 | static inline int node_state(int node, enum node_states state) |
| @@ -466,8 +460,6 @@ static inline int num_node_state(enum node_states state) | |||
| 466 | 460 | ||
| 467 | #define node_set_online(node) node_set_state((node), N_ONLINE) | 461 | #define node_set_online(node) node_set_state((node), N_ONLINE) |
| 468 | #define node_set_offline(node) node_clear_state((node), N_ONLINE) | 462 | #define node_set_offline(node) node_clear_state((node), N_ONLINE) |
| 469 | |||
| 470 | static inline int node_random(const nodemask_t mask) { return 0; } | ||
| 471 | #endif | 463 | #endif |
| 472 | 464 | ||
| 473 | #define node_online_map node_states[N_ONLINE] | 465 | #define node_online_map node_states[N_ONLINE] |
