summaryrefslogtreecommitdiff
path: root/src/base/loader
diff options
context:
space:
mode:
authorAli Saidi <saidi@eecs.umich.edu>2007-01-26 18:50:28 -0500
committerAli Saidi <saidi@eecs.umich.edu>2007-01-26 18:50:28 -0500
commit6d9d0c68b574ceba53fc36d34b83f7109e00b1d0 (patch)
tree8004fcb5879cd81d738bd750441fbc900208e049 /src/base/loader
parentc215d54aac6925cf13079d8d8fe3691451a77ce1 (diff)
parentfd8a4ff5a8a9ea65e227f0b4000dfcda06d4764f (diff)
downloadgem5-6d9d0c68b574ceba53fc36d34b83f7109e00b1d0.tar.xz
Merge zizzer:/bk/newmem
into zeep.pool:/z/saidi/work/m5.suncc --HG-- extra : convert_revision : 1706f6218abec7eb575dcff3ad4aef83894f64ab
Diffstat (limited to 'src/base/loader')
-rw-r--r--src/base/loader/object_file.cc4
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;
}