From: Dave Jones <davej@redhat.com>
To: linux-kernel@vger.kernel.org
Subject: [PATCH] Clean up numa defines in mmzone.h
Date: Fri, 1 Jul 2005 19:30:00 -0400 [thread overview]
Message-ID: <20050701233000.GB10534@redhat.com> (raw)
In-Reply-To: <20050701212606.GA2970@redhat.com>
On Fri, Jul 01, 2005 at 05:26:07PM -0400, Dave Jones wrote:
> this looks just.. wrong.
>
> #if CONFIG_NUMA
> extern struct pglist_data *node_data[];
> #define NODE_DATA(nid) (node_data[nid])
>
> #ifdef CONFIG_NUMA
This patch cleans this stuff up. The compile failure I
saw is fixed in the followup patch.
Signed-off-by: Dave Jones <davej@redhat.com>
--- linux-2.6.12/include/asm-i386/mmzone.h~ 2005-07-01 17:59:22.000000000 -0400
+++ linux-2.6.12/include/asm-i386/mmzone.h 2005-07-01 18:01:44.000000000 -0400
@@ -8,20 +8,15 @@
#include <asm/smp.h>
-#if CONFIG_NUMA
+#ifdef CONFIG_NUMA
extern struct pglist_data *node_data[];
#define NODE_DATA(nid) (node_data[nid])
-#ifdef CONFIG_NUMA
- #ifdef CONFIG_X86_NUMAQ
- #include <asm/numaq.h>
- #else /* summit or generic arch */
- #include <asm/srat.h>
- #endif
-#else /* !CONFIG_NUMA */
- #define get_memcfg_numa get_memcfg_numa_flat
- #define get_zholes_size(n) (0)
-#endif /* CONFIG_NUMA */
+#ifdef CONFIG_X86_NUMAQ
+ #include <asm/numaq.h>
+#else /* summit or generic arch */
+ #include <asm/srat.h>
+#endif
extern int get_memcfg_numa_flat(void );
/*
@@ -42,6 +37,9 @@ static inline void get_memcfg_numa(void)
get_memcfg_numa_flat();
}
+#else /* !CONFIG_NUMA */
+#define get_memcfg_numa get_memcfg_numa_flat
+#define get_zholes_size(n) (0)
#endif /* CONFIG_NUMA */
#ifdef CONFIG_DISCONTIGMEM
next prev parent reply other threads:[~2005-07-01 23:30 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2005-07-01 21:26 asm-i386/mmzone.h oddness Dave Jones
2005-07-01 23:30 ` Dave Jones [this message]
2005-07-01 23:31 ` [PATCH] Fix up non-NUMA breakage in mmzone.h Dave Jones
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=20050701233000.GB10534@redhat.com \
--to=davej@redhat.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