---

 25-akpm/include/linux/swapops.h |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff -puN include/linux/swapops.h~swp_entry-vs-swap_pte-fix-fix include/linux/swapops.h
--- 25/include/linux/swapops.h~swp_entry-vs-swap_pte-fix-fix	2004-03-25 10:10:57.286909600 -0800
+++ 25-akpm/include/linux/swapops.h	2004-03-25 10:10:57.287909448 -0800
@@ -15,11 +15,11 @@
 /*
  * Store a type+offset into a swp_entry_t in an arch-independent format
  */
-static inline swp_entry_t swp_entry(unsigned type, pgoff_t offset)
+static inline swp_entry_t swp_entry(unsigned long type, pgoff_t offset)
 {
 	swp_entry_t ret;
 
-	ret.val = ((unsigned long)type << SWP_TYPE_SHIFT(ret)) |
+	ret.val = (type << SWP_TYPE_SHIFT(ret)) |
 			(offset & SWP_OFFSET_MASK(ret));
 	return ret;
 }

_