2 files changed, 13 insertions, 0 deletions

diff --git a/Makefile b/Makefile
index f6578f47e21e..622c918abff8 100644
--- a/Makefile
+++ b/Makefile
@@ -784,6 +784,10 @@ quiet_cmd_vmlinux_version = GEN     .version
 quiet_cmd_sysmap = SYSMAP
       cmd_sysmap = $(CONFIG_SHELL) $(srctree)/scripts/mksysmap
 
+# Sort exception table at build time
+quiet_cmd_sortextable = SORTEX
+      cmd_sortextable = $(objtree)/scripts/sortextable
+
 # Link of vmlinux
 # If CONFIG_KALLSYMS is set .version is already updated
 # Generate System.map and verify that the content is consistent
@@ -796,6 +800,12 @@ define rule_vmlinux__
         $(call cmd,vmlinux__)
         $(Q)echo 'cmd_$@ := $(cmd_vmlinux__)' > $(@D)/.$(@F).cmd
 
+        $(if $(CONFIG_BUILDTIME_EXTABLE_SORT),                          \
+          $(Q)$(if $($(quiet)cmd_sortextable),                          \
+            echo '  $($(quiet)cmd_sortextable)  vmlinux' &&)            \
+          $(cmd_sortextable)  vmlinux)
+
+
         $(Q)$(if $($(quiet)cmd_sysmap),                                      \
           echo '  $($(quiet)cmd_sysmap)  System.map' &&)                     \
         $(cmd_sysmap) $@ System.map;                                         \
diff --git a/init/Kconfig b/init/Kconfig
index 6cfd71d06463..92a1296ba9fa 100644
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -27,6 +27,9 @@ config IRQ_WORK
         bool
         depends on HAVE_IRQ_WORK
 
+config BUILDTIME_EXTABLE_SORT
+        bool
+
 menu "General setup"
 
 config EXPERIMENTAL