Merge with 2.3.43. I did ignore all modifications to the qlogicisp.c

driver due to the Origin A64 hacks.

1 files changed, 2 insertions, 0 deletions

diff --git a/include/asm-i386/page.h b/include/asm-i386/page.h
index d6f199989..67855d163 100644
--- a/include/asm-i386/page.h
+++ b/include/asm-i386/page.h
@@ -37,10 +37,12 @@
 typedef struct { unsigned long long pte; } pte_t;
 typedef struct { unsigned long long pmd; } pmd_t;
 typedef struct { unsigned long long pgd; } pgd_t;
+#define PTE_MASK	(~(unsigned long long) (PAGE_SIZE-1))
 #else
 typedef struct { unsigned long pte; } pte_t;
 typedef struct { unsigned long pmd; } pmd_t;
 typedef struct { unsigned long pgd; } pgd_t;
+#define PTE_MASK	PAGE_MASK
 #endif
 
 typedef struct { unsigned long pgprot; } pgprot_t;