prefer new socket syscalls, fallback to SYS_socketcall only if needed

[musl] / arch / s390x / bits / user.h

diff --git a/arch/s390x/bits/user.h b/arch/s390x/bits/user.h
index 428a397..ff3f048 100644 (file)
--- a/arch/s390x/bits/user.h
+++ b/arch/s390x/bits/user.h
@@ -8,7 +8,7 @@ typedef union {
 
 typedef struct {
        unsigned fpc;
-       fpreg_t fprs[16];
+       elf_fpreg_t fprs[16];
 } elf_fpregset_t;
 
 #define ELF_NGREG 27
@@ -23,16 +23,6 @@ struct _user_fpregs_struct {
        double fprs[16];
 };
 
-struct _user_regs_struct {
-       struct _user_psw_struct psw;
-       unsigned long gprs[16];
-       unsigned acrs[16];
-       unsigned long orig_gpr2;
-       struct _user_fpregs_struct fp_regs;
-       struct _user_per_struct per_info;
-       unsigned long ieee_instruction_pointer;
-};
-
 struct _user_per_struct {
        unsigned long control_regs[3];
        unsigned single_step       : 1;
@@ -42,7 +32,17 @@ struct _user_per_struct {
        unsigned short perc_atmid;
        unsigned long address;
        unsigned char access_id;
-} per_struct;
+};
+
+struct _user_regs_struct {
+       struct _user_psw_struct psw;
+       unsigned long gprs[16];
+       unsigned acrs[16];
+       unsigned long orig_gpr2;
+       struct _user_fpregs_struct fp_regs;
+       struct _user_per_struct per_info;
+       unsigned long ieee_instruction_pointer;
+};
 
 struct user {
        struct _user_regs_struct regs;
@@ -54,8 +54,8 @@ struct user {
        char u_comm[32];
 };
 
-#define PAGE_MASK            (~(PAGE_SIZE-1))
-#define NBPG                 PAGE_SIZE
+#define PAGE_MASK            (~(PAGESIZE-1))
+#define NBPG                 PAGESIZE
 #define UPAGES               1
 #define HOST_TEXT_START_ADDR (u.start_code)
 #define HOST_STACK_END_ADDR  (u.start_stack + u.u_ssize * NBPG)