Re: 2.6.26-rc2-mm1

Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
From: Andrew Morton
Date: Wednesday, May 14, 2008 - 12:35 pm

On Wed, 14 May 2008 21:12:13 +0200
"Torsten Kaiser" <just.for.lkml@googlemail.com> wrote:


Thanks.


I suspect that this might be caused by the below.

That patch no longer seems to be necessary so I'll drop it.  Perhaps
you could try reverting it, please?



From: Ingo Molnar <mingo@elte.hu>

x86.git testing found the following build error on latest -git:

 drivers/acpi/numa.c: In function 'acpi_numa_init':
 drivers/acpi/numa.c:226: error: 'NR_NODE_MEMBLKS' undeclared (first use in this function)
 drivers/acpi/numa.c:226: error: (Each undeclared identifier is reported only once
 drivers/acpi/numa.c:226: error: for each function it appears in.)

with this config:

 http://redhat.com/~mingo/misc/config-Wed_Apr_30_22_42_42_CEST_2008.bad

i suspect we dont want SRAT parsing when CONFIG_HAVE_ARCH_PARSE_SRAT
is unset - but the fix looks a bit ugly. Perhaps we should define
NR_NODE_MEMBLKS even in this case and just let the code fall back
to some sane behavior?

Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

 drivers/acpi/numa.c |    4 ++++
 1 file changed, 4 insertions(+)

diff -puN drivers/acpi/numa.c~acpi-acpi_numa_init-build-fix drivers/acpi/numa.c
--- a/drivers/acpi/numa.c~acpi-acpi_numa_init-build-fix
+++ a/drivers/acpi/numa.c
@@ -176,6 +176,7 @@ acpi_parse_processor_affinity(struct acp
 	return 0;
 }
 
+#ifdef CONFIG_HAVE_ARCH_PARSE_SRAT
 static int __init
 acpi_parse_memory_affinity(struct acpi_subtable_header * header,
 			   const unsigned long end)
@@ -193,6 +194,7 @@ acpi_parse_memory_affinity(struct acpi_s
 
 	return 0;
 }
+#endif
 
 static int __init acpi_parse_srat(struct acpi_table_header *table)
 {
@@ -221,9 +223,11 @@ int __init acpi_numa_init(void)
 	if (!acpi_table_parse(ACPI_SIG_SRAT, acpi_parse_srat)) {
 		acpi_table_parse_srat(ACPI_SRAT_TYPE_CPU_AFFINITY,
 				      acpi_parse_processor_affinity, NR_CPUS);
+#ifdef CONFIG_HAVE_ARCH_PARSE_SRAT
 		acpi_table_parse_srat(ACPI_SRAT_TYPE_MEMORY_AFFINITY,
 				      acpi_parse_memory_affinity,
 				      NR_NODE_MEMBLKS);
+#endif
 	}
 
 	/* SLIT: System Locality Information Table */
_

--
Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]

