Merge master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-for-linus-2.6

[cascardo/linux.git] / mm / slab.c

diff --git a/mm/slab.c b/mm/slab.c
index 05a3910..9e876d6 100644 (file)
--- 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;