diff options
| author | Erik Hallnor <ehallnor@umich.edu> | 2003-10-14 13:29:20 -0400 |
|---|---|---|
| committer | Erik Hallnor <ehallnor@umich.edu> | 2003-10-14 13:29:20 -0400 |
| commit | 7755f825d4469cd2fe9699e53292b294f24a2392 (patch) | |
| tree | 5dc235585eb7815da741126320e603436f1c2d43 | |
| parent | 9d51e99865490a3cbb25459f1e86d77f24f7c9e9 (diff) | |
| parent | 118f5da7f86a25ba2468eeead1bfcdf33bab68e8 (diff) | |
| download | gem5-7755f825d4469cd2fe9699e53292b294f24a2392.tar.xz | |
Merge ehallnor@zizzer:/bk/m5
into zizzer.eecs.umich.edu:/y/ehallnor/work/m5
--HG--
extra : convert_revision : 25b46c6ff1be6ea339dcaccce2f2987e4ea0f484
| -rw-r--r-- | base/hostinfo.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/base/hostinfo.cc b/base/hostinfo.cc index 44d7e1bcd..5efb77356 100644 --- a/base/hostinfo.cc +++ b/base/hostinfo.cc @@ -42,7 +42,7 @@ procInfo(char *filename, char *target) int done = 0; char line[80]; char format[80]; - uint64_t usage; + long usage; FILE *fp = fopen(filename, "r"); |