X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=arch%2Fs390x%2Fbits%2Fuser.h;h=ff3f048380a4cac9f40ddce5acedaea19111f5a1;hb=2df8b1d806c3e1fd4b6b10e13794855a93fe6628;hp=d2065b5e02294c35cc26e0a050dfd2579e7fb27f;hpb=15094943050eb9a564f409323070e50b40f78816;p=musl

diff --git a/arch/s390x/bits/user.h b/arch/s390x/bits/user.h
index d2065b5e..ff3f0483 100644
--- a/arch/s390x/bits/user.h
+++ b/arch/s390x/bits/user.h
@@ -8,11 +8,11 @@ typedef union {
 
 typedef struct {
 	unsigned fpc;
-	fpreg_t fprs[16];
+	elf_fpreg_t fprs[16];
 } elf_fpregset_t;
 
 #define ELF_NGREG 27
-typedef unsigned long elf_greg_t, elf_gregset_t[ELG_NGREG];
+typedef unsigned long elf_greg_t, elf_gregset_t[ELF_NGREG];
 
 struct _user_psw_struct {
 	unsigned long mask, addr;
@@ -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)