Merge remote-tracking branch 'sami/to-craig' into sami-merge

Conflicts: pgrep.c w.c
2012-03-03 13:56:32 +11:00
parent cda4b65add 96e86ef1a0
commit 502a79e02f
10 changed files with 83 additions and 17 deletions
--- a/pmap.c
+++ b/pmap.c
@ -161,7 +161,7 @@ static int one_proc(proc_t * p)
 	unsigned long total_private_writeable = 0ul;
    KLONG diff = 0;

-	char *cp2 = NULL;
+	const char *cp2 = NULL;
 	unsigned long long rss = 0ull;
 	unsigned long long private_dirty = 0ull;
 	unsigned long long shared_dirty = 0ull;