--- zzzz-none-000/linux-2.4.17/include/asm-ppc/page.h	2001-08-28 13:58:33.000000000 +0000
+++ sangam-fb-322/linux-2.4.17/include/asm-ppc/page.h	2004-11-24 13:21:50.000000000 +0000
@@ -13,7 +13,11 @@
 #include <linux/config.h>
 
 /* Be sure to change arch/ppc/Makefile to match */
+#ifdef CONFIG_KERNEL_START_BOOL
+#define PAGE_OFFSET	CONFIG_KERNEL_START
+#else
 #define PAGE_OFFSET	0xc0000000
+#endif /* CONFIG_KERNEL_START_BOOL */
 #define KERNELBASE	PAGE_OFFSET
 
 #ifndef __ASSEMBLY__
@@ -86,6 +90,18 @@
 #define clear_user_page(page, vaddr)	clear_page(page)
 #define copy_user_page(to, from, vaddr)	copy_page(to, from)
 
+
+extern unsigned long ppc_memstart;
+extern unsigned long ppc_memoffset;
+#ifndef CONFIG_APUS
+#define PPC_MEMSTART	0
+#define PPC_MEMOFFSET	PAGE_OFFSET
+#else
+#define PPC_MEMSTART	ppc_memstart
+#define PPC_MEMOFFSET	ppc_memoffset
+#endif
+
+#if defined(CONFIG_APUS) && !defined(MODULE)
 /* map phys->virtual and virtual->phys for RAM pages */
 static inline unsigned long ___pa(unsigned long v)
 { 
@@ -113,6 +129,11 @@
 
 	return (void*) v;
 }
+#else
+#define ___pa(vaddr) ((vaddr)-PPC_MEMOFFSET)
+#define ___va(paddr) ((paddr)+PPC_MEMOFFSET)
+#endif
+
 #define __pa(x) ___pa ((unsigned long)(x))
 #define __va(x) ___va ((unsigned long)(x))