diff options
| author | Ingo Molnar <mingo@kernel.org> | 2013-06-19 12:55:31 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2013-06-19 12:55:31 +0200 |
| commit | d81344c50824a4d28a9397e97135d60075ac37ff (patch) | |
| tree | d25c443fb4a764cd788db857c49dd3d3f8f722d3 /arch/arc/kernel/module.c | |
| parent | 0de358f1c2642710d41190b73fbc295e675c4ab8 (diff) | |
| parent | 29bb9e5a75684106a37593ad75ec75ff8312731b (diff) | |
Merge branch 'sched/urgent' into sched/core
Merge in fixes before applying ongoing new work.
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/arc/kernel/module.c')
| -rw-r--r-- | arch/arc/kernel/module.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arc/kernel/module.c b/arch/arc/kernel/module.c index cdd359352c0a..376e04622962 100644 --- a/arch/arc/kernel/module.c +++ b/arch/arc/kernel/module.c @@ -47,7 +47,7 @@ int module_frob_arch_sections(Elf_Ehdr *hdr, Elf_Shdr *sechdrs, } } #endif - return 0; + return 0; } void module_arch_cleanup(struct module *mod) @@ -141,5 +141,5 @@ int module_finalize(const Elf32_Ehdr *hdr, const Elf_Shdr *sechdrs, mod->arch.unw_info = unw; } #endif - return 0; + return 0; } |