The ungrafting from PRIO bug fixes in net, when merged into net-next, merge cleanly but create a build failure. The resolution used here is from Petr Machata.
Showing the changes to include/uapi/linux (1 of 232 files). Show all
Unified · Split
| @@ -9,11 +9,11 @@ · 8 unmodified lines | |||
| 9 | * and the comment before kcov_remote_start() for usage details. | 9 | * and the comment before kcov_remote_start() for usage details. |
| 10 | */ | 10 | */ |
| 11 | struct kcov_remote_arg { | 11 | struct kcov_remote_arg { |
| 12 | unsigned int trace_mode; /* KCOV_TRACE_PC or KCOV_TRACE_CMP */ | 12 | __u32 trace_mode; /* KCOV_TRACE_PC or KCOV_TRACE_CMP */ |
| 13 | unsigned int area_size; /* Length of coverage buffer in words */ | 13 | __u32 area_size; /* Length of coverage buffer in words */ |
| 14 | unsigned int num_handles; /* Size of handles array */ | 14 | __u32 num_handles; /* Size of handles array */ |
| 15 | __u64 common_handle; | 15 | __aligned_u64 common_handle; |
| 16 | __u64 handles[0]; | 16 | __aligned_u64 handles[0]; |
| 17 | }; | 17 | }; |
| 18 | 18 | ||
| 19 | #define KCOV_REMOTE_MAX_HANDLES 0x100 | 19 | #define KCOV_REMOTE_MAX_HANDLES 0x100 |