From caed3ce0f7ff8e031e5c9600a16c8fcc04c40ae7 Mon Sep 17 00:00:00 2001 From: Kalesh Singh Date: Thu, 23 Jul 2020 14:26:13 +0000 Subject: [PATCH] ANDROID: GKI: Don't compact data structures when CONFIG_ZSMALLOC=n In order to keep abi compatibility for vendor zsmalloc module, ensure data structures are not compacted even if zsmalloc is disabled. Bug: 150917000 Change-Id: I8d5d85e50fa34204a48db67f2ae69eed591e8345 Signed-off-by: Kalesh Singh --- include/linux/mmzone.h | 2 -- mm/vmstat.c | 2 -- 2 files changed, 4 deletions(-) diff --git a/include/linux/mmzone.h b/include/linux/mmzone.h index b523ffe1161f..91f14f991883 100644 --- a/include/linux/mmzone.h +++ b/include/linux/mmzone.h @@ -208,9 +208,7 @@ enum zone_stat_item { #endif /* Second 128 byte cacheline */ NR_BOUNCE, -#if IS_ENABLED(CONFIG_ZSMALLOC) NR_ZSPAGES, /* allocated in zsmalloc */ -#endif NR_FREE_CMA_PAGES, NR_VM_ZONE_STAT_ITEMS }; diff --git a/mm/vmstat.c b/mm/vmstat.c index 96d39fbb9a1f..3748615dfb6e 100644 --- a/mm/vmstat.c +++ b/mm/vmstat.c @@ -1122,9 +1122,7 @@ const char * const vmstat_text[] = { "nr_shadow_call_stack_bytes", #endif "nr_bounce", -#if IS_ENABLED(CONFIG_ZSMALLOC) "nr_zspages", -#endif "nr_free_cma", /* enum numa_stat_item counters */