diff options
| author | H. Peter Anvin <hpa@zytor.com> | 2010-08-12 20:48:33 -0700 |
|---|---|---|
| committer | H. Peter Anvin <hpa@zytor.com> | 2010-08-12 20:52:53 -0700 |
| commit | a104d9a4fd0762b4167668bb43eaeef10469ee9c (patch) | |
| tree | 397f11badacb1c864e689a0aaaba17e051cff171 /core/mem | |
| parent | 0fb20934d2145e43f08650dbbf6613f24f2df8c6 (diff) | |
| parent | f3ab4925bd8c5c42cf17a34377f82b53b48b132e (diff) | |
| download | syslinux-a104d9a4fd0762b4167668bb43eaeef10469ee9c.tar.gz | |
Merge branch 'master' into elflink-merge
Resolved Conflicts:
core/diskfs.inc
core/mem/free.c
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
Diffstat (limited to 'core/mem')
| -rw-r--r-- | core/mem/free.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/mem/free.c b/core/mem/free.c index 9d853a4b..70b45a36 100644 --- a/core/mem/free.c +++ b/core/mem/free.c @@ -141,7 +141,7 @@ static void __free_tagged(malloc_tag_t tag) { for (i = 0; i < NHEAP; i++) { dprintf("__free_tagged(%u) heap %d\n", tag, i); head = &__core_malloc_head[i]; - for (fp = head ; fp != head ; fp = fp->a.next) { + for (fp = head->a.next ; fp != head ; fp = fp->a.next) { if (ARENA_TYPE_GET(fp->a.attrs) == ARENA_TYPE_USED && fp->a.tag == tag) fp = __free_block(fp); |