diff options
| author | Martin Pieuchot <mpi@cvs.openbsd.org> | 2017-11-27 09:23:45 +0000 |
|---|---|---|
| committer | Martin Pieuchot <mpi@cvs.openbsd.org> | 2017-11-27 09:23:45 +0000 |
| commit | da454410fba13ee12c6d7342f6d9c91038508a26 (patch) | |
| tree | 6114d87989fa8510e41bbfb7dfd2bdf95e51a810 /sys | |
| parent | 4daceff0d6d611a0ee7997d16c6285c20cea7ada (diff) | |
Remove MALLOC_DEBUG left overs.
From Klemens Nanni.
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/ddb/db_command.c | 11 | ||||
| -rw-r--r-- | sys/sys/malloc.h | 17 |
2 files changed, 4 insertions, 24 deletions
diff --git a/sys/ddb/db_command.c b/sys/ddb/db_command.c index 53ab733dd0c..8acff8d345e 100644 --- a/sys/ddb/db_command.c +++ b/sys/ddb/db_command.c @@ -1,4 +1,4 @@ -/* $OpenBSD: db_command.c,v 1.79 2017/10/19 16:58:05 bluhm Exp $ */ +/* $OpenBSD: db_command.c,v 1.80 2017/11/27 09:23:44 mpi Exp $ */ /* $NetBSD: db_command.c,v 1.20 1996/03/30 22:30:05 christos Exp $ */ /* @@ -352,16 +352,7 @@ db_map_print_cmd(db_expr_t addr, int have_addr, db_expr_t count, char *modif) void db_malloc_print_cmd(db_expr_t addr, int have_addr, db_expr_t count, char *modif) { -#if defined(MALLOC_DEBUG) - extern void debug_malloc_printit(int (*)(const char *, ...), vaddr_t); - - if (!have_addr) - addr = 0; - - debug_malloc_printit(db_printf, (vaddr_t)addr); -#else malloc_printit(db_printf); -#endif } /*ARGSUSED*/ diff --git a/sys/sys/malloc.h b/sys/sys/malloc.h index 959b9addbb8..e5fb2caa906 100644 --- a/sys/sys/malloc.h +++ b/sys/sys/malloc.h @@ -1,4 +1,4 @@ -/* $OpenBSD: malloc.h,v 1.115 2017/10/27 16:11:00 visa Exp $ */ +/* $OpenBSD: malloc.h,v 1.116 2017/11/27 09:23:44 mpi Exp $ */ /* $NetBSD: malloc.h,v 1.39 1998/07/12 19:52:01 augustss Exp $ */ /* @@ -65,7 +65,7 @@ #define M_FREE 0 /* should be on free list */ /* 1 - free */ #define M_DEVBUF 2 /* device driver memory */ -#define M_DEBUG 3 /* debug chunk */ +/* 3 - free */ #define M_PCB 4 /* protocol control block */ #define M_RTABLE 5 /* routing tables */ /* 6 - free */ @@ -187,7 +187,7 @@ "free", /* 0 M_FREE */ \ NULL, \ "devbuf", /* 2 M_DEVBUF */ \ - "debug", /* 3 M_DEBUG */ \ + NULL, \ "pcb", /* 4 M_PCB */ \ "rtable", /* 5 M_RTABLE */ \ NULL, /* 6 */ \ @@ -403,16 +403,5 @@ void poison_mem(void *, size_t); int poison_check(void *, size_t, size_t *, uint32_t *); uint32_t poison_value(void *); -#ifdef MALLOC_DEBUG -int debug_malloc(unsigned long, int, int, void **); -int debug_free(void *, int); -void debug_malloc_init(void); -void debug_malloc_assert_allocated(void *, const char *); -#define DEBUG_MALLOC_ASSERT_ALLOCATED(addr) \ - debug_malloc_assert_allocated(addr, __func__) - -void debug_malloc_print(void); -void debug_malloc_printit(int (*)(const char *, ...), vaddr_t); -#endif /* MALLOC_DEBUG */ #endif /* _KERNEL */ #endif /* !_SYS_MALLOC_H_ */ |