Index: linux-2.6.19-rc1-mm1/include/asm-ia64/pgtable.h
===================================================================
--- linux-2.6.19-rc1-mm1.orig/include/asm-ia64/pgtable.h	2006-10-11 19:30:01.000000000 -0500
+++ linux-2.6.19-rc1-mm1/include/asm-ia64/pgtable.h	2006-10-11 19:36:24.489161773 -0500
@@ -162,21 +162,21 @@
  */
 #define TLB_SIZE_SHIFT		54
 #define TLB_SIZE_MASK		0x1f
-#define TLB_SIZE_OFFSET		(1UL << TLB_SIZE_SHIFT)
+#define TLB_SIZE_OFFSET		(__IA64_UL(1) << TLB_SIZE_SHIFT)
 
 #define ENABLE_PAGE_TABLE_SHIFT	60
 
-#define TLB_SIZE(page_shift)	((page_shift) << TLB_SIZE_SHIFT)
-#define ENABLE_PAGE_TABLE	(1UL << ENABLE_PAGE_TABLE_SHIFT)
+#define TLB_SIZE(shift)		(__IA64_UL(shift) << TLB_SIZE_SHIFT)
+#define ENABLE_PAGE_TABLE	(__IA64_UL(1) << ENABLE_PAGE_TABLE_SHIFT)
 
 #define SET_TLB_SIZE(addr, page_shift)	(RGN_BASE(RGN_KERNEL) | TLB_SIZE(page_shift) | (addr))
 
-#define VKP_AREA(shift)		(RGN_BASE(RGN_KERNEL) | TLB_SIZE(page_shift) | ENABLE_PAGE_TABLE)
+#define VKP_AREA(shift)		(RGN_BASE(RGN_KERNEL) | TLB_SIZE(shift) | ENABLE_PAGE_TABLE)
 
 /* Extract various things from a VKP address */
 #define VKP_ADDR_TO_SHIFT(addr)	(((addr) >> TLB_SIZE_SHIFT) & TLB_SIZE_MASK)
 
-#define VKP_ADDR_TO_OFFSET(addr) (((addr) & (TLB_SIZE_OFFSET-1))
+#define VKP_ADDR_TO_OFFSET(addr) ((addr) & (TLB_SIZE_OFFSET-1))
 #define VKP_ADDR_TO_AREA(addr)	((addr) & ~(TLB_SIZE_OFFSET-1))
 
 #define VKP_PAGE_TO_PAGE(addr) (VKP_ADDR_TO_OFFSET(addr) >> (VKP_ADDR_TO_SHIFT(addr) - PAGE_SHIFT) | \
@@ -528,7 +528,7 @@ pte_same (pte_t a, pte_t b)
 #define update_mmu_cache(vma, address, pte) do { } while (0)
 
 extern pgd_t swapper_pg_dir[PTRS_PER_PGD];
-extern pgd_t region7[8][PTRS_PER_PGD];
+extern pgd_t region7_pg_dir[8][PTRS_PER_PGD];
 extern void paging_init (void);
 
 /*