summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSan Mehat <san@google.com>2009-05-18 13:44:43 -0700
committerThe Android Open Source Project <initial-contribution@android.com>2009-05-18 13:44:43 -0700
commit87c03897b1f85b028e00b3a49e03b1f865180659 (patch)
tree93683689458253369fb12452005115780810afdd
parent05abce16e1ce6d6e869b65c40a56e56fdfda3840 (diff)
parent89f9b9118a393ca5ca16467ec9e5e3e4a84690b5 (diff)
downloadextras-87c03897b1f85b028e00b3a49e03b1f865180659.tar.gz
am 89f9b911: showmap: Add support for 2.6.29
Merge commit '89f9b9118a393ca5ca16467ec9e5e3e4a84690b5' * commit '89f9b9118a393ca5ca16467ec9e5e3e4a84690b5': showmap: Add support for 2.6.29
-rw-r--r--showmap/showmap.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/showmap/showmap.c b/showmap/showmap.c
index 4abd56a8..2a028eea 100644
--- a/showmap/showmap.c
+++ b/showmap/showmap.c
@@ -77,8 +77,11 @@ again:
if(sscanf(line, "Private_Clean: %d kB", &mi->private_clean) != 1) goto oops;
if(fgets(line, 1024, fp) == 0) goto oops;
if(sscanf(line, "Private_Dirty: %d kB", &mi->private_dirty) != 1) goto oops;
- if(fgets(line, 1024, fp) == 0) goto oops;
- if(fgets(line, 1024, fp) == 0) goto oops;
+
+ if(fgets(line, 1024, fp) == 0) goto oops; // Referenced
+ if(fgets(line, 1024, fp) == 0) goto oops; // Swap
+ if(fgets(line, 1024, fp) == 0) goto oops; // KernelPageSize
+ if(fgets(line, 1024, fp) == 0) goto oops; // MMUPageSize
if(skip) {
free(mi);