aboutsummaryrefslogtreecommitdiffstats
path: root/arch/ia64/mm/extable.c
diff options
context:
space:
mode:
authorRusty Russell <rusty@rustcorp.com.au>2009-06-13 14:50:15 +0930
committerTony Luck <tony.luck@intel.com>2009-06-15 09:17:50 -0700
commit1dcd775eb302f897865bbab8779ae4165c13cd7e (patch)
tree467bdd707c0a371469a6b331f48fe6aebce7b1f2 /arch/ia64/mm/extable.c
parentMerge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild-next (diff)
downloadlinux-dev-1dcd775eb302f897865bbab8779ae4165c13cd7e.tar.xz
linux-dev-1dcd775eb302f897865bbab8779ae4165c13cd7e.zip
[IA64] fix compile error in arch/ia64/mm/extable.c
ad6561dffa17f17bb68d7207d422c26c381c4313 ("module: trim exception table on init free.") put a bogus trim_init_extable() function into ia64 which didn't compile. Signed-off-by: Rusty Russell <rusty@rustcorp.com.au> Signed-off-by: Tony Luck <tony.luck@intel.com>
Diffstat (limited to 'arch/ia64/mm/extable.c')
-rw-r--r--arch/ia64/mm/extable.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/ia64/mm/extable.c b/arch/ia64/mm/extable.c
index e95d5ad9285d..c99a41e29fe8 100644
--- a/arch/ia64/mm/extable.c
+++ b/arch/ia64/mm/extable.c
@@ -8,7 +8,7 @@
#include <linux/sort.h>
#include <asm/uaccess.h>
-#include <asm/module.h>
+#include <linux/module.h>
static int cmp_ex(const void *a, const void *b)
{
@@ -55,7 +55,7 @@ void sort_extable (struct exception_table_entry *start,
static inline unsigned long ex_to_addr(const struct exception_table_entry *x)
{
- return (unsigned long)&x->insn + x->insn;
+ return (unsigned long)&x->addr + x->addr;
}
#ifdef CONFIG_MODULES