diff --git a/[refs] b/[refs]
index bbd16a4e0061..e89b3a58b521 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a70773ddb96b74c7afe5a5bc859ba45e3d02899e
+refs/heads/master: ee13d785eac1fbe7e79ecca77bf7e902734a0b30
diff --git a/trunk/mm/slab.c b/trunk/mm/slab.c
index afe9c5f8c57a..71370256a7eb 100644
--- a/trunk/mm/slab.c
+++ b/trunk/mm/slab.c
@@ -1571,8 +1571,8 @@ static void set_up_list3s(struct kmem_cache *cachep, int index)
  * high order pages for slabs.  When the gfp() functions are more friendly
  * towards high-order requests, this should be changed.
  */
-static inline size_t calculate_slab_order(struct kmem_cache *cachep, size_t size,
-					  size_t align, gfp_t flags)
+static inline size_t calculate_slab_order(struct kmem_cache *cachep,
+			size_t size, size_t align, unsigned long flags)
 {
 	size_t left_over = 0;