aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndy Whitcroft <apw@shadowen.org>2005-06-23 03:07:52 -0400
committerLinus Torvalds <torvalds@ppc970.osdl.org>2005-06-23 12:45:04 -0400
commitb159d43fbf7eaaac6ecc647f51cf4257332db47b (patch)
tree968d856c1bd80b47c76d27da272d95bcaf97aa78
parent368a0a3afad08069b2679ecaff80fc18c10a6e2a (diff)
[PATCH] generify early_pfn_to_nid
Provide a default implementation for early_pfn_to_nid returning node 0. Allow architectures to override this with their own implementation out of asm/mmzone.h. Signed-off-by: Andy Whitcroft <apw@shadowen.org> Signed-off-by: Dave Hansen <haveblue@us.ibm.com> Signed-off-by: Martin Bligh <mbligh@aracnet.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
-rw-r--r--arch/i386/Kconfig4
-rw-r--r--include/asm-i386/mmzone.h3
-rw-r--r--include/linux/mmzone.h4
3 files changed, 11 insertions, 0 deletions
diff --git a/arch/i386/Kconfig b/arch/i386/Kconfig
index 8e5242c8e09d..a8128f997339 100644
--- a/arch/i386/Kconfig
+++ b/arch/i386/Kconfig
@@ -810,6 +810,10 @@ config HAVE_ARCH_ALLOC_REMAP
810 810
811source "mm/Kconfig" 811source "mm/Kconfig"
812 812
813config HAVE_ARCH_EARLY_PFN_TO_NID
814 bool
815 default y
816
813config HIGHPTE 817config HIGHPTE
814 bool "Allocate 3rd-level pagetables from highmem" 818 bool "Allocate 3rd-level pagetables from highmem"
815 depends on HIGHMEM4G || HIGHMEM64G 819 depends on HIGHMEM4G || HIGHMEM64G
diff --git a/include/asm-i386/mmzone.h b/include/asm-i386/mmzone.h
index 9cec191f462c..48e46d403aa6 100644
--- a/include/asm-i386/mmzone.h
+++ b/include/asm-i386/mmzone.h
@@ -143,4 +143,7 @@ static inline void get_memcfg_numa(void)
143} 143}
144 144
145#endif /* CONFIG_DISCONTIGMEM */ 145#endif /* CONFIG_DISCONTIGMEM */
146
147extern int early_pfn_to_nid(unsigned long pfn);
148
146#endif /* _ASM_MMZONE_H_ */ 149#endif /* _ASM_MMZONE_H_ */
diff --git a/include/linux/mmzone.h b/include/linux/mmzone.h
index 95f4a780ea66..6ef07de98d69 100644
--- a/include/linux/mmzone.h
+++ b/include/linux/mmzone.h
@@ -435,6 +435,10 @@ extern struct pglist_data contig_page_data;
435 435
436#endif 436#endif
437 437
438#ifndef CONFIG_HAVE_ARCH_EARLY_PFN_TO_NID
439#define early_pfn_to_nid(nid) (0UL)
440#endif
441
438#endif /* !__ASSEMBLY__ */ 442#endif /* !__ASSEMBLY__ */
439#endif /* __KERNEL__ */ 443#endif /* __KERNEL__ */
440#endif /* _LINUX_MMZONE_H */ 444#endif /* _LINUX_MMZONE_H */