X-Git-Url: http://git.onelab.eu/?p=linux-2.6.git;a=blobdiff_plain;f=include%2Fasm-alpha%2Fpage.h;h=b316fc6a0f718ed17ca21d517acdae241518c955;hp=2602b3685fe5732f9744ae538c0f83f01b861c56;hb=9213980e6a70d8473e0ffd4b39ab5b6caaba9ff5;hpb=c449269f45c2cdf53af08c8d0af37472f66539d9 diff --git a/include/asm-alpha/page.h b/include/asm-alpha/page.h index 2602b3685..b316fc6a0 100644 --- 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