Merge branch 'upstream'

1 files changed, 13 insertions, 0 deletions

diff --git a/arch/ppc64/kernel/module.c b/arch/ppc64/kernel/module.c
index c683bf88e690..928b8581fcb0 100644
--- a/arch/ppc64/kernel/module.c
+++ b/arch/ppc64/kernel/module.c
@@ -341,6 +341,19 @@ int apply_relocate_add(Elf64_Shdr *sechdrs,
                         *(unsigned long *)location = my_r2(sechdrs, me);
                         break;
 
+                case R_PPC64_TOC16:
+                        /* Subtact TOC pointer */
+                        value -= my_r2(sechdrs, me);
+                        if (value + 0x8000 > 0xffff) {
+                                printk("%s: bad TOC16 relocation (%lu)\n",
+                                       me->name, value);
+                                return -ENOEXEC;
+                        }
+                        *((uint16_t *) location)
+                                = (*((uint16_t *) location) & ~0xffff)
+                                | (value & 0xffff);
+                        break;
+
                 case R_PPC64_TOC16_DS:
                         /* Subtact TOC pointer */
                         value -= my_r2(sechdrs, me);