[PATCH] lib/extable.c: use bsearch() library function in search_extable()

[Thomas Meyer]

Signed-off-by: Thomas Meyer <thomas@xxxxxxxx>
---
Âlib/extable.c | 30 +++++++++++++-----------------
Â1 file changed, 13 insertions(+), 17 deletions(-)

diff --git a/lib/extable.c b/lib/extable.c
index 62968da..eb16cb3 100644
--- a/lib/extable.c
+++ b/lib/extable.c
@@ -9,6 +9,7 @@
 * 2 of the License, or (at your option) any later version.
 */
Â
+#include <linux/bsearch.h>
Â#include <linux/module.h>
Â#include <linux/init.h>
Â#include <linux/sort.h>
@@ -51,7 +52,7 @@ static void swap_ex(void *a, void *b, int size)
 * This is used both for the kernel exception table and for
 * the exception tables of modules that get loaded.
 */
-static int cmp_ex(const void *a, const void *b)
+static int cmp_ex_sort(const void *a, const void *b)
Â{
Â	const struct exception_table_entry *x = a, *y = b;
Â
@@ -67,7 +68,7 @@ void sort_extable(struct exception_table_entry *start,
Â		ÂÂstruct exception_table_entry *finish)
Â{
Â	sort(start, finish - start, sizeof(struct exception_table_entry),
-	ÂÂÂÂÂcmp_ex, swap_ex);
+	ÂÂÂÂÂcmp_ex_sort, swap_ex);
Â}
Â
Â#ifdef CONFIG_MODULES
@@ -93,6 +94,13 @@ void trim_init_extable(struct module *m)
Â#endif /* !ARCH_HAS_SORT_EXTABLE */
Â
Â#ifndef ARCH_HAS_SEARCH_EXTABLE
+
+static int cmp_ex_search(const void *key, const void *elt)
+{
+	const struct exception_table_entry * _elt = elt;
+	return *(unsigned long*) key - ex_to_insn(_elt);
+}
+
Â/*
 * Search one exception table for an entry corresponding to the
 * given instruction address, and return the address of the entry,
@@ -105,21 +113,9 @@ search_extable(const struct exception_table_entry *first,
Â	ÂÂÂÂÂÂÂconst struct exception_table_entry *last,
Â	ÂÂÂÂÂÂÂunsigned long value)
Â{
-	while (first <= last) {
-		const struct exception_table_entry *mid;
+	if(last < first)
+		return NULL;
Â
-		mid = ((last - first) >> 1) + first;
-		/*
-		Â* careful, the distance between value and insn
-		Â* can be larger than MAX_LONG:
-		Â*/
-		if (ex_to_insn(mid) < value)
-			first = mid + 1;
-		else if (ex_to_insn(mid) > value)
-			last = mid - 1;
-		else
-			return mid;
-	}
-	return NULL;
+	return bsearch(&value, first, last - first + 1, sizeof(struct exception_table_entry), cmp_ex_search);
Â}
Â#endif