diff options
| author | Chris Zankel <chris@zankel.net> | 2014-12-15 23:09:06 -0500 |
|---|---|---|
| committer | Chris Zankel <chris@zankel.net> | 2014-12-15 23:09:06 -0500 |
| commit | 865566ed33f08637c3486b4d301e96a9064ad2eb (patch) | |
| tree | dfa26622c8feaa57153d87d207133f01aff5858b /lib/show_mem.c | |
| parent | c0d7aa07504a8f4abd7b02b9144c4a92b7565f45 (diff) | |
| parent | b2776bf7149bddd1f4161f14f79520f17fc1d71d (diff) | |
Merge tag 'v3.18' into for_next
Linux 3.18
Diffstat (limited to 'lib/show_mem.c')
| -rw-r--r-- | lib/show_mem.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/show_mem.c b/lib/show_mem.c index 09225796991a..5e256271b47b 100644 --- a/lib/show_mem.c +++ b/lib/show_mem.c | |||
| @@ -28,7 +28,7 @@ void show_mem(unsigned int filter) | |||
| 28 | continue; | 28 | continue; |
| 29 | 29 | ||
| 30 | total += zone->present_pages; | 30 | total += zone->present_pages; |
| 31 | reserved = zone->present_pages - zone->managed_pages; | 31 | reserved += zone->present_pages - zone->managed_pages; |
| 32 | 32 | ||
| 33 | if (is_highmem_idx(zoneid)) | 33 | if (is_highmem_idx(zoneid)) |
| 34 | highmem += zone->present_pages; | 34 | highmem += zone->present_pages; |