diff --git a/[refs] b/[refs]
index ca74b5ed019a..5c1d42175423 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8c86cb127b2b7614903cb2a38db3207488a0405a
+refs/heads/master: c10b873695c6a1de0d8ebab40b525575ca576683
diff --git a/trunk/include/linux/slab.h b/trunk/include/linux/slab.h
index 4c8e552471b0..80b2dfde2e80 100644
--- a/trunk/include/linux/slab.h
+++ b/trunk/include/linux/slab.h
@@ -111,7 +111,7 @@ static inline void *kmem_cache_alloc_node(kmem_cache_t *cachep, int flags, int n
 {
 	return kmem_cache_alloc(cachep, flags);
 }
-static inline void *kmalloc_node(size_t size, int flags, int node)
+static inline void *kmalloc_node(size_t size, unsigned int __nocast flags, int node)
 {
 	return kmalloc(size, flags);
 }