public inbox for linux-ia64@vger.kernel.org
 help / color / mirror / Atom feed
From: davidm@mostang.com (David Mosberger-Tang)
To: linux-ia64@vger.kernel.org
Subject: [patch] pfn_to_nid() compile-fix
Date: Thu, 23 Jun 2005 05:24:16 +0000	[thread overview]
Message-ID: <20050623052416.14091D41B8@panda.mostang.com> (raw)

Without this patch, the current git tree doesn't compile unless
CONFIG_DISCONTIGMEM is specified.  The problem is that linux/mmzone.h
defines its own version of pfn_to_nid in that case.

	--david

[IA64] Fix pfn_to_nid() so the kernel compiles again for !CONFIG_DISCONTIGMEM.

Signed-off-by: David Mosberger-Tang <davidm@hpl.hp.com>

diff --git a/include/asm-ia64/mmzone.h b/include/asm-ia64/mmzone.h
--- a/include/asm-ia64/mmzone.h
+++ b/include/asm-ia64/mmzone.h
@@ -15,6 +15,8 @@
 #include <asm/page.h>
 #include <asm/meminit.h>
 
+#ifdef CONFIG_DISCONTIGMEM
+
 static inline int pfn_to_nid(unsigned long pfn)
 {
 #ifdef CONFIG_NUMA
@@ -29,8 +31,6 @@ static inline int pfn_to_nid(unsigned lo
 #endif
 }
 
-#ifdef CONFIG_DISCONTIGMEM
-
 #ifdef CONFIG_IA64_DIG /* DIG systems are small */
 # define MAX_PHYSNODE_ID	8
 # define NR_NODE_MEMBLKS	(MAX_NUMNODES * 8)

                 reply	other threads:[~2005-06-23  5:24 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

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=20050623052416.14091D41B8@panda.mostang.com \
    --to=davidm@mostang.com \
    --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