emo/procps
1
0
Fork 0
Code Issues Pull Requests Packages Releases Activity

Merge branch 'master' into nls

Browse Source 
Conflicts:
	configure.ac
	pmap.c
	ps/Makefile.am
This commit is contained in:
Craig Small
2011-12-26 09:11:27 +11:00
parent 46e51c92e6 2983b30523
commit a99002e3fe
9 changed files with 25 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pmap.c
View File

@@ -160,6 +160,7 @@ static int one_proc(proc_t * p)
unsigned long total_shared = 0ul;
unsigned long total_private_readonly = 0ul;
unsigned long total_private_writeable = 0ul;
KLONG diff = 0;
char *cp2 = NULL;
unsigned long long rss = 0ull;
@@ -213,7 +214,7 @@ static int one_proc(proc_t * p)
char flags[32];
/* to clean up unprintables */
char *tmp;
unsigned KLONG start, end, diff = 0;
unsigned KLONG start, end;
unsigned long long file_offset, inode;
unsigned dev_major, dev_minor;
unsigned long long smap_value;
@@ -253,6 +254,7 @@ static int one_proc(proc_t * p)
/* reset some counters */
rss = shared_dirty = private_dirty =
0ull;
diff = 0;
continue;
}
/* Other keys */