diff options
| author | Daniel Wagner <daniel.wagner@bmw-carit.de> | 2015-06-05 15:03:38 +1000 |
|---|---|---|
| committer | Michael Ellerman <mpe@ellerman.id.au> | 2015-06-05 15:03:38 +1000 |
| commit | 23008da383d2235377e607d525719de2cf12b886 (patch) | |
| tree | b7ae55375d09a14314738d061d3adc5df3768870 | |
| parent | 6b09cdc37f844e758d35e6101a167009116a2a16 (diff) | |
| download | linux-next-23008da383d2235377e607d525719de2cf12b886.tar.gz | |
lib-sort-add-64-bit-swap-function-v2
Changes since v0:
- Test for alignment of the array.
- Fixed compare function in test program according
Rasmus' feedback
- Added an unaligned test cases (swap_72)
Signed-off-by: Daniel Wagner <daniel.wagner@bmw-carit.de>
Cc: Rasmus Villemoes <linux@rasmusvillemoes.dk>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
| -rw-r--r-- | lib/sort.c | 18 |
1 files changed, 16 insertions, 2 deletions
diff --git a/lib/sort.c b/lib/sort.c index 86e3efeb35c6fd..9c6b229049cea4 100644 --- a/lib/sort.c +++ b/lib/sort.c @@ -58,6 +58,7 @@ void sort(void *base, size_t num, size_t size, int i = (num/2 - 1) * size, n = num * size, c, r; if (!swap_func) { +#if defined(CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS) switch (size) { case 4: swap_func = u32_swap; @@ -65,9 +66,22 @@ void sort(void *base, size_t num, size_t size, case 8: swap_func = u64_swap; break; - default: - swap_func = generic_swap; } +#else + switch (size) { + case 4: + if (((unsigned long)base & 3) == 0) + swap_func = u32_swap; + break; + case 8: + if (((unsigned long)base & 7) == 0) + swap_func = u64_swap; + break; + } +#endif /* CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS */ + + if (!swap_func) + swap_func = generic_swap; } /* heapify */ |