diff options
| author | H. Peter Anvin <hpa@zytor.com> | 2010-02-05 17:28:27 -0800 |
|---|---|---|
| committer | H. Peter Anvin <hpa@zytor.com> | 2010-02-05 17:28:27 -0800 |
| commit | 2dafb8402ed666b37f96f6e1579a99b8a8c85452 (patch) | |
| tree | 9ea825be372220a88d927041692722648e421394 | |
| parent | 3e48cb37712f34a158ea6b0f491c6ba37aab4c10 (diff) | |
| parent | 88c00aca310b7bade07833d3021cae9da266eae7 (diff) | |
| download | syslinux-fsc.tar.gz | |
Merge branch 'master' into fscsyslinux-4.00-pre17fsc
Resolved Conflicts:
core/pxelinux.asm
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
| -rw-r--r-- | gpxe/gpxe.diff | 16 | ||||
| -rw-r--r-- | gpxe/src/core/malloc.c | 4 |
2 files changed, 18 insertions, 2 deletions
diff --git a/gpxe/gpxe.diff b/gpxe/gpxe.diff index 16ab1c94..57e5f416 100644 --- a/gpxe/gpxe.diff +++ b/gpxe/gpxe.diff @@ -55,3 +55,19 @@ index 7ae7eab..9dc39fc 100644 /** * Path MTU +diff --git a/gpxe/src/core/malloc.c b/gpxe/src/core/malloc.c +index 8b0bc24..0153748 100644 +--- a/gpxe/src/core/malloc.c ++++ b/gpxe/src/core/malloc.c +@@ -78,9 +78,9 @@ size_t freemem; + /** + * Heap size + * +- * Currently fixed at 128kB. ++ * Currently fixed at 512kB. + */ +-#define HEAP_SIZE ( 128 * 1024 ) ++#define HEAP_SIZE ( 512 * 1024 ) + + /** The heap itself */ + static char heap[HEAP_SIZE] __attribute__ (( aligned ( __alignof__(void *) ))); diff --git a/gpxe/src/core/malloc.c b/gpxe/src/core/malloc.c index 8b0bc24d..01537483 100644 --- a/gpxe/src/core/malloc.c +++ b/gpxe/src/core/malloc.c @@ -78,9 +78,9 @@ size_t freemem; /** * Heap size * - * Currently fixed at 128kB. + * Currently fixed at 512kB. */ -#define HEAP_SIZE ( 128 * 1024 ) +#define HEAP_SIZE ( 512 * 1024 ) /** The heap itself */ static char heap[HEAP_SIZE] __attribute__ (( aligned ( __alignof__(void *) ))); |