Re: [PULL] module and parameter

[Rusty Russell <rusty@rustcorp.com.au>]

On Sat, 13 Jun 2009 06:35:46 am Tony Luck wrote:
> On Fri, Jun 12, 2009 at 5:35 AM, Rusty Russell<rusty@rustcorp.com.au> wrote:
> > The following changes since commit
> > 8ebf975608aaebd7feb33d77f07ba21a6380e086: Randy Dunlap (1):
>
> ...
>
> >      module: trim exception table on init free.
>
> This is causing build errors for ia64:
>
> arch/ia64/mm/extable.c: In function 'ex_to_addr':
> arch/ia64/mm/extable.c:58: error: 'const struct exception_table_entry'
> has no member named 'insn'
> arch/ia64/mm/extable.c:58: error: 'const struct exception_table_entry'
> has no member named 'insn'

Sorry, very sloppy of me.  Does this repair it?

> I note that this commit has been reverted in linux-next.  What's going on?

Hmm, older version broke sparc, but Stephen patched that one...

Rusty.

Subject: fix compile error in arch/ia64/mm/extable.c

ad6561dffa17f17bb68d7207d422c26c381c4313 ("module: trim exception table on init
free.") put a bogus trim_init_extable() function into ia64 which didn't compile.

Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>

diff --git a/arch/ia64/mm/extable.c b/arch/ia64/mm/extable.c
--- 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_tabl
 
 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