From 3a34dc17318f9bf09dbd7d10ac087a8a75f5f629 Mon Sep 17 00:00:00 2001 From: Levin Calado Date: Sun, 14 Jun 2015 23:24:15 +0800 Subject: add uksm 0.1.2.3 for v3.10 .ge.46.patch Conflicts: fs/exec.c Signed-off-by: Stefan Guendhoer --- include/linux/mmzone.h | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'include/linux/mmzone.h') diff --git a/include/linux/mmzone.h b/include/linux/mmzone.h index eca4a072a..14bef14cf 100644 --- a/include/linux/mmzone.h +++ b/include/linux/mmzone.h @@ -163,6 +163,9 @@ enum zone_stat_item { NR_ANON_TRANSPARENT_HUGEPAGES, #if !defined(CONFIG_CMA) || !defined(CONFIG_MTK_SVP) // SVP 16 NR_FREE_CMA_PAGES, +#endif +#ifdef CONFIG_UKSM + NR_UKSM_ZERO_PAGES, #endif NR_VM_ZONE_STAT_ITEMS }; @@ -930,7 +933,7 @@ static inline int is_normal_idx(enum zone_type idx) } /** - * is_highmem - helper function to quickly check if a struct zone is a + * is_highmem - helper function to quickly check if a struct zone is a * highmem zone or not. This is an attempt to keep references * to ZONE_{DMA/NORMAL/HIGHMEM/etc} in general code to a minimum. * @zone - pointer to struct zone variable -- cgit v1.2.3