summaryrefslogtreecommitdiffstats
path: root/src/core/malloc.c
diff options
context:
space:
mode:
authorHolger Lubitz2007-08-06 03:36:35 +0200
committerHolger Lubitz2007-08-06 03:36:35 +0200
commit781547449515fcb66e264d5876e9d05ea49043f4 (patch)
treede255dec650ac21b552c04d9ce83578ef7cd4cdc /src/core/malloc.c
parentMerge branch 'master' of git://git.etherboot.org/scm/gpxe (diff)
downloadipxe-781547449515fcb66e264d5876e9d05ea49043f4.tar.gz
ipxe-781547449515fcb66e264d5876e9d05ea49043f4.tar.xz
ipxe-781547449515fcb66e264d5876e9d05ea49043f4.zip
Revert "malloc attribute changes"
wasn't meant for my local "master" branch ;) This reverts commit 373022108ba389fb3d50a3d50f9baf64c6c82171.
Diffstat (limited to 'src/core/malloc.c')
-rw-r--r--src/core/malloc.c4
1 files changed, 0 insertions, 4 deletions
diff --git a/src/core/malloc.c b/src/core/malloc.c
index 6b8add94..2d892f42 100644
--- a/src/core/malloc.c
+++ b/src/core/malloc.c
@@ -95,7 +95,6 @@ static char heap[HEAP_SIZE] __attribute__ (( aligned ( __alignof__(void *) )));
*
* @c align must be a power of two. @c size may not be zero.
*/
-__attribute__ ((malloc))
void * alloc_memblock ( size_t size, size_t align ) {
struct memory_block *block;
size_t align_mask;
@@ -249,7 +248,6 @@ void free_memblock ( void *ptr, size_t size ) {
* Calling realloc() with a new size of zero is a valid way to free a
* memory block.
*/
-__attribute__ ((malloc))
void * realloc ( void *old_ptr, size_t new_size ) {
struct autosized_block *old_block;
struct autosized_block *new_block;
@@ -299,7 +297,6 @@ void * realloc ( void *old_ptr, size_t new_size ) {
* Allocates memory with no particular alignment requirement. @c ptr
* will be aligned to at least a multiple of sizeof(void*).
*/
-__attribute__ ((malloc))
void * malloc ( size_t size ) {
return realloc ( NULL, size );
}
@@ -329,7 +326,6 @@ void free ( void *ptr ) {
* This function name is non-standard, but pretty intuitive.
* zalloc(size) is always equivalent to calloc(1,size)
*/
-__attribute__ ((malloc))
void * zalloc ( size_t size ) {
void *data;