Merge tag 'v3.10.68' into update

[GitHub/mt8127/android_kernel_alcatel_ttab.git] / arch / arm / kernel / module.c

diff --git a/arch/arm/kernel/module.c b/arch/arm/kernel/module.c
index b69ed0c44555c6cc83e46489b4466da92ee4d6c7..70bec79c2f3831d344e9eb63bb6d8dbab87230e7 100644 (file)
--- a/arch/arm/kernel/module.c
+++ b/arch/arm/kernel/module.c
@@ -296,6 +296,10 @@ int module_finalize(const Elf32_Ehdr *hdr, const Elf_Shdr *sechdrs,
                        maps[ARM_SEC_EXIT].unw_sec = s;
                else if (strcmp(".ARM.exidx.devexit.text", secname) == 0)
                        maps[ARM_SEC_DEVEXIT].unw_sec = s;
+               else if (strcmp(".ARM.exidx.text.unlikely", secname) == 0)
+                       maps[ARM_SEC_UNLIKELY].unw_sec = s;
+               else if (strcmp(".ARM.exidx.text.hot", secname) == 0)
+                       maps[ARM_SEC_HOT].unw_sec = s;
                else if (strcmp(".init.text", secname) == 0)
                        maps[ARM_SEC_INIT].txt_sec = s;
                else if (strcmp(".devinit.text", secname) == 0)
@@ -306,6 +310,10 @@ int module_finalize(const Elf32_Ehdr *hdr, const Elf_Shdr *sechdrs,
                        maps[ARM_SEC_EXIT].txt_sec = s;
                else if (strcmp(".devexit.text", secname) == 0)
                        maps[ARM_SEC_DEVEXIT].txt_sec = s;
+               else if (strcmp(".text.unlikely", secname) == 0)
+                       maps[ARM_SEC_UNLIKELY].txt_sec = s;
+               else if (strcmp(".text.hot", secname) == 0)
+                       maps[ARM_SEC_HOT].txt_sec = s;
        }
 
        for (i = 0; i < ARM_SEC_MAX; i++)