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

diff --git a/arch/arm/mm/extable.c b/arch/arm/mm/extable.c
index 6548c3163f2ff77c9577fc9d2d9cc2a91a3e4878..4698233b97431d2a210366786f87d0e75f65194e 100644 (file)
--- a/arch/arm/mm/extable.c
+++ b/arch/arm/mm/extable.c
@@ -1,19 +1,13 @@
 /*
  *  linux/arch/arm/mm/extable.c
  */
-
 #include <linux/config.h>
-#include <linux/module.h>
-#include <linux/spinlock.h>
 #include <asm/uaccess.h>
 
-extern const struct exception_table_entry __start___ex_table[];
-extern const struct exception_table_entry __stop___ex_table[];
-
-static inline unsigned long
-search_one_table(const struct exception_table_entry *first,
-                const struct exception_table_entry *last,
-                unsigned long value)
+const struct exception_table_entry *
+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;
@@ -22,44 +16,11 @@ search_one_table(const struct exception_table_entry *first,
                mid = (last - first) / 2 + first;
                diff = mid->insn - value;
                 if (diff == 0)
-                        return mid->fixup;
+                        return mid;
                 else if (diff < 0)
                         first = mid+1;
                 else
                         last = mid-1;
         }
-        return 0;
-}
-
-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;
+        return NULL;
 }