[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH] drop the deprecated malloc/free hooks in hurd/mach-defpager
From: |
Flavio Cruz |
Subject: |
[PATCH] drop the deprecated malloc/free hooks in hurd/mach-defpager |
Date: |
Tue, 29 Dec 2015 23:09:54 +0100 |
User-agent: |
Mutt/1.5.24 (2015-08-30) |
---
mach-defpager: Drop the deprecated malloc/free hooks.
* mach-defpager/kalloc.c: Define malloc and free directly since those are weak
symbols.
diff --git a/mach-defpager/kalloc.c b/mach-defpager/kalloc.c
index ef844ac..35ddf9a 100644
--- a/mach-defpager/kalloc.c
+++ b/mach-defpager/kalloc.c
@@ -34,23 +34,9 @@
#include <mach.h>
#include <pthread.h> /* for spin locks */
-#include <malloc.h> /* for malloc_hook/free_hook */
#include "wiring.h"
-static void init_hook (void);
-static void *malloc_hook (size_t size, const void *caller);
-static void free_hook (void *ptr, const void *caller);
-
-/* GNU libc 2.14 defines this macro to declare hook variables as volatile.
- Define it as empty for older libc versions. */
-#ifndef __MALLOC_HOOK_VOLATILE
-# define __MALLOC_HOOK_VOLATILE
-#endif
-
-void (*__MALLOC_HOOK_VOLATILE __malloc_initialize_hook) (void) = init_hook;
-
-
/* #define DEBUG */
/*
@@ -264,21 +250,14 @@ kfree( void *data,
}
}
-static void
-init_hook (void)
-{
- __malloc_hook = malloc_hook;
- __free_hook = free_hook;
-}
-
-static void *
-malloc_hook (size_t size, const void *caller)
+void *
+malloc (size_t size)
{
return (void *) kalloc ((vm_size_t) size);
}
-static void
-free_hook (void *ptr, const void *caller)
+void
+free (void *ptr)
{
/* Just ignore harmless attempts at cleanliness. */
/* panic("free not implemented"); */
- [PATCH] drop the deprecated malloc/free hooks in hurd/mach-defpager,
Flavio Cruz <=