---

yaml --- r: 8365 b: refs/heads/master c: b2d5507 h: refs/heads/master i: 8363: 26689d1 v: v3
git-mirror · Sep 10, 2005 · 861b8b2 · 861b8b2
1 parent 4c3312b
commit 861b8b2
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: dfc866e5059561cc79a0cc1c68ff1492f4c78508
+refs/heads/master: b2d550736f8b2186b8ef7e206d0bfbfec2238ae8
diff --git a/trunk/include/linux/slab.h b/trunk/include/linux/slab.h
@@ -118,7 +118,8 @@ extern void kfree(const void *);
 extern unsigned int ksize(const void *);
 
 #ifdef CONFIG_NUMA
-extern void *kmem_cache_alloc_node(kmem_cache_t *, int flags, int node);
+extern void *kmem_cache_alloc_node(kmem_cache_t *,
+			unsigned int __nocast flags, int node);
 extern void *kmalloc_node(size_t size, unsigned int __nocast flags, int node);
 #else
 static inline void *kmem_cache_alloc_node(kmem_cache_t *cachep, int flags, int node)

diff --git a/trunk/mm/slab.c b/trunk/mm/slab.c
@@ -1720,7 +1720,7 @@ kmem_cache_create (const char *name, size_t size, size_t align,
 	cachep->objsize = size;
 
 	if (flags & CFLGS_OFF_SLAB)
-		cachep->slabp_cache = kmem_find_general_cachep(slab_size,0);
+		cachep->slabp_cache = kmem_find_general_cachep(slab_size, 0u);
 	cachep->ctor = ctor;
 	cachep->dtor = dtor;
 	cachep->name = name;
@@ -2839,7 +2839,7 @@ int fastcall kmem_ptr_validate(kmem_cache_t *cachep, void *ptr)
  * New and improved: it will now make sure that the object gets
  * put on the correct node list so that there is no false sharing.
  */
-void *kmem_cache_alloc_node(kmem_cache_t *cachep, int flags, int nodeid)
+void *kmem_cache_alloc_node(kmem_cache_t *cachep, unsigned int __nocast flags, int nodeid)
 {
 	unsigned long save_flags;
 	void *ptr;