s390/exceptions: sort exception table at build time

Follow x86 and MIPS and sort the main exception table at build time.

Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>

3 files changed, 2 insertions, 1 deletions

diff --git a/arch/s390/Kconfig b/arch/s390/Kconfig
index a39b4690c171..d6108593c099 100644
--- a/arch/s390/Kconfig
+++ b/arch/s390/Kconfig
@@ -89,6 +89,7 @@ config S390
         select HAVE_MEMBLOCK_NODE_MAP
         select HAVE_CMPXCHG_LOCAL
         select ARCH_DISCARD_MEMBLOCK
+        select BUILDTIME_EXTABLE_SORT
         select ARCH_INLINE_SPIN_TRYLOCK
         select ARCH_INLINE_SPIN_TRYLOCK_BH
         select ARCH_INLINE_SPIN_LOCK
diff --git a/arch/s390/kernel/early.c b/arch/s390/kernel/early.c
index bc95a8ebd9cc..83c3271c442b 100644
--- a/arch/s390/kernel/early.c
+++ b/arch/s390/kernel/early.c
@@ -455,7 +455,6 @@ void __init startup_init(void)
         init_kernel_storage_key();
         lockdep_init();
         lockdep_off();
-        sort_main_extable();
         setup_lowcore_early();
         setup_facility_list();
         detect_machine_type();
diff --git a/scripts/sortextable.c b/scripts/sortextable.c
index 1ca9ceb95eb6..6acf83449105 100644
--- a/scripts/sortextable.c
+++ b/scripts/sortextable.c
@@ -247,6 +247,7 @@ do_file(char const *const fname)
         case EM_X86_64:
                 custom_sort = sort_x86_table;
                 break;
+        case EM_S390:
         case EM_MIPS:
                 break;
         }  /* end switch */