From patchwork Fri Mar 28 20:29:16 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ben Hutchings X-Patchwork-Id: 876884 Received: from maynard.decadent.org.uk (maynard.decadent.org.uk [65.21.191.19]) (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 F2A911531C5 for ; Fri, 28 Mar 2025 20:29:19 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=65.21.191.19 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1743193762; cv=none; b=sjflPRbSfLAx/x9mdFTs/bIY6sYCKvuq1IbwpBvnlhHDfInKxIM/cT6g/PDJAIScbslunoaHkMC3fGci0aQM4DG+cSw3ctgoemRRZjdrJy2IYAnysGl3juNYiYfEhMi2Bn7jDd3oZJW+5LOr3Hctbb0jQJsS9GoXX+uCallzuLg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1743193762; c=relaxed/simple; bh=fWXgaxKeptKvwUIRzd4uyR2T+P3ORdiTS01RI347L/c=; h=Date:From:To:Cc:Subject:Message-ID:MIME-Version:Content-Type: Content-Disposition; b=q3PI2KBHKcylA/lMT4WCVNceFDju+FmMzLpTxabp2tndEUwNPJQd5ROrArclCd/GKVdi0K5DjDByPxMtEhGqBYfAxd4SMFLp375TSdolTdJXI7M1MPZ/mZNExwg7k6dxg97h1yiV+Ly8rpuxYzPsLTzrVYzZlqNpPpsZH2t+gRI= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=debian.org; spf=pass smtp.mailfrom=decadent.org.uk; arc=none smtp.client-ip=65.21.191.19 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=debian.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=decadent.org.uk Received: from [2a02:578:851f:1502:391e:c5f5:10e2:b9a3] (helo=deadeye) by maynard with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.96) (envelope-from ) id 1tyGKN-0006bX-0T; Fri, 28 Mar 2025 20:29:18 +0000 Received: from ben by deadeye with local (Exim 4.98.1) (envelope-from ) id 1tyGKK-000000006jp-2V2W; Fri, 28 Mar 2025 21:29:16 +0100 Date: Fri, 28 Mar 2025 21:29:16 +0100 From: Ben Hutchings To: "Luis Claudio R. Goncalves" Cc: linux-rt-users@vger.kernel.org Subject: [PATCH 5.10] rt: Fix buid issue in be2net Message-ID: Precedence: bulk X-Mailing-List: linux-rt-users@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Disposition: inline X-SA-Exim-Connect-IP: 2a02:578:851f:1502:391e:c5f5:10e2:b9a3 X-SA-Exim-Mail-From: ben@decadent.org.uk X-SA-Exim-Scanned: No (on maynard); SAEximRunCond expanded to false The problem described here is specific to v5.10-rt. The function be_cmd_unlock() includes the line: return spin_unlock_bh(...); In 5.10-rt, with CONFIG_PREEMPT_RT enabled, spin_unlock_bh() is a macro that doesn't expand to a valid expression, so this fails to compile. A similar issue was recently fixed in at_hdmac. Do the same thing here: make the spin_unlock_bh() and return 2 separate statements. Signed-off-by: Ben Hutchings --- drivers/net/ethernet/emulex/benet/be_cmds.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/drivers/net/ethernet/emulex/benet/be_cmds.c b/drivers/net/ethernet/emulex/benet/be_cmds.c index 9812a9a5d033..b3540b3d2862 100644 --- a/drivers/net/ethernet/emulex/benet/be_cmds.c +++ b/drivers/net/ethernet/emulex/benet/be_cmds.c @@ -875,10 +875,12 @@ static int be_cmd_lock(struct be_adapter *adapter) /* Must be used only in process context */ static void be_cmd_unlock(struct be_adapter *adapter) { - if (use_mcc(adapter)) - return spin_unlock_bh(&adapter->mcc_lock); - else + if (use_mcc(adapter)) { + spin_unlock_bh(&adapter->mcc_lock); + return; + } else { return mutex_unlock(&adapter->mbox_lock); + } } static struct be_mcc_wrb *be_cmd_copy(struct be_adapter *adapter,