Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933160AbaJWCuF (ORCPT ); Wed, 22 Oct 2014 22:50:05 -0400 Received: from relay2.sgi.com ([192.48.180.65]:52659 "EHLO relay.sgi.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S932432AbaJWCtf (ORCPT ); Wed, 22 Oct 2014 22:49:35 -0400 From: Alex Thorlton To: linux-mm@kvack.org, athorlton@sgi.com Cc: Andrew Morton , Bob Liu , David Rientjes , "Eric W. Biederman" , Hugh Dickins , Ingo Molnar , Kees Cook , "Kirill A. Shutemov" , Mel Gorman , Oleg Nesterov , Peter Zijlstra , Rik van Riel , Thomas Gleixner , Vladimir Davydov , linux-kernel@vger.kernel.org Subject: [PATCH 1/4] Disable khugepaged thread Date: Wed, 22 Oct 2014 21:49:24 -0500 Message-Id: <1414032567-109765-2-git-send-email-athorlton@sgi.com> X-Mailer: git-send-email 1.7.12.4 In-Reply-To: <1414032567-109765-1-git-send-email-athorlton@sgi.com> References: <1414032567-109765-1-git-send-email-athorlton@sgi.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org This patch just removes any call to start khugepaged for now. If we decide to go forward with this new approach, then this patch will also dismantle the other bits of khugepaged that we'll no longer need. Signed-off-by: Alex Thorlton Cc: Andrew Morton Cc: Bob Liu Cc: David Rientjes Cc: Eric W. Biederman Cc: Hugh Dickins Cc: Ingo Molnar Cc: Kees Cook Cc: Kirill A. Shutemov Cc: Mel Gorman Cc: Oleg Nesterov Cc: Peter Zijlstra Cc: Rik van Riel Cc: Thomas Gleixner Cc: Vladimir Davydov Cc: linux-kernel@vger.kernel.org --- mm/huge_memory.c | 23 +++-------------------- 1 file changed, 3 insertions(+), 20 deletions(-) diff --git a/mm/huge_memory.c b/mm/huge_memory.c index 74c78aa..63abf52 100644 --- a/mm/huge_memory.c +++ b/mm/huge_memory.c @@ -295,24 +295,9 @@ static ssize_t enabled_store(struct kobject *kobj, struct kobj_attribute *attr, const char *buf, size_t count) { - ssize_t ret; - - ret = double_flag_store(kobj, attr, buf, count, - TRANSPARENT_HUGEPAGE_FLAG, - TRANSPARENT_HUGEPAGE_REQ_MADV_FLAG); - - if (ret > 0) { - int err; - - mutex_lock(&khugepaged_mutex); - err = start_khugepaged(); - mutex_unlock(&khugepaged_mutex); - - if (err) - ret = err; - } - - return ret; + return double_flag_store(kobj, attr, buf, count, + TRANSPARENT_HUGEPAGE_FLAG, + TRANSPARENT_HUGEPAGE_REQ_MADV_FLAG); } static struct kobj_attribute enabled_attr = __ATTR(enabled, 0644, enabled_show, enabled_store); @@ -655,8 +640,6 @@ static int __init hugepage_init(void) if (totalram_pages < (512 << (20 - PAGE_SHIFT))) transparent_hugepage_flags = 0; - start_khugepaged(); - return 0; out: hugepage_exit_sysfs(hugepage_kobj); -- 1.7.12.4 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/