From 2a6165240565bdb52d23590b60c5925e4c6c7035 Mon Sep 17 00:00:00 2001
From: Heiko Carstens <heiko.carstens@de.ibm.com>
Date: Sat, 20 Apr 2013 14:07:29 +0200
Subject: [PATCH] --- yaml --- r: 362812 b: refs/heads/master c:
 63dd9b44ac926d3250c1e8dfcb309c37c870fe21 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index cde0b924e503..d7e192d5580f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e4371f602e2fce650cb3f7d1ca5c7cd6fca78dda
+refs/heads/master: 63dd9b44ac926d3250c1e8dfcb309c37c870fe21
diff --git a/trunk/arch/s390/include/asm/ptrace.h b/trunk/arch/s390/include/asm/ptrace.h
index 3ee5da3bc10c..559512a455da 100644
--- a/trunk/arch/s390/include/asm/ptrace.h
+++ b/trunk/arch/s390/include/asm/ptrace.h
@@ -9,9 +9,7 @@
 #include <uapi/asm/ptrace.h>
 
 #ifndef __ASSEMBLY__
-#ifndef __s390x__
-#else /* __s390x__ */
-#endif /* __s390x__ */
+
 extern long psw_kernel_bits;
 extern long psw_user_bits;
 
@@ -77,8 +75,6 @@ struct per_struct_kernel {
 #define PER_CONTROL_SUSPENSION		0x00400000UL
 #define PER_CONTROL_ALTERATION		0x00200000UL
 
-#ifdef __s390x__
-#endif /* __s390x__ */
 /*
  * These are defined as per linux/ptrace.h, which see.
  */