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 C80BCE936E1 for ; Wed, 4 Oct 2023 20:25:06 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S244634AbjJDUZI (ORCPT ); Wed, 4 Oct 2023 16:25:08 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38724 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S244668AbjJDUYF (ORCPT ); Wed, 4 Oct 2023 16:24:05 -0400 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id CF31910CB for ; Wed, 4 Oct 2023 13:23:49 -0700 (PDT) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 3D47AC433C9; Wed, 4 Oct 2023 20:23:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linux-foundation.org; s=korg; t=1696451029; bh=ClVt3x7/VrfHXQHkg69DUP6SqR3ARB3NJNmyKsN0s0E=; h=Date:To:From:Subject:From; b=0aR2WbK1bG2rKtbI8MIz93LlsYKFtlAbJVudT/ZWnFNdS0nfykomg4CaGxWEYAvLD Pv/BoIGeNARhe296XuQ3UMpuCJC3nnJXHR61Hfd1bmlVssVeXnP8lDUiygzvzUUsTU FzZ/C+Grt8KRr8wK8nCJQJTrWCWbNWqYLjodkOUk= Date: Wed, 04 Oct 2023 13:23:47 -0700 To: mm-commits@vger.kernel.org, herve.codina@bootlin.com, andriy.shevchenko@linux.intel.com, akpm@linux-foundation.org From: Andrew Morton Subject: [merged mm-nonmm-stable] minmax-deduplicate-__unconst_integer_typeof.patch removed from -mm tree Message-Id: <20231004202349.3D47AC433C9@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: minmax: deduplicate __unconst_integer_typeof() has been removed from the -mm tree. Its filename was minmax-deduplicate-__unconst_integer_typeof.patch This patch was dropped because it was merged into the mm-nonmm-stable branch of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm ------------------------------------------------------ From: Andy Shevchenko Subject: minmax: deduplicate __unconst_integer_typeof() Date: Mon, 11 Sep 2023 18:49:13 +0300 It appears that compiler_types.h already have an implementation of the __unconst_integer_typeof() called __unqual_scalar_typeof(). Use it instead of the copy. Link: https://lkml.kernel.org/r/20230911154913.4176033-1-andriy.shevchenko@linux.intel.com Signed-off-by: Andy Shevchenko Acked-by: Herve Codina Signed-off-by: Andrew Morton --- include/linux/minmax.h | 26 +++----------------------- 1 file changed, 3 insertions(+), 23 deletions(-) --- a/include/linux/minmax.h~minmax-deduplicate-__unconst_integer_typeof +++ a/include/linux/minmax.h @@ -2,6 +2,7 @@ #ifndef _LINUX_MINMAX_H #define _LINUX_MINMAX_H +#include #include #include @@ -135,27 +136,6 @@ #define max_t(type, x, y) __careful_cmp((type)(x), (type)(y), >) /* - * Remove a const qualifier from integer types - * _Generic(foo, type-name: association, ..., default: association) performs a - * comparison against the foo type (not the qualified type). - * Do not use the const keyword in the type-name as it will not match the - * unqualified type of foo. - */ -#define __unconst_integer_type_cases(type) \ - unsigned type: (unsigned type)0, \ - signed type: (signed type)0 - -#define __unconst_integer_typeof(x) typeof( \ - _Generic((x), \ - char: (char)0, \ - __unconst_integer_type_cases(char), \ - __unconst_integer_type_cases(short), \ - __unconst_integer_type_cases(int), \ - __unconst_integer_type_cases(long), \ - __unconst_integer_type_cases(long long), \ - default: (x))) - -/* * Do not check the array parameter using __must_be_array(). * In the following legit use-case where the "array" passed is a simple pointer, * __must_be_array() will return a failure. @@ -169,13 +149,13 @@ * 'int *buff' and 'int buff[N]' types. * * The array can be an array of const items. - * typeof() keeps the const qualifier. Use __unconst_integer_typeof() in order + * typeof() keeps the const qualifier. Use __unqual_scalar_typeof() in order * to discard the const qualifier for the __element variable. */ #define __minmax_array(op, array, len) ({ \ typeof(&(array)[0]) __array = (array); \ typeof(len) __len = (len); \ - __unconst_integer_typeof(__array[0]) __element = __array[--__len]; \ + __unqual_scalar_typeof(__array[0]) __element = __array[--__len];\ while (__len--) \ __element = op(__element, __array[__len]); \ __element; }) _ Patches currently in -mm which might be from andriy.shevchenko@linux.intel.com are