Commit 6642779d authored by Russell King's avatar Russell King

[ARM] Update extable.c for 2.5.55 exception table / module changes.

parent 216886db
/* /*
* linux/arch/arm/mm/extable.c * linux/arch/arm/mm/extable.c
*/ */
#include <linux/config.h> #include <linux/config.h>
#include <linux/module.h>
#include <linux/spinlock.h>
#include <asm/uaccess.h> #include <asm/uaccess.h>
extern const struct exception_table_entry __start___ex_table[]; const struct exception_table_entry *
extern const struct exception_table_entry __stop___ex_table[]; search_extable(const struct exception_table_entry *first,
const struct exception_table_entry *last,
static inline unsigned long unsigned long value)
search_one_table(const struct exception_table_entry *first,
const struct exception_table_entry *last,
unsigned long value)
{ {
while (first <= last) { while (first <= last) {
const struct exception_table_entry *mid; const struct exception_table_entry *mid;
...@@ -22,44 +16,11 @@ search_one_table(const struct exception_table_entry *first, ...@@ -22,44 +16,11 @@ search_one_table(const struct exception_table_entry *first,
mid = (last - first) / 2 + first; mid = (last - first) / 2 + first;
diff = mid->insn - value; diff = mid->insn - value;
if (diff == 0) if (diff == 0)
return mid->fixup; return mid;
else if (diff < 0) else if (diff < 0)
first = mid+1; first = mid+1;
else else
last = mid-1; last = mid-1;
} }
return 0; return NULL;
}
extern spinlock_t modlist_lock;
unsigned long
search_exception_table(unsigned long addr)
{
unsigned long ret;
#ifndef CONFIG_MODULES
/* There is only the kernel to search. */
ret = search_one_table(__start___ex_table, __stop___ex_table-1, addr);
#else
unsigned long flags;
struct list_head *l;
ret = 0;
/* The kernel is the last "module" -- no need to treat it special. */
spin_lock_irqsave(&modlist_lock, flags);
list_for_each(l, &extables) {
struct exception_table *ex
= list_entry(l, struct exception_table, list);
if (ex->num_entries == 0)
continue;
ret = search_one_table(ex->entry,
ex->entry + ex->num_entries - 1, addr);
if (ret)
break;
}
spin_unlock_irqrestore(&modlist_lock, flags);
#endif
return ret;
} }
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment