History

Merge tag 'uml-for-7.1-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/uml/linux

Pull uml updates from Johannes Berg: "Mostly cleanups and small things, notably: - musl libc compatibility - vDSO installation fix - TLB sync race fix for recent SMP support - build fix for 32-bit with Clang 20/21" * tag 'uml-for-7.1-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/uml/linux: um: Disable GCOV_PROFILE_ALL on 32-bit UML with Clang 20/21 um: drivers: call kernel_strrchr() explicitly in cow_user.c um: Replace strncpy() with strnlen()+memcpy_and_pad() in strncpy_chunk_from_user() x86/um: fix vDSO installation um: Remove CONFIG_FRAME_WARN from x86_64_defconfig um: Fix pte_read() and pte_exec() for kernel mappings um: Fix potential race condition in TLB sync um: time-travel: clean up kernel-doc warnings um: avoid struct sigcontext redefinition with musl um: fix address-of CMSG_DATA() rvalue in stub

Linus Torvalds committed 6 months ago

Commit 065c4e62 parents b66cb4f 6522fe512 files · +33 −16Browse files

Showing the changes to include/uapi/linux (1 of 12 files). Show all

Unified · Split

include/uapi/linux/um_timetravel.h+5−1
@@ -56,6 +56,9 @@ enum um_timetravel_shared_mem_fds { · 55 unmodified lines
5656 * in the control message
5757 */
5858 UM_TIMETRAVEL_SHARED_LOGFD,
59+ /**
60+ * @UM_TIMETRAVEL_SHARED_MAX_FDS: number of fds listed here
61+ */
5962 UM_TIMETRAVEL_SHARED_MAX_FDS,
6063 };
6164
@@ -242,6 +245,7 @@ union um_timetravel_schedshm_client { · 180 unmodified lines
242245 __u64 req_time;
243246 __u64 name;
244247 };
248+ /* private: */
245249 char reserve[128]; /* reserved for future usage */
246250 };
247251
@@ -264,7 +268,7 @@ union um_timetravel_schedshm_client { · 16 unmodified lines
264268 * is made by any client. Clients also must update this value when they
265269 * insert/update an own request into the shared memory while not running
266270 * themselves, and the new request is before than the current value.
267− * current_time: Current time, can only be set by the client in running state
271+ * @current_time: Current time, can only be set by the client in running state
268272 * (indicated by @running_id), though that client may only run until @free_until,
269273 * so it must remain smaller than @free_until.
270274 * @running_id: The current client in state running, set before a client is