diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-06-15 13:38:06 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-06-15 13:38:06 -0400 |
| commit | 03347e2592078a90df818670fddf97a33eec70fb (patch) | |
| tree | fde73020d4bcf7fff0fe083619789bd999f2b24b /arch | |
| parent | 19035e5b5d1e3127b4925d86f6a77964f91f2c3c (diff) | |
| parent | 1dcd775eb302f897865bbab8779ae4165c13cd7e (diff) | |
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
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/ia64/mm/extable.c | 4 |
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 @@ | |||
| 8 | #include <linux/sort.h> | 8 | #include <linux/sort.h> |
| 9 | 9 | ||
| 10 | #include <asm/uaccess.h> | 10 | #include <asm/uaccess.h> |
| 11 | #include <asm/module.h> | 11 | #include <linux/module.h> |
| 12 | 12 | ||
| 13 | static int cmp_ex(const void *a, const void *b) | 13 | static int cmp_ex(const void *a, const void *b) |
| 14 | { | 14 | { |
| @@ -55,7 +55,7 @@ void sort_extable (struct exception_table_entry *start, | |||
| 55 | 55 | ||
| 56 | static inline unsigned long ex_to_addr(const struct exception_table_entry *x) | 56 | static inline unsigned long ex_to_addr(const struct exception_table_entry *x) |
| 57 | { | 57 | { |
| 58 | return (unsigned long)&x->insn + x->insn; | 58 | return (unsigned long)&x->addr + x->addr; |
| 59 | } | 59 | } |
| 60 | 60 | ||
| 61 | #ifdef CONFIG_MODULES | 61 | #ifdef CONFIG_MODULES |