Commit b3f2f6cd1ff935ecac9a5346904b899d7af689fe
1 parent
003386fff3
Exists in
master
and in
20 other branches
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>
Showing 1 changed file with 0 additions and 17 deletions Side-by-side Diff
arch/ia64/mm/numa.c
| ... | ... | @@ -17,7 +17,6 @@ |
| 17 | 17 | #include <linux/init.h> |
| 18 | 18 | #include <linux/bootmem.h> |
| 19 | 19 | #include <linux/module.h> |
| 20 | -#include <linux/random.h> | |
| 21 | 20 | #include <asm/mmzone.h> |
| 22 | 21 | #include <asm/numa.h> |
| 23 | 22 | |
| ... | ... | @@ -50,22 +49,6 @@ |
| 50 | 49 | |
| 51 | 50 | return (i < num_node_memblks) ? node_memblk[i].nid : (num_node_memblks ? -1 : 0); |
| 52 | 51 | } |
| 53 | - | |
| 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 | 52 | |
| 70 | 53 | #if defined(CONFIG_SPARSEMEM) && defined(CONFIG_NUMA) |
| 71 | 54 | /* |