Remove unneeded _syscallX macros from user view in asm-*/unistd.h

[linux-2.6] / include / asm-s390 / ptrace.h

diff --git a/include/asm-s390/ptrace.h b/include/asm-s390/ptrace.h
index 4eff8f2e3bf1d636e78ccb9842bc519722387c7d..4d75d77b0f9960cad73cedb09adaae4e85a6c5c1 100644 (file)
--- a/include/asm-s390/ptrace.h
+++ b/include/asm-s390/ptrace.h
@@ -181,11 +181,8 @@
 #define PTRACE_OLDSETOPTIONS         21
 
 #ifndef __ASSEMBLY__
-#include <linux/config.h>
 #include <linux/stddef.h>
 #include <linux/types.h>
-#include <asm/setup.h>
-#include <asm/page.h>
 
 typedef union
 {
@@ -276,7 +273,7 @@ typedef struct
 #endif /* __s390x__ */
 
 #define PSW_KERNEL_BITS        (PSW_BASE_BITS | PSW_MASK_DAT | PSW_ASC_PRIMARY | \
-                        PSW_DEFAULT_KEY)
+                        PSW_MASK_MCHECK | PSW_DEFAULT_KEY)
 #define PSW_USER_BITS  (PSW_BASE_BITS | PSW_MASK_DAT | PSW_ASC_HOME | \
                         PSW_MASK_IO | PSW_MASK_EXT | PSW_MASK_MCHECK | \
                         PSW_MASK_PSTATE | PSW_DEFAULT_KEY)
@@ -301,6 +298,9 @@ typedef struct
 } s390_regs;
 
 #ifdef __KERNEL__
+#include <asm/setup.h>
+#include <asm/page.h>
+
 /*
  * The pt_regs struct defines the way the registers are stored on
  * the stack during a system call.
@@ -468,6 +468,8 @@ struct user_regs_struct
 };
 
 #ifdef __KERNEL__
+#define __ARCH_SYS_PTRACE      1
+
 #define user_mode(regs) (((regs)->psw.mask & PSW_MASK_PSTATE) != 0)
 #define instruction_pointer(regs) ((regs)->psw.addr & PSW_ADDR_INSN)
 #define profile_pc(regs) instruction_pointer(regs)