2 files changed, 6 insertions, 3 deletions

diff --git a/include/Kbuild b/include/Kbuild
index bdca155028ec..d8c3e3cbf416 100644
--- a/include/Kbuild
+++ b/include/Kbuild
@@ -1,3 +1,6 @@
+# Top-level Makefile calls into asm-$(ARCH)
+# List only non-arch directories below
+
 header-y += asm-generic/
 header-y += linux/
 header-y += sound/
@@ -5,5 +8,3 @@ header-y += mtd/
 header-y += rdma/
 header-y += video/
 header-y += drm/
-
-header-y += asm-$(ARCH)/
diff --git a/include/asm-generic/vmlinux.lds.h b/include/asm-generic/vmlinux.lds.h
index 9cd44b162ba1..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