Received: by 2002:a05:6358:4e97:b0:b3:742d:4702 with SMTP id ce23csp2891640rwb; Mon, 15 Aug 2022 13:26:14 -0700 (PDT) X-Google-Smtp-Source: AA6agR5XGXR/yV7ednGhzweBB2Jdb0tmyFoH8mAPZ8tHAgXvVYMYip3Umj2E+yVF457Jb+BXa3kX X-Received: by 2002:a05:6402:14cf:b0:43c:f7bd:181c with SMTP id f15-20020a05640214cf00b0043cf7bd181cmr15812512edx.163.1660595174706; Mon, 15 Aug 2022 13:26:14 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1660595174; cv=none; d=google.com; s=arc-20160816; b=aGGjCYD01SrfIfkX1ghJh9nS1N0HWxpKiXEo/PQPn4yD67DvAqXpRYdwAu1b5twBfi 5PF2CzJNxySbmQM7tr/scgB1Lh411JClST8gmwT22zirpbxO8VsPF9sjQjBUauwyudaM mVvh3PP1gzfEV/QJMIEUDRzV1iCPmmLzwTP3AU9eg3SU3AzZ7yiAtXXyOSCeVJVMgXhO xW3vTxgteNJrIbU91nUUoUEK2FZUu6v3Hk9EGg4oBRGHdE7LYdBAki6KfKJFyax7TQWS XzDrKbD9N5LZab9w14of0ZQ/pwglsSk9kCvXpUszQnXVhafG9LOvXQOKOm32ihH9Y0dF aKcA== 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=QhKBnVcSC8yG3lb1ggElaYpSlwK7vLqRhA4bENTs/4/QQeDVBfhhU3aDhQewbl1Hel p+OMhBQGQW+jrKBm1M3aeT1EgIGSI5ImYUWQ5uPDVAC6XKHEg1WYj5duTndo6o2jlYeB xlDInPe1EWoBlVlZVCesRDJEs8UhLPwnr24OYNj6/AZAH1EOnh5X1bNYDFrz9mHkMOpj QBTGiIxqMBnZ3maq9lT+/cENvvUoRmwslB900TmWvuDZyz48bL1yQnUNlfK7Fm79sHhL u4x5Y4rYf2/Zv4nTriG62fQIBKQgLQiV3PDOh6vPQ45QXnm9mBEz1IKePOnjxRFbam6P XJJA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=D7kHjisz; 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 n21-20020a05640206d500b004407104243csi7185197edy.153.2022.08.15.13.25.36; Mon, 15 Aug 2022 13:26:14 -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=D7kHjisz; 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 S1346472AbiHOUPx (ORCPT + 99 others); Mon, 15 Aug 2022 16:15:53 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52452 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1346963AbiHOUMl (ORCPT ); Mon, 15 Aug 2022 16:12:41 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [145.40.68.75]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8244B89827; Mon, 15 Aug 2022 11:58:40 -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 ams.source.kernel.org (Postfix) with ESMTPS id E3C9DB810A1; Mon, 15 Aug 2022 18:58:38 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 47208C43142; Mon, 15 Aug 2022 18:58:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1660589917; bh=36kaqV//Q65MyMm68X4c+Dpwi17dNDifBxO1QrGo2o8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=D7kHjiszInBAchIMzJFdati7s7AnQ5L5TY1yGaFUj27YrgQ5HVpC6ScBa++UQa+sj vy1WhvdcB8iVKGkwIU9FO16Nv53NiRgDvVRl7fbqLDvhQboVe6rxC6AHOYHziTLFcF cwqLgMqWx2UdR4DZwSgbyKWb/qEVOKyYYly6qaAM= 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.18 0090/1095] um: Remove straying parenthesis Date: Mon, 15 Aug 2022 19:51:29 +0200 Message-Id: <20220815180433.237855478@linuxfoundation.org> X-Mailer: git-send-email 2.37.2 In-Reply-To: <20220815180429.240518113@linuxfoundation.org> References: <20220815180429.240518113@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