From 5a49de62926e12646036e667f8e035dca0017f2b Mon Sep 17 00:00:00 2001
From: Heiko Carstens <heiko.carstens@de.ibm.com>
Date: Sat, 20 Apr 2013 14:25:42 +0200
Subject: [PATCH] --- yaml --- r: 362810 b: refs/heads/master c:
 0f58104c8c62e40c8734477b6a9308c77b5d9355 h: refs/heads/master v: v3

---
 [refs]                               | 2 +-
 trunk/arch/s390/include/asm/compat.h | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index ec4567fd182c..3b62d79f9dbe 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a2aec0d3e22f3f940a165181ef339ac16deefa7c
+refs/heads/master: 0f58104c8c62e40c8734477b6a9308c77b5d9355
diff --git a/trunk/arch/s390/include/asm/compat.h b/trunk/arch/s390/include/asm/compat.h
index d967ac8d55d0..1f1a4490cdeb 100644
--- a/trunk/arch/s390/include/asm/compat.h
+++ b/trunk/arch/s390/include/asm/compat.h
@@ -248,8 +248,6 @@ static inline int is_compat_task(void)
 	return is_32bit_task();
 }
 
-#endif
-
 static inline void __user *arch_compat_alloc_user_space(long len)
 {
 	unsigned long stack;
@@ -260,6 +258,8 @@ static inline void __user *arch_compat_alloc_user_space(long len)
 	return (void __user *) (stack - len);
 }
 
+#endif
+
 struct compat_ipc64_perm {
 	compat_key_t key;
 	__compat_uid32_t uid;