diff options
Diffstat (limited to 'arch/blackfin/kernel/module.c')
-rw-r--r-- | arch/blackfin/kernel/module.c | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/arch/blackfin/kernel/module.c b/arch/blackfin/kernel/module.c index 372f756f1ad9..8b9fe29d03f4 100644 --- a/arch/blackfin/kernel/module.c +++ b/arch/blackfin/kernel/module.c | |||
@@ -165,8 +165,8 @@ module_frob_arch_sections(Elf_Ehdr * hdr, Elf_Shdr * sechdrs, | |||
165 | 165 | ||
166 | for (s = sechdrs; s < sechdrs_end; ++s) { | 166 | for (s = sechdrs; s < sechdrs_end; ++s) { |
167 | if ((strcmp(".l1.text", secstrings + s->sh_name) == 0) || | 167 | if ((strcmp(".l1.text", secstrings + s->sh_name) == 0) || |
168 | ((strcmp(".text", secstrings + s->sh_name)==0) && | 168 | ((strcmp(".text", secstrings + s->sh_name) == 0) && |
169 | (hdr->e_flags & FLG_CODE_IN_L1) && (s->sh_size > 0))) { | 169 | (hdr->e_flags & FLG_CODE_IN_L1) && (s->sh_size > 0))) { |
170 | mod->arch.text_l1 = s; | 170 | mod->arch.text_l1 = s; |
171 | dest = l1_inst_sram_alloc(s->sh_size); | 171 | dest = l1_inst_sram_alloc(s->sh_size); |
172 | if (dest == NULL) { | 172 | if (dest == NULL) { |
@@ -179,9 +179,9 @@ module_frob_arch_sections(Elf_Ehdr * hdr, Elf_Shdr * sechdrs, | |||
179 | s->sh_flags &= ~SHF_ALLOC; | 179 | s->sh_flags &= ~SHF_ALLOC; |
180 | s->sh_addr = (unsigned long)dest; | 180 | s->sh_addr = (unsigned long)dest; |
181 | } | 181 | } |
182 | if ((strcmp(".l1.data", secstrings + s->sh_name) == 0)|| | 182 | if ((strcmp(".l1.data", secstrings + s->sh_name) == 0) || |
183 | ((strcmp(".data", secstrings + s->sh_name)==0) && | 183 | ((strcmp(".data", secstrings + s->sh_name) == 0) && |
184 | (hdr->e_flags & FLG_DATA_IN_L1) && (s->sh_size > 0))) { | 184 | (hdr->e_flags & FLG_DATA_IN_L1) && (s->sh_size > 0))) { |
185 | mod->arch.data_a_l1 = s; | 185 | mod->arch.data_a_l1 = s; |
186 | dest = l1_data_sram_alloc(s->sh_size); | 186 | dest = l1_data_sram_alloc(s->sh_size); |
187 | if (dest == NULL) { | 187 | if (dest == NULL) { |
@@ -195,8 +195,8 @@ module_frob_arch_sections(Elf_Ehdr * hdr, Elf_Shdr * sechdrs, | |||
195 | s->sh_addr = (unsigned long)dest; | 195 | s->sh_addr = (unsigned long)dest; |
196 | } | 196 | } |
197 | if (strcmp(".l1.bss", secstrings + s->sh_name) == 0 || | 197 | if (strcmp(".l1.bss", secstrings + s->sh_name) == 0 || |
198 | ((strcmp(".bss", secstrings + s->sh_name)==0) && | 198 | ((strcmp(".bss", secstrings + s->sh_name) == 0) && |
199 | (hdr->e_flags & FLG_DATA_IN_L1) && (s->sh_size > 0))) { | 199 | (hdr->e_flags & FLG_DATA_IN_L1) && (s->sh_size > 0))) { |
200 | mod->arch.bss_a_l1 = s; | 200 | mod->arch.bss_a_l1 = s; |
201 | dest = l1_data_sram_alloc(s->sh_size); | 201 | dest = l1_data_sram_alloc(s->sh_size); |
202 | if (dest == NULL) { | 202 | if (dest == NULL) { |
@@ -326,7 +326,7 @@ apply_relocate_add(Elf_Shdr * sechdrs, const char *strtab, | |||
326 | pr_debug("before %x after %x\n", *location16, | 326 | pr_debug("before %x after %x\n", *location16, |
327 | (value & 0xffff)); | 327 | (value & 0xffff)); |
328 | tmp = (value & 0xffff); | 328 | tmp = (value & 0xffff); |
329 | if((unsigned long)location16 >= L1_CODE_START) { | 329 | if ((unsigned long)location16 >= L1_CODE_START) { |
330 | dma_memcpy(location16, &tmp, 2); | 330 | dma_memcpy(location16, &tmp, 2); |
331 | } else | 331 | } else |
332 | *location16 = tmp; | 332 | *location16 = tmp; |
@@ -335,7 +335,7 @@ apply_relocate_add(Elf_Shdr * sechdrs, const char *strtab, | |||
335 | pr_debug("before %x after %x\n", *location16, | 335 | pr_debug("before %x after %x\n", *location16, |
336 | ((value >> 16) & 0xffff)); | 336 | ((value >> 16) & 0xffff)); |
337 | tmp = ((value >> 16) & 0xffff); | 337 | tmp = ((value >> 16) & 0xffff); |
338 | if((unsigned long)location16 >= L1_CODE_START) { | 338 | if ((unsigned long)location16 >= L1_CODE_START) { |
339 | dma_memcpy(location16, &tmp, 2); | 339 | dma_memcpy(location16, &tmp, 2); |
340 | } else | 340 | } else |
341 | *location16 = tmp; | 341 | *location16 = tmp; |
@@ -404,8 +404,8 @@ module_finalize(const Elf_Ehdr * hdr, | |||
404 | continue; | 404 | continue; |
405 | 405 | ||
406 | if ((sechdrs[i].sh_type == SHT_RELA) && | 406 | if ((sechdrs[i].sh_type == SHT_RELA) && |
407 | ((strcmp(".rela.l1.text", secstrings + sechdrs[i].sh_name) == 0)|| | 407 | ((strcmp(".rela.l1.text", secstrings + sechdrs[i].sh_name) == 0) || |
408 | ((strcmp(".rela.text", secstrings + sechdrs[i].sh_name) == 0) && | 408 | ((strcmp(".rela.text", secstrings + sechdrs[i].sh_name) == 0) && |
409 | (hdr->e_flags & FLG_CODE_IN_L1)))) { | 409 | (hdr->e_flags & FLG_CODE_IN_L1)))) { |
410 | apply_relocate_add((Elf_Shdr *) sechdrs, strtab, | 410 | apply_relocate_add((Elf_Shdr *) sechdrs, strtab, |
411 | symindex, i, mod); | 411 | symindex, i, mod); |
@@ -417,13 +417,13 @@ module_finalize(const Elf_Ehdr * hdr, | |||
417 | void module_arch_cleanup(struct module *mod) | 417 | void module_arch_cleanup(struct module *mod) |
418 | { | 418 | { |
419 | if ((mod->arch.text_l1) && (mod->arch.text_l1->sh_addr)) | 419 | if ((mod->arch.text_l1) && (mod->arch.text_l1->sh_addr)) |
420 | l1_inst_sram_free((void*)mod->arch.text_l1->sh_addr); | 420 | l1_inst_sram_free((void *)mod->arch.text_l1->sh_addr); |
421 | if ((mod->arch.data_a_l1) && (mod->arch.data_a_l1->sh_addr)) | 421 | if ((mod->arch.data_a_l1) && (mod->arch.data_a_l1->sh_addr)) |
422 | l1_data_sram_free((void*)mod->arch.data_a_l1->sh_addr); | 422 | l1_data_sram_free((void *)mod->arch.data_a_l1->sh_addr); |
423 | if ((mod->arch.bss_a_l1) && (mod->arch.bss_a_l1->sh_addr)) | 423 | if ((mod->arch.bss_a_l1) && (mod->arch.bss_a_l1->sh_addr)) |
424 | l1_data_sram_free((void*)mod->arch.bss_a_l1->sh_addr); | 424 | l1_data_sram_free((void *)mod->arch.bss_a_l1->sh_addr); |
425 | if ((mod->arch.data_b_l1) && (mod->arch.data_b_l1->sh_addr)) | 425 | if ((mod->arch.data_b_l1) && (mod->arch.data_b_l1->sh_addr)) |
426 | l1_data_B_sram_free((void*)mod->arch.data_b_l1->sh_addr); | 426 | l1_data_B_sram_free((void *)mod->arch.data_b_l1->sh_addr); |
427 | if ((mod->arch.bss_b_l1) && (mod->arch.bss_b_l1->sh_addr)) | 427 | if ((mod->arch.bss_b_l1) && (mod->arch.bss_b_l1->sh_addr)) |
428 | l1_data_B_sram_free((void*)mod->arch.bss_b_l1->sh_addr); | 428 | l1_data_B_sram_free((void *)mod->arch.bss_b_l1->sh_addr); |
429 | } | 429 | } |