From 568413d268c1b44986bcb2638ebbc34d7f242e17 Mon Sep 17 00:00:00 2001
From: Alexey Dobriyan <adobriyan@gmail.com>
Date: Wed, 27 Jul 2005 11:43:27 -0700
Subject: [PATCH] --- yaml --- r: 5097 b: refs/heads/master c:
 c10b873695c6a1de0d8ebab40b525575ca576683 h: refs/heads/master i:   5095:
 f9f0adf56a5a787e12ff3ca57b24cda813acdb25 v: v3

---
 [refs]                     | 2 +-
 trunk/include/linux/slab.h | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

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);
 }