Merge zizzer:/bk/m5

into  zeep.eecs.umich.edu:/z/saidi/work/m5

--HG--
extra : convert_revision : 792c2993791fdce6170c7b875fc6510c74faae65

base/hostinfo.cc

@@ -70,7 +70,7 @@ procInfo(char *filename, char *target)
     while (fp && !feof(fp) && !done) {
         if (fgets(line, 80, fp)) {
             if (strncmp(line, target, strlen(target)) == 0) {
-                snprintf(format, sizeof(format), "%s %%lld", target);
+                snprintf(format, sizeof(format), "%s %%ld", target);
                 sscanf(line, format, &usage);
 
                 fclose(fp);