diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-05-30 13:08:03 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-05-30 13:08:03 -0400 |
commit | b3f2f6cd1ff935ecac9a5346904b899d7af689fe (patch) | |
tree | db77dc4c2528455dd6fe858670a580ecbd43afb6 | |
parent | 003386fff3e02e51cea882e60f7d28290113964c (diff) |
ia64: revert __node_random addition
This partially reverts commit 4ec37de89d8c758ee8115e0e64b3f994910789ee
("[IA64] Fix build breakage"), since the commit that made it necessary
got reverted earlier (see commit 35926ff5fba8, 'Revert "cpusets:
randomize node rotor used in cpuset_mem_spread_node()"')
Even if we ever re-introduce this, there is no reason to make
__node_random be some architecture-specific function.
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r-- | arch/ia64/mm/numa.c | 17 |
1 files changed, 0 insertions, 17 deletions
diff --git a/arch/ia64/mm/numa.c b/arch/ia64/mm/numa.c index 2437718bd6b1..3efea7d0a351 100644 --- a/arch/ia64/mm/numa.c +++ b/arch/ia64/mm/numa.c | |||
@@ -17,7 +17,6 @@ | |||
17 | #include <linux/init.h> | 17 | #include <linux/init.h> |
18 | #include <linux/bootmem.h> | 18 | #include <linux/bootmem.h> |
19 | #include <linux/module.h> | 19 | #include <linux/module.h> |
20 | #include <linux/random.h> | ||
21 | #include <asm/mmzone.h> | 20 | #include <asm/mmzone.h> |
22 | #include <asm/numa.h> | 21 | #include <asm/numa.h> |
23 | 22 | ||
@@ -51,22 +50,6 @@ paddr_to_nid(unsigned long paddr) | |||
51 | return (i < num_node_memblks) ? node_memblk[i].nid : (num_node_memblks ? -1 : 0); | 50 | return (i < num_node_memblks) ? node_memblk[i].nid : (num_node_memblks ? -1 : 0); |
52 | } | 51 | } |
53 | 52 | ||
54 | /* | ||
55 | * Return the bit number of a random bit set in the nodemask. | ||
56 | * (returns -1 if nodemask is empty) | ||
57 | */ | ||
58 | int __node_random(const nodemask_t *maskp) | ||
59 | { | ||
60 | int w, bit = -1; | ||
61 | |||
62 | w = nodes_weight(*maskp); | ||
63 | if (w) | ||
64 | bit = bitmap_ord_to_pos(maskp->bits, | ||
65 | get_random_int() % w, MAX_NUMNODES); | ||
66 | return bit; | ||
67 | } | ||
68 | EXPORT_SYMBOL(__node_random); | ||
69 | |||
70 | #if defined(CONFIG_SPARSEMEM) && defined(CONFIG_NUMA) | 53 | #if defined(CONFIG_SPARSEMEM) && defined(CONFIG_NUMA) |
71 | /* | 54 | /* |
72 | * Because of holes evaluate on section limits. | 55 | * Because of holes evaluate on section limits. |