mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: William Lee Irwin III <wli@holomorphy.com>
To: jbarnes@engr.sgi.com
Cc: akpm@osdl.org, linux-kernel@vger.kernel.org
Subject: [bootfix] pass used_node_mask by reference in 2.6.10-mm1
Date: Mon, 3 Jan 2005 11:13:19 -0800	[thread overview]
Message-ID: <20050103191319.GO29332@holomorphy.com> (raw)

Without passing this parameter by reference, the changes to used_node_mask
are meaningless and do not affect the caller's copy.

This leads to boot-time failure. This proposed fix passes it by reference.


-- wli

Signed-off-by: William Irwin <wli@holomorphy.com>


Index: mm1-2.6.10/mm/page_alloc.c
===================================================================
--- mm1-2.6.10.orig/mm/page_alloc.c	2005-01-03 10:37:58.000000000 -0800
+++ mm1-2.6.10/mm/page_alloc.c	2005-01-03 10:44:01.000000000 -0800
@@ -1377,7 +1377,7 @@
  * on them otherwise.
  * It returns -1 if no node is found.
  */
-static int __init find_next_best_node(int node, nodemask_t used_node_mask)
+static int __init find_next_best_node(int node, nodemask_t *used_node_mask)
 {
 	int i, n, val;
 	int min_val = INT_MAX;
@@ -1390,11 +1390,11 @@
 		n = (node+i) % num_online_nodes();
 
 		/* Don't want a node to appear more than once */
-		if (node_isset(n, used_node_mask))
+		if (node_isset(n, *used_node_mask))
 			continue;
 
 		/* Use the local node if we haven't already */
-		if (!node_isset(node, used_node_mask)) {
+		if (!node_isset(node, *used_node_mask)) {
 			best_node = node;
 			break;
 		}
@@ -1418,7 +1418,7 @@
 	}
 
 	if (best_node >= 0)
-		node_set(best_node, used_node_mask);
+		node_set(best_node, *used_node_mask);
 
 	return best_node;
 }
@@ -1442,7 +1442,7 @@
 	load = num_online_nodes();
 	prev_node = local_node;
 	nodes_clear(used_mask);
-	while ((node = find_next_best_node(local_node, used_mask)) >= 0) {
+	while ((node = find_next_best_node(local_node, &used_mask)) >= 0) {
 		/*
 		 * We don't want to pressure a particular node.
 		 * So adding penalty to the first node in same

             reply	other threads:[~2005-01-03 19:16 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2005-01-03 19:13 William Lee Irwin III [this message]
2005-01-03 19:50 ` William Lee Irwin III
2005-01-03 20:44   ` Jesse Barnes
2005-01-07  1:06     ` Matthew Dobson

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20050103191319.GO29332@holomorphy.com \
    --to=wli@holomorphy.com \
    --cc=akpm@osdl.org \
    --cc=jbarnes@engr.sgi.com \
    --cc=linux-kernel@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

Powered by JetHome