Received: by 2002:a05:6358:4e97:b0:b3:742d:4702 with SMTP id ce23csp2813853rwb; Mon, 15 Aug 2022 11:52:55 -0700 (PDT) X-Google-Smtp-Source: AA6agR6NhZpwg7yFWkjFfULfPIBkrmHo77CJ0b2QYcVs5lHNWap7B+8Mc/FKImMOb/q+/6DdEXmr X-Received: by 2002:a17:907:c12:b0:731:6473:baf6 with SMTP id ga18-20020a1709070c1200b007316473baf6mr10945623ejc.522.1660589575371; Mon, 15 Aug 2022 11:52:55 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1660589575; cv=none; d=google.com; s=arc-20160816; b=S6LNoUpevzpRyGkYyFX3BnjQzhORIyxbCR/pOsQuWsA0L2UEgIQZrN5rpRvsz4FAtl ftiQFEvAdLm7hO+rsXQEhxEMuvpuqHvEVyi4yWkwlnzGTaElGRqd1be1JrOZQmMqcSVc rSKPe7zyuZA8lazleMtBzIz+/cEuglJTx0fqu/cMuWMVSqHIyrojd5/fmQYDvTWE/80D +KnNwHiwIz22YKlGwkb9AawU0G5N4myacHqtMkDeWEh3MnzzGqlEGwyUtkOimbEaPbjU n5Lt7e9atemy1KBo3/8dIC1tix7OoO6wiHOAjE3sAc0nWnw7NMgzuQpPTDQlaA43uWqi Uhgg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=NpdPwSziyJlzsXejbwMypJH+iFBM7Fp0iPXj5iC8tDo=; b=faQWXtAehvBxBgBWjJ/y1Te9pU4dA99K593WN7g7HUPtHJQ9DRndAhjKIECpMQm9O6 8I0c2QRHCFOZe0q3mJ1cT03JAGRCekkS+qXQioVR20+tnM9sPtyeuR8fRvi67FHM5mHO HtUF70qgnoP9g0oIod2XOfLN9ZxOHI+CK5XxidKz18pLYwPiqgZl9XSh452uZzbwm3Ai XggzUdoYeafgUDADn0rfRCbyyRXR2F8+VckkdoO8RyY6k1y8DM3pBbiwhnsOHX6vDJbG 287U1sERJOY+nDoRoCOhGBC/s90HjcSEkgP/eDqyG2JqykxiA4JrMTuk9rS4n7poX715 kUhg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=N0lnTMnK; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id w20-20020a056402269400b0043c23c5d892si9667193edd.444.2022.08.15.11.52.25; Mon, 15 Aug 2022 11:52:55 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=N0lnTMnK; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S240733AbiHOSVe (ORCPT + 99 others); Mon, 15 Aug 2022 14:21:34 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41592 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233670AbiHOSUY (ORCPT ); Mon, 15 Aug 2022 14:20:24 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 926DB2A735; Mon, 15 Aug 2022 11:16: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 dfw.source.kernel.org (Postfix) with ESMTPS id 32C1D612A3; Mon, 15 Aug 2022 18:16:41 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 3B01BC43470; Mon, 15 Aug 2022 18:16:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1660587400; bh=36kaqV//Q65MyMm68X4c+Dpwi17dNDifBxO1QrGo2o8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=N0lnTMnKnrchyyRCb1uDQsh1144vgP4dJPIQW2x1sXPXgSP8tUBf2DoKJtfFkS9VO 0zW1rge3BHQllOtJwzLdzi/7WcFtqyWDttyfComR3AxRaXw4pCBG1Hqd80tdSVwANy 6etzfJ48Pv5FDE4YgBFGcWLh7QD4VVr3NvRuTSgE= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Benjamin Beichler , Richard Weinberger Subject: [PATCH 5.15 074/779] um: Remove straying parenthesis Date: Mon, 15 Aug 2022 19:55:18 +0200 Message-Id: <20220815180340.462895841@linuxfoundation.org> X-Mailer: git-send-email 2.37.2 In-Reply-To: <20220815180337.130757997@linuxfoundation.org> References: <20220815180337.130757997@linuxfoundation.org> User-Agent: quilt/0.67 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-7.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE 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 From: Benjamin Beichler commit c6496e0a4a90d8149203c16323cff3fa46e422e7 upstream. Commit e3a33af812c6 ("um: fix and optimize xor select template for CONFIG64 and timetravel mode") caused a build regression when CONFIG_XOR_BLOCKS and CONFIG_UML_TIME_TRAVEL_SUPPORT are selected. Fix it by removing the straying parenthesis. Cc: stable@vger.kernel.org Fixes: e3a33af812c6 ("um: fix and optimize xor select template for CONFIG64 and timetravel mode") Signed-off-by: Benjamin Beichler [rw: Added commit message] Signed-off-by: Richard Weinberger Signed-off-by: Greg Kroah-Hartman --- arch/um/include/asm/xor.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- 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