From c69ff7a87b7143261dfd475b588a1436695d5eca Mon Sep 17 00:00:00 2001 From: Suren Baghdasaryan Date: Thu, 16 Apr 2020 13:06:50 -0700 Subject: [PATCH] ANDROID: GKI: fix ABI diffs caused by ION heap and pool vmstat additions New nr_ion_heap and nr_ion_heap_pool fields in vmstat file cause ABI differences. Fix them by adding the fields. Bug: 110330255 Bug: 130198686 Bug: 153442668 Test: boot Signed-off-by: Minchan Kim (cherry picked from commit 8f76a3ed2a76492deba9edebc990cac3b32f78be) Signed-off-by: Martin Liu [surenb: cherry picked and trimmed the original patch to include only necessary changes to resolve ABI diff for node_stat_item enum] Bug: 149182139 Test: build and boot Signed-off-by: Suren Baghdasaryan Change-Id: I82b43bd3d94b950bd266aa53a3794182604a52d0 --- include/linux/mmzone.h | 2 ++ mm/vmstat.c | 3 +++ 2 files changed, 5 insertions(+) diff --git a/include/linux/mmzone.h b/include/linux/mmzone.h index 340db9eaa524..57f5772f4e33 100644 --- a/include/linux/mmzone.h +++ b/include/linux/mmzone.h @@ -188,6 +188,8 @@ enum node_stat_item { NR_WRITTEN, /* page writings since bootup */ NR_KERNEL_MISC_RECLAIMABLE, /* reclaimable non-slab kernel pages */ NR_UNRECLAIMABLE_PAGES, + NR_ION_HEAP, + NR_ION_HEAP_POOL, NR_VM_NODE_STAT_ITEMS }; diff --git a/mm/vmstat.c b/mm/vmstat.c index ac18931a50e2..2ef02636021a 100644 --- a/mm/vmstat.c +++ b/mm/vmstat.c @@ -1168,6 +1168,9 @@ const char * const vmstat_text[] = { "nr_kernel_misc_reclaimable", "nr_unreclaimable_pages", + + "nr_ion_heap", + "nr_ion_heap_pool", /* enum writeback_stat_item counters */ "nr_dirty_threshold", "nr_dirty_background_threshold",