From c6629e4181eff3387b5c31c4a1dbecfc5298a0fe Mon Sep 17 00:00:00 2001 From: Heiko Carstens Date: Tue, 29 May 2012 11:21:27 +0200 Subject: [PATCH] --- yaml --- r: 309601 b: refs/heads/master c: 2e30db9522837e2a5d30ce1e66afb0a7ee0ff350 h: refs/heads/master i: 309599: 5f4b9ff7c551cdd735f7164342204d6ca4afc2e3 v: v3 --- [refs] | 2 +- trunk/arch/s390/Kconfig | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 55100f1455fb..137d5a6740ab 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1896d256d3513eafa2c2d506299b8f3951319ca2 +refs/heads/master: 2e30db9522837e2a5d30ce1e66afb0a7ee0ff350 diff --git a/trunk/arch/s390/Kconfig b/trunk/arch/s390/Kconfig index e16390c0bca8..57c86da61c19 100644 --- a/trunk/arch/s390/Kconfig +++ b/trunk/arch/s390/Kconfig @@ -93,6 +93,7 @@ config S390 select ARCH_SAVE_PAGE_KEYS if HIBERNATION select HAVE_MEMBLOCK select HAVE_MEMBLOCK_NODE_MAP + select HAVE_CMPXCHG_LOCAL select ARCH_DISCARD_MEMBLOCK select ARCH_INLINE_SPIN_TRYLOCK select ARCH_INLINE_SPIN_TRYLOCK_BH