---

yaml --- r: 320423 b: refs/heads/master c: 3193a98 h: refs/heads/master i: 320421: 5115e21 320419: 6546b81 320415: e812e24 v: v3
git-mirror · Jul 26, 2012 · 65ca3ec · 65ca3ec
1 parent e4e4558
commit 65ca3ec
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d5274369945a9c1cc05cb05c0d9713afe2f87db0
+refs/heads/master: 3193a98dc8777815803738fdae654c6ba0feee76
diff --git a/trunk/arch/s390/Kconfig b/trunk/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/trunk/arch/s390/kernel/early.c b/trunk/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/trunk/scripts/sortextable.c b/trunk/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 */