aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVictor Fusco <victor@cetuc.puc-rio.br>2005-09-10 00:26:36 -0700
committerLinus Torvalds <torvalds@g5.osdl.org>2005-09-10 10:06:26 -0700
commitb2d550736f8b2186b8ef7e206d0bfbfec2238ae8 (patch)
tree45926a39be5c8c99d790521ec30d20f167df1c95
parentdfc866e5059561cc79a0cc1c68ff1492f4c78508 (diff)
[PATCH] mm/slab: fix sparse warnings
Fix the sparse warning "implicit cast to nocast type" Signed-off-by: Victor Fusco <victor@cetuc.puc-rio.br> Signed-off-by: Domen Puncer <domen@coderock.org> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
-rw-r--r--include/linux/slab.h3
-rw-r--r--mm/slab.c4
2 files changed, 4 insertions, 3 deletions
diff --git a/include/linux/slab.h b/include/linux/slab.h
index 42a6bea58af..1f356f3bbc6 100644
--- a/include/linux/slab.h
+++ b/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/mm/slab.c b/mm/slab.c
index 05a391059fe..9e876d6dfad 100644
--- a/mm/slab.c
+++ b/mm/slab.c
@@ -1720,7 +1720,7 @@ next:
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 @@ out:
* 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;