aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-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 *);
118extern unsigned int ksize(const void *); 118extern unsigned int ksize(const void *);
119 119
120#ifdef CONFIG_NUMA 120#ifdef CONFIG_NUMA
121extern void *kmem_cache_alloc_node(kmem_cache_t *, int flags, int node); 121extern void *kmem_cache_alloc_node(kmem_cache_t *,
122 unsigned int __nocast flags, int node);
122extern void *kmalloc_node(size_t size, unsigned int __nocast flags, int node); 123extern void *kmalloc_node(size_t size, unsigned int __nocast flags, int node);
123#else 124#else
124static inline void *kmem_cache_alloc_node(kmem_cache_t *cachep, int flags, int node) 125static 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:
1720 cachep->objsize = size; 1720 cachep->objsize = size;
1721 1721
1722 if (flags & CFLGS_OFF_SLAB) 1722 if (flags & CFLGS_OFF_SLAB)
1723 cachep->slabp_cache = kmem_find_general_cachep(slab_size,0); 1723 cachep->slabp_cache = kmem_find_general_cachep(slab_size, 0u);
1724 cachep->ctor = ctor; 1724 cachep->ctor = ctor;
1725 cachep->dtor = dtor; 1725 cachep->dtor = dtor;
1726 cachep->name = name; 1726 cachep->name = name;
@@ -2839,7 +2839,7 @@ out:
2839 * New and improved: it will now make sure that the object gets 2839 * New and improved: it will now make sure that the object gets
2840 * put on the correct node list so that there is no false sharing. 2840 * put on the correct node list so that there is no false sharing.
2841 */ 2841 */
2842void *kmem_cache_alloc_node(kmem_cache_t *cachep, int flags, int nodeid) 2842void *kmem_cache_alloc_node(kmem_cache_t *cachep, unsigned int __nocast flags, int nodeid)
2843{ 2843{
2844 unsigned long save_flags; 2844 unsigned long save_flags;
2845 void *ptr; 2845 void *ptr;