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 <[email protected]> Cc: Andrew Morton <[email protected]> Cc: Bob Liu <[email protected]> Cc: David Rientjes <[email protected]> Cc: Eric W. Biederman <[email protected]> Cc: Hugh Dickins <[email protected]> Cc: Ingo Molnar <[email protected]> Cc: Kees Cook <[email protected]> Cc: Kirill A. Shutemov <[email protected]> Cc: Mel Gorman <[email protected]> Cc: Oleg Nesterov <[email protected]> Cc: Peter Zijlstra <[email protected]> Cc: Rik van Riel <[email protected]> Cc: Thomas Gleixner <[email protected]> Cc: Vladimir Davydov <[email protected]> Cc: [email protected] --- 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 [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
