diff options
| author | Ingo Molnar <mingo@elte.hu> | 2011-08-05 10:32:54 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2011-08-05 10:33:55 +0200 |
| commit | 3272cab4063467410802367a8d69f06c65b2a866 (patch) | |
| tree | 1c665f8572b0aab2a5343d32b5eaa6713669b04f /include/linux/moduleloader.h | |
| parent | f629299b544b6cc12b4e3e85fec96f4ce5809482 (diff) | |
| parent | 140d0b2108faebc77c6523296e211e509cb9f5f9 (diff) | |
Merge branch 'linus' into perf/urgent
Merge reason: Include most of the merge window trees, to do fixes on top.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'include/linux/moduleloader.h')
| -rw-r--r-- | include/linux/moduleloader.h | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/include/linux/moduleloader.h b/include/linux/moduleloader.h index c1f40c2f7ffb..b2be02ebf453 100644 --- a/include/linux/moduleloader.h +++ b/include/linux/moduleloader.h @@ -5,7 +5,12 @@ #include <linux/module.h> #include <linux/elf.h> -/* These must be implemented by the specific architecture */ +/* These may be implemented by architectures that need to hook into the + * module loader code. Architectures that don't need to do anything special + * can just rely on the 'weak' default hooks defined in kernel/module.c. + * Note, however, that at least one of apply_relocate or apply_relocate_add + * must be implemented by each architecture. + */ /* Adjust arch-specific sections. Return 0 on success. */ int module_frob_arch_sections(Elf_Ehdr *hdr, |