public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
From: Dave Jones <davej@redhat.com>
To: linux-kernel@vger.kernel.org
Subject: [PATCH] Fix up non-NUMA breakage in mmzone.h
Date: Fri, 1 Jul 2005 19:31:55 -0400	[thread overview]
Message-ID: <20050701233155.GC10534@redhat.com> (raw)
In-Reply-To: <20050701212606.GA2970@redhat.com>

On Fri, Jul 01, 2005 at 05:26:07PM -0400, Dave Jones wrote:
 > I was wondering why the rawhide gcc (4.0.0 20050622 (Red Hat 4.0.0-13))
 > blew up whilst trying to compile -rc3 and newer, with this informative
 > error..
 > 
 > include/asm/mmzone.h:154: error: syntax error before numeric constant

If CONFIG_NUMA isn't set, we use the define in <linux/mmzone.h>
for early_pfn_to_nid (which defines it to 0).

Because of this, the prototype needs to move inside the CONFIG_NUMA
too, or anal gcc's get really confused.

Signed-off-by: Dave Jones <davej@redhat.com>

--- linux-2.6.12/include/asm-i386/mmzone.h~	2005-07-01 18:30:14.000000000 -0400
+++ linux-2.6.12/include/asm-i386/mmzone.h	2005-07-01 18:30:30.000000000 -0400
@@ -37,6 +37,8 @@ static inline void get_memcfg_numa(void)
 	get_memcfg_numa_flat();
 }
 
+extern int early_pfn_to_nid(unsigned long pfn);
+
 #else /* !CONFIG_NUMA */
 #define get_memcfg_numa get_memcfg_numa_flat
 #define get_zholes_size(n) (0)
@@ -149,6 +151,4 @@ static inline int pfn_valid(int pfn)
 
 #endif /* CONFIG_NEED_MULTIPLE_NODES */
 
-extern int early_pfn_to_nid(unsigned long pfn);
-
 #endif /* _ASM_MMZONE_H_ */

      parent reply	other threads:[~2005-07-01 23:32 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 ` [PATCH] Clean up numa defines in mmzone.h Dave Jones
2005-07-01 23:31 ` Dave Jones [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=20050701233155.GC10534@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