Changeset 727 for GPL

Timestamp:

Sep 7, 2022, 11:35:13 AM (3 years ago)

Author:

Paul Smedley

Message:

fix kmalloc so that GFP_ZERO works for larger memory allocations, reimplement kzalloc

Location:

GPL/branches/uniaud32-next

Files:

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

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

@@ -92 +92 @@
  * @flags: the type of memory to allocate (see kmalloc).
  */
-void *kzalloc(size_t n, gfp_t gfp_flags);
+static inline void *kzalloc(size_t size, gfp_t flags)
+{
+        return kmalloc(size, flags | __GFP_ZERO);
+}
+
 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

@@ -627 +627 @@
     }
     if(size >= 4096) {
-        return vmalloc(size);
-    }
+        addr = (LINEAR)vmalloc(size);
+    } else {
 #ifdef DEBUGHEAP
-    addr = (LINEAR)malloc(size, filename, lineno);
+        addr = (LINEAR)malloc(size, filename, lineno);
 #else
-    addr = (LINEAR)malloc(size);
+        addr = (LINEAR)malloc(size);
 #endif
+    }
     if(addr == NULL) {
         DebugInt3();
@@ -671 +672 @@
 }
 
-//******************************************************************************
-//******************************************************************************
-void *kzalloc(size_t size, unsigned int flags)
-{
-        void *ret;
-        ret = _kmalloc(size, flags);
-        if (ret)
-                memset(ret, 0, size);
-        return ret;
-}
 //******************************************************************************
 //******************************************************************************