Commit ea8e69e8 authored by Anton Blanchard's avatar Anton Blanchard Committed by Linus Torvalds

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

This fixes two shift warnings on 64 bit archs.
parent 353e641f
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
* swp_entry_t's are *never* stored anywhere in their arch-dependent format. * 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_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 * 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) ...@@ -19,7 +19,7 @@ static inline swp_entry_t swp_entry(unsigned type, pgoff_t offset)
{ {
swp_entry_t ret; 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)); (offset & SWP_OFFSET_MASK(ret));
return ret; return ret;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment