From patchwork Tue Oct 27 13:52:43 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 289982 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=-12.8 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY, SPF_HELO_NONE, SPF_PASS, URIBL_BLOCKED, USER_AGENT_GIT autolearn=unavailable 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 5D0E2C5DF9D for ; Tue, 27 Oct 2020 14:40:46 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 0700D22258 for ; Tue, 27 Oct 2020 14:40:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1603809646; bh=R5PbW+sXDK7226DchEgeE2gG3rKu+u6XKrP7QE2j8nw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=UmcjQzGBQFDoKIx4YgZgO7DGkKfRt+uhIZGB0CwhVbep+07PrKOv1k3DUYS9hEhUu skJNFhD7HdxeHvKlHUHOqJ19TXXcHj13is4jRO9GckYi2eqfYPklGRf86NcZvjv8Ak wavbP9WJIeocv0RsdLrHRQGxViWs/lqfbLBg6NM4= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1761235AbgJ0Oik (ORCPT ); Tue, 27 Oct 2020 10:38:40 -0400 Received: from mail.kernel.org ([198.145.29.99]:37910 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1761246AbgJ0Oij (ORCPT ); Tue, 27 Oct 2020 10:38:39 -0400 Received: from localhost (83-86-74-64.cable.dynamic.v4.ziggo.nl [83.86.74.64]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 2F3C3206B2; Tue, 27 Oct 2020 14:38:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1603809518; bh=R5PbW+sXDK7226DchEgeE2gG3rKu+u6XKrP7QE2j8nw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=YjtHrhyKAklvlfxzHawaKhmyKqw5Q1PH23rf1qSQ6ihjarSdh9oUnZDPtMwt86Mvb BBoEvRMX1yQeqp6PMe+ZRATLox3WsYveTyBrveP2R/iuaiNj9EURJ+zznl/nO8dPeM uqO/du1srAqCKW1NzYUI2DuBbI1zcUM9mDj15aso= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Finn Thain , Stan Johnson , Michael Ellerman , Sasha Levin Subject: [PATCH 5.4 225/408] powerpc/tau: Remove duplicated set_thresholds() call Date: Tue, 27 Oct 2020 14:52:43 +0100 Message-Id: <20201027135505.514848387@linuxfoundation.org> X-Mailer: git-send-email 2.29.1 In-Reply-To: <20201027135455.027547757@linuxfoundation.org> References: <20201027135455.027547757@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Finn Thain [ Upstream commit 420ab2bc7544d978a5d0762ee736412fe9c796ab ] The commentary at the call site seems to disagree with the code. The conditional prevents calling set_thresholds() via the exception handler, which appears to crash. Perhaps that's because it immediately triggers another TAU exception. Anyway, calling set_thresholds() from TAUupdate() is redundant because tau_timeout() does so. Fixes: 1da177e4c3f41 ("Linux-2.6.12-rc2") Signed-off-by: Finn Thain Tested-by: Stan Johnson Signed-off-by: Michael Ellerman Link: https://lore.kernel.org/r/d7c7ee33232cf72a6a6bbb6ef05838b2e2b113c0.1599260540.git.fthain@telegraphics.com.au Signed-off-by: Sasha Levin --- arch/powerpc/kernel/tau_6xx.c | 5 ----- 1 file changed, 5 deletions(-) diff --git a/arch/powerpc/kernel/tau_6xx.c b/arch/powerpc/kernel/tau_6xx.c index 268205cc347da..b8d7e7d498e0a 100644 --- a/arch/powerpc/kernel/tau_6xx.c +++ b/arch/powerpc/kernel/tau_6xx.c @@ -110,11 +110,6 @@ static void TAUupdate(int cpu) #ifdef DEBUG printk("grew = %d\n", tau[cpu].grew); #endif - -#ifndef CONFIG_TAU_INT /* tau_timeout will do this if not using interrupts */ - set_thresholds(cpu); -#endif - } #ifdef CONFIG_TAU_INT