compile fix 2.6.15-rc1-mm1 + EXPERIMENTAL+ CONFIG_SPARSEMEM + X86_PC

[KAMEZAWA Hiroyuki]

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@xxxxxxxxxxxxxx>

Signed-Off-By KAMEZAWA Hiroyuki <kamezawa.hiroyu@xxxxxxxxxxxxxx
--
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);

-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/