From 65ca3ec8878d46cacdc958a440710fc7ba33818e Mon Sep 17 00:00:00 2001 From: Heiko Carstens Date: Tue, 24 Jul 2012 14:51:34 +0200 Subject: [PATCH] --- yaml --- r: 320423 b: refs/heads/master c: 3193a98dc8777815803738fdae654c6ba0feee76 h: refs/heads/master i: 320421: 5115e218575faa933de56cabc0867f886574ba69 320419: 6546b81b59faa5c4deaf2293098e1e50bdb01916 320415: e812e24ff80781320ba0bea0558d365057aa48ac v: v3 --- [refs] | 2 +- trunk/arch/s390/Kconfig | 1 + trunk/arch/s390/kernel/early.c | 1 - trunk/scripts/sortextable.c | 1 + 4 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 3fa37cd7774f..40b274f604ef 100644 --- 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 index a39b4690c171..d6108593c099 100644 --- 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 index bc95a8ebd9cc..83c3271c442b 100644 --- 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 index 1ca9ceb95eb6..6acf83449105 100644 --- 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 */