summaryrefslogtreecommitdiffstats
path: root/src/include
diff options
context:
space:
mode:
authorMichael Brown2015-03-03 16:16:32 +0100
committerMichael Brown2015-03-03 16:24:15 +0100
commitb2f38da88811ebb491b3667c412ca703063e5fce (patch)
treee4f89b9e246a624dead960db054345da911f468b /src/include
parent[malloc] Move valgrind headers out of arch/x86 (diff)
downloadipxe-b2f38da88811ebb491b3667c412ca703063e5fce.tar.gz
ipxe-b2f38da88811ebb491b3667c412ca703063e5fce.tar.xz
ipxe-b2f38da88811ebb491b3667c412ca703063e5fce.zip
[malloc] Rewrite unrelicensable portions of malloc.c
Signed-off-by: Michael Brown <mcb30@ipxe.org>
Diffstat (limited to 'src/include')
-rw-r--r--src/include/ipxe/malloc.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/include/ipxe/malloc.h b/src/include/ipxe/malloc.h
index bbd6cb898..dd158b8e6 100644
--- a/src/include/ipxe/malloc.h
+++ b/src/include/ipxe/malloc.h
@@ -9,7 +9,7 @@
*
*/
-FILE_LICENCE ( GPL2_OR_LATER );
+FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
/*
* Prototypes for the standard functions (malloc() et al) are in
@@ -77,8 +77,8 @@ static inline void * __malloc malloc_dma ( size_t size, size_t phys_align ) {
* If @c ptr is NULL, no action is taken.
*/
static inline void free_dma ( void *ptr, size_t size ) {
- free_memblock ( ptr, size );
VALGRIND_FREELIKE_BLOCK ( ptr, 0 );
+ free_memblock ( ptr, size );
}
/** A cache discarder */