diff options
| author | Frank Ch. Eigler <fche@elastic.org> | 2009-12-11 12:18:31 -0500 |
|---|---|---|
| committer | Frank Ch. Eigler <fche@elastic.org> | 2009-12-11 12:19:30 -0500 |
| commit | a48b443b8f9c1cafaf2a78bd05584f4049093920 (patch) | |
| tree | 9496bff532e4a7a920c809ab6145184215477ab1 /runtime | |
| parent | e47f92ea31a605802c59541ca325ffd567c45ca4 (diff) | |
| download | systemtap-steved-a48b443b8f9c1cafaf2a78bd05584f4049093920.tar.gz systemtap-steved-a48b443b8f9c1cafaf2a78bd05584f4049093920.tar.xz systemtap-steved-a48b443b8f9c1cafaf2a78bd05584f4049093920.zip | |
runtime build: fix alloc.c buildability on old gcc 3.4
* runtime/alloc.c (_stp_kmalloc): Move var decl back to top.
Diffstat (limited to 'runtime')
| -rw-r--r-- | runtime/alloc.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/runtime/alloc.c b/runtime/alloc.c index 7b072900..2e98b94e 100644 --- a/runtime/alloc.c +++ b/runtime/alloc.c @@ -191,7 +191,6 @@ static void *_stp_kmalloc(size_t size) static void *_stp_kzalloc(size_t size) #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,15) { - _stp_allocated_memory += size; #ifdef DEBUG_MEM void *ret = kmalloc(size + MEM_DEBUG_SIZE, STP_ALLOC_FLAGS); if (likely(ret)) { @@ -200,6 +199,7 @@ static void *_stp_kzalloc(size_t size) } #else void *ret = kmalloc(size, STP_ALLOC_FLAGS); + _stp_allocated_memory += size; if (likely(ret)) memset (ret, 0, size); #endif /* DEBUG_MEM */ @@ -207,9 +207,9 @@ static void *_stp_kzalloc(size_t size) } #else /* LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,15) */ { - _stp_allocated_memory += size; #ifdef DEBUG_MEM void *ret = kzalloc(size + MEM_DEBUG_SIZE, STP_ALLOC_FLAGS); + _stp_allocated_memory += size; if (likely(ret)) { ret = _stp_mem_debug_setup(ret, size, MEM_KMALLOC); } |