diff options
| author | Pablo Neira Ayuso <pablo@netfilter.org> | 2019-06-25 01:32:59 +0200 |
|---|---|---|
| committer | Pablo Neira Ayuso <pablo@netfilter.org> | 2019-06-25 01:32:59 +0200 |
| commit | 1c5ba67d2277ac2faf37c61076e8b5fa312be492 (patch) | |
| tree | a645a1a2f7aea7faafcd67c6ba1bfd424b95cd7d /lib/sort.c | |
| parent | dbb5281a1f84b2f93032d4864c211ce8a20811a7 (diff) | |
| parent | 045df37e743c7448931131988e99e8fe0cc92a54 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next
Resolve conflict between d2912cb15bdd ("treewide: Replace GPLv2
boilerplate/reference with SPDX - rule 500") removing the GPL disclaimer
and fe03d4745675 ("Update my email address") which updates Jozsef
Kadlecsik's email.
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Diffstat (limited to 'lib/sort.c')
| -rw-r--r-- | lib/sort.c | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/lib/sort.c b/lib/sort.c index 50855ea8c262..cf408aec3733 100644 --- a/lib/sort.c +++ b/lib/sort.c @@ -43,8 +43,9 @@ static bool is_aligned(const void *base, size_t size, unsigned char align) /** * swap_words_32 - swap two elements in 32-bit chunks - * @a, @b: pointers to the elements - * @size: element size (must be a multiple of 4) + * @a: pointer to the first element to swap + * @b: pointer to the second element to swap + * @n: element size (must be a multiple of 4) * * Exchange the two objects in memory. This exploits base+index addressing, * which basically all CPUs have, to minimize loop overhead computations. @@ -65,8 +66,9 @@ static void swap_words_32(void *a, void *b, size_t n) /** * swap_words_64 - swap two elements in 64-bit chunks - * @a, @b: pointers to the elements - * @size: element size (must be a multiple of 8) + * @a: pointer to the first element to swap + * @b: pointer to the second element to swap + * @n: element size (must be a multiple of 8) * * Exchange the two objects in memory. This exploits base+index * addressing, which basically all CPUs have, to minimize loop overhead @@ -100,8 +102,9 @@ static void swap_words_64(void *a, void *b, size_t n) /** * swap_bytes - swap two elements a byte at a time - * @a, @b: pointers to the elements - * @size: element size + * @a: pointer to the first element to swap + * @b: pointer to the second element to swap + * @n: element size * * This is the fallback if alignment doesn't allow using larger chunks. */ |