---

yaml --- r: 309601 b: refs/heads/master c: 2e30db9 h: refs/heads/master i: 309599: 5f4b9ff v: v3
git-mirror · May 30, 2012 · c6629e4 · c6629e4
1 parent e875aa9
commit c6629e4
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git 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
@@ -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