Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id B1682C2BBD4 for ; Tue, 15 Dec 2020 23:59:59 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 9084622D07 for ; Tue, 15 Dec 2020 23:59:59 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726817AbgLOX7p (ORCPT ); Tue, 15 Dec 2020 18:59:45 -0500 Received: from mail.kernel.org ([198.145.29.99]:34562 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727842AbgLOX0E (ORCPT ); Tue, 15 Dec 2020 18:26:04 -0500 Date: Tue, 15 Dec 2020 15:23:09 -0800 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linux-foundation.org; s=korg; t=1608074589; bh=0ZYxL52jDpuBHLDje+GDczjTBqVsCCUGoXRi/AKAoa4=; h=From:To:Subject:From; b=rdKm0XUomaXkVrgoQ2aFCzyKYQ4SOxQzj89tF06bEz7MmXq1ps4PlTTKA7YMxepFO 5YL8j9nCgqkY+WOKaaUVj26cqi8ICXfLT8ORNvQh+DUTqoJJb6LcQEeJiSFvP3EZZ4 6YlKMWvNAmNgySWe9Vwsq4hBuHOwSWYD7B9Spsy8= From: akpm@linux-foundation.org To: bhe@redhat.com, iamjoonsoo.kim@lge.com, mateusznosek0@gmail.com, mm-commits@vger.kernel.org, nigupta@nvidia.com, sh_def@163.com, vbabka@suse.cz Subject: [merged] mm-compaction-make-defer_compaction-and-compaction_deferred-static.patch removed from -mm tree Message-ID: <20201215232309.IuARPKevv%akpm@linux-foundation.org> User-Agent: s-nail v14.8.16 Precedence: bulk Reply-To: linux-kernel@vger.kernel.org List-ID: X-Mailing-List: mm-commits@vger.kernel.org The patch titled Subject: mm/compaction: make defer_compaction and compaction_deferred static has been removed from the -mm tree. Its filename was mm-compaction-make-defer_compaction-and-compaction_deferred-static.patch This patch was dropped because it was merged into mainline or a subsystem tree ------------------------------------------------------ From: Hui Su Subject: mm/compaction: make defer_compaction and compaction_deferred static defer_compaction() and compaction_deferred() and compaction_restarting() in mm/compaction.c won't be used in other files, so make them static, and remove the declaration in the header file. Take the chance to fix a typo. Link: https://lkml.kernel.org/r/20201123170801.GA9625@rlk Signed-off-by: Hui Su Acked-by: Vlastimil Babka Cc: Nitin Gupta Cc: Baoquan He Cc: Mateusz Nosek Cc: Joonsoo Kim Signed-off-by: Andrew Morton --- include/linux/compaction.h | 12 ------------ mm/compaction.c | 8 ++++---- 2 files changed, 4 insertions(+), 16 deletions(-) --- a/include/linux/compaction.h~mm-compaction-make-defer_compaction-and-compaction_deferred-static +++ a/include/linux/compaction.h @@ -98,11 +98,8 @@ extern void reset_isolation_suitable(pg_ extern enum compact_result compaction_suitable(struct zone *zone, int order, unsigned int alloc_flags, int highest_zoneidx); -extern void defer_compaction(struct zone *zone, int order); -extern bool compaction_deferred(struct zone *zone, int order); extern void compaction_defer_reset(struct zone *zone, int order, bool alloc_success); -extern bool compaction_restarting(struct zone *zone, int order); /* Compaction has made some progress and retrying makes sense */ static inline bool compaction_made_progress(enum compact_result result) @@ -194,15 +191,6 @@ static inline enum compact_result compac return COMPACT_SKIPPED; } -static inline void defer_compaction(struct zone *zone, int order) -{ -} - -static inline bool compaction_deferred(struct zone *zone, int order) -{ - return true; -} - static inline bool compaction_made_progress(enum compact_result result) { return false; --- a/mm/compaction.c~mm-compaction-make-defer_compaction-and-compaction_deferred-static +++ a/mm/compaction.c @@ -157,7 +157,7 @@ EXPORT_SYMBOL(__ClearPageMovable); * allocation success. 1 << compact_defer_shift, compactions are skipped up * to a limit of 1 << COMPACT_MAX_DEFER_SHIFT */ -void defer_compaction(struct zone *zone, int order) +static void defer_compaction(struct zone *zone, int order) { zone->compact_considered = 0; zone->compact_defer_shift++; @@ -172,7 +172,7 @@ void defer_compaction(struct zone *zone, } /* Returns true if compaction should be skipped this time */ -bool compaction_deferred(struct zone *zone, int order) +static bool compaction_deferred(struct zone *zone, int order) { unsigned long defer_limit = 1UL << zone->compact_defer_shift; @@ -209,7 +209,7 @@ void compaction_defer_reset(struct zone } /* Returns true if restarting compaction after many failures */ -bool compaction_restarting(struct zone *zone, int order) +static bool compaction_restarting(struct zone *zone, int order) { if (order < zone->compact_order_failed) return false; @@ -237,7 +237,7 @@ static void reset_cached_positions(struc } /* - * Compound pages of >= pageblock_order should consistenly be skipped until + * Compound pages of >= pageblock_order should consistently be skipped until * released. It is always pointless to compact pages of such order (if they are * migratable), and the pageblocks they occupy cannot contain any free pages. */ _ Patches currently in -mm which might be from sh_def@163.com are fs-proc-make-pde_get-return-nothing.patch acctc-use-elif-instead-of-end-and-elif.patch mm-memcontrol-rewrite-mem_cgroup_page_lruvec.patch