Commit 03347e25 authored by Linus Torvalds's avatar Linus Torvalds

Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6

* 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6:
  [IA64] fix compile error in arch/ia64/mm/extable.c
parents 19035e5b 1dcd775e
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
#include <linux/sort.h> #include <linux/sort.h>
#include <asm/uaccess.h> #include <asm/uaccess.h>
#include <asm/module.h> #include <linux/module.h>
static int cmp_ex(const void *a, const void *b) static int cmp_ex(const void *a, const void *b)
{ {
...@@ -55,7 +55,7 @@ void sort_extable (struct exception_table_entry *start, ...@@ -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) 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 #ifdef CONFIG_MODULES
......
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