patch-2.1.121 linux/include/asm-alpha/page.h

Next file: linux/include/asm-alpha/pgtable.h
Previous file: linux/include/asm-alpha/mmu_context.h
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.1.120/linux/include/asm-alpha/page.h linux/include/asm-alpha/page.h
@@ -8,6 +8,8 @@
 
 #ifdef __KERNEL__
 
+#ifndef __ASSEMBLY__
+
 #define STRICT_MM_TYPECHECKS
 
 /*
@@ -102,12 +104,18 @@
 #define __pgd(x)	(x)
 #define __pgprot(x)	(x)
 
-#endif
+#endif /* STRICT_MM_TYPECHECKS */
+#endif /* !ASSEMBLY */
 
 /* to align the pointer to the (next) page boundary */
-#define PAGE_ALIGN(addr)		(((addr)+PAGE_SIZE-1)&PAGE_MASK)
+#define PAGE_ALIGN(addr)	(((addr)+PAGE_SIZE-1)&PAGE_MASK)
+
+#ifdef USE_48_BIT_KSEG
+#define PAGE_OFFSET		0xffff800000000000
+#else
+#define PAGE_OFFSET		0xfffffc0000000000
+#endif
 
-#define PAGE_OFFSET		0xFFFFFC0000000000UL
 #define __pa(x)			((unsigned long) (x) - PAGE_OFFSET)
 #define __va(x)			((void *)((unsigned long) (x) + PAGE_OFFSET))
 #define MAP_NR(addr)		(__pa(addr) >> PAGE_SHIFT)

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen, slshen@lbl.gov