From: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
To: Andrew Morton <akpm@osdl.org>
Cc: Linux Kernel Mailing List <linux-kernel@vger.kernel.org>
Subject: compile fix 2.6.15-rc1-mm1 + EXPERIMENTAL+ CONFIG_SPARSEMEM + X86_PC
Date: Fri, 18 Nov 2005 15:51:31 +0900 [thread overview]
Message-ID: <437D79F3.9070301@jp.fujitsu.com> (raw)
Hi,
This is a compile fix for
X86_PC && EXPERIMENTAL && CONFIG_SPARSEMEM=y && !CONFIG_NEED_MULTIPLE_NODES
BTW, on x86, it looks I can select CONFIG_NUMA=y but will not set
CONFIG_NEED_MULTIPLE_NODES. It this expected ?
-- Kamezawa Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
Signed-Off-By KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com
--
Index: linux-2.6.15-rc1-mm1/include/linux/mmzone.h
===================================================================
--- linux-2.6.15-rc1-mm1.orig/include/linux/mmzone.h
+++ linux-2.6.15-rc1-mm1/include/linux/mmzone.h
@@ -596,12 +596,13 @@ static inline int pfn_valid(unsigned lon
return 0;
return valid_section(__nr_to_section(pfn_to_section_nr(pfn)));
}
-
+#ifdef CONFIG_NEED_MULTIPLE_NODES
#define pfn_to_nid(pfn) \
({ \
unsigned long __pfn = (pfn); \
page_to_nid(pfn_to_page(pfn)); \
})
+#endif
#define early_pfn_valid(pfn) pfn_valid(pfn)
void sparse_init(void);
Index: linux-2.6.15-rc1-mm1/drivers/base/memory.c
===================================================================
--- linux-2.6.15-rc1-mm1.orig/drivers/base/memory.c
+++ linux-2.6.15-rc1-mm1/drivers/base/memory.c
@@ -25,7 +25,7 @@
#define MEMORY_CLASS_NAME "memory"
-static struct sysdev_class memory_sysdev_class = {
+struct sysdev_class memory_sysdev_class = {
set_kset_name(MEMORY_CLASS_NAME),
};
EXPORT_SYMBOL(memory_sysdev_class);
next reply other threads:[~2005-11-18 6:51 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2005-11-18 6:51 KAMEZAWA Hiroyuki [this message]
2005-11-19 1:07 ` compile fix 2.6.15-rc1-mm1 + EXPERIMENTAL+ CONFIG_SPARSEMEM + X86_PC Andrew Morton
2005-11-19 2:46 ` Tim Schmielau
2005-11-19 3:29 ` Tim Schmielau
2005-11-19 11:40 ` Kamezawa Hiroyuki
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=437D79F3.9070301@jp.fujitsu.com \
--to=kamezawa.hiroyu@jp.fujitsu.com \
--cc=akpm@osdl.org \
--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