Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next

[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 39da8d8..71e387a 100644 (file)
--- a/include/asm-generic/vmlinux.lds.h
+++ b/include/asm-generic/vmlinux.lds.h
@@ -909,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.*)                                                   \