From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752068AbcEOW0W (ORCPT ); Sun, 15 May 2016 18:26:22 -0400 Received: from out1134-202.mail.aliyun.com ([42.120.134.202]:62959 "EHLO out1134-202.mail.aliyun.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751798AbcEOW0V (ORCPT ); Sun, 15 May 2016 18:26:21 -0400 X-Greylist: delayed 151203 seconds by postgrey-1.27 at vger.kernel.org; Sun, 15 May 2016 18:26:20 EDT X-Alimail-AntiSpam: AC=CONTINUE;BC=0.0889062|-1;FP=0|0|0|0|0|-1|-1|-1;HT=e02c03302;MF=chengang@emindsoft.com.cn;NM=1;PH=DS;RN=7;RT=6;SR=0;TI=SMTPD_----4oy.Pp7_1463350854; From: chengang@emindsoft.com.cn To: akpm@linux-foundation.org Cc: aarcange@redhat.com, rientjes@google.com, linux-kernel@vger.kernel.org, Chen Gang , Chen Gang Subject: [PATCH] include/linux/khugepaged.h: Improve the code only Date: Mon, 16 May 2016 06:20:51 +0800 Message-Id: <1463350851-1941-1-git-send-email-chengang@emindsoft.com.cn> X-Mailer: git-send-email 1.9.3 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Chen Gang khugepaged_enabled() can be treated as khugepaged_always() or khugepaged_req_madv(). The compiler will always treat it as "and 3". khugepaged_enter() can return __khugepaged_enter() result directly, since __khugepaged_enter() will return 0 or -ENOMEM. Signed-off-by: Chen Gang --- include/linux/khugepaged.h | 22 +++++++++------------- 1 file changed, 9 insertions(+), 13 deletions(-) diff --git a/include/linux/khugepaged.h b/include/linux/khugepaged.h index eeb3079..0df1c1d 100644 --- a/include/linux/khugepaged.h +++ b/include/linux/khugepaged.h @@ -9,19 +9,16 @@ extern void __khugepaged_exit(struct mm_struct *mm); extern int khugepaged_enter_vma_merge(struct vm_area_struct *vma, unsigned long vm_flags); -#define khugepaged_enabled() \ - (transparent_hugepage_flags & \ - ((1<vm_mm)) - return -ENOMEM; + return __khugepaged_enter(vma->vm_mm); return 0; } #else /* CONFIG_TRANSPARENT_HUGEPAGE */ -- 1.9.3