From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753496AbcFUFbp (ORCPT ); Tue, 21 Jun 2016 01:31:45 -0400 Received: from mail-pf0-f193.google.com ([209.85.192.193]:36103 "EHLO mail-pf0-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754733AbcFUFaz (ORCPT ); Tue, 21 Jun 2016 01:30:55 -0400 From: Ganesh Mahendran To: devel@driverdev.osuosl.org, linux-kernel@vger.kernel.org Cc: gregkh@linuxfoundation.org, arve@android.com, riandrews@android.com, Ganesh Mahendran Subject: [PATCH 2/3] staging: lowmemorykiller: count anon pages only when we have swap devices Date: Tue, 21 Jun 2016 13:30:17 +0800 Message-Id: <1466487018-5410-2-git-send-email-opensource.ganesh@gmail.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1466487018-5410-1-git-send-email-opensource.ganesh@gmail.com> References: <1466487018-5410-1-git-send-email-opensource.ganesh@gmail.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org lowmem_count() should only count anon pages when we have swap device. Signed-off-by: Ganesh Mahendran --- drivers/staging/android/lowmemorykiller.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/drivers/staging/android/lowmemorykiller.c b/drivers/staging/android/lowmemorykiller.c index 6da9260..1d8de47 100644 --- a/drivers/staging/android/lowmemorykiller.c +++ b/drivers/staging/android/lowmemorykiller.c @@ -73,10 +73,14 @@ static unsigned long lowmem_deathpending_timeout; static unsigned long lowmem_count(struct shrinker *s, struct shrink_control *sc) { - return global_page_state(NR_ACTIVE_ANON) + - global_page_state(NR_ACTIVE_FILE) + - global_page_state(NR_INACTIVE_ANON) + - global_page_state(NR_INACTIVE_FILE); + unsigned long freeable = global_page_state(NR_ACTIVE_FILE) + + global_page_state(NR_INACTIVE_FILE); + + if (get_nr_swap_pages() > 0) + freeable += global_page_state(NR_ACTIVE_ANON) + + global_page_state(NR_INACTIVE_ANON); + + return freeable; } static unsigned long lowmem_scan(struct shrinker *s, struct shrink_control *sc) -- 1.9.1