nv-tegra-mirror/linux-nv-oot
1
0
Fork 0
mirror of git://nv-tegra.nvidia.com/linux-nv-oot.git synced 2025-12-24 10:11:26 +03:00
Code Issues Packages Projects Releases Wiki Activity

trace: Fix build for Linux v6.10

Browse Source 
In Linux v6.10, the __assign_str() macro was updated to remove the 2nd
argument. Add a test to the conftest script to detect this and update
the various trace header files as necessary.

Bug 4593750

Change-Id: I495e78658249baa84cca5b864f4e172c1f3f0838
Signed-off-by: Jon Hunter <jonathanh@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/c/linux-nv-oot/+/3152310
Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>
Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com>
This commit is contained in:
Jon Hunter
2024-06-06 11:39:48 +01:00
committed by mobile promotions
parent 4e62fd7ed9
commit 083d7038d1
6 changed files with 94 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
include/trace/events/camera_common.h
View File

@@ -1,7 +1,7 @@
/* SPDX-License-Identifier: GPL-2.0-only */
/*
* Copyright (c) 2017-2023, NVIDIA CORPORATION, All rights reserved.
*/
/* SPDX-FileCopyrightText: Copyright (c) 2017-2024 NVIDIA CORPORATION & AFFILIATES. All rights reserved. */
#include <nvidia/conftest.h>
#undef TRACE_SYSTEM
#define TRACE_SYSTEM camera_common
@@ -22,7 +22,11 @@ DECLARE_EVENT_CLASS(channel_simple,
__string(name, name)
),
TP_fast_assign(
#if defined(NV___ASSIGN_STR_HAS_NO_SRC_ARG)
__assign_str(name);
#else
__assign_str(name, name);
#endif
),
TP_printk("%s", __get_str(name))
);
@@ -50,7 +54,11 @@ DECLARE_EVENT_CLASS(channel,
__field(int, num)
),
TP_fast_assign(
#if defined(NV___ASSIGN_STR_HAS_NO_SRC_ARG)
__assign_str(name);
#else
__assign_str(name, name);
#endif
__entry->num = num;
),
TP_printk("%s : 0x%x", __get_str(name), (int)__entry->num)
@@ -110,7 +118,11 @@ DECLARE_EVENT_CLASS(frame,
__field(long, tv_nsec)
),
TP_fast_assign(
#if defined(NV___ASSIGN_STR_HAS_NO_SRC_ARG)
__assign_str(str);
#else
__assign_str(str, str);
#endif
__entry->tv_sec = ts->tv_sec;
__entry->tv_nsec = ts->tv_nsec;
),