diff options
Diffstat (limited to 'lib/extable.c')
| -rw-r--r-- | lib/extable.c | 50 |
1 files changed, 9 insertions, 41 deletions
diff --git a/lib/extable.c b/lib/extable.c index 0be02ad561e9..4cac81ec225e 100644 --- a/lib/extable.c +++ b/lib/extable.c @@ -14,37 +14,7 @@ #include <linux/sort.h> #include <asm/uaccess.h> -#ifndef ARCH_HAS_RELATIVE_EXTABLE -#define ex_to_insn(x) ((x)->insn) -#else -static inline unsigned long ex_to_insn(const struct exception_table_entry *x) -{ - return (unsigned long)&x->insn + x->insn; -} -#endif - #ifndef ARCH_HAS_SORT_EXTABLE -#ifndef ARCH_HAS_RELATIVE_EXTABLE -#define swap_ex NULL -#else -static void swap_ex(void *a, void *b, int size) -{ - struct exception_table_entry *x = a, *y = b, tmp; - int delta = b - a; - - tmp = *x; - x->insn = y->insn + delta; - y->insn = tmp.insn - delta; - -#ifdef swap_ex_entry_fixup - swap_ex_entry_fixup(x, y, tmp, delta); -#else - x->fixup = y->fixup + delta; - y->fixup = tmp.fixup - delta; -#endif -} -#endif /* ARCH_HAS_RELATIVE_EXTABLE */ - /* * The exception table needs to be sorted so that the binary * search that we use to find entries in it works properly. @@ -56,9 +26,9 @@ static int cmp_ex(const void *a, const void *b) const struct exception_table_entry *x = a, *y = b; /* avoid overflow */ - if (ex_to_insn(x) > ex_to_insn(y)) + if (x->insn > y->insn) return 1; - if (ex_to_insn(x) < ex_to_insn(y)) + if (x->insn < y->insn) return -1; return 0; } @@ -67,7 +37,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, NULL); } #ifdef CONFIG_MODULES @@ -78,15 +48,13 @@ void sort_extable(struct exception_table_entry *start, void trim_init_extable(struct module *m) { /*trim the beginning*/ - while (m->num_exentries && - within_module_init(ex_to_insn(&m->extable[0]), m)) { + while (m->num_exentries && within_module_init(m->extable[0].insn, m)) { m->extable++; m->num_exentries--; } /*trim the end*/ while (m->num_exentries && - within_module_init(ex_to_insn(&m->extable[m->num_exentries - 1]), - m)) + within_module_init(m->extable[m->num_exentries-1].insn, m)) m->num_exentries--; } #endif /* CONFIG_MODULES */ @@ -113,13 +81,13 @@ search_extable(const struct exception_table_entry *first, * careful, the distance between value and insn * can be larger than MAX_LONG: */ - if (ex_to_insn(mid) < value) + if (mid->insn < value) first = mid + 1; - else if (ex_to_insn(mid) > value) + else if (mid->insn > value) last = mid - 1; else return mid; - } - return NULL; + } + return NULL; } #endif |