3 files changed, 40 insertions, 2 deletions

diff --git a/include/asm-generic/bitops/sched.h b/include/asm-generic/bitops/sched.h
index 5ef93a4d009f..815bb0148060 100644
--- a/include/asm-generic/bitops/sched.h
+++ b/include/asm-generic/bitops/sched.h
@@ -15,7 +15,7 @@ static inline int sched_find_first_bit(const unsigned long *b)
 #if BITS_PER_LONG == 64
         if (unlikely(b[0]))
                 return __ffs(b[0]);
-        if (unlikely(b[1]))
+        if (likely(b[1]))
                 return __ffs(b[1]) + 64;
         return __ffs(b[2]) + 128;
 #elif BITS_PER_LONG == 32
diff --git a/include/asm-generic/bug.h b/include/asm-generic/bug.h
index 1d9573cf4a0b..c92ae0f166ff 100644
--- a/include/asm-generic/bug.h
+++ b/include/asm-generic/bug.h
@@ -37,7 +37,10 @@
 #endif
 
 #ifndef HAVE_ARCH_WARN_ON
-#define WARN_ON(condition) unlikely((condition))
+#define WARN_ON(condition) ({                                           \
+        typeof(condition) __ret_warn_on = (condition);                  \
+        unlikely(__ret_warn_on);                                        \
+})
 #endif
 #endif
 
diff --git a/include/asm-generic/vmlinux.lds.h b/include/asm-generic/vmlinux.lds.h
index 69240b52f8e1..e60d6f21fa62 100644
--- a/include/asm-generic/vmlinux.lds.h
+++ b/include/asm-generic/vmlinux.lds.h
@@ -125,6 +125,10 @@
                 *(__param)                                              \
                 VMLINUX_SYMBOL(__stop___param) = .;                     \
         }                                                               \
+                                                                        \
+        /* Unwind data binary search table */                           \
+        EH_FRAME_HDR                                                    \
+                                                                        \
         __end_rodata = .;                                               \
         . = ALIGN(4096);
 
@@ -157,6 +161,18 @@
                 *(.kprobes.text)                                        \
                 VMLINUX_SYMBOL(__kprobes_text_end) = .;
 
+#ifdef CONFIG_STACK_UNWIND
+                /* Unwind data binary search table */
+#define EH_FRAME_HDR                                                    \
+                .eh_frame_hdr : AT(ADDR(.eh_frame_hdr) - LOAD_OFFSET) { \
+                        VMLINUX_SYMBOL(__start_unwind_hdr) = .;         \
+                        *(.eh_frame_hdr)                                \
+                        VMLINUX_SYMBOL(__end_unwind_hdr) = .;           \
+                }
+#else
+#define EH_FRAME_HDR
+#endif
+
                 /* DWARF debug sections.
                 Symbols in the DWARF debugging sections are relative to
                 the beginning of the section so we begin them at 0.  */
@@ -197,3 +213,22 @@
 
 #define NOTES                                                           \
                 .notes : { *(.note.*) } :note
+
+#define INITCALLS                                                       \
+        *(.initcall0.init)                                              \
+        *(.initcall0s.init)                                             \
+        *(.initcall1.init)                                              \
+        *(.initcall1s.init)                                             \
+        *(.initcall2.init)                                              \
+        *(.initcall2s.init)                                             \
+        *(.initcall3.init)                                              \
+        *(.initcall3s.init)                                             \
+        *(.initcall4.init)                                              \
+        *(.initcall4s.init)                                             \
+        *(.initcall5.init)                                              \
+        *(.initcall5s.init)                                             \
+        *(.initcall6.init)                                              \
+        *(.initcall6s.init)                                             \
+        *(.initcall7.init)                                              \
+        *(.initcall7s.init)
+