PAGE_ALIGN(): correctly handle 64-bit values on 32-bit architectures

[safe/jmp/linux-2.6] / include / asm-xtensa / page.h

diff --git a/include/asm-xtensa/page.h b/include/asm-xtensa/page.h
index 1adedbf..11f7dc2 100644 (file)
--- a/include/asm-xtensa/page.h
+++ b/include/asm-xtensa/page.h
@@ -26,13 +26,11 @@
 
 /*
  * PAGE_SHIFT determines the page size
- * PAGE_ALIGN(x) aligns the pointer to the (next) page boundary
  */
 
 #define PAGE_SHIFT             12
 #define PAGE_SIZE              (__XTENSA_UL_CONST(1) << PAGE_SHIFT)
 #define PAGE_MASK              (~(PAGE_SIZE-1))
-#define PAGE_ALIGN(addr)       (((addr)+PAGE_SIZE - 1) & PAGE_MASK)
 
 #define PAGE_OFFSET            XCHAL_KSEG_CACHED_VADDR
 #define MAX_MEM_PFN            XCHAL_KSEG_SIZE
@@ -98,6 +96,7 @@
 typedef struct { unsigned long pte; } pte_t;           /* page table entry */
 typedef struct { unsigned long pgd; } pgd_t;           /* PGD table entry */
 typedef struct { unsigned long pgprot; } pgprot_t;
+typedef struct page *pgtable_t;
 
 #define pte_val(x)     ((x).pte)
 #define pgd_val(x)     ((x).pgd)