From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 39F7D222D72; Thu, 12 Dec 2024 17:37:01 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1734025021; cv=none; b=DCAoU5xMgcACQ9MSz5oYpXacA9Q9FgjhW0hmsmAU1x7rMUIc3uiYBg2C57LFcSXKZ9KIK9HcCBz3qhOxIZ4wguahoLmCvVmc+6kw52zQKLRMsnUqsW4x+8Q9W716I4QMWH3qo8oFv51A2Ms48nMb03GgMsKXMSK75z1PcVSKQ2Y= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1734025021; c=relaxed/simple; bh=Iu9XWtfayiAdw0CLfSQmtjX26CMm3ledKM+TPqf5csk=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Pob8NUYB0ANIWDysLWqoZTOXnfI0KquWRUG0Fw0zibazZzzER7ci5gB1SzfvpXFUqZN7T/wAsRGqjtNo9d9K+TfexGpGsd5wDbYQzgwhhgUtKw3u8OpGtxgY1X/mq7j/aFr4WRfKGmYiW+J3LqshOnRaOL04lfMi2uHaeHAPShk= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=fERhfqUA; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="fERhfqUA" Received: by smtp.kernel.org (Postfix) with ESMTPSA id B00DCC4CECE; Thu, 12 Dec 2024 17:37:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1734025021; bh=Iu9XWtfayiAdw0CLfSQmtjX26CMm3ledKM+TPqf5csk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=fERhfqUAlN1/0Rv4jeaQ4x2ohKT096wm/w3n9OokVo53OY9FXau8DBuUN3H+rBC3J 2gJYDO11hAWbpa61On2GKGBQ9l2Oi/lFZ+v8i4yTzQG5/UbrM+KEi+cUATZVGuSx7Z fO6dbvLQJ1pYlKvlVsELI+CQHQ3MdnW85guWqUJY= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Jonas Gorski , "Maciej W. Rozycki" , Thomas Bogendoerfer , Sasha Levin Subject: [PATCH 5.4 029/321] mips: asm: fix warning when disabling MIPS_FP_SUPPORT Date: Thu, 12 Dec 2024 15:59:07 +0100 Message-ID: <20241212144231.154424873@linuxfoundation.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20241212144229.291682835@linuxfoundation.org> References: <20241212144229.291682835@linuxfoundation.org> User-Agent: quilt/0.67 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 5.4-stable review patch. If anyone has any objections, please let me know. ------------------ From: Jonas Gorski [ Upstream commit da09935975c8f8c90d6f57be2422dee5557206cd ] When MIPS_FP_SUPPORT is disabled, __sanitize_fcr31() is defined as nothing, which triggers a gcc warning: In file included from kernel/sched/core.c:79: kernel/sched/core.c: In function 'context_switch': ./arch/mips/include/asm/switch_to.h:114:39: warning: suggest braces around empty body in an 'if' statement [-Wempty-body] 114 | __sanitize_fcr31(next); \ | ^ kernel/sched/core.c:5316:9: note: in expansion of macro 'switch_to' 5316 | switch_to(prev, next, prev); | ^~~~~~~~~ Fix this by providing an empty body for __sanitize_fcr31() like one is defined for __mips_mt_fpaff_switch_to(). Fixes: 36a498035bd2 ("MIPS: Avoid FCSR sanitization when CONFIG_MIPS_FP_SUPPORT=n") Signed-off-by: Jonas Gorski Reviewed-by: Maciej W. Rozycki Signed-off-by: Thomas Bogendoerfer Signed-off-by: Sasha Levin --- arch/mips/include/asm/switch_to.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/mips/include/asm/switch_to.h b/arch/mips/include/asm/switch_to.h index 09cbe9042828f..531eb245fc575 100644 --- a/arch/mips/include/asm/switch_to.h +++ b/arch/mips/include/asm/switch_to.h @@ -97,7 +97,7 @@ do { \ } \ } while (0) #else -# define __sanitize_fcr31(next) +# define __sanitize_fcr31(next) do { (void) (next); } while (0) #endif /* -- 2.43.0