Merge branch 'master' into devel
Conflicts: arch/arm/include/asm/elf.h arch/arm/kernel/module.c
This commit is contained in:
commit
9759d22c83
5 changed files with 16 additions and 3 deletions
|
@ -50,6 +50,7 @@ typedef struct user_fp elf_fpregset_t;
|
||||||
#define R_ARM_ABS32 2
|
#define R_ARM_ABS32 2
|
||||||
#define R_ARM_CALL 28
|
#define R_ARM_CALL 28
|
||||||
#define R_ARM_JUMP24 29
|
#define R_ARM_JUMP24 29
|
||||||
|
#define R_ARM_V4BX 40
|
||||||
#define R_ARM_PREL31 42
|
#define R_ARM_PREL31 42
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
|
|
@ -155,6 +155,15 @@ apply_relocate(Elf32_Shdr *sechdrs, const char *strtab, unsigned int symindex,
|
||||||
*(u32 *)loc |= offset & 0x00ffffff;
|
*(u32 *)loc |= offset & 0x00ffffff;
|
||||||
break;
|
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:
|
case R_ARM_PREL31:
|
||||||
offset = *(u32 *)loc + sym->st_value - loc;
|
offset = *(u32 *)loc + sym->st_value - loc;
|
||||||
*(u32 *)loc = offset & 0x7fffffff;
|
*(u32 *)loc = offset & 0x7fffffff;
|
||||||
|
|
|
@ -1026,8 +1026,10 @@ int iop13xx_pci_setup(int nr, struct pci_sys_data *sys)
|
||||||
which_atu = 0;
|
which_atu = 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!which_atu)
|
if (!which_atu) {
|
||||||
|
kfree(res);
|
||||||
return 0;
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
switch(which_atu) {
|
switch(which_atu) {
|
||||||
case IOP13XX_INIT_ATU_ATUX:
|
case IOP13XX_INIT_ATU_ATUX:
|
||||||
|
@ -1074,6 +1076,7 @@ int iop13xx_pci_setup(int nr, struct pci_sys_data *sys)
|
||||||
sys->map_irq = iop13xx_pcie_map_irq;
|
sys->map_irq = iop13xx_pcie_map_irq;
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
|
kfree(res);
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -723,7 +723,7 @@ static void __init sanity_check_meminfo(void)
|
||||||
* the vmalloc area.
|
* the vmalloc area.
|
||||||
*/
|
*/
|
||||||
if (__va(bank->start) >= VMALLOC_MIN ||
|
if (__va(bank->start) >= VMALLOC_MIN ||
|
||||||
__va(bank->start) < PAGE_OFFSET) {
|
__va(bank->start) < (void *)PAGE_OFFSET) {
|
||||||
printk(KERN_NOTICE "Ignoring RAM at %.8lx-%.8lx "
|
printk(KERN_NOTICE "Ignoring RAM at %.8lx-%.8lx "
|
||||||
"(vmalloc region overlap).\n",
|
"(vmalloc region overlap).\n",
|
||||||
bank->start, bank->start + bank->size - 1);
|
bank->start, bank->start + bank->size - 1);
|
||||||
|
|
|
@ -318,7 +318,7 @@ cumanascsi_2_set_proc_info(struct Scsi_Host *host, char *buffer, int length)
|
||||||
{
|
{
|
||||||
int ret = length;
|
int ret = length;
|
||||||
|
|
||||||
if (length >= 11 && strcmp(buffer, "CUMANASCSI2") == 0) {
|
if (length >= 11 && strncmp(buffer, "CUMANASCSI2", 11) == 0) {
|
||||||
buffer += 11;
|
buffer += 11;
|
||||||
length -= 11;
|
length -= 11;
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue