ia64: revert __node_random addition (b3f2f6cd) · Commits · 戴 / test

This partially reverts commit ("[IA64] Fix build breakage"), since the commit that made it necessary got reverted earlier (see commit , '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>

arch/ia64/mm/numa.c

+0 −17

Original line number	Diff line number	Diff line
		@@ -17,7 +17,6 @@
		#include <linux/init.h>
		#include <linux/bootmem.h>
		#include <linux/module.h>
		#include <linux/random.h>
		#include <asm/mmzone.h>
		#include <asm/numa.h>

		@@ -51,22 +50,6 @@ paddr_to_nid(unsigned long paddr)
		return (i < num_node_memblks) ? node_memblk[i].nid : (num_node_memblks ? -1 : 0);
		}

		/*
		* 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);

		#if defined(CONFIG_SPARSEMEM) && defined(CONFIG_NUMA)
		/*
		* Because of holes evaluate on section limits.

Admin message