Merge tag 'locking-urgent-2026-09-20' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tipgrafted

Pull futex fix from Ingo Molnar:

 - Also allocate a default private futex hash on vfork() as well, to
   avoid races with (private) futex waiters (Peter Zijlstra)

* tag 'locking-urgent-2026-09-20' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  futex: Also allocate private hash on vfork()

1 files changed, 53 insertions, 0 deletions

diff --git a/sound/soc/sof/trace.c b/sound/soc/sof/trace.c
new file mode 100644
index 000000000..fe6c67c01
--- /dev/null
+++ b/sound/soc/sof/trace.c
@@ -0,0 +1,53 @@
+// SPDX-License-Identifier: GPL-2.0-only
+//
+// Copyright(c) 2022 Intel Corporation
+
+#include "sof-priv.h"
+
+int sof_fw_trace_init(struct snd_sof_dev *sdev)
+{
+	const struct sof_ipc_fw_tracing_ops *fw_tracing = sof_ipc_get_ops(sdev, fw_tracing);
+
+	if (!fw_tracing) {
+		dev_info(sdev->dev, "Firmware tracing is not available\n");
+		sdev->fw_trace_is_supported = false;
+
+		return 0;
+	}
+
+	return fw_tracing->init(sdev);
+}
+
+void sof_fw_trace_free(struct snd_sof_dev *sdev)
+{
+	if (!sdev->fw_trace_is_supported)
+		return;
+
+	if (sdev->ipc->ops->fw_tracing->free)
+		sdev->ipc->ops->fw_tracing->free(sdev);
+}
+
+void sof_fw_trace_fw_crashed(struct snd_sof_dev *sdev)
+{
+	if (!sdev->fw_trace_is_supported)
+		return;
+
+	if (sdev->ipc->ops->fw_tracing->fw_crashed)
+		sdev->ipc->ops->fw_tracing->fw_crashed(sdev);
+}
+
+void sof_fw_trace_suspend(struct snd_sof_dev *sdev, pm_message_t pm_state)
+{
+	if (!sdev->fw_trace_is_supported)
+		return;
+
+	sdev->ipc->ops->fw_tracing->suspend(sdev, pm_state);
+}
+
+int sof_fw_trace_resume(struct snd_sof_dev *sdev)
+{
+	if (!sdev->fw_trace_is_supported)
+		return 0;
+
+	return sdev->ipc->ops->fw_tracing->resume(sdev);
+}