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 7D28EECAAD8 for ; Fri, 16 Sep 2022 20:06:49 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230248AbiIPUGs (ORCPT ); Fri, 16 Sep 2022 16:06:48 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35004 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229838AbiIPUGn (ORCPT ); Fri, 16 Sep 2022 16:06:43 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [IPv6:2604:1380:4601:e00::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4E979A5C51 for ; Fri, 16 Sep 2022 13:06:41 -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 ams.source.kernel.org (Postfix) with ESMTPS id 07327B82938 for ; Fri, 16 Sep 2022 20:06:40 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id B6B5EC433C1; Fri, 16 Sep 2022 20:06:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linux-foundation.org; s=korg; t=1663358798; bh=fE6ZXoBQEVmyuAwP6PoToel/VfrSLsi0DBpOfdFqgoY=; h=Date:To:From:Subject:From; b=KIEPIDzVn2yuWguibIR3LIWNTK5TQp0V02+cZq5fWqe6aSTdcF0GkM4+9WY+NhHq5 nX4wBJiB2h2zgJjwrfLJwgw3XjgWXDv38jQRRRgeCOgkoDilO8By17X+ZqbUaxPf7t p6qufuOIsIFnWGgN3a/HNC584k9ZA8s9UN0eOt0o= Date: Fri, 16 Sep 2022 13:06:37 -0700 To: mm-commits@vger.kernel.org, willy@infradead.org, osalvador@suse.de, david@redhat.com, anshuman.khandual@arm.com, linmiaohe@huawei.com, akpm@linux-foundation.org From: Andrew Morton Subject: + mm-remove-obsolete-macro-nr_pcp_order_mask-and-nr_pcp_order_width.patch added to mm-unstable branch Message-Id: <20220916200638.B6B5EC433C1@smtp.kernel.org> Precedence: bulk Reply-To: linux-kernel@vger.kernel.org List-ID: X-Mailing-List: mm-commits@vger.kernel.org The patch titled Subject: mm: remove obsolete macro NR_PCP_ORDER_MASK and NR_PCP_ORDER_WIDTH has been added to the -mm mm-unstable branch. Its filename is mm-remove-obsolete-macro-nr_pcp_order_mask-and-nr_pcp_order_width.patch This patch will shortly appear at https://git.kernel.org/pub/scm/linux/kernel/git/akpm/25-new.git/tree/patches/mm-remove-obsolete-macro-nr_pcp_order_mask-and-nr_pcp_order_width.patch This patch will later appear in the mm-unstable branch at git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm Before you just go and hit "reply", please: a) Consider who else should be cc'ed b) Prefer to cc a suitable mailing list as well c) Ideally: find the original patch on the mailing list and do a reply-to-all to that, adding suitable additional cc's *** Remember to use Documentation/process/submit-checklist.rst when testing your code *** The -mm tree is included into linux-next via the mm-everything branch at git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm and is updated there every 2-3 working days ------------------------------------------------------ From: Miaohe Lin Subject: mm: remove obsolete macro NR_PCP_ORDER_MASK and NR_PCP_ORDER_WIDTH Date: Fri, 16 Sep 2022 15:22:44 +0800 Since commit 8b10b465d0e1 ("mm/page_alloc: free pages in a single pass during bulk free"), they're not used anymore. Remove them. Link: https://lkml.kernel.org/r/20220916072257.9639-4-linmiaohe@huawei.com Signed-off-by: Miaohe Lin Reviewed-by: David Hildenbrand Reviewed-by: Anshuman Khandual Reviewed-by: Oscar Salvador Cc: Matthew Wilcox Signed-off-by: Andrew Morton --- include/linux/mmzone.h | 7 ------- mm/page_alloc.c | 1 - 2 files changed, 8 deletions(-) --- a/include/linux/mmzone.h~mm-remove-obsolete-macro-nr_pcp_order_mask-and-nr_pcp_order_width +++ a/include/linux/mmzone.h @@ -564,13 +564,6 @@ enum zone_watermarks { #define NR_LOWORDER_PCP_LISTS (MIGRATE_PCPTYPES * (PAGE_ALLOC_COSTLY_ORDER + 1)) #define NR_PCP_LISTS (NR_LOWORDER_PCP_LISTS + NR_PCP_THP) -/* - * Shift to encode migratetype and order in the same integer, with order - * in the least significant bits. - */ -#define NR_PCP_ORDER_WIDTH 8 -#define NR_PCP_ORDER_MASK ((1<_watermark[WMARK_MIN] + z->watermark_boost) #define low_wmark_pages(z) (z->_watermark[WMARK_LOW] + z->watermark_boost) #define high_wmark_pages(z) (z->_watermark[WMARK_HIGH] + z->watermark_boost) --- a/mm/page_alloc.c~mm-remove-obsolete-macro-nr_pcp_order_mask-and-nr_pcp_order_width +++ a/mm/page_alloc.c @@ -1584,7 +1584,6 @@ static void free_pcppages_bulk(struct zo order = pindex_to_order(pindex); nr_pages = 1 << order; - BUILD_BUG_ON(MAX_ORDER >= (1<