Merge /spare/repo/netdev-2.6/ branch 'ieee80211'

[linux-2.6] / fs / jfs / jfs_metapage.c

diff --git a/fs/jfs/jfs_metapage.c b/fs/jfs/jfs_metapage.c
index aa1cc7be3a56229d198cea33ec963fd8f0631db2..6c5485d16c3916d6fa764e814345c9e21f4fe0a3 100644 (file)
--- a/fs/jfs/jfs_metapage.c
+++ b/fs/jfs/jfs_metapage.c
@@ -198,7 +198,7 @@ static void init_once(void *foo, kmem_cache_t *cachep, unsigned long flags)
        }
 }
 
-static inline struct metapage *alloc_metapage(int gfp_mask)
+static inline struct metapage *alloc_metapage(unsigned int gfp_mask)
 {
        return mempool_alloc(metapage_mempool, gfp_mask);
 }