Merge branch 'master' into devel

Conflicts:
	arch/arm/include/asm/elf.h
	arch/arm/kernel/module.c

5 files changed, 16 insertions, 3 deletions

diff --git a/arch/arm/include/asm/elf.h b/arch/arm/include/asm/elf.h
index def8eac6e89d..d7da19bcf928 100644
--- a/arch/arm/include/asm/elf.h
+++ b/arch/arm/include/asm/elf.h
@@ -50,6 +50,7 @@ typedef struct user_fp elf_fpregset_t;
 #define R_ARM_ABS32     2
 #define R_ARM_CALL      28
 #define R_ARM_JUMP24    29
+#define R_ARM_V4BX      40
 #define R_ARM_PREL31    42
 
 /*
diff --git a/arch/arm/kernel/module.c b/arch/arm/kernel/module.c
index 13dbd5bf5cc2..d1731e39b496 100644
--- a/arch/arm/kernel/module.c
+++ b/arch/arm/kernel/module.c
@@ -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;
diff --git a/arch/arm/mach-iop13xx/pci.c b/arch/arm/mach-iop13xx/pci.c
index 673b0db22034..4873f26a42e1 100644
--- a/arch/arm/mach-iop13xx/pci.c
+++ b/arch/arm/mach-iop13xx/pci.c
@@ -1026,8 +1026,10 @@ int iop13xx_pci_setup(int nr, struct pci_sys_data *sys)
                 which_atu = 0;
         }
 
-        if (!which_atu)
+        if (!which_atu) {
+                kfree(res);
                 return 0;
+        }
 
         switch(which_atu) {
         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;
                 break;
         default:
+                kfree(res);
                 return 0;
         }
 
diff --git a/arch/arm/mm/mmu.c b/arch/arm/mm/mmu.c
index 1585814f8414..b438fc4fb77b 100644
--- a/arch/arm/mm/mmu.c
+++ b/arch/arm/mm/mmu.c
@@ -723,7 +723,7 @@ static void __init sanity_check_meminfo(void)
                  * the vmalloc area.
                  */
                 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 "
                                "(vmalloc region overlap).\n",
                                bank->start, bank->start + bank->size - 1);
diff --git a/drivers/scsi/arm/cumana_2.c b/drivers/scsi/arm/cumana_2.c
index 8ee01b907332..c9902b5c1f2b 100644
--- a/drivers/scsi/arm/cumana_2.c
+++ b/drivers/scsi/arm/cumana_2.c
@@ -318,7 +318,7 @@ cumanascsi_2_set_proc_info(struct Scsi_Host *host, char *buffer, int length)
 {
         int ret = length;
 
-        if (length >= 11 && strcmp(buffer, "CUMANASCSI2") == 0) {
+        if (length >= 11 && strncmp(buffer, "CUMANASCSI2", 11) == 0) {
                 buffer += 11;
                 length -= 11;