Index: linux-2.6.16-rc5-mm3/include/asm-ia64/pgtable.h
===================================================================
--- linux-2.6.16-rc5-mm3.orig/include/asm-ia64/pgtable.h	2006-03-07 09:17:25.000000000 -0800
+++ linux-2.6.16-rc5-mm3/include/asm-ia64/pgtable.h	2006-03-07 11:14:47.000000000 -0800
@@ -474,7 +474,7 @@ extern void paging_init (void);
  *	bit  63   : _PAGE_PROTNONE bit
  */
 #define __swp_type(entry)		(((entry).val >> 2) & 0x7f)
-#define __swp_offset(entry)		(((entry).val << 1) >> 10)
+#define __swp_offset(entry)		(((entry).val >> 9) & 0x3fffffffffffffLL)
 #define __swp_entry(type,offset)	((swp_entry_t) { ((type) << 2) | ((long) (offset) << 9) })
 #define __pte_to_swp_entry(pte)		((swp_entry_t) { pte_val(pte) })
 #define __swp_entry_to_pte(x)		((pte_t) { (x).val })