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 X-Spam-Level: X-Spam-Status: No, score=-5.6 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_PASS,URIBL_BLOCKED,USER_AGENT_MUTT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 39161C10F0E for ; Mon, 15 Apr 2019 16:35:17 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id F2E942087C for ; Mon, 15 Apr 2019 16:35:16 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=kroah.com header.i=@kroah.com header.b="O+0ieU2L"; dkim=pass (2048-bit key) header.d=messagingengine.com header.i=@messagingengine.com header.b="u6J0FSq0" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726785AbfDOQfQ (ORCPT ); Mon, 15 Apr 2019 12:35:16 -0400 Received: from out1-smtp.messagingengine.com ([66.111.4.25]:57733 "EHLO out1-smtp.messagingengine.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726094AbfDOQfQ (ORCPT ); Mon, 15 Apr 2019 12:35:16 -0400 Received: from compute6.internal (compute6.nyi.internal [10.202.2.46]) by mailout.nyi.internal (Postfix) with ESMTP id AF5D7220AA; Mon, 15 Apr 2019 12:35:15 -0400 (EDT) Received: from mailfrontend2 ([10.202.2.163]) by compute6.internal (MEProxy); Mon, 15 Apr 2019 12:35:15 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kroah.com; h= date:from:to:cc:subject:message-id:references:mime-version :content-type:in-reply-to; s=fm3; bh=Oq28iQZ3gsVODQzcrH7i8IJryKP 2TJys8AF7J8Z3bGM=; b=O+0ieU2LOSM6GJRd4T/QqoEhV3MqAN5vG0mNBgcaz03 u2R62ADMICdZVMCFtuXjlkl51CzJcib6vG9VR0ckAF/Y5Q1YOHc/aSc/n9l1p/gK SwutXZSGtj0rUPHYMEa8ooTp1YMVO2Cl44QP3Ze47Qn2h0ZasN8jgiNJoXIRvzrm dcXQKXciCAQMLggJkaRTOo311dqq5F5IyIvAO7o94Od0emL23cR6FpjgYkvHm559 9u2DjZix29h1Vi+8xTCwkJgWRYcXtZTC1l24k/wxkmuXNf97SnfierzKKiK2wPib hVXxk6l9iW7lNQoJnYiM02NrI1bUS8bWhsx45/uJXjg== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to:x-me-proxy :x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s=fm2; bh=Oq28iQ Z3gsVODQzcrH7i8IJryKP2TJys8AF7J8Z3bGM=; b=u6J0FSq05r6eep7YKX1TSY DTS7R5ohIv0LsYbzto6ytnZAY6VUCqztQC8+AJe/DbwUksOmIkQMEPkY1q8HgRzm RIx/W544R55G1SoSHVYN6/XhKbCOi1NWL0tw1m1Q3Og+XVzP6isp3zv7fBISdG2/ YVlLpV0oBcncALo1/ryazjw7jhMyth56zrZFqzCLZv5CCS038d6xNUTII+hODKES YmOZJtlMcETKTR2MC83q17w1xl3tcbsyfLAdfvi5xJD14Qn7WgTOG8MP8z2E0+OG WDCA+YI14mQdaWKMFpPiQ9PlFDJgrczImWic+uoIgMEppjhVWGgiX1EfimtF+xIA == X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeduuddrvdelgddutddvucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmne cujfgurhepfffhvffukfhfgggtuggjfgesthdtredttdervdenucfhrhhomhepifhrvghg ucfmjfcuoehgrhgvgheskhhrohgrhhdrtghomheqnecukfhppeekfedrkeeirdekledrud dtjeenucfrrghrrghmpehmrghilhhfrhhomhepghhrvghgsehkrhhorghhrdgtohhmnecu vehluhhsthgvrhfuihiivgeptd X-ME-Proxy: Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) by mail.messagingengine.com (Postfix) with ESMTPA id 4B5BA10380; Mon, 15 Apr 2019 12:35:14 -0400 (EDT) Date: Mon, 15 Apr 2019 18:35:12 +0200 From: Greg KH To: Sasha Levin Cc: Michael Neuling , stable@vger.kernel.org, Fredrik Noring , Breno Leitao , Christoph Biedl , Michael Ellerman Subject: Re: [PATCH 4.19] powerpc/tm: Limit TM code inside PPC_TRANSACTIONAL_MEM Message-ID: <20190415163512.GA23591@kroah.com> References: <20190408063238.16181-1-mikey@neuling.org> <20190408144552.GF4689@sasha-vm> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20190408144552.GF4689@sasha-vm> User-Agent: Mutt/1.11.4 (2019-03-13) Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org On Mon, Apr 08, 2019 at 10:45:52AM -0400, Sasha Levin wrote: > On Mon, Apr 08, 2019 at 04:32:38PM +1000, Michael Neuling wrote: > > From: Breno Leitao > > > > commit 897bc3df8c5aebb54c32d831f917592e873d0559 upstream. > > > > Commit e1c3743e1a20 ("powerpc/tm: Set MSR[TS] just prior to recheckpoint") > > moved a code block around and this block uses a 'msr' variable outside of > > the CONFIG_PPC_TRANSACTIONAL_MEM, however the 'msr' variable is declared > > inside a CONFIG_PPC_TRANSACTIONAL_MEM block, causing a possible error when > > CONFIG_PPC_TRANSACTION_MEM is not defined. > > > > error: 'msr' undeclared (first use in this function) > > > > This is not causing a compilation error in the mainline kernel, because > > 'msr' is being used as an argument of MSR_TM_ACTIVE(), which is defined as > > the following when CONFIG_PPC_TRANSACTIONAL_MEM is *not* set: > > > > #define MSR_TM_ACTIVE(x) 0 > > > > This patch just fixes this issue avoiding the 'msr' variable usage outside > > the CONFIG_PPC_TRANSACTIONAL_MEM block, avoiding trusting in the > > MSR_TM_ACTIVE() definition. > > > > Cc: stable@vger.kernel.org > > Reported-by: Christoph Biedl > > Fixes: e1c3743e1a20 ("powerpc/tm: Set MSR[TS] just prior to recheckpoint") > > Signed-off-by: Breno Leitao > > Signed-off-by: Michael Ellerman > > Signed-off-by: Michael Neuling > > --- > > Greg: I think the original patch got rejected with a conflict. > > This correctly applies to v4.19.34. > > Thanks for the backport, I've queued it for 4.9-4.19 since the patch it > fixes is included in all of those. Thaks for queueing up all of these while I was away for a week, much appreciated. greg k-h