lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source 
* '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
This commit is contained in:
Linus Torvalds
2009-06-15 10:38:06 -07:00
parent 19035e5b5d 1dcd775eb3
commit 03347e2592
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
arch/ia64/mm/extable.c
View File

@@ -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,
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