From c5f548f88583eb7754d3fcd4f9a867fa6af59261 Mon Sep 17 00:00:00 2001 From: Xiao Guangrong Date: Mon, 8 Oct 2012 16:29:59 -0700 Subject: [PATCH] --- yaml --- r: 332373 b: refs/heads/master c: 227e4047488d3ee0173a914275a7fd207ad51e5b h: refs/heads/master i: 332371: 2b4226ccd6e0a9d4f1ad458ed43cf939dc3a7eca v: v3 --- [refs] | 2 +- trunk/mm/huge_memory.c | 5 ----- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/[refs] b/[refs] index e130768f7693..727947a78caa 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 17c230afa58a6d013a4949d5c04b823a281d40fa +refs/heads/master: 227e4047488d3ee0173a914275a7fd207ad51e5b diff --git a/trunk/mm/huge_memory.c b/trunk/mm/huge_memory.c index a169c4dbcddc..e19cc426c522 100644 --- a/trunk/mm/huge_memory.c +++ b/trunk/mm/huge_memory.c @@ -225,9 +225,6 @@ static ssize_t enabled_store(struct kobject *kobj, ret = err; } - if (ret > 0 && khugepaged_enabled()) - set_recommended_min_free_kbytes(); - return ret; } static struct kobj_attribute enabled_attr = @@ -562,8 +559,6 @@ static int __init hugepage_init(void) start_khugepaged(); - set_recommended_min_free_kbytes(); - return 0; out: hugepage_exit_sysfs(hugepage_kobj);