History

Merge tag 'mm-nonmm-stable-2025-01-24-23-16' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm

Pull non-MM updates from Andrew Morton: "Mainly individually changelogged singleton patches. The patch series in this pull are: - "lib min_heap: Improve min_heap safety, testing, and documentation" from Kuan-Wei Chiu provides various tightenings to the min_heap library code - "xarray: extract __xa_cmpxchg_raw" from Tamir Duberstein preforms some cleanup and Rust preparation in the xarray library code - "Update reference to include/asm-<arch>" from Geert Uytterhoeven fixes pathnames in some code comments - "Converge on using secs_to_jiffies()" from Easwar Hariharan uses the new secs_to_jiffies() in various places where that is appropriate - "ocfs2, dlmfs: convert to the new mount API" from Eric Sandeen switches two filesystems to the new mount API - "Convert ocfs2 to use folios" from Matthew Wilcox does that - "Remove get_task_comm() and print task comm directly" from Yafang Shao removes now-unneeded calls to get_task_comm() in various places - "squashfs: reduce memory usage and update docs" from Phillip Lougher implements some memory savings in squashfs and performs some maintainability work - "lib: clarify comparison function requirements" from Kuan-Wei Chiu tightens the sort code's behaviour and adds some maintenance work - "nilfs2: protect busy buffer heads from being force-cleared" from Ryusuke Konishi fixes an issues in nlifs when the fs is presented with a corrupted image - "nilfs2: fix kernel-doc comments for function return values" from Ryusuke Konishi fixes some nilfs kerneldoc - "nilfs2: fix issues with rename operations" from Ryusuke Konishi addresses some nilfs BUG_ONs which syzbot was able to trigger - "minmax.h: Cleanups and minor optimisations" from David Laight does some maintenance work on the min/max library code - "Fixes and cleanups to xarray" from Kemeng Shi does maintenance work on the xarray library code" * tag 'mm-nonmm-stable-2025-01-24-23-16' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm: (131 commits) ocfs2: use str_yes_no() and str_no_yes() helper functions include/linux/lz4.h: add some missing macros Xarray: use xa_mark_t in xas_squash_marks() to keep code consistent Xarray: remove repeat check in xas_squash_marks() Xarray: distinguish large entries correctly in xas_split_alloc() Xarray: move forward index correctly in xas_pause() Xarray: do not return sibling entries from xas_find_marked() ipc/util.c: complete the kernel-doc function descriptions gcov: clang: use correct function param names latencytop: use correct kernel-doc format for func params minmax.h: remove some #defines that are only expanded once minmax.h: simplify the variants of clamp() minmax.h: move all the clamp() definitions after the min/max() ones minmax.h: use BUILD_BUG_ON_MSG() for the lo < hi test in clamp() minmax.h: reduce the #define expansion of min(), max() and clamp() minmax.h: update some comments minmax.h: add whitespace around operators and after commas nilfs2: do not update mtime of renamed directory that is not moved nilfs2: handle errors that nilfs_prepare_chunk() may return CREDITS: fix spelling mistake ...

Linus Torvalds committed 1 year ago

Commit c159dfb2 parents baf29cc beeba1e179 files · +2501 −2093Browse files

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

Unified · Split

include/uapi/linux/taskstats.h+17−0
@@ -72,6 +72,8 @@ struct taskstats { · 71 unmodified lines
72 */72 */
73 __u64 cpu_count __attribute__((aligned(8)));73 __u64 cpu_count __attribute__((aligned(8)));
74 __u64 cpu_delay_total;74 __u64 cpu_delay_total;
75 __u64 cpu_delay_max;
76 __u64 cpu_delay_min;
75 77
76 /* Following four fields atomically updated using task->delays->lock */78 /* Following four fields atomically updated using task->delays->lock */
77 79
@@ -80,10 +82,14 @@ struct taskstats { · 2 unmodified lines
80 */82 */
81 __u64 blkio_count;83 __u64 blkio_count;
82 __u64 blkio_delay_total;84 __u64 blkio_delay_total;
85 __u64 blkio_delay_max;
86 __u64 blkio_delay_min;
83 87
84 /* Delay waiting for page fault I/O (swap in only) */88 /* Delay waiting for page fault I/O (swap in only) */
85 __u64 swapin_count;89 __u64 swapin_count;
86 __u64 swapin_delay_total;90 __u64 swapin_delay_total;
91 __u64 swapin_delay_max;
92 __u64 swapin_delay_min;
87 93
88 /* cpu "wall-clock" running time94 /* cpu "wall-clock" running time
89 * On some architectures, value will adjust for cpu time stolen95 * On some architectures, value will adjust for cpu time stolen
@@ -166,10 +172,14 @@ struct taskstats { · 76 unmodified lines
166 /* Delay waiting for memory reclaim */172 /* Delay waiting for memory reclaim */
167 __u64 freepages_count;173 __u64 freepages_count;
168 __u64 freepages_delay_total;174 __u64 freepages_delay_total;
175 __u64 freepages_delay_max;
176 __u64 freepages_delay_min;
169 177
170 /* Delay waiting for thrashing page */178 /* Delay waiting for thrashing page */
171 __u64 thrashing_count;179 __u64 thrashing_count;
172 __u64 thrashing_delay_total;180 __u64 thrashing_delay_total;
181 __u64 thrashing_delay_max;
182 __u64 thrashing_delay_min;
173 183
174 /* v10: 64-bit btime to avoid overflow */184 /* v10: 64-bit btime to avoid overflow */
175 __u64 ac_btime64; /* 64-bit begin time */185 __u64 ac_btime64; /* 64-bit begin time */
@@ -177,6 +187,8 @@ struct taskstats { · 1 unmodified line
177 /* v11: Delay waiting for memory compact */187 /* v11: Delay waiting for memory compact */
178 __u64 compact_count;188 __u64 compact_count;
179 __u64 compact_delay_total;189 __u64 compact_delay_total;
190 __u64 compact_delay_max;
191 __u64 compact_delay_min;
180 192
181 /* v12 begin */193 /* v12 begin */
182 __u32 ac_tgid; /* thread group ID */194 __u32 ac_tgid; /* thread group ID */
@@ -198,10 +210,15 @@ struct taskstats { · 15 unmodified lines
198 /* v13: Delay waiting for write-protect copy */210 /* v13: Delay waiting for write-protect copy */
199 __u64 wpcopy_count;211 __u64 wpcopy_count;
200 __u64 wpcopy_delay_total;212 __u64 wpcopy_delay_total;
213 __u64 wpcopy_delay_max;
214 __u64 wpcopy_delay_min;
201 215
202 /* v14: Delay waiting for IRQ/SOFTIRQ */216 /* v14: Delay waiting for IRQ/SOFTIRQ */
203 __u64 irq_count;217 __u64 irq_count;
204 __u64 irq_delay_total;218 __u64 irq_delay_total;
219 __u64 irq_delay_max;
220 __u64 irq_delay_min;
221 /* v15: add Delay max */
205};222};
206 223
207 224