From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 6F139C43334 for ; Mon, 4 Jul 2022 00:00:18 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232741AbiGDAAR (ORCPT ); Sun, 3 Jul 2022 20:00:17 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36812 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229918AbiGDAAR (ORCPT ); Sun, 3 Jul 2022 20:00:17 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5B81A1168 for ; Sun, 3 Jul 2022 17:00:16 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id ED3AA61272 for ; Mon, 4 Jul 2022 00:00:15 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 49778C341C6; Mon, 4 Jul 2022 00:00:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linux-foundation.org; s=korg; t=1656892815; bh=EozWSX57t/lDHyVtjcplKWF+V+v0zdO3cwkCagCcAD0=; h=Date:To:From:Subject:From; b=NwOZVMVh0H6quqKu73Y0cbGqjTWFh5e5szeIqCwE/2K3LpgzeYopyYWE9GxiEr4p9 wNJ4gFW9iZyEYnRsE0GFVEPioeJY2SW2nQgQyJYB8ifoAPDhC3DOBCA4dZyjWs3QIg S+wZW8TwmFf/8T6s4NQysnKKI2Y7he2/AJSzWnsU= Date: Sun, 03 Jul 2022 17:00:14 -0700 To: mm-commits@vger.kernel.org, lkp@intel.com, roman.gushchin@linux.dev, akpm@linux-foundation.org From: Andrew Morton Subject: [folded-merged] mm-shrinkers-provide-shrinkers-with-names-fix.patch removed from -mm tree Message-Id: <20220704000015.49778C341C6@smtp.kernel.org> Precedence: bulk Reply-To: linux-kernel@vger.kernel.org List-ID: X-Mailing-List: mm-commits@vger.kernel.org The quilt patch titled Subject: mm: shrinkers: fix build warnings has been removed from the -mm tree. Its filename was mm-shrinkers-provide-shrinkers-with-names-fix.patch This patch was dropped because it was folded into mm-shrinkers-provide-shrinkers-with-names.patch ------------------------------------------------------ From: Roman Gushchin Subject: mm: shrinkers: fix build warnings Add __printf(a, b) attributes to shrinker functions taking shrinker name as an argument to avoid compiler warnings like: mm/shrinker_debug.c:143:9: warning: function 'shrinker_debugfs_rename' might be a candidate for 'gnu_printf' format attribute [-Wsuggest-attribute=format] mm/shrinker_debug.c:217:9: warning: function 'shrinker_debugfs_rename' might be a candidate for 'gnu_printf' format attribute [-Wsuggest-attribute=format] mm/vmscan.c:637:9: warning: function 'prealloc_shrinker' might be a candidate for 'gnu_printf' format attribute [-Wsuggest-attribute=format] mm/vmscan.c:642:9: warning: function 'prealloc_shrinker' might be a candidate for 'gnu_printf' format attribute [-Wsuggest-attribute=format] mm/vmscan.c:697:9: warning: function 'register_shrinker' might be a candidate for 'gnu_printf' format attribute [-Wsuggest-attribute=format] mm/vmscan.c:702:9: warning: function 'register_shrinker' might be a candidate for 'gnu_printf' format attribute [-Wsuggest-attribute=format] Link: https://lkml.kernel.org/r/Yr+ZTnLb9lJk6fJO@castle Signed-off-by: Roman Gushchin Reported-by: kernel test robot Signed-off-by: Andrew Morton --- include/linux/shrinker.h | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) --- a/include/linux/shrinker.h~mm-shrinkers-provide-shrinkers-with-names-fix +++ a/include/linux/shrinker.h @@ -93,9 +93,11 @@ struct shrinker { */ #define SHRINKER_NONSLAB (1 << 3) -extern int prealloc_shrinker(struct shrinker *shrinker, const char *fmt, ...); +extern int __printf(2, 3) prealloc_shrinker(struct shrinker *shrinker, + const char *fmt, ...); extern void register_shrinker_prepared(struct shrinker *shrinker); -extern int register_shrinker(struct shrinker *shrinker, const char *fmt, ...); +extern int __printf(2, 3) register_shrinker(struct shrinker *shrinker, + const char *fmt, ...); extern void unregister_shrinker(struct shrinker *shrinker); extern void free_prealloced_shrinker(struct shrinker *shrinker); extern void synchronize_shrinkers(void); @@ -103,8 +105,8 @@ extern void synchronize_shrinkers(void); #ifdef CONFIG_SHRINKER_DEBUG extern int shrinker_debugfs_add(struct shrinker *shrinker); extern void shrinker_debugfs_remove(struct shrinker *shrinker); -extern int shrinker_debugfs_rename(struct shrinker *shrinker, - const char *fmt, ...); +extern int __printf(2, 3) shrinker_debugfs_rename(struct shrinker *shrinker, + const char *fmt, ...); #else /* CONFIG_SHRINKER_DEBUG */ static inline int shrinker_debugfs_add(struct shrinker *shrinker) { @@ -113,8 +115,8 @@ static inline int shrinker_debugfs_add(s static inline void shrinker_debugfs_remove(struct shrinker *shrinker) { } -static inline int shrinker_debugfs_rename(struct shrinker *shrinker, - const char *fmt, ...) +static inline __printf(2, 3) +int shrinker_debugfs_rename(struct shrinker *shrinker, const char *fmt, ...) { return 0; } _ Patches currently in -mm which might be from roman.gushchin@linux.dev are mm-memcontrol-introduce-mem_cgroup_ino-and-mem_cgroup_get_from_ino.patch mm-shrinkers-introduce-debugfs-interface-for-memory-shrinkers.patch mm-shrinkers-provide-shrinkers-with-names.patch mm-docs-document-shrinker-debugfs.patch tools-add-memcg_shrinkerpy.patch mm-shrinkers-add-scan-interface-for-shrinker-debugfs.patch mm-shrinkers-add-scan-interface-for-shrinker-debugfs-fix.patch mm-memcontrol-do-not-miss-memcg_max-events-for-enforced-allocations.patch