diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-08-11 16:58:24 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-08-11 16:58:24 -0700 |
| commit | 4b9eaf33d83d91430b7ca45d0ebf8241da489c92 (patch) | |
| tree | 85ca3cf23a902ac53fecf8f9b6129c745af44d29 /fs | |
| parent | d3396e1e4ec4aa41ef563841e8ba511ae0589003 (diff) | |
| parent | 5830169f47269f78f6624bd70165eb571270da82 (diff) | |
| download | linux-4b9eaf33d83d91430b7ca45d0ebf8241da489c92.tar.gz linux-4b9eaf33d83d91430b7ca45d0ebf8241da489c92.tar.bz2 linux-4b9eaf33d83d91430b7ca45d0ebf8241da489c92.zip | |
Merge branch 'akpm' (patches from Andrew)
Merge fixes from Andrew Morton:
"7 fixes"
* emailed patches from Andrew Morton <akpm@linux-foundation.org>:
mm/memory_hotplug.c: initialize per_cpu_nodestats for hotadded pgdats
mm, oom: fix uninitialized ret in task_will_free_mem()
kasan: remove the unnecessary WARN_ONCE from quarantine.c
mm: memcontrol: fix memcg id ref counter on swap charge move
mm: memcontrol: fix swap counter leak on swapout from offline cgroup
proc, meminfo: use correct helpers for calculating LRU sizes in meminfo
mm/hugetlb: fix incorrect hugepages count during mem hotplug
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/proc/meminfo.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/proc/meminfo.c b/fs/proc/meminfo.c index 09e18fdf61e5..b9a8c813e5e6 100644 --- a/fs/proc/meminfo.c +++ b/fs/proc/meminfo.c @@ -46,7 +46,7 @@ static int meminfo_proc_show(struct seq_file *m, void *v) cached = 0; for (lru = LRU_BASE; lru < NR_LRU_LISTS; lru++) - pages[lru] = global_page_state(NR_LRU_BASE + lru); + pages[lru] = global_node_page_state(NR_LRU_BASE + lru); available = si_mem_available(); |