Index: linux-2.6.18-mm3/include/asm-ia64/pgtable.h
===================================================================
--- linux-2.6.18-mm3.orig/include/asm-ia64/pgtable.h	2006-10-06 22:01:53.073141522 -0700
+++ linux-2.6.18-mm3/include/asm-ia64/pgtable.h	2006-10-07 10:29:26.766627702 -0700
@@ -338,14 +338,7 @@ pgd_offset (struct mm_struct *mm, unsign
 	return mm->pgd + pgd_index(address);
 }
 
-/* In the kernel's mapped region we completely ignore the region number
-   (since we know it's in region number 5). */
-#define pgd_offset_k(addr) \
-	(init_mm.pgd + (((addr) >> PGDIR_SHIFT) & (PTRS_PER_PGD - 1)))
-
-/* Look up a pgd entry in the gate area.  On IA-64, the gate-area
-   resides in the kernel-mapped segment, hence we use pgd_offset_k()
-   here.  */
+#define pgd_offset_k(addr) pgd_offset(&init_mm, addr)
 #define pgd_offset_gate(mm, addr)	pgd_offset_k(addr)
 
 #ifdef CONFIG_PGTABLE_4