aboutsummaryrefslogtreecommitdiff
path: root/modutils/insmod.c
diff options
context:
space:
mode:
Diffstat (limited to 'modutils/insmod.c')
-rw-r--r--modutils/insmod.c23
1 files changed, 12 insertions, 11 deletions
diff --git a/modutils/insmod.c b/modutils/insmod.c
index 4620f6f95..079de6940 100644
--- a/modutils/insmod.c
+++ b/modutils/insmod.c
@@ -651,7 +651,7 @@ static struct obj_symbol *arch_new_symbol(void);
651 651
652static enum obj_reloc arch_apply_relocation(struct obj_file *f, 652static enum obj_reloc arch_apply_relocation(struct obj_file *f,
653 struct obj_section *targsec, 653 struct obj_section *targsec,
654 struct obj_section *symsec, 654 /*struct obj_section *symsec,*/
655 struct obj_symbol *sym, 655 struct obj_symbol *sym,
656 ElfW(RelM) *rel, ElfW(Addr) value); 656 ElfW(RelM) *rel, ElfW(Addr) value);
657 657
@@ -792,8 +792,9 @@ static char *m_fullName;
792/*======================================================================*/ 792/*======================================================================*/
793 793
794 794
795static int check_module_name_match(const char *filename, struct stat *statbuf, 795static int check_module_name_match(const char *filename,
796 void *userdata, int depth) 796 struct stat *statbuf ATTRIBUTE_UNUSED,
797 void *userdata, int depth ATTRIBUTE_UNUSED)
797{ 798{
798 char *fullname = (char *) userdata; 799 char *fullname = (char *) userdata;
799 char *tmp; 800 char *tmp;
@@ -835,7 +836,7 @@ static struct obj_symbol *arch_new_symbol(void)
835static enum obj_reloc 836static enum obj_reloc
836arch_apply_relocation(struct obj_file *f, 837arch_apply_relocation(struct obj_file *f,
837 struct obj_section *targsec, 838 struct obj_section *targsec,
838 struct obj_section *symsec, 839 /*struct obj_section *symsec,*/
839 struct obj_symbol *sym, 840 struct obj_symbol *sym,
840 ElfW(RelM) *rel, ElfW(Addr) v) 841 ElfW(RelM) *rel, ElfW(Addr) v)
841{ 842{
@@ -1751,7 +1752,7 @@ static int arch_list_add(ElfW(RelM) *rel, struct arch_list_entry **list,
1751 1752
1752#if defined(USE_SINGLE) 1753#if defined(USE_SINGLE)
1753 1754
1754static int arch_single_init(ElfW(RelM) *rel, struct arch_single_entry *single, 1755static int arch_single_init(/*ElfW(RelM) *rel,*/ struct arch_single_entry *single,
1755 int offset, int size) 1756 int offset, int size)
1756{ 1757{
1757 if (single->allocated == 0) { 1758 if (single->allocated == 0) {
@@ -1899,7 +1900,7 @@ static void arch_create_got(struct obj_file *f)
1899#if defined(USE_GOT_ENTRIES) 1900#if defined(USE_GOT_ENTRIES)
1900 if (got_allocate) { 1901 if (got_allocate) {
1901 got_offset += arch_single_init( 1902 got_offset += arch_single_init(
1902 rel, &intsym->gotent, 1903 /*rel,*/ &intsym->gotent,
1903 got_offset, GOT_ENTRY_SIZE); 1904 got_offset, GOT_ENTRY_SIZE);
1904 1905
1905 got_needed = 1; 1906 got_needed = 1;
@@ -1913,7 +1914,7 @@ static void arch_create_got(struct obj_file *f)
1913 plt_offset, PLT_ENTRY_SIZE); 1914 plt_offset, PLT_ENTRY_SIZE);
1914#else 1915#else
1915 plt_offset += arch_single_init( 1916 plt_offset += arch_single_init(
1916 rel, &intsym->pltent, 1917 /*rel,*/ &intsym->pltent,
1917 plt_offset, PLT_ENTRY_SIZE); 1918 plt_offset, PLT_ENTRY_SIZE);
1918#endif 1919#endif
1919 plt_needed = 1; 1920 plt_needed = 1;
@@ -3220,7 +3221,7 @@ static int obj_relocate(struct obj_file *f, ElfW(Addr) base)
3220 3221
3221 /* Do it! */ 3222 /* Do it! */
3222 switch (arch_apply_relocation 3223 switch (arch_apply_relocation
3223 (f, targsec, symsec, intsym, rel, value) 3224 (f, targsec, /*symsec,*/ intsym, rel, value)
3224 ) { 3225 ) {
3225 case obj_reloc_ok: 3226 case obj_reloc_ok:
3226 break; 3227 break;
@@ -3299,7 +3300,7 @@ static int obj_create_image(struct obj_file *f, char *image)
3299 3300
3300/*======================================================================*/ 3301/*======================================================================*/
3301 3302
3302static struct obj_file *obj_load(FILE * fp, int loadprogbits) 3303static struct obj_file *obj_load(FILE * fp, int loadprogbits ATTRIBUTE_UNUSED)
3303{ 3304{
3304 struct obj_file *f; 3305 struct obj_file *f;
3305 ElfW(Shdr) * section_headers; 3306 ElfW(Shdr) * section_headers;
@@ -4193,9 +4194,9 @@ static const char *moderror(int err)
4193 4194
4194#if !ENABLE_FEATURE_2_4_MODULES 4195#if !ENABLE_FEATURE_2_4_MODULES
4195int insmod_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE; 4196int insmod_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
4196int insmod_main(int argc, char **argv) 4197int insmod_main(int argc ATTRIBUTE_UNUSED, char **argv)
4197#else 4198#else
4198static int insmod_ng_main(int argc, char **argv) 4199static int insmod_ng_main(int argc ATTRIBUTE_UNUSED, char **argv)
4199#endif 4200#endif
4200{ 4201{
4201 long ret; 4202 long ret;