Merge branch 'work.exfat' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs

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

diff --git a/include/asm-generic/vmlinux.lds.h b/include/asm-generic/vmlinux.lds.h
index e00f41a..71e387a 100644 (file)
--- a/include/asm-generic/vmlinux.lds.h
+++ b/include/asm-generic/vmlinux.lds.h
@@ -535,6 +535,7 @@
                                                                        \
        RO_EXCEPTION_TABLE                                              \
        NOTES                                                           \
+       BTF                                                             \
                                                                        \
        . = ALIGN((align));                                             \
        __end_rodata = .;
@@ -621,6 +622,20 @@
                __stop___ex_table = .;                                  \
        }
 
+/*
+ * .BTF
+ */
+#ifdef CONFIG_DEBUG_INFO_BTF
+#define BTF                                                            \
+       .BTF : AT(ADDR(.BTF) - LOAD_OFFSET) {                           \
+               __start_BTF = .;                                        \
+               *(.BTF)                                                 \
+               __stop_BTF = .;                                         \
+       }
+#else
+#define BTF
+#endif
+
 /*
  * Init task
  */
@@ -894,10 +909,17 @@
  * section definitions so that such archs put those in earlier section
  * definitions.
  */
+#ifdef RUNTIME_DISCARD_EXIT
+#define EXIT_DISCARDS
+#else
+#define EXIT_DISCARDS                                                  \
+       EXIT_TEXT                                                       \
+       EXIT_DATA
+#endif
+
 #define DISCARDS                                                       \
        /DISCARD/ : {                                                   \
-       EXIT_TEXT                                                       \
-       EXIT_DATA                                                       \
+       EXIT_DISCARDS                                                   \
        EXIT_CALL                                                       \
        *(.discard)                                                     \
        *(.discard.*)                                                   \