The patch titled
Subject: lib-sort-add-64-bit-swap-function-v2
has been removed from the -mm tree. Its filename was
lib-sort-add-64-bit-swap-function-v2.patch
This patch was dropped because it was folded into lib-sort-add-64-bit-swap-function.patch
------------------------------------------------------
From: Daniel Wagner <daniel.wagner@xxxxxxxxxxxx>
Subject: 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@xxxxxxxxxxxx>
Cc: Rasmus Villemoes <linux@xxxxxxxxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
lib/sort.c | 18 ++++++++++++++++--
1 file changed, 16 insertions(+), 2 deletions(-)
diff -puN lib/sort.c~lib-sort-add-64-bit-swap-function-v2 lib/sort.c
--- a/lib/sort.c~lib-sort-add-64-bit-swap-function-v2
+++ a/lib/sort.c
@@ -58,6 +58,7 @@ void sort(void *base, size_t num, size_t
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
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 */
_
Patches currently in -mm which might be from daniel.wagner@xxxxxxxxxxxx are
origin.patch
lib-sort-add-64-bit-swap-function.patch
lib-sort-add-64-bit-swap-function-v2-fix.patch
--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
