X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fthreads%2Fmalloc.c;h=4f8675cf90572164dbf715a35cfe33fc876e1f24;hb=2f2b3a9b0e72eb25010d1fa757687fd8a87658ef;hp=9c83e3d438f780199166c3c92aa0893aa842f98f;hpb=dcfc312e3cc930d418f86948ef062eb7e8fd283a;p=pintos-anon

diff --git a/src/threads/malloc.c b/src/threads/malloc.c
index 9c83e3d..4f8675c 100644
--- a/src/threads/malloc.c
+++ b/src/threads/malloc.c
@@ -158,7 +158,7 @@ malloc (size_t size)
    kernel to panic in normal operation, so this function should
    only be used during kernel initialization. */
 void *
-xmalloc (size_t size) 
+malloc_or_panic (size_t size) 
 {
   void *p = malloc (size);
   if (p == NULL && size > 0)
@@ -192,7 +192,7 @@ calloc (size_t a, size_t b)
    kernel to panic in normal operation, so this function should
    only be used during kernel initialization. */
 void *
-xcalloc (size_t a, size_t b) 
+calloc_or_panic (size_t a, size_t b) 
 {
   void *p = calloc (a, b);
   if (p == NULL && a > 0 && b > 0)