diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-01-05 19:03:39 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-01-05 19:03:39 -0800 |
| commit | 0bbb2753584231db364b624bf8cf82551b94da7d (patch) | |
| tree | 559c49330037fa4e2f5d231e06576f80dc49caaf /arch/parisc/include/asm/module.h | |
| parent | 0578c3b4d44c34e499e1fd5916ed6c63635b25cf (diff) | |
| parent | 9e01892c4234070bbcf3a9f582514c8b91464375 (diff) | |
| download | talos-op-linux-0bbb2753584231db364b624bf8cf82551b94da7d.tar.gz talos-op-linux-0bbb2753584231db364b624bf8cf82551b94da7d.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-for-linus
* git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-for-linus:
module: convert to stop_machine_create/destroy.
stop_machine: introduce stop_machine_create/destroy.
parisc: fix module loading failure of large kernel modules
module: fix module loading failure of large kernel modules for parisc
module: fix warning of unused function when !CONFIG_PROC_FS
kernel/module.c: compare symbol values when marking symbols as exported in /proc/kallsyms.
remove CONFIG_KMOD
Diffstat (limited to 'arch/parisc/include/asm/module.h')
| -rw-r--r-- | arch/parisc/include/asm/module.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/arch/parisc/include/asm/module.h b/arch/parisc/include/asm/module.h index c2cb49e934c1..1f4123427ea0 100644 --- a/arch/parisc/include/asm/module.h +++ b/arch/parisc/include/asm/module.h @@ -23,8 +23,10 @@ struct mod_arch_specific { unsigned long got_offset, got_count, got_max; unsigned long fdesc_offset, fdesc_count, fdesc_max; - unsigned long stub_offset, stub_count, stub_max; - unsigned long init_stub_offset, init_stub_count, init_stub_max; + struct { + unsigned long stub_offset; + unsigned int stub_entries; + } *section; int unwind_section; struct unwind_table *unwind; }; |
