From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id C883F823DE for ; Sun, 28 Jun 2026 02:31:35 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1782613896; cv=none; b=ZHjgf3VJ5YniUpy573Q3G7Sv9rI3D8P/dlIE0KuAEhYuLU3AbiQJjfHr7YsVmnx9twSniSj/+ZxiR5kj2rsPOV1vFsuPtpopdQUNoippuH+AOSN0EGsvuz++2C1ArusRLzG+6JxgE16qXWFaZCD3OYDcGevHZCfqlfMZuC8IokQ= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1782613896; c=relaxed/simple; bh=SrUWTf1oyS4+fU2BEBR6TL3r0vez7fQCIP48G/sP/Xo=; h=Date:To:From:Subject:Message-Id; b=j++wu9TZdwVsQJunSl6fOH8VlrJXKym5ICI0kwlFzMqFUfA+cepyls1YTm1FcS5LBqFfIaLGqLrw53GF8nyyHDKTxCL2EmEohyBoQVldc4YSbnx+UDBvSAcz45Kzebww/FAB22G+If/3mTOJMofXROPUkvBvhXx8wu9Z4XbTVJI= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linux-foundation.org header.i=@linux-foundation.org header.b=bcK53h9+; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linux-foundation.org header.i=@linux-foundation.org header.b="bcK53h9+" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 78AA21F000E9; Sun, 28 Jun 2026 02:31:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux-foundation.org; s=korg; t=1782613895; bh=gFw2fIyKPAI17CgGk8as5R4rD9SoeIh2UdaDcAmdSIQ=; h=Date:To:From:Subject; b=bcK53h9+J62z/rRnOKbBeYEl19nmAsP3Ltflph6912/0PrETj6QtGzL+3LcooklOY I3g4LHTg41JpP4MMkBM+/tjSYDPKKOECIz1ztxbDmCMzepzXO18dW7wHY6MT8Ub8Td Lauxv9KeQz8z8Dygy/7Gy9ZOFUO1n1GrUjOMvWFU= Date: Sat, 27 Jun 2026 19:31:35 -0700 To: mm-commits@vger.kernel.org,ye.liu@linux.dev,akpm@linux-foundation.org From: Andrew Morton Subject: [to-be-updated] mm-page_owner-hoist-config_memcg-to-function-level-for-print_page_owner_memcg.patch removed from -mm tree Message-Id: <20260628023135.78AA21F000E9@smtp.kernel.org> Precedence: bulk X-Mailing-List: mm-commits@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: The quilt patch titled Subject: mm/page_owner: hoist CONFIG_MEMCG to function level for print_page_owner_memcg() has been removed from the -mm tree. Its filename was mm-page_owner-hoist-config_memcg-to-function-level-for-print_page_owner_memcg.patch This patch was dropped because an updated version will be issued ------------------------------------------------------ From: Ye Liu Subject: mm/page_owner: hoist CONFIG_MEMCG to function level for print_page_owner_memcg() Date: Tue, 23 Jun 2026 14:52:28 +0800 The print_page_owner_memcg() function has CONFIG_MEMCG guarding its entire body via #ifdef inside the function, which leaves a no-op { return ret; } when the config is disabled. Hoist the #ifdef to the top level so the real implementation and the empty stub are two clearly separated definitions. No functional change. Link: https://lore.kernel.org/20260623065234.31866-4-ye.liu@linux.dev Signed-off-by: Ye Liu Cc: Brendan Jackman Cc: Johannes Weiner Cc: Michal Hocko Cc: Suren Baghdasaryan Cc: Vlastimil Babka Cc: Zi Yan Signed-off-by: Andrew Morton --- mm/page_owner.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) --- a/mm/page_owner.c~mm-page_owner-hoist-config_memcg-to-function-level-for-print_page_owner_memcg +++ a/mm/page_owner.c @@ -529,13 +529,13 @@ ext_put_continue: seq_putc(m, '\n'); } +#ifdef CONFIG_MEMCG /* * Looking for memcg information and print it out */ static inline int print_page_owner_memcg(char *kbuf, size_t count, int ret, struct page *page) { -#ifdef CONFIG_MEMCG unsigned long memcg_data; struct mem_cgroup *memcg; bool online; @@ -563,10 +563,16 @@ static inline int print_page_owner_memcg name); out_unlock: rcu_read_unlock(); -#endif /* CONFIG_MEMCG */ return ret; } +#else +static inline int print_page_owner_memcg(char *kbuf, size_t count, int ret, + struct page *page) +{ + return ret; +} +#endif static ssize_t print_page_owner(char __user *buf, size_t count, unsigned long pfn, _ Patches currently in -mm which might be from ye.liu@linux.dev are a.patch mm-page_owner-add-missing-newline-to-count_threshold-format-string.patch mm-page_owner-move-free_ts_nsec-output-to-free-section-in-__dump_page_owner.patch mm-page_owner-drop-redundant-page_owner-prefix-from-static-symbols.patch mm-page_owner-clamp-skip_buddy_pages-pfn-advance-at-max_order_nr_pages-boundary.patch mm-page_owner-use-memcg_data-snapshot-instead-of-pagememcgkmem-to-avoid-toctou-vm_bug_on.patch