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 /arch/x86/mm | |
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 'arch/x86/mm')
-rw-r--r-- | arch/x86/mm/numa.c | 17 |
1 files changed, 0 insertions, 17 deletions
diff --git a/arch/x86/mm/numa.c b/arch/x86/mm/numa.c index 10c27bb1e95f..550df481accd 100644 --- a/arch/x86/mm/numa.c +++ b/arch/x86/mm/numa.c | |||
@@ -2,7 +2,6 @@ | |||
2 | #include <linux/topology.h> | 2 | #include <linux/topology.h> |
3 | #include <linux/module.h> | 3 | #include <linux/module.h> |
4 | #include <linux/bootmem.h> | 4 | #include <linux/bootmem.h> |
5 | #include <linux/random.h> | ||
6 | 5 | ||
7 | #ifdef CONFIG_DEBUG_PER_CPU_MAPS | 6 | #ifdef CONFIG_DEBUG_PER_CPU_MAPS |
8 | # define DBG(x...) printk(KERN_DEBUG x) | 7 | # define DBG(x...) printk(KERN_DEBUG x) |
@@ -66,19 +65,3 @@ const struct cpumask *cpumask_of_node(int node) | |||
66 | } | 65 | } |
67 | EXPORT_SYMBOL(cpumask_of_node); | 66 | EXPORT_SYMBOL(cpumask_of_node); |
68 | #endif | 67 | #endif |
69 | |||
70 | /* | ||
71 | * Return the bit number of a random bit set in the nodemask. | ||
72 | * (returns -1 if nodemask is empty) | ||
73 | */ | ||
74 | int __node_random(const nodemask_t *maskp) | ||
75 | { | ||
76 | int w, bit = -1; | ||
77 | |||
78 | w = nodes_weight(*maskp); | ||
79 | if (w) | ||
80 | bit = bitmap_ord_to_pos(maskp->bits, | ||
81 | get_random_int() % w, MAX_NUMNODES); | ||
82 | return bit; | ||
83 | } | ||
84 | EXPORT_SYMBOL(__node_random); | ||