diff options
| author | H. Peter Anvin <hpa@zytor.com> | 2010-02-10 15:59:46 -0800 |
|---|---|---|
| committer | H. Peter Anvin <hpa@zytor.com> | 2010-02-10 15:59:46 -0800 |
| commit | e8d0e6fb18aae44474e864d8040d5ed44ff6acab (patch) | |
| tree | 547115848f342060950112d85b83706ef12fd800 /com32/lib/sys/openmem.c | |
| parent | 5396e250a679c368b3dd353c730358d6c54960c8 (diff) | |
| parent | 2dafb8402ed666b37f96f6e1579a99b8a8c85452 (diff) | |
| download | syslinux-e8d0e6fb18aae44474e864d8040d5ed44ff6acab.tar.gz | |
Merge branch 'fsc' into pathbased
Resolved Conflicts:
core/fs/ext2/ext2.c
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
Diffstat (limited to 'com32/lib/sys/openmem.c')
| -rw-r--r-- | com32/lib/sys/openmem.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/com32/lib/sys/openmem.c b/com32/lib/sys/openmem.c index 13a45c2a..33b8de0d 100644 --- a/com32/lib/sys/openmem.c +++ b/com32/lib/sys/openmem.c @@ -42,7 +42,6 @@ const struct input_dev __file_dev; int openmem(const void *base, size_t len, int flags) { - com32sys_t regs; int fd; struct file_info *fp; @@ -51,6 +50,8 @@ int openmem(const void *base, size_t len, int flags) if (fd < 0) return -1; + fp = &__file_info[fd]; + fp->i.length = fp->i.nbytes = len; fp->i.datap = (void *)base; fp->i.filedes = 0; /* No actual file */ |