s390/bug: add entry size to the __bug_table section

Change the __EMIT_BUG inline assembly to emit mergeable __bug_table
entries with type @progbits and specify the size of each entry.
The entry size is encoded sh_entsize field of the section definition,
it allows to identify which struct bug_entry to use to decode the
entries. This will be needed for the objtool support.

Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>

diff --git a/arch/s390/include/asm/bug.h b/arch/s390/include/asm/bug.h
index 429f43a8a8e81fbac2837179ec5cf54ab04a49ba..713fc9735ffb046d2794bd821e6df89e647b6e32 100644 (file)
--- a/arch/s390/include/asm/bug.h
+++ b/arch/s390/include/asm/bug.h
@@ -15,7 +15,7 @@
                ".section .rodata.str,\"aMS\",@progbits,1\n"    \
                "2:     .asciz  \""__FILE__"\"\n"               \
                ".previous\n"                                   \
-               ".section __bug_table,\"aw\"\n"                 \
+               ".section __bug_table,\"awM\",@progbits,%2\n"   \
                "3:     .long   1b-3b,2b-3b\n"                  \
                "       .short  %0,%1\n"                        \
                "       .org    3b+%2\n"                        \
@@ -27,17 +27,17 @@
 
 #else /* CONFIG_DEBUG_BUGVERBOSE */
 
-#define __EMIT_BUG(x) do {                             \
-       asm volatile(                                   \
-               "0:     j       0b+2\n"                 \
-               "1:\n"                                  \
-               ".section __bug_table,\"aw\"\n"         \
-               "2:     .long   1b-2b\n"                \
-               "       .short  %0\n"                   \
-               "       .org    2b+%1\n"                \
-               ".previous\n"                           \
-               : : "i" (x),                            \
-                   "i" (sizeof(struct bug_entry)));    \
+#define __EMIT_BUG(x) do {                                     \
+       asm volatile(                                           \
+               "0:     j       0b+2\n"                         \
+               "1:\n"                                          \
+               ".section __bug_table,\"awM\",@progbits,%1\n"   \
+               "2:     .long   1b-2b\n"                        \
+               "       .short  %0\n"                           \
+               "       .org    2b+%1\n"                        \
+               ".previous\n"                                   \
+               : : "i" (x),                                    \
+                   "i" (sizeof(struct bug_entry)));            \
 } while (0)
 
 #endif /* CONFIG_DEBUG_BUGVERBOSE */