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 kanga.kvack.org (kanga.kvack.org [205.233.56.17]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 8367BCCD195 for ; Fri, 17 Oct 2025 08:16:21 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id D69558E003E; Fri, 17 Oct 2025 04:16:20 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id D19A38E0016; Fri, 17 Oct 2025 04:16:20 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id C08588E003E; Fri, 17 Oct 2025 04:16:20 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0017.hostedemail.com [216.40.44.17]) by kanga.kvack.org (Postfix) with ESMTP id A07C08E0016 for ; Fri, 17 Oct 2025 04:16:20 -0400 (EDT) Received: from smtpin10.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay07.hostedemail.com (Postfix) with ESMTP id 310F41605B1 for ; Fri, 17 Oct 2025 08:16:20 +0000 (UTC) X-FDA: 84006898920.10.C0984A2 Received: from sea.source.kernel.org (sea.source.kernel.org [172.234.252.31]) by imf19.hostedemail.com (Postfix) with ESMTP id 559211A0010 for ; Fri, 17 Oct 2025 08:16:18 +0000 (UTC) Authentication-Results: imf19.hostedemail.com; dkim=fail ("body hash did not verify") header.d=linuxfoundation.org header.s=korg header.b=bcNOBDQA; dmarc=pass (policy=none) header.from=linuxfoundation.org; spf=pass (imf19.hostedemail.com: domain of gregkh@linuxfoundation.org designates 172.234.252.31 as permitted sender) smtp.mailfrom=gregkh@linuxfoundation.org ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1760688978; a=rsa-sha256; cv=none; b=aqJC7Mk6lNR8WAYVfhtM8k1rEBYfAUgK7dcLghruS8JbHRXD536Z76A+6iqdgNfx/Uz9sw xKEY3uwTjxzngKSZ8usaRATIvsUI05n5qwBaxu1JXl2ZZC+SJvGXIAHGCz3W04eV/2ennO eWq1Fx1y4eteb8/dZ2OraEfSWGeG2qc= ARC-Authentication-Results: i=1; imf19.hostedemail.com; dkim=fail ("body hash did not verify") header.d=linuxfoundation.org header.s=korg header.b=bcNOBDQA; dmarc=pass (policy=none) header.from=linuxfoundation.org; spf=pass (imf19.hostedemail.com: domain of gregkh@linuxfoundation.org designates 172.234.252.31 as permitted sender) smtp.mailfrom=gregkh@linuxfoundation.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1760688978; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:dkim-signature; bh=inCbmCUnkb/NXoTK0MHp5fGLs6BbivzSKfTQxewZZEc=; b=zqErjBOy0BdDnLoz0wPJwuHLl3vVAWnMDCkRT7+8rXKQY308zmm1C57drgrwridxbXAReD hDBW4afdltev0/cAdt/O7axAWVge013K9gk8B6KcnHBkU+2qHRjRpL3FH+qjNnAiD0FUrJ a0IZf/EL7YINKmVFTTlB3wE4Ij9ndlc= Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by sea.source.kernel.org (Postfix) with ESMTP id 2FFCF4AED4; Fri, 17 Oct 2025 08:16:17 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 78357C4CEF9; Fri, 17 Oct 2025 08:16:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1760688977; bh=PHE61ocZpAmbcR8Zt6lhiDv74Fbgrfjoc7lG+GFvvjg=; h=Subject:To:Cc:From:Date:In-Reply-To:From; b=bcNOBDQAVwSZ8Gw7PDF8jKMOTbGQssjr4ZV43XpXV/ijYkoiBmu/AuaRm1D9AynKy 8xVWFzjJ5XtopifK2sr8p3u7Uo/87NOdIDhkHvixLm2IL5EMheCU7SdZKI5suu9Zqx vmUc2IXhg5amhjCQCNmSOSceBxpJW6H+LiXqkcsQ= Subject: Patch "minmax: add a few more MIN_T/MAX_T users" has been added to the 5.15-stable tree To: David.Laight@ACULAB.COM, David.Laight@aculab.com, adilger.kernel@dilger.ca, agk@redhat.com, airlied@linux.ie, akpm@linux-foundation.org, amd-gfx@lists.freedesktop.org, andriy.shevchenko@linux.intel.com, anton.ivanov@cambridgegreys.com, bp@alien8.de, clm@fb.com, coreteam@netfilter.org, daniel@ffwll.ch, dave.hansen@linux.intel.com, davem@davemloft.net, dm-devel@redhat.com, dmitry.torokhov@gmail.com, dri-devel@lists.freedesktop.org, dsahern@kernel.org, dsterba@suse.com, dushistov@mail.ru, farbere@amazon.com, freedreno@lists.freedesktop.org, fw@strlen.de, gregkh@linuxfoundation.org, hdegoede@redhat.com, herve.codina@bootlin.com, hpa@zytor.com, jack@suse.com, james.morse@arm.com, jdelvare@suse.com, jdike@addtoit.com, jejb@linux.ibm.com, jernej.skrabec@gmail.com, jmaloy@redhat.com, josef@toxicpanda.com, kadlec@netfilter.org, krzysztof.kozlowski@canonical.com, kuba@kernel.org, linus.walleij@linaro.org, linux-arm-kernel@lists.infradead.org, linux-mm@kvack.org, linux-staging@lists.linux.dev, linux-stm32@st-md-mailman.stormreply.co, m@kvack.org, linux-sunxi@lists.linux.dev, linux-um@lists.infradead.org, linux@rasmusvillemoes.dk, linux@roeck-us.net, lorenzo.stoakes@oracle.com, luc.vanoostenryck@gmail.com, luto@kernel.org, maarten.lankhorst@linux.intel.com, malattia@linux.it, martin.petersen@oracle.com, maz@kernel.org, mcoquelin.stm32@gmail.com, mgross@linux.intel.com, minchan@kernel.org, mingo@redhat.com, mripard@kernel.org, ngupta@vflare.org, pablo@netfilter.org, peterz@infradead.org, pmladek@suse.com, qiuxu.zhuo@intel.com, quic_akhilpo@quicinc.com, richard@nod.at, robdclark@gmail.com, rostedt@goodmis.org, rric@kernel.org, ruanjinjie@huawei.com, sakari.ailus@linux.intel.com, sashal@kernel.org, sean@poorly.run, senozhatsky@chromium.org, shuah@kernel.org, snitzer@redhat.com, tglx@linutronix.de, tipc-discussion@lists.sourceforge.net, tony.luck@intel.com, torvalds@linux-foundation.org, tytso@mit.edu, tzimmermann@suse.de, wens@csie.org, willy@infradead.org, x86@kernel.org, ying.xue@windriver.com, yoshfuji@linux-ipv6.org Cc: From: Date: Fri, 17 Oct 2025 10:16:14 +0200 In-Reply-To: <20251008152946.29285-7-farbere@amazon.com> Message-ID: <2025101714-crisping-parakeet-ceba@gregkh> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-stable: commit X-Patchwork-Hint: ignore X-Stat-Signature: us79uommmjzkqr3cdhdj6csot8eim7jj X-Rspamd-Queue-Id: 559211A0010 X-Rspamd-Server: rspam06 X-Rspam-User: X-HE-Tag: 1760688978-266081 X-HE-Meta: U2FsdGVkX1/HhptWINfC+2+zg/9f0ugmVXTonisz+LTTM0FxSW1Ggjot7l0qIeQN36U1s8aKSliFqKZ6t/quztnqwQBQ9FrZp72XrZgTUK9aoxQWV2rsF5cWp5d2VdTytz13ft9JA59RtEPv5y0sUQrXmPNagi9VzJ6+014hWrt66iFgoK746ooSu7L7t/1B8r9+sai7NEVmK8O/7x4QiDYl+M24hIGbWV7+YU35zTURQhY0B2cD2qVCH+VIL/okuqCcsmYoJeqBfYprvwUVyjSHGs/RzuI6BZ1eelzBJ0lh4xikaAtIp61B38qUuIKiURm2IVY8EYEk3/JYXOgoYutW9Z8pIY1YH5doIp5yq+oS5aggsIkidkmgDhneBlZhqVf7IdLE+SIcJzlQFSP290wb81HD5l/00+yIfgFoCIDL9d7Ac4Xu09Rpn70rehXfB6RycVF/WcRWwYta34B1TaXMe9mFW9ae9gBfrzBMl5aNxWeXBOweHoeWHdtfK1KNgVzUM1LExzeOouCrSiLs/Opze77SFqeX7Fwlazmc8cWnrNWFp2xlT6pxKnxL5x++EOehlclhGx3AbyaXF4gTMWsXirjGadlwlEUXychBxws4e04LtfXjAFrUMq7L65EQweuor2wIg7UWGpFW+ZlcurvnWh70k3KB3fTy/8yFoFnoGolbeiVs8FHCD1mnOvRMr0O4PT+zcTccBgWmblDfYeXtmYKxHXoGLjD9j55+au4RcpgxvswLBT0cq/79iJIMMDw5oPDl3hrOzf2P6HSrsuloe/z1oCT8Ss6OnB+S25q+j5+X7kPjRu/PU/z+pLRoHlhLm1IUWLpkvklD63O6amANS+kteWWcRv8esw2ZAzQxuRegF9Eo+n4cG8VEAqA+UTizIUgg+eZZqXKs9BEepFns47rLyujLr0DltmcxPP2K0uALk72prmFcQh/h8gpz9xEoqI8155lrZzNukSO DzTrqXWC XZDs7BSBRrMQu0f+f8b29i+jkFMobPT9gmuKJza/7Wf0SKmPJVdKKkZnfv1RrvWs/bSWEEIQmkl+s549Eo+cP80cMnhJqK66xBzyOmHAH7KIKoRsTwCJINb/lZVeKfsHNvlUeDAGhqqDO0r8/pxX3Cbl430Yciai6yWzKgW5y8oQRDBytjI6zKeWlFvac355HbNnKqIBwWS/MtZYEVUnEGv4FoxSLiBc8suHg79RC2fmpGGpWOmwwR+X1O+YtOmcyacoo8UEWVK97NqvmMGr2yY8K8k1S/q0G5sSW2vYJbmQR825h/ljsXv7dzWm0E80NhykvNP264zKp7r2oX9f/+9+wqq1OCi4gpMdb2KAmFx6L/swwqcfIahhAoAzhP5iSD8ZOy4aQk+aLEEKEJuReaij1O6cCvSP5PGQU1X6+ds6dmPemAAA+rZGdyaYNMQE7myM+QaDDlhyrG8yHSqHlA/L6yx9NRo9ARkhHMcNiu7I8neXOwvBP6M7rgk1FSzE53Fc7dJKoaohtjv3b2YbLh3PimzGQx8UbNIVDl8QErVhGiYG+AHhmDyKDSZbxxt52maPW6IgQhheMGOV/tW5eGS1ISFSXrHXDW55aPrFc32vBEKUPXg8PdWMlX1fM9yzcc82VtbpdeacGcPJiILTYyTgzoTrUbGiSU8X5i3/r56WdTCSa+vj0nxtlLvOADXoCjoyeCMHKmhmVRnbiT+JX1V4VWyrLgvqPBcfFXA+yApN9toMqc23WaHiLUI2k45KOV8pXOY6RF8WQHyWS4ya5CFi6cghp6iZGY1Lki1C4V51TAVUUT/s5VFW0IKqcgoCrz7bSGJHMLYUl3riLu8RAdAZBv3n93Cp6gUs5bABGdm84GCWRC610mLmjUdBg383jXkbxmJQsCQxJoB7m3Ol2e13HfMKb4BR9Hj9JY2u2d2565Xb+ZlyAMh4wASI8acOGsSQpFk34ydP9UDsIgb4IISw21NUa dnD/TGnj a54ZoUSPa2k4IIw6POwtAl0vj1ziQAu5aovWhnbuq7RvmlDjkNU4rVyoCDvWismsaQEnlfavD6CCb1eUW+Y9QUEDcqKr45hGhGSOTpdiEhki+UYQ1jw/S+Uxq+evAzw4seG72DvQEYGXnSy5k+3zxZz8J6eQZwuRmiZZG1OtVuizx1XsRXwJspy0Zrsa0hUAJic0mT7f+KXfWaEqVbdZ5dnkYuH1tGhU34aObJBESv7VlDiGQstNYx+f+aoPS4Bgqu5M2kh7yqS8z01rNrnnonN3sX2GJdHvSYHDQ03zLF+hFlxD5x6ZUOZFrYIsGrhsy83N3/I0hqz4Nzq4MCbk9F8E9xN1LtT82WXF8q7nDvQnCi1EokkU/FPTcgX/XG/EznVDnz4iqRDQk93UTighdSr9LIVkf1AfZyFjhisKUMWcTTKrIty/qiIUJ1iNm19a64Pxw8V2iIUxAnk3RrwI0/3WgFmK5cwNiN1rA7sB4fjNJK2kw2eRiOoQJuGPst54kDI9yOP67lWZ+9jaiTqEYZk7uxSrfSA620S4HTHQS1yIOwypjesIzj3takanAtP/FHgASi1x88RSlJjDT2DFDQ2YW1cs5GCgZZB2qkbM2p1eC38tSXaITTJvTeqGVZ8LEY0sbPFF0W52EELhmDJW6F4lUwRYeFdxPPkNGeBX3/0AKBK5wpxvQsB9RAPP0ZkiAWNpFQD4eRwYFsY7EWB/AVExNg4fClPnpA+yZTQF8tsNN5D5gqbqPn5p9ZHEiVBFI3dJ2Ls0jHUIiKto3KoTVaamu2zreDgOKpPCE7b2lTpbNjcLVuvO1qQaoePokgaGCpGBffnk8hr0hI5mmjaBl5cItFISNo6pv2Ef5b1sTMcUtwOKCYSRdBqAGD4yYXCQTJiHAds9YHDE4OeK81GvW5swrhJBs5WedBH5AnUgJEk= X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: List-Subscribe: List-Unsubscribe: This is a note to let you know that I've just added the patch titled minmax: add a few more MIN_T/MAX_T users to the 5.15-stable tree which can be found at: http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary The filename of the patch is: minmax-add-a-few-more-min_t-max_t-users.patch and it can be found in the queue-5.15 subdirectory. If you, or anyone else, feels it should not be added to the stable tree, please let know about it. >From stable+bounces-183618-greg=kroah.com@vger.kernel.org Wed Oct 8 17:33:30 2025 From: Eliav Farber Date: Wed, 8 Oct 2025 15:29:31 +0000 Subject: minmax: add a few more MIN_T/MAX_T users To: , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , Cc: Linus Torvalds , David Laight , Lorenzo Stoakes Message-ID: <20251008152946.29285-7-farbere@amazon.com> From: Linus Torvalds [ Upstream commit 4477b39c32fdc03363affef4b11d48391e6dc9ff ] Commit 3a7e02c040b1 ("minmax: avoid overly complicated constant expressions in VM code") added the simpler MIN_T/MAX_T macros in order to avoid some excessive expansion from the rather complicated regular min/max macros. The complexity of those macros stems from two issues: (a) trying to use them in situations that require a C constant expression (in static initializers and for array sizes) (b) the type sanity checking and MIN_T/MAX_T avoids both of these issues. Now, in the whole (long) discussion about all this, it was pointed out that the whole type sanity checking is entirely unnecessary for min_t/max_t which get a fixed type that the comparison is done in. But that still leaves min_t/max_t unnecessarily complicated due to worries about the C constant expression case. However, it turns out that there really aren't very many cases that use min_t/max_t for this, and we can just force-convert those. This does exactly that. Which in turn will then allow for much simpler implementations of min_t()/max_t(). All the usual "macros in all upper case will evaluate the arguments multiple times" rules apply. We should do all the same things for the regular min/max() vs MIN/MAX() cases, but that has the added complexity of various drivers defining their own local versions of MIN/MAX, so that needs another level of fixes first. Link: https://lore.kernel.org/all/b47fad1d0cf8449886ad148f8c013dae@AcuMS.aculab.com/ Cc: David Laight Cc: Lorenzo Stoakes Signed-off-by: Linus Torvalds Signed-off-by: Eliav Farber Signed-off-by: Greg Kroah-Hartman --- V2 -> V3: Fix fs/erofs/zdata.h to use MIN_T instead of min_t to fix build on the following patch: In file included from ./include/linux/kernel.h:16, from ./include/linux/list.h:9, from ./include/linux/wait.h:7, from ./include/linux/wait_bit.h:8, from ./include/linux/fs.h:6, from fs/erofs/internal.h:10, from fs/erofs/zdata.h:9, from fs/erofs/zdata.c:6: fs/erofs/zdata.c: In function ‘z_erofs_decompress_pcluster’: fs/erofs/zdata.h:185:61: error: ISO C90 forbids variable length array ‘pages_onstack’ [-Werror=vla] 185 | min_t(unsigned int, THREAD_SIZE / 8 / sizeof(struct page *), 96U) | ^~~~ ./include/linux/minmax.h:49:23: note: in definition of macro ‘__cmp_once_unique’ 49 | ({ type ux = (x); type uy = (y); __cmp(op, ux, uy); }) | ^ ./include/linux/minmax.h:164:27: note: in expansion of macro ‘__cmp_once’ 164 | #define min_t(type, x, y) __cmp_once(min, type, x, y) | ^~~~~~~~~~ fs/erofs/zdata.h:185:9: note: in expansion of macro ‘min_t’ 185 | min_t(unsigned int, THREAD_SIZE / 8 / sizeof(struct page *), 96U) | ^~~~~ fs/erofs/zdata.c:847:36: note: in expansion of macro ‘Z_EROFS_VMAP_ONSTACK_PAGES’ 847 | struct page *pages_onstack[Z_EROFS_VMAP_ONSTACK_PAGES]; | ^~~~~~~~~~~~~~~~~~~~~~~~~~ cc1: all warnings being treated as errors V1 -> V2: Use `[ Upstream commit ]` instead of `commit upstream.` like in all other patches. arch/x86/mm/pgtable.c | 2 +- drivers/edac/sb_edac.c | 4 ++-- drivers/gpu/drm/drm_color_mgmt.c | 2 +- drivers/md/dm-integrity.c | 2 +- drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 2 +- fs/erofs/zdata.h | 2 +- net/ipv4/proc.c | 2 +- net/ipv6/proc.c | 2 +- 8 files changed, 9 insertions(+), 9 deletions(-) --- a/arch/x86/mm/pgtable.c +++ b/arch/x86/mm/pgtable.c @@ -107,7 +107,7 @@ static inline void pgd_list_del(pgd_t *p #define UNSHARED_PTRS_PER_PGD \ (SHARED_KERNEL_PMD ? KERNEL_PGD_BOUNDARY : PTRS_PER_PGD) #define MAX_UNSHARED_PTRS_PER_PGD \ - max_t(size_t, KERNEL_PGD_BOUNDARY, PTRS_PER_PGD) + MAX_T(size_t, KERNEL_PGD_BOUNDARY, PTRS_PER_PGD) static void pgd_set_mm(pgd_t *pgd, struct mm_struct *mm) --- a/drivers/edac/sb_edac.c +++ b/drivers/edac/sb_edac.c @@ -109,8 +109,8 @@ static const u32 knl_interleave_list[] = 0x104, 0x10c, 0x114, 0x11c, /* 20-23 */ }; #define MAX_INTERLEAVE \ - (max_t(unsigned int, ARRAY_SIZE(sbridge_interleave_list), \ - max_t(unsigned int, ARRAY_SIZE(ibridge_interleave_list), \ + (MAX_T(unsigned int, ARRAY_SIZE(sbridge_interleave_list), \ + MAX_T(unsigned int, ARRAY_SIZE(ibridge_interleave_list), \ ARRAY_SIZE(knl_interleave_list)))) struct interleave_pkg { --- a/drivers/gpu/drm/drm_color_mgmt.c +++ b/drivers/gpu/drm/drm_color_mgmt.c @@ -528,7 +528,7 @@ int drm_plane_create_color_properties(st { struct drm_device *dev = plane->dev; struct drm_property *prop; - struct drm_prop_enum_list enum_list[max_t(int, DRM_COLOR_ENCODING_MAX, + struct drm_prop_enum_list enum_list[MAX_T(int, DRM_COLOR_ENCODING_MAX, DRM_COLOR_RANGE_MAX)]; int i, len; --- a/drivers/md/dm-integrity.c +++ b/drivers/md/dm-integrity.c @@ -2536,7 +2536,7 @@ static void do_journal_write(struct dm_i unlikely(from_replay) && #endif ic->internal_hash) { - char test_tag[max_t(size_t, HASH_MAX_DIGESTSIZE, MAX_TAG_SIZE)]; + char test_tag[MAX_T(size_t, HASH_MAX_DIGESTSIZE, MAX_TAG_SIZE)]; integrity_sector_checksum(ic, sec + ((l - j) << ic->sb->log2_sectors_per_block), (char *)access_journal_data(ic, i, l), test_tag); --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c @@ -2805,7 +2805,7 @@ static void stmmac_dma_interrupt(struct u32 channels_to_check = tx_channel_count > rx_channel_count ? tx_channel_count : rx_channel_count; u32 chan; - int status[max_t(u32, MTL_MAX_TX_QUEUES, MTL_MAX_RX_QUEUES)]; + int status[MAX_T(u32, MTL_MAX_TX_QUEUES, MTL_MAX_RX_QUEUES)]; /* Make sure we never check beyond our status buffer. */ if (WARN_ON_ONCE(channels_to_check > ARRAY_SIZE(status))) --- a/fs/erofs/zdata.h +++ b/fs/erofs/zdata.h @@ -182,7 +182,7 @@ static inline void z_erofs_onlinepage_en } #define Z_EROFS_VMAP_ONSTACK_PAGES \ - min_t(unsigned int, THREAD_SIZE / 8 / sizeof(struct page *), 96U) + MIN_T(unsigned int, THREAD_SIZE / 8 / sizeof(struct page *), 96U) #define Z_EROFS_VMAP_GLOBAL_PAGES 2048 #endif --- a/net/ipv4/proc.c +++ b/net/ipv4/proc.c @@ -43,7 +43,7 @@ #include #include -#define TCPUDP_MIB_MAX max_t(u32, UDP_MIB_MAX, TCP_MIB_MAX) +#define TCPUDP_MIB_MAX MAX_T(u32, UDP_MIB_MAX, TCP_MIB_MAX) /* * Report socket allocation statistics [mea@utu.fi] --- a/net/ipv6/proc.c +++ b/net/ipv6/proc.c @@ -27,7 +27,7 @@ #include #define MAX4(a, b, c, d) \ - max_t(u32, max_t(u32, a, b), max_t(u32, c, d)) + MAX_T(u32, MAX_T(u32, a, b), MAX_T(u32, c, d)) #define SNMP_MIB_MAX MAX4(UDP_MIB_MAX, TCP_MIB_MAX, \ IPSTATS_MIB_MAX, ICMP_MIB_MAX) Patches currently in stable-queue which might be from farbere@amazon.com are queue-5.15/minmax-add-a-few-more-min_t-max_t-users.patch queue-5.15/minmax-improve-macro-expansion-and-type-checking.patch queue-5.15/minmax-fix-indentation-of-__cmp_once-and-__clamp_once.patch queue-5.15/minmax.h-simplify-the-variants-of-clamp.patch queue-5.15/minmax-add-in_range-macro.patch queue-5.15/minmax.h-move-all-the-clamp-definitions-after-the-min-max-ones.patch queue-5.15/minmax-don-t-use-max-in-situations-that-want-a-c-constant-expression.patch queue-5.15/minmax.h-remove-some-defines-that-are-only-expanded-once.patch queue-5.15/minmax.h-use-build_bug_on_msg-for-the-lo-hi-test-in-clamp.patch queue-5.15/minmax-simplify-min-max-clamp-implementation.patch queue-5.15/minmax-deduplicate-__unconst_integer_typeof.patch queue-5.15/minmax-simplify-and-clarify-min_t-max_t-implementation.patch queue-5.15/minmax.h-add-whitespace-around-operators-and-after-commas.patch queue-5.15/minmax-avoid-overly-complicated-constant-expressions-in-vm-code.patch queue-5.15/minmax-make-generic-min-and-max-macros-available-everywhere.patch queue-5.15/minmax-fix-up-min3-and-max3-too.patch queue-5.15/minmax.h-reduce-the-define-expansion-of-min-max-and-clamp.patch queue-5.15/minmax-introduce-min-max-_array.patch queue-5.15/minmax.h-update-some-comments.patch