Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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

+2 -2
+2 -2
arch/ia64/mm/extable.c
··· 8 8 #include <linux/sort.h> 9 9 10 10 #include <asm/uaccess.h> 11 - #include <asm/module.h> 11 + #include <linux/module.h> 12 12 13 13 static int cmp_ex(const void *a, const void *b) 14 14 { ··· 55 55 56 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 61 #ifdef CONFIG_MODULES