Messages in current thread:
2.6.26-rc2-mm1, Andrew Morton, (Wed May 14, 1:01 am)
Re: [BUG] 2.6.26-rc2-mm1 - kernel bug while bootup at __al ..., Kamalesh Babulal, (Wed May 14, 11:21 am)
Re: 2.6.26-rc2-mm1: sparc64 - possible recursive locking d ..., Mariusz Kozlowski, (Wed May 14, 11:29 am)
Re: 2.6.26-rc2-mm1: sparc64 - possible recursive locking d ..., Mariusz Kozlowski, (Wed May 14, 11:50 am)
Re: 2.6.26-rc2-mm1, Torsten Kaiser, (Wed May 14, 12:12 pm)
Re: 2.6.26-rc2-mm1, Andrew Morton, (Wed May 14, 12:35 pm)
Re: 2.6.26-rc2-mm1 (WARN() build error), Randy Dunlap, (Wed May 14, 1:39 pm)
Re: 2.6.26-rc2-mm1 (CONFIG_*FD build errors), Randy Dunlap, (Wed May 14, 1:43 pm)
Re: 2.6.26-rc2-mm1, Zan Lynx, (Wed May 14, 1:49 pm)
Re: 2.6.26-rc2-mm1, Andrew Morton, (Wed May 14, 2:00 pm)
Re: 2.6.26-rc2-mm1 (SCSI_DH build errors), Randy Dunlap, (Wed May 14, 2:13 pm)
Re: 2.6.26-rc2-mm1, me, (Wed May 14, 2:14 pm)
2.6.26-rc2-mm1: sloooow mkfs.ext2, Alexey Dobriyan, (Wed May 14, 2:16 pm)
Re: 2.6.26-rc2-mm1 (p9 build error when 9P_FS=n), Randy Dunlap, (Wed May 14, 2:16 pm)
Re: 2.6.26-rc2-mm1: sloooow mkfs.ext2, Alexey Dobriyan, (Wed May 14, 2:33 pm)
Re: 2.6.26-rc2-mm1, Rafael J. Wysocki, (Wed May 14, 2:54 pm)
Re: 2.6.26-rc2-mm1, Zan Lynx, (Wed May 14, 3:06 pm)
Re: 2.6.26-rc2-mm1 (p9 build error when 9P_FS=n), Eric Van Hensbergen, (Wed May 14, 5:00 pm)
Re: 2.6.26-rc2-mm1 (p9 build error when 9P_FS=n), Andrew Morton, (Wed May 14, 5:05 pm)
Re: [BUG] 2.6.26-rc2-mm1 - kernel bug while bootup at __al ..., KAMEZAWA Hiroyuki, (Wed May 14, 6:54 pm)
Re: 2.6.26-rc2-mm1 (p9 build error when 9P_FS=n), Eric Van Hensbergen, (Wed May 14, 7:29 pm)
Re: 2.6.26-rc2-mm1 (p9 build error when 9P_FS=n), Andrew Morton, (Wed May 14, 8:04 pm)
Re: 2.6.26-rc2-mm1 (p9 build error when 9P_FS=n), Eric Van Hensbergen, (Wed May 14, 8:53 pm)
Re: 2.6.26-rc2-mm1 (SCSI_DH build errors), James Bottomley, (Thu May 15, 7:46 am)
Re: 2.6.26-rc2-mm1, Torsten Kaiser, (Thu May 15, 10:44 am)
[PATCH] Re: 2.6.26-rc2-mm1 - fix parenthesis in include/as ..., Mariusz Kozlowski, (Thu May 15, 10:58 am)
[PATCH] Re: 2.6.26-rc2-mm1 - fix parenthesis in include/as ..., Mariusz Kozlowski, (Thu May 15, 10:59 am)
[PATCH] Re: 2.6.26-rc2-mm1 - fix parenthesis in include/as ..., Mariusz Kozlowski, (Thu May 15, 11:01 am)
[BUG] Re: 2.6.26-rc2-mm1 - x86_32 oops on modprobe wusbcore, Mariusz Kozlowski, (Thu May 15, 11:21 am)
Re: 2.6.26-rc2-mm1, Andrew Morton, (Thu May 15, 11:49 am)
Re: 2.6.26-rc2-mm1 (SCSI_DH build errors), Chandra Seetharaman, (Thu May 15, 12:56 pm)
Re: [BUG] Re: 2.6.26-rc2-mm1 - x86_32 oops on modprobe wus ..., Inaky Perez-Gonzalez, (Thu May 15, 1:05 pm)
Re: 2.6.26-rc2-mm1: sloooow mkfs.ext2, Jiri Slaby, (Thu May 15, 2:41 pm)
Re: 2.6.26-rc2-mm1: high speed something, Andrew Morton, (Fri May 16, 2:31 pm)
Re: 2.6.26-rc2-mm1: high speed something, Greg KH, (Fri May 16, 3:00 pm)
2.6.26-rc2-mm1: high speed something, Alexey Dobriyan, (Fri May 16, 3:17 pm)
Re: 2.6.26-rc2-mm1: possible circular locking dependency d ..., Mariusz Kozlowski, (Tue May 20, 3:01 am)
Re: 2.6.26-rc2-mm1 (SCSI_DH build errors), Andrew Morton, (Thu May 22, 8:25 pm)
Re: 2.6.26-rc2-mm1 (SCSI_DH build errors), Chandra Seetharaman, (Fri May 23, 12:39 pm)
Re: 2.6.26-rc2-mm1 (SCSI_DH build errors), Randy Dunlap, (Fri May 23, 1:28 pm)
Re: 2.6.26-rc2-mm1 (SCSI_DH build errors), Chandra Seetharaman, (Fri May 23, 6:16 pm)