git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6
[pandora-kernel.git]
/
arch
/
blackfin
/
kernel
/
module.c
diff --git
a/arch/blackfin/kernel/module.c
b/arch/blackfin/kernel/module.c
index
1bd7f2d
..
d5aee36
100644
(file)
--- a/
arch/blackfin/kernel/module.c
+++ b/
arch/blackfin/kernel/module.c
@@
-201,8
+201,8
@@
apply_relocate(Elf_Shdr * sechdrs, const char *strtab,
/* Arithmetic relocations are handled. */
/* We do not expect LSETUP to be split and hence is not */
/* handled. */
/* Arithmetic relocations are handled. */
/* We do not expect LSETUP to be split and hence is not */
/* handled. */
-/* R_
byte and R_byte2 are also not handled as the gas
*/
-/*
does not generate it.
*/
+/* R_
BFIN_BYTE and R_BFIN_BYTE2 are also not handled as the
*/
+/*
gas does not generate it.
*/
/*************************************************************************/
int
apply_relocate_add(Elf_Shdr * sechdrs, const char *strtab,
/*************************************************************************/
int
apply_relocate_add(Elf_Shdr * sechdrs, const char *strtab,
@@
-243,8
+243,8
@@
apply_relocate_add(Elf_Shdr * sechdrs, const char *strtab,
#endif
switch (ELF32_R_TYPE(rel[i].r_info)) {
#endif
switch (ELF32_R_TYPE(rel[i].r_info)) {
- case R_
pcrel
24:
- case R_
pcrel24_jump_l
:
+ case R_
BFIN_PCREL
24:
+ case R_
BFIN_PCREL24_JUMP_L
:
/* Add the value, subtract its postition */
location16 =
(uint16_t *) (sechdrs[sechdrs[relsec].sh_info].
/* Add the value, subtract its postition */
location16 =
(uint16_t *) (sechdrs[sechdrs[relsec].sh_info].
@@
-266,18
+266,18
@@
apply_relocate_add(Elf_Shdr * sechdrs, const char *strtab,
(*location16 & 0xff00) | (value >> 16 & 0x00ff);
*(location16 + 1) = value & 0xffff;
break;
(*location16 & 0xff00) | (value >> 16 & 0x00ff);
*(location16 + 1) = value & 0xffff;
break;
- case R_
pcrel12_jump
:
- case R_
pcrel12_jump_s
:
+ case R_
BFIN_PCREL12_JUMP
:
+ case R_
BFIN_PCREL12_JUMP_S
:
value -= (uint32_t) location32;
value >>= 1;
*location16 = (value & 0xfff);
break;
value -= (uint32_t) location32;
value >>= 1;
*location16 = (value & 0xfff);
break;
- case R_
pcrel
10:
+ case R_
BFIN_PCREL
10:
value -= (uint32_t) location32;
value >>= 1;
*location16 = (value & 0x3ff);
break;
value -= (uint32_t) location32;
value >>= 1;
*location16 = (value & 0x3ff);
break;
- case R_
luimm
16:
+ case R_
BFIN_LUIMM
16:
pr_debug("before %x after %x\n", *location16,
(value & 0xffff));
tmp = (value & 0xffff);
pr_debug("before %x after %x\n", *location16,
(value & 0xffff));
tmp = (value & 0xffff);
@@
-286,7
+286,7
@@
apply_relocate_add(Elf_Shdr * sechdrs, const char *strtab,
} else
*location16 = tmp;
break;
} else
*location16 = tmp;
break;
- case R_
huimm
16:
+ case R_
BFIN_HUIMM
16:
pr_debug("before %x after %x\n", *location16,
((value >> 16) & 0xffff));
tmp = ((value >> 16) & 0xffff);
pr_debug("before %x after %x\n", *location16,
((value >> 16) & 0xffff));
tmp = ((value >> 16) & 0xffff);
@@
-295,10
+295,10
@@
apply_relocate_add(Elf_Shdr * sechdrs, const char *strtab,
} else
*location16 = tmp;
break;
} else
*location16 = tmp;
break;
- case R_
rimm
16:
+ case R_
BFIN_RIMM
16:
*location16 = (value & 0xffff);
break;
*location16 = (value & 0xffff);
break;
- case R_
byte4_data
:
+ case R_
BFIN_BYTE4_DATA
:
pr_debug("before %x after %x\n", *location32, value);
*location32 = value;
break;
pr_debug("before %x after %x\n", *location32, value);
*location32 = value;
break;