aboutsummaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-05-30 09:00:03 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2010-05-30 09:00:03 -0700
commit35926ff5fba8245bd1c6ac04155048f6f89232b1 (patch)
tree9afc520f47e29cb3cd80462fe62858f17b1c6cfb /arch
parentb612a0553714c6b9744ad0d03f10cac78f3a84b1 (diff)
downloadkernel_samsung_tuna-35926ff5fba8245bd1c6ac04155048f6f89232b1.zip
kernel_samsung_tuna-35926ff5fba8245bd1c6ac04155048f6f89232b1.tar.gz
kernel_samsung_tuna-35926ff5fba8245bd1c6ac04155048f6f89232b1.tar.bz2
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')
-rw-r--r--arch/x86/mm/numa.c17
1 files changed, 0 insertions, 17 deletions
diff --git a/arch/x86/mm/numa.c b/arch/x86/mm/numa.c
index 10c27bb..550df48 100644
--- a/arch/x86/mm/numa.c
+++ b/arch/x86/mm/numa.c
@@ -2,7 +2,6 @@
#include <linux/topology.h>
#include <linux/module.h>
#include <linux/bootmem.h>
-#include <linux/random.h>
#ifdef CONFIG_DEBUG_PER_CPU_MAPS
# define DBG(x...) printk(KERN_DEBUG x)
@@ -66,19 +65,3 @@ const struct cpumask *cpumask_of_node(int node)
}
EXPORT_SYMBOL(cpumask_of_node);
#endif
-
-/*
- * Return the bit number of a random bit set in the nodemask.
- * (returns -1 if nodemask is empty)
- */
-int __node_random(const nodemask_t *maskp)
-{
- int w, bit = -1;
-
- w = nodes_weight(*maskp);
- if (w)
- bit = bitmap_ord_to_pos(maskp->bits,
- get_random_int() % w, MAX_NUMNODES);
- return bit;
-}
-EXPORT_SYMBOL(__node_random);