Changeset 772 for GPL/trunk/lib32/memory.c

Timestamp:

Apr 19, 2025, 8:08:37 PM (4 months ago)

Author:

David Azarewicz

Message:

Merge in changes from 6.6-LTS branch.
Fixed additional 25+ problems.

Location:

GPL/trunk

Files:

• . (modified) (1 prop)
• lib32/memory.c (modified) (5 diffs)

GPL/trunk/lib32/memory.c

@@ -424 +424 @@
 void *__vmalloc(unsigned long size, gfp_t gfp_mask)
 {
-        return vmalloc(size);
+    LINEAR addr;
+    addr = (LINEAR) vmalloc(size);
+
+    if (gfp_mask & __GFP_ZERO)
+        memset((LINEAR)addr, 0, size);
+
+    return addr;
 }
 //******************************************************************************
@@ -610 +616 @@
 
 //******************************************************************************
+//******************************************************************************
 #ifdef DEBUGHEAP
 void *__kmalloc(int size, int flags, const char *filename, int lineno)
@@ -626 +633 @@
     }
     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();
         return 0;
     }
+    if (flags & __GFP_ZERO)
+        memset((LINEAR)addr, 0, size);
         //dprintf(("kmalloc %d returned %x", size, addr));
     return addr;
 }
 
+//******************************************************************************
 //******************************************************************************
 #ifdef DEBUGHEAP
@@ -668 +679 @@
 
 //******************************************************************************
-void *kzalloc(size_t size, unsigned int flags)
-{
-        void *ret;
-        ret = _kmalloc(size, flags);
-        if (ret)
-                memset(ret, 0, size);
-        return ret;
-}
-//******************************************************************************
 //******************************************************************************
 void *kcalloc(size_t n, size_t size, unsigned int flags)
@@ -773 +775 @@
         return buf;
 }
+
 //******************************************************************************
 //******************************************************************************