From 861b8b24bb2ebe814e2fda729a40374d13db49ab Mon Sep 17 00:00:00 2001 From: Victor Fusco Date: Sat, 10 Sep 2005 00:26:36 -0700 Subject: [PATCH] --- yaml --- r: 8365 b: refs/heads/master c: b2d550736f8b2186b8ef7e206d0bfbfec2238ae8 h: refs/heads/master i: 8363: 26689d1086c905f05cd6165421bc17c63cfc0085 v: v3 --- [refs] | 2 +- trunk/include/linux/slab.h | 3 ++- trunk/mm/slab.c | 4 ++-- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 2bd2b3ceec48..50640bc944c9 100644 --- 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 index 42a6bea58af3..1f356f3bbc64 100644 --- 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 index 05a391059fe1..9e876d6dfad9 100644 --- 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;