module and parameter
The following changes since commit 8ebf975608aaebd7feb33d77f07ba21a6380e086:
Randy Dunlap (1):
block: fix kernel-doc in recent block/ changes
are available in the git repository at:
ssh://master.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-module-and-param.git master
Amerigo Wang (4):
x86 module: merge the same functions in module_32.c and module_64.c x86 module: merge the rest functions with macros
uml module: fix uml build process due to this merge
module: merge module_alloc() finally
Rusty Russell (8):
cyber2000fb.c: use proper method for stopping unload if CONFIG_ARCH_SHARK
module_param: invbool should take a 'bool', not an 'int'
module_param: split perm field into flags and perm
module_param: add __same_type convenience wrapper for __builtin_types_compatible_p
module_param: allow 'bool' module_params to be bool, not just int.
uvesafb: improve parameter handling.
module: trim exception table on init free.
module: cleanup FIXME comments about trimming exception table entries.
arch/alpha/mm/extable.c | 21 ++++
arch/avr32/kernel/module.c | 2 -
arch/cris/kernel/module.c | 2 -
arch/frv/kernel/module.c | 2 -
arch/h8300/kernel/module.c | 2 -
arch/ia64/mm/extable.c | 26 +++++
arch/m32r/kernel/module.c | 2 -
arch/m68k/kernel/module.c | 2 -
arch/m68knommu/kernel/module.c | 2 -
arch/mips/kernel/module.c | 2 -
arch/mn10300/kernel/module.c | 2 -
arch/parisc/kernel/module.c | 2 -
arch/powerpc/kernel/module.c | 2 -
arch/s390/kernel/module.c | 2 -
arch/sh/kernel/module.c | 2 -
arch/sparc/include/asm/uaccess_32.h | 3 +
arch/sparc/kernel/module.c | 2 -
arch/sparc/mm/extable.c | 29 ++++++
arch/um/include/asm/pgtable.h | 7 +-
arch/um/sys-i386/Makefile | 2 +-
arch/um/sys-x86_64/Makefile | 4 +-
arch/um/sys-x86_64/um_module.c | 21 ----
arch/x86/include/asm/pgtable_32_types.h | 4 +
arch/x86/kernel/Makefile | 2 +-
arch/x86/kernel/{module_64.c => module.c} | 82 +++++++++++++---
arch/x86/kernel/module_32.c | 152 -----------------------------
arch/xtensa/kernel/module.c | 2 -
drivers/video/aty/aty128fb.c | 2 +-
drivers/video/cyber2000fb.c | 9 +-
drivers/video/uvesafb.c | 10 +-
include/linux/compiler.h | 5 +
include/linux/module.h | 1 +
include/linux/moduleparam.h | 40 ++++++--
kernel/module.c | 1 +
kernel/params.c | 46 ++++++---
lib/extable.c | 21 ++++-
36 files changed, 256 insertions(+), 262 deletions(-)
delete mode 100644 arch/um/sys-x86_64/um_module.c
rename arch/x86/kernel/{module_64.c => module.c} (74%)
delete mode 100644 arch/x86/kernel/module_32.cQuoted 2 lines · Rusty Russell
The following changes since commit
8ebf975608aaebd7feb33d77f07ba21a6380e086:
Randy Dunlap (1):
...
Quoted 1 line
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'arch/ia64/mm/extable.c: In function 'trim_init_extable':arch/ia64/mm/extable.c:69: error: dereferencing pointer to incomplete type arch/ia64/mm/extable.c:70: error: implicit declaration of function 'within_module_init'arch/ia64/mm/extable.c:70: error: dereferencing pointer to incomplete type arch/ia64/mm/extable.c:71: error: dereferencing pointer to incomplete type arch/ia64/mm/extable.c:72: error: dereferencing pointer to incomplete type arch/ia64/mm/extable.c:75: error: dereferencing pointer to incomplete type arch/ia64/mm/extable.c:76: error: dereferencing pointer to incomplete type arch/ia64/mm/extable.c:76: error: dereferencing pointer to incomplete type arch/ia64/mm/extable.c:78: error: dereferencing pointer to incomplete type
I note that this commit has been reverted in linux-next. What's going on?
-Tony
Quoted 8 lines · Tony Luck
Quoted 2 lines · Rusty Russell
The following changes since commit
8ebf975608aaebd7feb33d77f07ba21a6380e086: Randy Dunlap (1):...
Quoted 1 line
module: trim exception table on init free.
Quoted 7 lines
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 structexception_table_entry' has no member named 'insn'arch/ia64/mm/extable.c:58: error: 'const structexception_table_entry' has no member named 'insn'
Sorry, very sloppy of me. Does this repair it?
Quoted 1 line
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.
arch/ia64/mm/extable.c +2 -2
@@ -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_tablstatic 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
Quoted 5 lines · Rusty Russell
Quoted 4 lines · Tony Luck
Quoted 1 line · Rusty Russell
module: trim exception table on init free.
This is causing build errors for ia64:
Unfortunately this has gone into Linus' tree already. I have compile-tested my previous patch for ia64, and it fixes compile at least.
Quoted 2 lines
Quoted 2 lines
I note that this commit has been reverted in linux-next. What's going on?
kisskb.ellerman.id.au says it's broken there, so it's applied.
While I've got your attention, there was another build break on ia64 in linux-next, caused by removal of smp_call_function_mask.
Thanks,
Rusty.
Subject: ia64: convert last user of smp_call_function_mask
smp_call_function_many is the new version: it takes a pointer. Also, use mm accessor macro while we're changing this.
arch/ia64/kernel/smp.c +1 -1
@@ -301,7 +301,7 @@ smp_flush_tlb_mm (struct mm_struct *mm)return ; } -smp_call_function_mask (mm->cpu_vm_mask, +smp_call_function_many (mm_cpumask (mm), (void (*)(void *))local_finish_flush_tlb_mm, mm,1 );local_irq_disable ();local_finish_flush_tlb_mm (mm);
Quoted 2 lines
While I've got your attention, there was another build break on ia64 in linux-next, caused by removal of
smp_call_function_mask.
Your fix made it into next-20090615 ... so I didn't ever see this problem.
-Tony
Quoted 1 line
Sorry, very sloppy of me. Does this repair it?
Yes. That compiles and boots too.
Thanks
-Tony