From: Anton Blanchard <anton@samba.org>
Date: Mon, 3 Jun 2002 04:58:18 +0000 (-0700)
Subject: [PATCH] Fix for recent swap changes on 64 bit archs
X-Git-Tag: v2.5.21~71
X-Git-Url: http://git.neil.brown.name/?a=commitdiff_plain;h=ea8e69e88f6e7a8b661ddda84e44ff172988cd01;p=history.git

[PATCH] Fix for recent swap changes on 64 bit archs

This fixes two shift warnings on 64 bit archs.
---

diff --git a/include/linux/swapops.h b/include/linux/swapops.h
index 500f9960d939..1b67fd0a27ab 100644
--- a/include/linux/swapops.h
+++ b/include/linux/swapops.h
@@ -10,7 +10,7 @@
  * swp_entry_t's are *never* stored anywhere in their arch-dependent format.
  */
 #define SWP_TYPE_SHIFT(e)	(sizeof(e.val) * 8 - MAX_SWAPFILES_SHIFT)
-#define SWP_OFFSET_MASK(e)	((1 << SWP_TYPE_SHIFT(e)) - 1)
+#define SWP_OFFSET_MASK(e)	((1UL << SWP_TYPE_SHIFT(e)) - 1)
 
 /*
  * Store a type+offset into a swp_entry_t in an arch-independent format
@@ -19,7 +19,7 @@ static inline swp_entry_t swp_entry(unsigned type, pgoff_t offset)
 {
 	swp_entry_t ret;
 
-	ret.val = (type << SWP_TYPE_SHIFT(ret)) |
+	ret.val = ((unsigned long)type << SWP_TYPE_SHIFT(ret)) |
 			(offset & SWP_OFFSET_MASK(ret));
 	return ret;
 }