Message ID | 20220713135539.919429-1-Jason@zx2c4.com |
---|---|
State | Superseded |
Headers | show
Return-Path: <linux-um-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org> X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=pass (2048-bit key; secure) header.d=lists.infradead.org header.i=@lists.infradead.org header.a=rsa-sha256 header.s=bombadil.20210309 header.b=2xtdTcqU; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=zx2c4.com header.i=@zx2c4.com header.a=rsa-sha256 header.s=20210105 header.b=LpCif7I6; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=none (no SPF record) smtp.mailfrom=lists.infradead.org (client-ip=2607:7c80:54:3::133; helo=bombadil.infradead.org; envelope-from=linux-um-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org; receiver=<UNKNOWN>) Received: from bombadil.infradead.org (bombadil.infradead.org [IPv6:2607:7c80:54:3::133]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4LjfKj3y56z9ryY for <incoming@patchwork.ozlabs.org>; Wed, 13 Jul 2022 23:56:06 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:Message-Id:Date:Subject:Cc :To:From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References: List-Owner; bh=w5oMIvqF2XVHjQW8fkmJi3dc2pU1I/0/SunKDbI0jS8=; b=2xtdTcqUdxsBy4 dRXtuQTRRIB/FLgHVw+rTYBJy1GkGHjWwK7mMNTxX7RMpqWHmUGjNPzXlzTHjXccYz7dL0orIPFO8 qTVZL+EqrXjZBbT54Fyl0oUsmD9JzqrPIgnGjBgBbUJMmSiT9KP0Zj5Es078Aio0TSlfvfwuKWodk iCy3ZurwJohU1vnGTt+LV7mVfqPMogF+knsE4qkemuxNidLOo223k2Tb1p0nhXyA0/56G26XPCNOC IXSihy8ZgmTP3doWOlJKSu8fr+0DsxQ2lze4e7bu6sV4GneSYdsvExBmqsslCcUig0q7C/42VWP12 OE/FySOuG9ClrRg4w6yw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1oBcqD-0049Hk-N7; Wed, 13 Jul 2022 13:55:49 +0000 Received: from ams.source.kernel.org ([2604:1380:4601:e00::1]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1oBcq9-0049Bw-RP for linux-um@lists.infradead.org; Wed, 13 Jul 2022 13:55:47 +0000 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 729A9B81F66; Wed, 13 Jul 2022 13:55:44 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 9AF2CC34114; Wed, 13 Jul 2022 13:55:43 +0000 (UTC) Authentication-Results: smtp.kernel.org; dkim=pass (1024-bit key) header.d=zx2c4.com header.i=@zx2c4.com header.b="LpCif7I6" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=zx2c4.com; s=20210105; t=1657720541; h=from:from: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; bh=bawxo4wQSGz34zHaH54dBSzxxCoLrOF8mCeNb04Rm14=; b=LpCif7I6a9KEjcnOn0R4l//g3IiGbLp/2ehMOTGzXhHWltiluo5tYN0mgszeUy3mQ84Ldg R658zg4D3TizZSIv/KDx+sEOUDbS2Bhswc7ENI2rbK12NDoZQxZ7r66CqOymwebCrrREda sX/Ve7oQDI2VhP/qlZGr+3Npjnm78+Q= Received: by mail.zx2c4.com (ZX2C4 Mail Server) with ESMTPSA id 8cc883ad (TLSv1.3:AEAD-AES256-GCM-SHA384:256:NO); Wed, 13 Jul 2022 13:55:41 +0000 (UTC) From: "Jason A. Donenfeld" <Jason@zx2c4.com> To: johannes@sipsolutions.net, linux-um@lists.infradead.org, linux-kernel@vger.kernel.org Cc: "Jason A. Donenfeld" <Jason@zx2c4.com> Subject: [PATCH] um: remove stray ) in macro expression Date: Wed, 13 Jul 2022 15:55:39 +0200 Message-Id: <20220713135539.919429-1-Jason@zx2c4.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220713_065546_441420_870D48FC X-CRM114-Status: GOOD ( 11.55 ) X-Spam-Score: -4.9 (----) X-Spam-Report: =?unknown-8bit?q?Spam_detection_software=2C_running_on_the_sy?= =?unknown-8bit?q?stem_=22bombadil=2Einfradead=2Eorg=22=2C?= =?unknown-8bit?q?_has_NOT_identified_this_incoming_email_as_spam=2E__The_ori?= =?unknown-8bit?q?ginal?= =?unknown-8bit?q?_message_has_been_attached_to_this_so_you_can_view_it_or_la?= =?unknown-8bit?q?bel?= =?unknown-8bit?q?_similar_future_email=2E__If_you_have_any_questions=2C_see?= =?unknown-8bit?q?_the_administrator_of_that_system_for_details=2E?= =?unknown-8bit?q?_?= =?unknown-8bit?q?_Content_preview=3A__A_commit_erroneously_added_a_stray_=29?= =?unknown-8bit?q?=2C_causing_compile_errors=3A?= =?unknown-8bit?q?_In_file_included_from_/home/zx2c4/Projects/wireguard-linux?= =?unknown-8bit?q?/crypto/xor=2Ec=3A17=3A?= =?unknown-8bit?q?_/home/zx2c4/Projects/wireguard-linux/crypto/xor=2Ec=3A_In_?= =?unknown-8bit?q?function_=E2=80=98register=5Fxor=5Fblocks=E2=80=99=3A?= =?unknown-8bit?q?_/home/zx2c4/Projects/wireguard-lin_=5B=2E=2E=2E=5D_?= =?unknown-8bit?q?_?= =?unknown-8bit?q?_Content_analysis_details=3A___=28-4=2E9_points=2C_5=2E0_re?= =?unknown-8bit?q?quired=29?= =?unknown-8bit?q?_?= =?unknown-8bit?q?_pts_rule_name______________description?= =?unknown-8bit?q?_----_----------------------_------------------------------?= =?unknown-8bit?q?--------------------?= =?unknown-8bit?q?_-5=2E0_RCVD=5FIN=5FDNSWL=5FHI_______RBL=3A_Sender_listed_a?= =?unknown-8bit?q?t_https=3A//www=2Ednswl=2Eorg/=2C?= =?unknown-8bit?q?_high_trust?= =?unknown-8bit?b?IFsyNjA0OjEzODA6NDYwMTplMDA6MDowOjA6MSBsaXN0ZWQgaW5d?= =?unknown-8bit?b?IFtsaXN0LmRuc3dsLm9yZ10=?= =?unknown-8bit?q?_-0=2E0_SPF=5FPASS_______________SPF=3A_sender_matches_SPF_?= =?unknown-8bit?q?record?= =?unknown-8bit?q?_0=2E0_SPF=5FHELO=5FNONE__________SPF=3A_HELO_does_not_publ?= =?unknown-8bit?q?ish_an_SPF_Record?= =?unknown-8bit?q?_0=2E2_HEADER=5FFROM=5FDIFFERENT=5FDOMAINS_From_and_Envelop?= =?unknown-8bit?q?eFrom_2nd_level?= =?unknown-8bit?q?_mail_domains_are_different?= =?unknown-8bit?q?_-0=2E1_DKIM=5FVALID=5FAU__________Message_has_a_valid_DKIM?= =?unknown-8bit?q?_or_DK_signature_from?= =?unknown-8bit?q?_author=27s_domain?= =?unknown-8bit?q?_-0=2E1_DKIM=5FVALID_____________Message_has_at_least_one_v?= =?unknown-8bit?q?alid_DKIM_or_DK_signature?= =?unknown-8bit?q?_0=2E1_DKIM=5FSIGNED____________Message_has_a_DKIM_or_DK_si?= =?unknown-8bit?q?gnature=2C_not_necessarily?= =?unknown-8bit?q?_valid?= X-BeenThere: linux-um@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: <linux-um.lists.infradead.org> List-Unsubscribe: <http://lists.infradead.org/mailman/options/linux-um>, <mailto:linux-um-request@lists.infradead.org?subject=unsubscribe> List-Archive: <http://lists.infradead.org/pipermail/linux-um/> List-Post: <mailto:linux-um@lists.infradead.org> List-Help: <mailto:linux-um-request@lists.infradead.org?subject=help> List-Subscribe: <http://lists.infradead.org/mailman/listinfo/linux-um>, <mailto:linux-um-request@lists.infradead.org?subject=subscribe> Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Sender: "linux-um" <linux-um-bounces@lists.infradead.org> Errors-To: linux-um-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org |
Series |
um: remove stray ) in macro expression
|
expand
|
diff --git a/arch/um/include/asm/xor.h b/arch/um/include/asm/xor.h index 22b39de73c24..647fae200c5d 100644 --- a/arch/um/include/asm/xor.h +++ b/arch/um/include/asm/xor.h @@ -18,7 +18,7 @@ #undef XOR_SELECT_TEMPLATE /* pick an arbitrary one - measuring isn't possible with inf-cpu */ #define XOR_SELECT_TEMPLATE(x) \ - (time_travel_mode == TT_MODE_INFCPU ? TT_CPU_INF_XOR_DEFAULT : x)) + (time_travel_mode == TT_MODE_INFCPU ? TT_CPU_INF_XOR_DEFAULT : x) #endif #endif
A commit erroneously added a stray ), causing compile errors: In file included from /home/zx2c4/Projects/wireguard-linux/crypto/xor.c:17: /home/zx2c4/Projects/wireguard-linux/crypto/xor.c: In function ‘register_xor_blocks’: /home/zx2c4/Projects/wireguard-linux/arch/um/include/asm/xor.h:21:74: error: expected ‘;’ before ‘)’ token 21 | (time_travel_mode == TT_MODE_INFCPU ? TT_CPU_INF_XOR_DEFAULT : x)) | ^ /home/zx2c4/Projects/wireguard-linux/crypto/xor.c:66:27: note: in expansion of macro ‘XOR_SELECT_TEMPLATE’ 66 | active_template = XOR_SELECT_TEMPLATE(NULL); | ^~~~~~~~~~~~~~~~~~~ /home/zx2c4/Projects/wireguard-linux/arch/um/include/asm/xor.h:21:74: error: expected statement before ‘)’ token 21 | (time_travel_mode == TT_MODE_INFCPU ? TT_CPU_INF_XOR_DEFAULT : x)) | ^ /home/zx2c4/Projects/wireguard-linux/crypto/xor.c:66:27: note: in expansion of macro ‘XOR_SELECT_TEMPLATE’ 66 | active_template = XOR_SELECT_TEMPLATE(NULL); | ^~~~~~~~~~~~~~~~~~~ /home/zx2c4/Projects/wireguard-linux/crypto/xor.c: In function ‘calibrate_xor_blocks’: /home/zx2c4/Projects/wireguard-linux/arch/um/include/asm/xor.h:21:74: error: expected ‘;’ before ‘)’ token 21 | (time_travel_mode == TT_MODE_INFCPU ? TT_CPU_INF_XOR_DEFAULT : x)) | ^ /home/zx2c4/Projects/wireguard-linux/crypto/xor.c:124:19: note: in expansion of macro ‘XOR_SELECT_TEMPLATE’ 124 | fastest = XOR_SELECT_TEMPLATE(NULL); | ^~~~~~~~~~~~~~~~~~~ /home/zx2c4/Projects/wireguard-linux/arch/um/include/asm/xor.h:21:74: error: expected statement before ‘)’ token 21 | (time_travel_mode == TT_MODE_INFCPU ? TT_CPU_INF_XOR_DEFAULT : x)) | ^ /home/zx2c4/Projects/wireguard-linux/crypto/xor.c:124:19: note: in expansion of macro ‘XOR_SELECT_TEMPLATE’ 124 | fastest = XOR_SELECT_TEMPLATE(NULL); | ^~~~~~~~~~~~~~~~~~~ CC fs/namei.o make[3]: *** [/home/zx2c4/Projects/wireguard-linux/scripts/Makefile.build:249: crypto/xor.o] Error 1 make[3]: *** Waiting for unfinished jobs.... Fixes: e3a33af812c6 ("um: fix and optimize xor select template for CONFIG64 and timetravel mode") Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com> --- arch/um/include/asm/xor.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)