From efeecacbd1e623c8e9bcb88e94bf4354ddfe8b70 Mon Sep 17 00:00:00 2001 From: Jon Hunter Date: Wed, 4 Dec 2024 09:04:24 +0000 Subject: [PATCH] tegra: rtcpu: Fix build for Linux v6.12 In Linux v6.12 the definition 'no_llseek' was finally removed. Since Linux v6.0 it had been redefined as NULL. Add a test to conftest to determine if 'no_llseek' is present and if not then it is no longer necessary to populate this and we can leave as NULL. Bug 4876974 Change-Id: Idc0f5eff6f95f404a24b6d795f6a9460b99639e4 Signed-off-by: Jon Hunter Reviewed-on: https://git-master.nvidia.com/r/c/linux-nv-oot/+/3261670 Reviewed-by: svcacv GVS: buildbot_gerritrpt Reviewed-by: Pushpesh Pranjal --- drivers/platform/tegra/rtcpu/tegra-rtcpu-trace.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/drivers/platform/tegra/rtcpu/tegra-rtcpu-trace.c b/drivers/platform/tegra/rtcpu/tegra-rtcpu-trace.c index 08a6ced7..a6a0fa40 100644 --- a/drivers/platform/tegra/rtcpu/tegra-rtcpu-trace.c +++ b/drivers/platform/tegra/rtcpu/tegra-rtcpu-trace.c @@ -1,5 +1,7 @@ -// SPDX-License-Identifier: GPL-2.0 -// Copyright (c) 2022-2024, NVIDIA CORPORATION & AFFILIATES. All rights reserved. +// SPDX-License-Identifier: GPL-2.0-only +// SPDX-FileCopyrightText: Copyright (c) 2022-2024, NVIDIA CORPORATION & AFFILIATES. All rights reserved. + +#include #include "soc/tegra/camrtc-trace.h" #include @@ -1614,7 +1616,9 @@ static int rtcpu_raw_trace_release(struct inode *inode, struct file *file) static const struct file_operations rtcpu_raw_trace_fops = { .owner = THIS_MODULE, +#if defined(NV_NO_LLSEEK_PRESENT) .llseek = no_llseek, +#endif .read = rtcpu_raw_trace_read, .write = rtcpu_raw_trace_write, .poll = rtcpu_raw_trace_poll,