|
@@ -190,7 +190,7 @@ size_t ksize(const void *);
|
|
|
#endif
|
|
|
|
|
|
/**
|
|
|
- * kcalloc - allocate memory for an array. The memory is set to zero.
|
|
|
+ * kmalloc_array - allocate memory for an array.
|
|
|
* @n: number of elements.
|
|
|
* @size: element size.
|
|
|
* @flags: the type of memory to allocate.
|
|
@@ -240,11 +240,22 @@ size_t ksize(const void *);
|
|
|
* for general use, and so are not documented here. For a full list of
|
|
|
* potential flags, always refer to linux/gfp.h.
|
|
|
*/
|
|
|
-static inline void *kcalloc(size_t n, size_t size, gfp_t flags)
|
|
|
+static inline void *kmalloc_array(size_t n, size_t size, gfp_t flags)
|
|
|
{
|
|
|
if (size != 0 && n > ULONG_MAX / size)
|
|
|
return NULL;
|
|
|
- return __kmalloc(n * size, flags | __GFP_ZERO);
|
|
|
+ return __kmalloc(n * size, flags);
|
|
|
+}
|
|
|
+
|
|
|
+/**
|
|
|
+ * kcalloc - allocate memory for an array. The memory is set to zero.
|
|
|
+ * @n: number of elements.
|
|
|
+ * @size: element size.
|
|
|
+ * @flags: the type of memory to allocate (see kmalloc).
|
|
|
+ */
|
|
|
+static inline void *kcalloc(size_t n, size_t size, gfp_t flags)
|
|
|
+{
|
|
|
+ return kmalloc_array(n, size, flags | __GFP_ZERO);
|
|
|
}
|
|
|
|
|
|
#if !defined(CONFIG_NUMA) && !defined(CONFIG_SLOB)
|