public inbox for linux-ia64@vger.kernel.org
 help / color / mirror / Atom feed
From: Takayoshi Kochi <kochi@hpc.bs1.fc.nec.co.jp>
To: linux-ia64@vger.kernel.org
Subject: Re: kernel update (relative to 2.4.22)
Date: Fri, 12 Sep 2003 12:47:38 +0000	[thread overview]
Message-ID: <marc-linux-ia64-106337111917901@msgid-missing> (raw)
In-Reply-To: <marc-linux-ia64-106312897006127@msgid-missing>

[-- Attachment #1: Type: Text/Plain, Size: 374 bytes --]

From: Takayoshi Kochi <kochi@hpc.bs1.fc.nec.co.jp>
Subject: Re: kernel update (relative to 2.4.22)
Date: Fri, 12 Sep 2003 21:43:19 +0900 (JST)

> Hi Bjorn,
> 
> For NUMA configuration, we need the attached patch which is
> the same fix as 2.6.  I confirmed both the DIG and GENERIC
> kernels boot on 8-way (2-node) NEC TX7.

Sorry, I forgot the attachment.

Takayoshi Kochi

[-- Attachment #2: dcm-2422_2.diff --]
[-- Type: Text/Plain, Size: 1600 bytes --]

--- linux-2.4.22/drivers/acpi/tables.c.save	Fri Sep 12 09:45:18 2003
+++ linux-2.4.22/drivers/acpi/tables.c	Fri Sep 12 21:11:05 2003
@@ -69,7 +69,7 @@
 
 static unsigned long		sdt_pa;		/* Physical Address */
 static unsigned long		sdt_count;	/* Table count */
-static struct acpi_table_sdt	*sdt_entry;
+static struct acpi_table_sdt	sdt_entry[ACPI_MAX_TABLES];
 
 void
 acpi_table_print (
@@ -425,12 +425,6 @@
 			sdt_count = ACPI_MAX_TABLES;
 		}
 
-		sdt_entry = alloc_bootmem(sdt_count * sizeof(struct acpi_table_sdt));
-		if (!sdt_entry) {
-			printk(KERN_ERR "ACPI: Could not allocate mem for SDT entries!\n");
-			return -ENOMEM;
-		}
-
 		for (i = 0; i < sdt_count; i++)
 			sdt_entry[i].pa = (unsigned long) mapped_xsdt->entry[i];
 	}
@@ -477,12 +471,6 @@
 			sdt_count = ACPI_MAX_TABLES;
 		}
 
-		sdt_entry = alloc_bootmem(sdt_count * sizeof(struct acpi_table_sdt));
-		if (!sdt_entry) {
-			printk(KERN_ERR "ACPI: Could not allocate mem for SDT entries!\n");
-			return -ENOMEM;
-		}
-
 		for (i = 0; i < sdt_count; i++)
 			sdt_entry[i].pa = (unsigned long) mapped_rsdt->entry[i];
 	}
--- linux-2.4.22/arch/ia64/kernel/setup.c.save	Fri Sep 12 09:45:18 2003
+++ linux-2.4.22/arch/ia64/kernel/setup.c	Fri Sep 12 20:40:10 2003
@@ -378,7 +378,6 @@
 	saved_command_line[COMMAND_LINE_SIZE-1] = '\0';		/* for safety */
 
 	efi_init();
-	find_memory();
 
 #ifdef CONFIG_ACPI_BOOT
 	/* Initialize the ACPI boot-time table parser */
@@ -394,6 +393,7 @@
 #endif /* CONFIG_APCI_BOOT */
 
 	iomem_resource.end = ~0UL;	/* FIXME probably belongs elsewhere */
+	find_memory();
 
 #if 0
 	/* XXX fix me */

      parent reply	other threads:[~2003-09-12 12:47 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2003-09-09 17:28 kernel update (relative to 2.4.22) Bjorn Helgaas
2003-09-12 12:43 ` Takayoshi Kochi
2003-09-12 12:47 ` Takayoshi Kochi [this message]

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=marc-linux-ia64-106337111917901@msgid-missing \
    --to=kochi@hpc.bs1.fc.nec.co.jp \
    --cc=linux-ia64@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