Merge tag 'drm-misc-next-fixes-2020-02-07' of git://anongit.freedesktop.org/drm/drm...

[linux-2.6-microblaze.git] / include / asm-generic / export.h

diff --git a/include/asm-generic/export.h b/include/asm-generic/export.h
index afddc54..365345f 100644 (file)
--- a/include/asm-generic/export.h
+++ b/include/asm-generic/export.h
@@ -27,9 +27,11 @@
 .endm
 
 /*
- * note on .section use: @progbits vs %progbits nastiness doesn't matter,
- * since we immediately emit into those sections anyway.
+ * note on .section use: we specify progbits since usage of the "M" (SHF_MERGE)
+ * section flag requires it. Use '%progbits' instead of '@progbits' since the
+ * former apparently works on all arches according to the binutils source.
  */
+
 .macro ___EXPORT_SYMBOL name,val,sec
 #ifdef CONFIG_MODULES
        .section ___ksymtab\sec+\name,"a"
@@ -37,7 +39,7 @@
 __ksymtab_\name:
        __put \val, __kstrtab_\name
        .previous
-       .section __ksymtab_strings,"a"
+       .section __ksymtab_strings,"aMS",%progbits,1
 __kstrtab_\name:
        .asciz "\name"
        .previous