diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2025-12-10 17:21:30 +0900 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2025-12-10 17:21:30 +0900 |
| commit | 0048fbb4011ec55c32d3148b2cda56433f273375 (patch) | |
| tree | 2129c56147e3b451eb2f7989d5fa40d7aac93eef /include | |
| parent | 2137cb863b8018710315138f40eefcceb8584d1b (diff) | |
| parent | c42ba5a87bdccbca11403b7ca8bad1a57b833732 (diff) | |
| download | tip-x86/boot.tar.gz | |
Merge tag 'locking-futex-2025-12-10' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tipx86/boot
Pull futex updates from Ingo Molnar:
- Standardize on ktime_t in restart_block::time as well (Thomas
Weißschuh)
- Futex selftests:
- Add robust list testcases (André Almeida)
- Formatting fixes/cleanups (Carlos Llamas)
* tag 'locking-futex-2025-12-10' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
futex: Store time as ktime_t in restart block
selftests/futex: Create test for robust list
selftests/futex: Skip tests if shmget unsupported
selftests/futex: Add newline to ksft_exit_fail_msg()
selftests/futex: Remove unused test_futex_mpol()
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/restart_block.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/restart_block.h b/include/linux/restart_block.h index 36ddfa1ec3010e..67d2bf5799428d 100644 --- a/include/linux/restart_block.h +++ b/include/linux/restart_block.h @@ -32,7 +32,7 @@ struct restart_block { u32 val; u32 flags; u32 bitset; - u64 time; + ktime_t time; u32 __user *uaddr2; } futex; /* For nanosleep */ |