Code Review
/
kvmfornfv.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "Adding breaktrace & disabling timer migration"
[kvmfornfv.git]
/
qemu
/
roms
/
ipxe
/
src
/
include
/
ipxe
/
malloc.h
diff --git
a/qemu/roms/ipxe/src/include/ipxe/malloc.h
b/qemu/roms/ipxe/src/include/ipxe/malloc.h
index
bbd6cb8
..
dd158b8
100644
(file)
--- a/
qemu/roms/ipxe/src/include/ipxe/malloc.h
+++ b/
qemu/roms/ipxe/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
/*
* 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 ) {
* 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 );
VALGRIND_FREELIKE_BLOCK ( ptr, 0 );
+ free_memblock ( ptr, size );
}
/** A cache discarder */
}
/** A cache discarder */