Merge branch 'linus' into cpus4096

1 files changed, 5 insertions, 1 deletions

diff --git a/include/asm-generic/vmlinux.lds.h b/include/asm-generic/vmlinux.lds.h
index 729f6b0a60e9..6d88a923c945 100644
--- a/include/asm-generic/vmlinux.lds.h
+++ b/include/asm-generic/vmlinux.lds.h
@@ -221,6 +221,7 @@
  * during second ld run in second ld pass when generating System.map */
 #define TEXT_TEXT                                                       \
                 ALIGN_FUNCTION();                                       \
+                *(.text.hot)                                            \
                 *(.text)                                                \
                 *(.ref.text)                                            \
                 *(.text.init.refok)                                     \
@@ -230,7 +231,8 @@
         CPU_KEEP(init.text)                                             \
         CPU_KEEP(exit.text)                                             \
         MEM_KEEP(init.text)                                             \
-        MEM_KEEP(exit.text)
+        MEM_KEEP(exit.text)                                             \
+                *(.text.unlikely)
 
 
 /* sched.text is aling to function alignment to secure we have same
@@ -359,6 +361,8 @@
         }
 
 #define INITCALLS                                                       \
+        *(.initcallearly.init)                                          \
+        __early_initcall_end = .;                                       \
         *(.initcall0.init)                                              \
         *(.initcall0s.init)                                             \
         *(.initcall1.init)                                              \