diff options
| author | Gabe Black <gblack@eecs.umich.edu> | 2007-01-27 01:59:20 -0500 |
|---|---|---|
| committer | Gabe Black <gblack@eecs.umich.edu> | 2007-01-27 01:59:20 -0500 |
| commit | 0358ccee23072eef0b6448e3170457037682a452 (patch) | |
| tree | 378b5ba325d74536092a7f245423d81274db38b4 /src/base/loader/object_file.cc | |
| parent | e41f54f97f9ebdea32cc6498c346636cddc9e06d (diff) | |
| parent | 5c7bf74c073d0aea808046d10dfcaa6c319217a3 (diff) | |
| download | gem5-0358ccee23072eef0b6448e3170457037682a452.tar.xz | |
Merge zizzer:/bk/newmem
into zower.eecs.umich.edu:/eecshome/m5/newmem
src/arch/sparc/isa/formats/mem/util.isa:
src/arch/sparc/isa_traits.hh:
src/arch/sparc/system.cc:
Hand Merge
--HG--
extra : convert_revision : d5e0c97caebb616493e2f642e915969d7028109c
Diffstat (limited to 'src/base/loader/object_file.cc')
| -rw-r--r-- | src/base/loader/object_file.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/base/loader/object_file.cc b/src/base/loader/object_file.cc index da5aa9552..7424b9305 100644 --- a/src/base/loader/object_file.cc +++ b/src/base/loader/object_file.cc @@ -101,7 +101,7 @@ ObjectFile::close() } if (fileData) { - ::munmap(fileData, len); + ::munmap((char*)fileData, len); fileData = NULL; } } @@ -147,7 +147,7 @@ createObjectFile(const string &fname, bool raw) // don't know what it is close(fd); - munmap(fileData, len); + munmap((char*)fileData, len); return NULL; } |