diff --git a/freebsd/sys/sys/malloc.h b/freebsd/sys/sys/malloc.h index d70fd21c..5586b39b 100644 --- a/freebsd/sys/sys/malloc.h +++ b/freebsd/sys/sys/malloc.h @@ -126,6 +126,13 @@ struct malloc_type_header { }; #ifdef _KERNEL +#ifdef __rtems__ +#include +#define malloc _bsd_malloc +#define realloc _bsd_realloc +#define reallocf _bsd_reallocf +#define free _bsd_free +#endif /* __rtems__ */ #define MALLOC_DEFINE(type, shortdesc, longdesc) \ struct malloc_type type[1] = { \ { NULL, M_MAGIC, shortdesc, NULL } \ diff --git a/rtemsbsd/include/machine/rtems-bsd-config.h.in b/rtemsbsd/include/machine/rtems-bsd-config.h.in index 3d9db4ca..9e0cedcb 100644 --- a/rtemsbsd/include/machine/rtems-bsd-config.h.in +++ b/rtemsbsd/include/machine/rtems-bsd-config.h.in @@ -96,9 +96,6 @@ #include -#define realloc _bsd_realloc -#define reallocf _bsd_reallocf - /* Debug */ void rtems_bsd_assert_func(const char *file, int line, const char *func, const char *expr); diff --git a/rtemsbsd/include/machine/rtems-bsd-symbols.h b/rtemsbsd/include/machine/rtems-bsd-symbols.h index 909d98eb..fe7d9bd3 100644 --- a/rtemsbsd/include/machine/rtems-bsd-symbols.h +++ b/rtemsbsd/include/machine/rtems-bsd-symbols.h @@ -249,7 +249,6 @@ #define ehci_resume _bsd_ehci_resume #define ehci_shutdown _bsd_ehci_shutdown #define ehci_suspend _bsd_ehci_suspend -#define free _bsd_free #define hid_end_parse _bsd_hid_end_parse #define hid_get_data _bsd_hid_get_data #define hid_get_data_unsigned _bsd_hid_get_data_unsigned @@ -278,7 +277,6 @@ #define kthread_exit _bsd_kthread_exit #define kthread_start _bsd_kthread_start #define kthread_suspend _bsd_kthread_suspend -#define malloc _bsd_malloc #define malloc_init _bsd_malloc_init #define malloc_uninit _bsd_malloc_uninit #define maxproc _bsd_maxproc