sysadmin/ipxe
1
0
Fork 0
mirror of https://github.com/ipxe/ipxe synced 2025-12-29 19:38:37 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into curses

Browse Source 
Conflicts:

	src/include/compiler.h
	src/include/readline/readline.h

created by strings branch merge. resolved.
This commit is contained in:
Holger Lubitz
2007-08-23 23:15:54 +02:00
parent 2e88138b06 376bacab67
commit 5d6f6fb924
16 changed files with 342 additions and 300 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/include/gpxe/dhcp.h
View File

@@ -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 );

2
src/include/gpxe/iobuf.h
View File

@@ -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 );

4
src/include/gpxe/malloc.h
View File

@@ -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 );
}