This is a multi-part message in MIME format.
Signed-off-by: Dave Hansen <haveblue@us.ibm.com>
---

 memhotplug-dave/include/asm-ppc64/page.h |   59 ++++++++++++++++---------------
 1 files changed, 32 insertions(+), 27 deletions(-)

diff -puN include/asm-ppc64/page.h~G6-move-virt_to_phys-below-PAGE_OFFSET include/asm-ppc64/page.h
--- memhotplug/include/asm-ppc64/page.h~G6-move-virt_to_phys-below-PAGE_OFFSET	2004-11-12 16:51:55.000000000 -0800
+++ memhotplug-dave/include/asm-ppc64/page.h	2004-11-12 16:51:55.000000000 -0800
@@ -180,33 +180,6 @@ static inline int get_order(unsigned lon
 	return order;
 }
 
-#define __boot_pa(x)   ((unsigned long)(x)-PAGE_OFFSET)
-#define __boot_va(x)   ((void *)((unsigned long)(x) + KERNELBASE))
-#ifndef CONFIG_NONLINEAR
-#define __pa(x)		__boot_pa(x)
-#define __va(x)		__boot_va(x)
-#else
-static inline unsigned long __pa(const void *ptr_addr);
-#endif
-
-/**
- *	virt_to_phys	-	map virtual addresses to physical
- *	@address: address to remap
- *
- *	The returned physical address is the physical (CPU) mapping for
- *	the memory address given. It is only valid to use this function on
- *	addresses directly mapped or allocated via kmalloc.
- *
- *	This function does not give bus mappings for DMA transfers. In
- *	almost all conceivable cases a device driver should not be using
- *	this function
- */
-static inline unsigned long virt_to_phys(volatile void * address)
-{
-	return __pa((void *)address);
-}
-
-
 extern int page_is_ram(unsigned long pfn);
 
 #endif /* __ASSEMBLY__ */
@@ -242,6 +215,38 @@ extern int page_is_ram(unsigned long pfn
 #define __ba_to_bpn(x) ((((unsigned long)(x)) & ~REGION_MASK) >> PAGE_SHIFT)
 
 #ifndef __ASSEMBLY__
+
+#define __boot_pa(x)   ((unsigned long)(x)-PAGE_OFFSET)
+#define __boot_va(x)   ((void *)((unsigned long)(x) + KERNELBASE))
+#ifndef CONFIG_NONLINEAR
+#define __pa(x)		__boot_pa(x)
+#define __va(x)		__boot_va(x)
+#else
+/*
+ * Should nonlinear.h be included here instead?  Do we need
+ * to rework some of these headers? - daveh FIXME
+ */
+static inline unsigned long __pa(const void *ptr_addr);
+#endif
+
+
+/**
+ *	virt_to_phys	-	map virtual addresses to physical
+ *	@address: address to remap
+ *
+ *	The returned physical address is the physical (CPU) mapping for
+ *	the memory address given. It is only valid to use this function on
+ *	addresses directly mapped or allocated via kmalloc.
+ *
+ *	This function does not give bus mappings for DMA transfers. In
+ *	almost all conceivable cases a device driver should not be using
+ *	this function
+ */
+static inline unsigned long virt_to_phys(volatile void * address)
+{
+	return __pa((void *)address);
+}
+
 #ifdef CONFIG_DISCONTIGMEM
 #define page_to_pfn(page)	discontigmem_page_to_pfn(page)
 #define pfn_to_page(pfn)	discontigmem_pfn_to_page(pfn)
_