2 files changed, 21 insertions, 4 deletions

diff --git a/scripts/mod/file2alias.c b/scripts/mod/file2alias.c
index 23708636b05c..25e5cb0aaef6 100644
--- a/scripts/mod/file2alias.c
+++ b/scripts/mod/file2alias.c
@@ -210,8 +210,8 @@ static void do_usb_entry(void *symval,
                                 range_lo < 0x9 ? "[%X-9" : "[%X",
                                 range_lo);
                         sprintf(alias + strlen(alias),
-                                range_hi > 0xA ? "a-%X]" : "%X]",
-                                range_lo);
+                                range_hi > 0xA ? "A-%X]" : "%X]",
+                                range_hi);
                 }
         }
         if (bcdDevice_initial_digits < (sizeof(bcdDevice_lo) * 2 - 1))
diff --git a/scripts/mod/modpost.c b/scripts/mod/modpost.c
index 17855761e6b7..99a45fdc1bbf 100644
--- a/scripts/mod/modpost.c
+++ b/scripts/mod/modpost.c
@@ -584,12 +584,16 @@ static int ignore_undef_symbol(struct elf_info *info, const char *symname)
                 if (strncmp(symname, "_restgpr_", sizeof("_restgpr_") - 1) == 0 ||
                     strncmp(symname, "_savegpr_", sizeof("_savegpr_") - 1) == 0 ||
                     strncmp(symname, "_rest32gpr_", sizeof("_rest32gpr_") - 1) == 0 ||
-                    strncmp(symname, "_save32gpr_", sizeof("_save32gpr_") - 1) == 0)
+                    strncmp(symname, "_save32gpr_", sizeof("_save32gpr_") - 1) == 0 ||
+                    strncmp(symname, "_restvr_", sizeof("_restvr_") - 1) == 0 ||
+                    strncmp(symname, "_savevr_", sizeof("_savevr_") - 1) == 0)
                         return 1;
         if (info->hdr->e_machine == EM_PPC64)
                 /* Special register function linked on all modules during final link of .ko */
                 if (strncmp(symname, "_restgpr0_", sizeof("_restgpr0_") - 1) == 0 ||
-                    strncmp(symname, "_savegpr0_", sizeof("_savegpr0_") - 1) == 0)
+                    strncmp(symname, "_savegpr0_", sizeof("_savegpr0_") - 1) == 0 ||
+                    strncmp(symname, "_restvr_", sizeof("_restvr_") - 1) == 0 ||
+                    strncmp(symname, "_savevr_", sizeof("_savevr_") - 1) == 0)
                         return 1;
         /* Do not ignore this symbol */
         return 0;
@@ -1498,6 +1502,16 @@ static int addend_386_rel(struct elf_info *elf, Elf_Shdr *sechdr, Elf_Rela *r)
 #define R_ARM_JUMP24    29
 #endif
 
+#ifndef R_ARM_THM_CALL
+#define R_ARM_THM_CALL          10
+#endif
+#ifndef R_ARM_THM_JUMP24
+#define R_ARM_THM_JUMP24        30
+#endif
+#ifndef R_ARM_THM_JUMP19
+#define R_ARM_THM_JUMP19        51
+#endif
+
 static int addend_arm_rel(struct elf_info *elf, Elf_Shdr *sechdr, Elf_Rela *r)
 {
         unsigned int r_typ = ELF_R_TYPE(r->r_info);
@@ -1511,6 +1525,9 @@ static int addend_arm_rel(struct elf_info *elf, Elf_Shdr *sechdr, Elf_Rela *r)
         case R_ARM_PC24:
         case R_ARM_CALL:
         case R_ARM_JUMP24:
+        case R_ARM_THM_CALL:
+        case R_ARM_THM_JUMP24:
+        case R_ARM_THM_JUMP19:
                 /* From ARM ABI: ((S + A) | T) - P */
                 r->r_addend = (int)(long)(elf->hdr +
                               sechdr->sh_offset +