diff options
| author | Ingo Molnar <mingo@kernel.org> | 2020-01-06 07:51:15 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2020-01-06 07:51:15 +0100 |
| commit | 31c7ac388aa905a196ee16dff2015111f701f035 (patch) | |
| tree | 09a43dde7fbf30ce57eaf5ba7ebda84da961538d /Documentation/dev-tools | |
| parent | 28336be568bb473d16ba80db0801276fb4f1bbe5 (diff) | |
| parent | c79f46a282390e0f5b306007bf7b11a46d529538 (diff) | |
| download | linux-31c7ac388aa905a196ee16dff2015111f701f035.tar.bz2 | |
Merge tag 'v5.5-rc5' into locking/kcsan, to resolve conflict
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'Documentation/dev-tools')
| -rw-r--r-- | Documentation/dev-tools/kcov.rst | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/Documentation/dev-tools/kcov.rst b/Documentation/dev-tools/kcov.rst index 36890b026e77..1c4e1825d769 100644 --- a/Documentation/dev-tools/kcov.rst +++ b/Documentation/dev-tools/kcov.rst @@ -251,11 +251,11 @@ selectively from different subsystems. .. code-block:: c struct kcov_remote_arg { - unsigned trace_mode; - unsigned area_size; - unsigned num_handles; - uint64_t common_handle; - uint64_t handles[0]; + __u32 trace_mode; + __u32 area_size; + __u32 num_handles; + __aligned_u64 common_handle; + __aligned_u64 handles[0]; }; #define KCOV_INIT_TRACE _IOR('c', 1, unsigned long) |