Merge remote-tracking branch 'modules/modules-next'

diff --git a/scripts/mod/modpost.c b/scripts/mod/modpost.c
index a4be8e112bb63c2ece5baa423e9aef65c92a1ad1..3d155dd27eb6da8eab9a81767fe30796be1cf4d3 100644 (file)
--- a/scripts/mod/modpost.c
+++ b/scripts/mod/modpost.c
@@ -884,7 +884,7 @@ static void check_section(const char *modname, struct elf_info *elf,
 #define ALL_EXIT_SECTIONS EXIT_SECTIONS, ALL_XXXEXIT_SECTIONS
 
 #define DATA_SECTIONS ".data$", ".data.rel$"
-#define TEXT_SECTIONS ".text$"
+#define TEXT_SECTIONS ".text$", ".text.unlikely$"
 
 #define INIT_SECTIONS      ".init.*"
 #define CPU_INIT_SECTIONS  ".cpuinit.*"