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 31E4A377575; Mon, 4 May 2026 14:12:57 +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=1777903977; cv=none; b=E81sLAz3RT6UIgLShKy09SfuTZvvQnaKNCKHuomRv3/7sYruBGTjqVInMy/vFrpNxAsJqo8kYD319+Q0SwoenkGQ/HN8lm7Ud3uakGpRNl2ZfMD02R6OnWu9FYlhsOiDui6oX4RPQvFyiNa9ZDRmyChj7jcZojnbi90ZPhfuvZI= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777903977; c=relaxed/simple; bh=pK5RDLhy6Gd5U+lVpptXY8eNfSK47hLT6p2DSVyyZec=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=kjWGXi53rbtF//EBqwkLAar7mCG5r0piUbSQL4T4jCa6CWlK70pf+dKOfvTmlkNtMvNe/SOaJHBrjgANiKk8CEdAPpTIMEYQDJkDJvp4HCXvGL3leAggL3oRK1RgoHUp4/jFKxNh86+Mqur+LbxDtYrAckVZJhvjyQRXA3aF92M= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=KqUTbNjx; 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="KqUTbNjx" Received: by smtp.kernel.org (Postfix) with ESMTPSA id B2D70C2BCB8; Mon, 4 May 2026 14:12:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1777903977; bh=pK5RDLhy6Gd5U+lVpptXY8eNfSK47hLT6p2DSVyyZec=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=KqUTbNjxZbkzrvfvxUUZfdvEE0oRbtxGHE/pLEz0IIue5AKBGTnJLAKn44HPncN9B Y64ye8zDdUUnCp/Ug89iA5aUgZIC3dRGbdnUzTk2bggcTnyugyWA3GKWOFr7lKw360 IGCnPKFcw/9aqC0YAKlye3heb+X9IgygUZVuhklw= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Arnd Bergmann , Thorsten Blum , Jarkko Sakkinen Subject: [PATCH 6.18 136/275] tpm: avoid -Wunused-but-set-variable Date: Mon, 4 May 2026 15:51:16 +0200 Message-ID: <20260504135147.957561975@linuxfoundation.org> X-Mailer: git-send-email 2.54.0 In-Reply-To: <20260504135142.929052779@linuxfoundation.org> References: <20260504135142.929052779@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.18-stable review patch. If anyone has any objections, please let me know. ------------------ From: Arnd Bergmann commit 6f1d4d2ecfcd1b577dc87350ea965fe81f272e83 upstream. Outside of the EFI tpm code, the TPM_MEMREMAP()/TPM_MEMUNMAP functions are defined as trivial macros, leading to the mapping_size variable ending up unused: In file included from drivers/char/tpm/tpm-sysfs.c:16: In file included from drivers/char/tpm/tpm.h:28: include/linux/tpm_eventlog.h:167:6: error: variable 'mapping_size' set but not used [-Werror,-Wunused-but-set-variable] 167 | int mapping_size; Turn the stubs into inline functions to avoid this warning. Cc: stable@vger.kernel.org # v5.3+ Fixes: c46f3405692d ("tpm: Reserve the TPM final events table") Signed-off-by: Arnd Bergmann Reviewed-by: Thorsten Blum Reviewed-by: Jarkko Sakkinen Signed-off-by: Jarkko Sakkinen Signed-off-by: Greg Kroah-Hartman --- include/linux/tpm_eventlog.h | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) --- a/include/linux/tpm_eventlog.h +++ b/include/linux/tpm_eventlog.h @@ -131,11 +131,16 @@ struct tcg_algorithm_info { }; #ifndef TPM_MEMREMAP -#define TPM_MEMREMAP(start, size) NULL +static inline void *TPM_MEMREMAP(unsigned long start, size_t size) +{ + return NULL; +} #endif #ifndef TPM_MEMUNMAP -#define TPM_MEMUNMAP(start, size) do{} while(0) +static inline void TPM_MEMUNMAP(void *mapping, size_t size) +{ +} #endif /**