lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' into devel

Browse Source 
Conflicts:
	arch/arm/include/asm/elf.h
	arch/arm/kernel/module.c
This commit is contained in:
Russell King
2009-03-28 20:30:18 +00:00
committed by Russell King
parent ed40d0c472 f0bba9f934
commit 9759d22c83
5 changed files with 16 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
arch/arm/kernel/module.c
View File

@ -155,6 +155,15 @@ apply_relocate(Elf32_Shdr *sechdrs, const char *strtab, unsigned int symindex,
*(u32 *)loc |= offset & 0x00ffffff;
break;
case R_ARM_V4BX:
/* Preserve Rm and the condition code. Alter
* other bits to re-code instruction as
* MOV PC,Rm.
*/
*(u32 *)loc &= 0xf000000f;
*(u32 *)loc |= 0x01a0f000;
break;
case R_ARM_PREL31:
offset = *(u32 *)loc + sym->st_value - loc;
*(u32 *)loc = offset & 0x7fffffff;