Changeset 726 for GPL

Timestamp:

Sep 6, 2022, 11:14:39 AM (3 years ago)

Author:

Paul Smedley

Message:

Revert changes from r723

Location:

GPL/branches/uniaud32-next

Files:

• include/linux/slab.h (modified) (1 diff)
• lib32/memory.c (modified) (3 diffs)

GPL/branches/uniaud32-next/include/linux/slab.h

@@ -92 +92 @@
  * @flags: the type of memory to allocate (see kmalloc).
  */
-static inline void *kzalloc(size_t size, gfp_t flags)
-{
-        return __kmalloc(size, flags | __GFP_ZERO);
-}
-
+void *kzalloc(size_t n, gfp_t gfp_flags);
 void *kcalloc(size_t n, size_t size, unsigned int __nocast gfp_flags);
 void *krealloc(const void *, size_t, gfp_t);

GPL/branches/uniaud32-next/lib32/memory.c

@@ -610 +610 @@
 
 //******************************************************************************
+//******************************************************************************
 #ifdef DEBUGHEAP
 void *__kmalloc(int size, int flags, const char *filename, int lineno)
@@ -644 +645 @@
 
 //******************************************************************************
+//******************************************************************************
 #ifdef DEBUGHEAP
 void __kfree(const void *ptr, const char *filename, int lineno)
@@ -669 +671 @@
 }
 
+//******************************************************************************
+//******************************************************************************
+void *kzalloc(size_t size, unsigned int flags)
+{
+        void *ret;
+        ret = _kmalloc(size, flags);
+        if (ret)
+                memset(ret, 0, size);
+        return ret;
+}
 //******************************************************************************
 //******************************************************************************