diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2025-04-03 11:16:57 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2025-04-03 11:16:57 -0700 |
| commit | 5a2b5cb76cb4c3e878d25f92801df9e12a7b2037 (patch) | |
| tree | a3b66ec38e83a09031a9b49a918ab34f5127ce79 /include | |
| parent | 8c7c1b5506e593ce00c42214b4fcafd640ceeb42 (diff) | |
| parent | 8b46fdaea819a679da176b879e7b0674a1161a5e (diff) | |
Merge tag 'mm-nonmm-stable-2025-04-02-22-12' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm
Pull more non-MM updates from Andrew Morton:
"One bugfix and a couple of small late-arriving updates"
* tag 'mm-nonmm-stable-2025-04-02-22-12' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm:
lib: scatterlist: fix sg_split_phys to preserve original scatterlist offsets
lib/sort.c: add _nonatomic() variants with cond_resched()
mailmap: add an entry for Nicolas Schier
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/sort.h | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/include/linux/sort.h b/include/linux/sort.h index e163287ac6c1..8e5603b10941 100644 --- a/include/linux/sort.h +++ b/include/linux/sort.h @@ -13,4 +13,15 @@ void sort(void *base, size_t num, size_t size, cmp_func_t cmp_func, swap_func_t swap_func); +/* Versions that periodically call cond_resched(): */ + +void sort_r_nonatomic(void *base, size_t num, size_t size, + cmp_r_func_t cmp_func, + swap_r_func_t swap_func, + const void *priv); + +void sort_nonatomic(void *base, size_t num, size_t size, + cmp_func_t cmp_func, + swap_func_t swap_func); + #endif |