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

torvalds · torvalds · commit 03347e259207 · 2009-06-15T10:38:06.000-07:00
* '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
diff --git 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

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@`
`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,7 +55,7 @@ void sort_extable (struct exception_table_entry *start,`
`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`