diff options
| author | H. Peter Anvin <hpa@zytor.com> | 2011-04-25 17:19:32 -0700 |
|---|---|---|
| committer | H. Peter Anvin <hpa@zytor.com> | 2011-04-25 17:19:32 -0700 |
| commit | 6bb618c959ffc6d462ce597f4e1f0e6c4baa7fa3 (patch) | |
| tree | eb738bf1a45e1fe0ee17fca8509c96a3579a6592 /com32/sysdump/memory.c | |
| parent | 3b772bb6588a28fd5741ca86f579e3838d96eb80 (diff) | |
| parent | 0c8bfd91ab11a00b796f32982a30414c8bac7ec9 (diff) | |
| download | syslinux-4.10-pre6.tar.gz | |
Merge remote-tracking branch 'origin/master' into lwipsyslinux-4.10-pre6
Resolved Conflicts:
com32/include/netinet/in.h
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
Diffstat (limited to 'com32/sysdump/memory.c')
| -rw-r--r-- | com32/sysdump/memory.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/com32/sysdump/memory.c b/com32/sysdump/memory.c index 6552e7f3..377f9a99 100644 --- a/com32/sysdump/memory.c +++ b/com32/sysdump/memory.c @@ -7,7 +7,6 @@ #include <stdlib.h> #include <sys/cpu.h> #include "sysdump.h" -#include "backend.h" static char *lowmem; static size_t lowmem_len; @@ -29,7 +28,7 @@ void snapshot_lowmem(void) } } -static void dump_memory_range(struct backend *be, const void *where, +static void dump_memory_range(struct upload_backend *be, const void *where, const void *addr, size_t len) { char filename[32]; @@ -38,7 +37,7 @@ static void dump_memory_range(struct backend *be, const void *where, cpio_writefile(be, filename, where, len); } -void dump_memory(struct backend *be) +void dump_memory(struct upload_backend *be) { printf("Dumping memory... "); |