diff options
| author | Michael Brown | 2007-08-23 22:51:57 +0200 |
|---|---|---|
| committer | Michael Brown | 2007-08-23 22:51:57 +0200 |
| commit | 746d0f8febe166a3d5bad03a84ca4e33d1bcfe34 (patch) | |
| tree | 8fb0d6d2d7066bdbc54f3540fa9564c0ad290127 /src/include/gpxe | |
| parent | Auto-assign drive number only if set to 0xff; almost all applications (diff) | |
| parent | use malloc attribute (diff) | |
| download | ipxe-746d0f8febe166a3d5bad03a84ca4e33d1bcfe34.tar.gz ipxe-746d0f8febe166a3d5bad03a84ca4e33d1bcfe34.tar.xz ipxe-746d0f8febe166a3d5bad03a84ca4e33d1bcfe34.zip | |
Merge commit 'holger/strings'
Diffstat (limited to 'src/include/gpxe')
| -rw-r--r-- | src/include/gpxe/dhcp.h | 2 | ||||
| -rw-r--r-- | src/include/gpxe/iobuf.h | 2 | ||||
| -rw-r--r-- | src/include/gpxe/malloc.h | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/src/include/gpxe/dhcp.h b/src/include/gpxe/dhcp.h index bbd345c8b..43bccf185 100644 --- a/src/include/gpxe/dhcp.h +++ b/src/include/gpxe/dhcp.h @@ -507,7 +507,7 @@ extern void register_dhcp_options ( struct dhcp_option_block *options ); extern void unregister_dhcp_options ( struct dhcp_option_block *options ); extern void init_dhcp_options ( struct dhcp_option_block *options, void *data, size_t max_len ); -extern struct dhcp_option_block * alloc_dhcp_options ( size_t max_len ); +extern struct dhcp_option_block * __malloc alloc_dhcp_options ( size_t max_len ); extern struct dhcp_option * set_dhcp_option ( struct dhcp_option_block *options, unsigned int tag, const void *data, size_t len ); diff --git a/src/include/gpxe/iobuf.h b/src/include/gpxe/iobuf.h index c0dfd434d..e3db01ac2 100644 --- a/src/include/gpxe/iobuf.h +++ b/src/include/gpxe/iobuf.h @@ -161,7 +161,7 @@ static inline size_t iob_tailroom ( struct io_buffer *iobuf ) { return ( iobuf->end - iobuf->tail ); } -extern struct io_buffer * alloc_iob ( size_t len ); +extern struct io_buffer * __malloc alloc_iob ( size_t len ); extern void free_iob ( struct io_buffer *iobuf ); extern void iob_pad ( struct io_buffer *iobuf, size_t min_len ); extern int iob_ensure_headroom ( struct io_buffer *iobuf, size_t len ); diff --git a/src/include/gpxe/malloc.h b/src/include/gpxe/malloc.h index 0e18f6a35..cce5d1d34 100644 --- a/src/include/gpxe/malloc.h +++ b/src/include/gpxe/malloc.h @@ -19,7 +19,7 @@ extern size_t freemem; -extern void * alloc_memblock ( size_t size, size_t align ); +extern void * __malloc alloc_memblock ( size_t size, size_t align ); extern void free_memblock ( void *ptr, size_t size ); extern void mpopulate ( void *start, size_t len ); extern void mdumpfree ( void ); @@ -35,7 +35,7 @@ extern void mdumpfree ( void ); * * @c align must be a power of two. @c size may not be zero. */ -static inline void * malloc_dma ( size_t size, size_t phys_align ) { +static inline void * __malloc malloc_dma ( size_t size, size_t phys_align ) { return alloc_memblock ( size, phys_align ); } |