patch-2_6_7-vs1_9_1_12

[linux-2.6.git] / include / asm-alpha / page.h

diff --git a/include/asm-alpha/page.h b/include/asm-alpha/page.h
index 2602b36..b316fc6 100644 (file)
--- a/include/asm-alpha/page.h
+++ b/include/asm-alpha/page.h
@@ -73,10 +73,13 @@ extern __inline__ int get_order(unsigned long size)
        return order;
 }
 
-#endif /* !__ASSEMBLY__ */
+#ifdef USE_48_BIT_KSEG
+#define PAGE_OFFSET            0xffff800000000000UL
+#else
+#define PAGE_OFFSET            0xfffffc0000000000UL
+#endif
 
-/* to align the pointer to the (next) page boundary */
-#define PAGE_ALIGN(addr)       (((addr)+PAGE_SIZE-1)&PAGE_MASK)
+#else
 
 #ifdef USE_48_BIT_KSEG
 #define PAGE_OFFSET            0xffff800000000000
@@ -84,6 +87,11 @@ extern __inline__ int get_order(unsigned long size)
 #define PAGE_OFFSET            0xfffffc0000000000
 #endif
 
+#endif /* !__ASSEMBLY__ */
+
+/* to align the pointer to the (next) page boundary */
+#define PAGE_ALIGN(addr)       (((addr)+PAGE_SIZE-1)&PAGE_MASK)
+
 #define __pa(x)                        ((unsigned long) (x) - PAGE_OFFSET)
 #define __va(x)                        ((void *)((unsigned long) (x) + PAGE_OFFSET))
 #ifndef CONFIG_DISCONTIGMEM