From patchwork Mon Oct 2 14:34:05 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Laight X-Patchwork-Id: 147326 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:2a8e:b0:403:3b70:6f57 with SMTP id in14csp1478554vqb; Mon, 2 Oct 2023 07:50:45 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGTpbPeUvHtP43DukJqdQuUaPUhIBBJ0HkbC1w8u4+2/CqavfcBY1X7jrUEjDTfNk18rEDG X-Received: by 2002:a17:903:1cf:b0:1b8:94e9:e7b0 with SMTP id e15-20020a17090301cf00b001b894e9e7b0mr12279572plh.9.1696258245345; Mon, 02 Oct 2023 07:50:45 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1696258245; cv=none; d=google.com; s=arc-20160816; b=iAOJdtIKONmIv8q3HEVPB3vvUhB69f7RNa/C+24fEKqHvSu2x/qg10g6xujqo4lyI6 g4SA1NcQLNjBgNv00jTcmc+YJ4GZS1OY42/7oM0KguNR615+sMKGPsPTG6SznANaybgQ N2XcxXbYDw1YkKyip7JXpW0XT13QG4XTlqLbaK8NZUHiRFL+3D+IVNTfBMn3mSS0RVzk D3Qc6ogNbqUsl59gRa5gtid6bOuU+Xr1QZaNIOFmjJX5UqMWBNxYPDaUwdRAZXOV9Bkc pQWcM5X+SO/LMQ3XtZQXmoo1CbKJrFSzDPqDHQtE/lSpHeLCcJm5rjxoyoDVnlxyUvVj JtsA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:content-language :mime-version:accept-language:message-id:date:thread-index :thread-topic:subject:cc:to:from; bh=vd9+v2DkRsbj4UnC9RsKGhwSm4jgUapqgudsLl9BJQw=; fh=fO40NsRcNIaP8koSV01GAddG0gmrZB11gTzM2cignlo=; b=mXRIXaYRZ+KtzGI4mkYv99q70bImcWX8q5I/dsNa3Q8S0tP5T5/pOjLpd+yUchHUoz +g6MIJKFHsJH032Mm1+bAw6lEQgV2kHR2//C+08kumMzEqWXCv7VctvxAGDGKTu/VWYO cre0LhUFFVl/vBJIlEfwC7nZPYLnv9SKUbv9EFmZMtqXTLPbQwsbYrHqbALOu3isFpYQ ++xgrtLdsfCL1HvgXYfywfGQiDe2IrtXScbV+QQ48J7Vvw2hoG5gS8tWAe6CrSBHN77T Nwz6IDdArpOx8zf4qtzBJxssqTlrjr/Lazb0SUFgYRNjgVFMXfSUy+ZHEnIc3mkSY2GV L8aQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=aculab.com Received: from snail.vger.email (snail.vger.email. [2620:137:e000::3:7]) by mx.google.com with ESMTPS id lg7-20020a170902fb8700b001c60d1de681si19491719plb.108.2023.10.02.07.50.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 02 Oct 2023 07:50:45 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 as permitted sender) client-ip=2620:137:e000::3:7; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=aculab.com Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by snail.vger.email (Postfix) with ESMTP id 1885380E73D6; Mon, 2 Oct 2023 07:34:17 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at snail.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237691AbjJBOeQ convert rfc822-to-8bit (ORCPT + 18 others); Mon, 2 Oct 2023 10:34:16 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57110 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237538AbjJBOeP (ORCPT ); Mon, 2 Oct 2023 10:34:15 -0400 Received: from eu-smtp-delivery-151.mimecast.com (eu-smtp-delivery-151.mimecast.com [185.58.86.151]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E244FAD for ; Mon, 2 Oct 2023 07:34:11 -0700 (PDT) Received: from AcuMS.aculab.com (156.67.243.121 [156.67.243.121]) by relay.mimecast.com with ESMTP with both STARTTLS and AUTH (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id uk-mta-323-BFh42y3gPLOfgOGwjWsmYQ-1; Mon, 02 Oct 2023 15:34:07 +0100 X-MC-Unique: BFh42y3gPLOfgOGwjWsmYQ-1 Received: from AcuMS.Aculab.com (10.202.163.4) by AcuMS.aculab.com (10.202.163.4) with Microsoft SMTP Server (TLS) id 15.0.1497.48; Mon, 2 Oct 2023 15:34:05 +0100 Received: from AcuMS.Aculab.com ([::1]) by AcuMS.aculab.com ([::1]) with mapi id 15.00.1497.048; Mon, 2 Oct 2023 15:34:05 +0100 From: David Laight To: "linux-kernel@vger.kernel.org" CC: "'linux@rasmusvillemoes.dk'" , 'Steven Rostedt' , "keescook@chromium.org" , "'bvanassche@acm.org'" , "torvalds@linux-foundation.org" , Nathan Chancellor , "Nick Desaulniers" , Arnd Bergmann , "akpm@linux-foundation.org" Subject: [PATCH next] compiler.h: Move __is_constexpr() to compiler.h. Thread-Topic: [PATCH next] compiler.h: Move __is_constexpr() to compiler.h. Thread-Index: Adn1PNrdhhFKapOtSdeAhH/r8REupw== Date: Mon, 2 Oct 2023 14:34:05 +0000 Message-ID: <6d2b584e26544ee6a0810e494352d432@AcuMS.aculab.com> Accept-Language: en-GB, en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-ms-exchange-transport-fromentityheader: Hosted x-originating-ip: [10.202.205.107] MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: aculab.com Content-Language: en-US X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H5,RCVD_IN_MSPIKE_WL,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (snail.vger.email [0.0.0.0]); Mon, 02 Oct 2023 07:34:17 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1778655685779298324 X-GMAIL-MSGID: 1778655685779298324 Prior to f747e6667ebb2 __is_constexpr() was in its only user minmax.h. That commit moved it to const.h - but that file just defined ULL(x) and UL(x) so that constants can be defined for .S and .c files. So apart from the word 'const' it wasn't really a good location. Instead move the definition to compiler.h just before the similar is_signed_type() and is_unsigned_type(). (Which were moved there by dcf8e5633e2e6) This may not be a good long-term home, but the three definitions belong together. Signed-off-by: David Laight --- This makes it possible to use __is_constexpr() inside is_signed_type() so that the result is constant integer expression for pointer types. In particular (void *)1 isn't constant enough. include/linux/compiler.h | 8 ++++++++ include/linux/const.h | 8 -------- tools/include/linux/const.h | 8 -------- 3 files changed, 8 insertions(+), 16 deletions(-) diff --git a/include/linux/compiler.h b/include/linux/compiler.h index d7779a18b24f..2efec9bfcc40 100644 --- a/include/linux/compiler.h +++ b/include/linux/compiler.h @@ -230,6 +230,14 @@ static inline void *offset_to_ptr(const int *off) /* &a[0] degrades to a pointer: a different type from an array */ #define __must_be_array(a) BUILD_BUG_ON_ZERO(__same_type((a), &(a)[0])) +/* + * This returns a constant expression while determining if an argument is + * a constant expression, most importantly without evaluating the argument. + * Glory to Martin Uecker + */ +#define __is_constexpr(x) \ + (sizeof(int) == sizeof(*(8 ? ((void *)((long)(x) * 0l)) : (int *)8))) + /* * Whether 'type' is a signed type or an unsigned type. Supports scalar types, * bool and also pointer types. diff --git a/include/linux/const.h b/include/linux/const.h index 435ddd72d2c4..81b8aae5a855 100644 --- a/include/linux/const.h +++ b/include/linux/const.h @@ -3,12 +3,4 @@ #include -/* - * This returns a constant expression while determining if an argument is - * a constant expression, most importantly without evaluating the argument. - * Glory to Martin Uecker - */ -#define __is_constexpr(x) \ - (sizeof(int) == sizeof(*(8 ? ((void *)((long)(x) * 0l)) : (int *)8))) - #endif /* _LINUX_CONST_H */ diff --git a/tools/include/linux/const.h b/tools/include/linux/const.h index 435ddd72d2c4..81b8aae5a855 100644 --- a/tools/include/linux/const.h +++ b/tools/include/linux/const.h @@ -3,12 +3,4 @@ #include -/* - * This returns a constant expression while determining if an argument is - * a constant expression, most importantly without evaluating the argument. - * Glory to Martin Uecker - */ -#define __is_constexpr(x) \ - (sizeof(int) == sizeof(*(8 ? ((void *)((long)(x) * 0l)) : (int *)8))) - #endif /* _LINUX_CONST_H */