From 85a77b351d915a7060ff4b314800469f740361aa Mon Sep 17 00:00:00 2001
From: Lijun Fang <fanglijun3@huawei.com>
Date: Fri, 15 Nov 2019 20:33:55 +0800
Subject: [PATCH] mm: totalram_pages remain unchanged when cdmnode not set

ascend inclusion
category: bugfix
bugzilla: NA
CVE: NA

------------

ddr_totalram_pages() return totalram_pages remain unchanged
when cdmnode not set.

Fixes: da9b9592e18f ("mm: Change tmpfs size base on ddr size.")
Signed-off-by: Lijun Fang <fanglijun3@huawei.com>
Reviewed-by: Kefeng Wang <wangkefeng.wang@huawei.com>
Signed-off-by: Yang Yingliang <yangyingliang@huawei.com>
---
 mm/shmem.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/mm/shmem.c b/mm/shmem.c
index e9342c370d06..9382528467a9 100644
--- a/mm/shmem.c
+++ b/mm/shmem.c
@@ -115,6 +115,9 @@ static unsigned long ddr_totalram_pages(void)
 	unsigned long managed_pages = 0;
 	pg_data_t *pgdat;
 
+	if (nodes_empty(cdmmask))
+		return totalram_pages;
+
 	for_each_online_node(nid) {
 		if (is_cdm_node(nid))
 			continue;
-- 
GitLab