diff --git a/[refs] b/[refs] index 6102d7b24ef6..5f6c4e325397 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ef421be741a3e56cb89088a7dd4f73cc38739d1b +refs/heads/master: 979b0fea2d9ae5d57237a368d571cbc84655fba6 diff --git a/trunk/include/linux/slab.h b/trunk/include/linux/slab.h index 805ed4b92f9a..c2ad35016599 100644 --- a/trunk/include/linux/slab.h +++ b/trunk/include/linux/slab.h @@ -276,6 +276,17 @@ static inline void *kzalloc(size_t size, gfp_t flags) return kmalloc(size, flags | __GFP_ZERO); } +/** + * kzalloc_node - allocate zeroed memory from a particular memory node. + * @size: how many bytes of memory are required. + * @flags: the type of memory to allocate (see kmalloc). + * @node: memory node from which to allocate + */ +static inline void *kzalloc_node(size_t size, gfp_t flags, int node) +{ + return kmalloc_node(size, flags | __GFP_ZERO, node); +} + #ifdef CONFIG_SLABINFO extern const struct seq_operations slabinfo_op; ssize_t slabinfo_write(struct file *, const char __user *, size_t, loff_t *);