From: Dave Hansen <haveblue@us.ibm.com>
To: Andrew Morton <akpm@osdl.org>
Cc: "Martin J. Bligh" <mbligh@aracnet.com>,
Patricia Gaughen <gone@us.ibm.com>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>
Subject: [PATCH] fix Summit srat.h includes
Date: 07 Sep 2003 11:35:39 -0700 [thread overview]
Message-ID: <1062959739.27214.2174.camel@nighthawk> (raw)
[-- Attachment #1: Type: text/plain, Size: 823 bytes --]
I was compiling for my plain 'ol PC, and was getting unresolved symbols
for get_memcfg_from_srat() and get_zholes_size(). The CONFIG_NUMA
definition right now allows it to be turned on for plain old X86_PC.
Does anyone know why this is?
depends on SMP && HIGHMEM64G &&
(X86_PC || X86_NUMAQ || X86_GENERICARCH ||
(X86_SUMMIT && ACPI && !ACPI_HT_ONLY))
In any case, the summit code incorrectly assumes in at least 2 places
that NUMA && !NUMAQ means summit. Someone was evidently trying to cover
the generic subarch case, but that's already taken care of by the lovely
config system and CONFIG_ACPI_SRAT. This patch fixes those assumptions
and adds a nice little warning for people that try to #include srat.h
without having srat support turned on.
--
Dave Hansen
haveblue@us.ibm.com
[-- Attachment #2: srat-include-2.6.0-test4-0.patch --]
[-- Type: text/x-patch, Size: 1508 bytes --]
diff -ru linux-2.6.0-test4/include/asm-i386/mmzone.h linux-2.6.0-test4-srat/include/asm-i386/mmzone.h
--- linux-2.6.0-test4/include/asm-i386/mmzone.h 2003-08-22 16:56:14.000000000 -0700
+++ linux-2.6.0-test4-srat/include/asm-i386/mmzone.h 2003-09-15 08:22:32.000000000 -0700
@@ -119,7 +119,7 @@
#ifdef CONFIG_X86_NUMAQ
#include <asm/numaq.h>
-#elif CONFIG_NUMA /* summit or generic arch */
+#elif CONFIG_ACPI_SRAT
#include <asm/srat.h>
#elif CONFIG_X86_PC
#define get_memcfg_numa get_memcfg_numa_flat
diff -ru linux-2.6.0-test4/include/asm-i386/numnodes.h linux-2.6.0-test4-srat/include/asm-i386/numnodes.h
--- linux-2.6.0-test4/include/asm-i386/numnodes.h 2003-08-22 16:52:57.000000000 -0700
+++ linux-2.6.0-test4-srat/include/asm-i386/numnodes.h 2003-09-15 08:22:50.000000000 -0700
@@ -5,7 +5,7 @@
#ifdef CONFIG_X86_NUMAQ
#include <asm/numaq.h>
-#elif CONFIG_NUMA
+#elif CONFIG_ACPI_SRAT
#include <asm/srat.h>
#else
#define MAX_NUMNODES 1
diff -ru linux-2.6.0-test4/include/asm-i386/srat.h linux-2.6.0-test4-srat/include/asm-i386/srat.h
--- linux-2.6.0-test4/include/asm-i386/srat.h 2003-08-22 16:53:43.000000000 -0700
+++ linux-2.6.0-test4-srat/include/asm-i386/srat.h 2003-09-15 08:20:49.000000000 -0700
@@ -27,6 +27,10 @@
#ifndef _ASM_SRAT_H_
#define _ASM_SRAT_H_
+#ifndef CONFIG_ACPI_SRAT
+#error CONFIG_ACPI_SRAT not defined, and srat.h header has been included
+#endif
+
#define MAX_NUMNODES 8
extern void get_memcfg_from_srat(void);
extern unsigned long *get_zholes_size(int);
next reply other threads:[~2003-09-07 18:36 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2003-09-07 18:35 Dave Hansen [this message]
2003-09-08 4:06 ` [PATCH] fix Summit srat.h includes Martin J. Bligh
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=1062959739.27214.2174.camel@nighthawk \
--to=haveblue@us.ibm.com \
--cc=akpm@osdl.org \
--cc=gone@us.ibm.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mbligh@aracnet.com \
/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;
as well as URLs for NNTP newsgroup(s).