summaryrefslogtreecommitdiffstats
path: root/src/arch
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/arch
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/arch')
-rw-r--r--src/arch/i386/core/umalloc.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/src/arch/i386/core/umalloc.c b/src/arch/i386/core/umalloc.c
index 5bad072e8..bfd62ef16 100644
--- a/src/arch/i386/core/umalloc.c
+++ b/src/arch/i386/core/umalloc.c
@@ -135,7 +135,6 @@ static void ecollect_free ( void ) {
* Calling realloc() with a new size of zero is a valid way to free a
* memory block.
*/
-__attribute__ ((malloc))
userptr_t urealloc ( userptr_t ptr, size_t new_size ) {
struct external_memory extmem;
userptr_t new = ptr;
@@ -209,7 +208,6 @@ userptr_t urealloc ( userptr_t ptr, size_t new_size ) {
*
* Memory is guaranteed to be aligned to a page boundary.
*/
-__attribute__ ((malloc))
userptr_t umalloc ( size_t size ) {
return urealloc ( UNULL, size );
}