public inbox for linux-ia64@vger.kernel.org
 help / color / mirror / Atom feed
From: jbarnes@sgi.com (Jesse Barnes)
To: torvalds@osdl.org, akpm@osdl.org, linux-kernel@vger.kernel.org,
	linux-ia64@vger.kernel.org
Subject: [PATCH] memblks compile fixes
Date: Thu, 05 Feb 2004 20:25:03 +0000	[thread overview]
Message-ID: <20040205202503.GB6551@sgi.com> (raw)

Looks like Jes forgot missed some conversions in his NR_MEMBLKS removal
patch.  Here's are the fixes to get ia64 going again.

Thanks,
Jesse

=== arch/ia64/kernel/acpi.c 1.60 vs edited ==--- 1.60/arch/ia64/kernel/acpi.c	Tue Feb  3 21:35:17 2004
+++ edited/arch/ia64/kernel/acpi.c	Thu Feb  5 11:46:50 2004
@@ -395,7 +395,7 @@
 	size = ma->length_hi;
 	size = (size << 32) | ma->length_lo;
 
-	if (num_memblks >= NR_MEMBLKS) {
+	if (num_node_memblks >= NR_NODE_MEMBLKS) {
 		printk(KERN_ERR "Too many mem chunks in SRAT. Ignoring %ld MBytes at %lx\n",
 		       size/(1024*1024), paddr);
 		return;
=== arch/ia64/sn/kernel/setup.c 1.30 vs edited ==--- 1.30/arch/ia64/sn/kernel/setup.c	Tue Feb  3 21:39:58 2004
+++ edited/arch/ia64/sn/kernel/setup.c	Thu Feb  5 11:46:31 2004
@@ -136,7 +136,7 @@
 	int nid;
 
 	nid = pxm_to_nid_map[pxm];
-	for (i = 0; i < num_memblks; i++) {
+	for (i = 0; i < num_node_memblks; i++) {
 		if (node_memblk[i].nid = nid) {
 			return NASID_GET(node_memblk[i].start_paddr);
 		}

             reply	other threads:[~2004-02-05 20:25 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2004-02-05 20:25 Jesse Barnes [this message]
2004-02-05 23:15 ` [PATCH] memblks compile fixes Andrew Morton

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=20040205202503.GB6551@sgi.com \
    --to=jbarnes@sgi.com \
    --cc=akpm@osdl.org \
    --cc=linux-ia64@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=torvalds@osdl.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