diff options
Diffstat (limited to 'include/asm-x86/ia32.h')
-rw-r--r-- | include/asm-x86/ia32.h | 62 |
1 files changed, 30 insertions, 32 deletions
diff --git a/include/asm-x86/ia32.h b/include/asm-x86/ia32.h index aa9733206e29..55d3abe5276f 100644 --- a/include/asm-x86/ia32.h +++ b/include/asm-x86/ia32.h | |||
@@ -14,19 +14,19 @@ | |||
14 | 14 | ||
15 | /* signal.h */ | 15 | /* signal.h */ |
16 | struct sigaction32 { | 16 | struct sigaction32 { |
17 | unsigned int sa_handler; /* Really a pointer, but need to deal | 17 | unsigned int sa_handler; /* Really a pointer, but need to deal |
18 | with 32 bits */ | 18 | with 32 bits */ |
19 | unsigned int sa_flags; | 19 | unsigned int sa_flags; |
20 | unsigned int sa_restorer; /* Another 32 bit pointer */ | 20 | unsigned int sa_restorer; /* Another 32 bit pointer */ |
21 | compat_sigset_t sa_mask; /* A 32 bit mask */ | 21 | compat_sigset_t sa_mask; /* A 32 bit mask */ |
22 | }; | 22 | }; |
23 | 23 | ||
24 | struct old_sigaction32 { | 24 | struct old_sigaction32 { |
25 | unsigned int sa_handler; /* Really a pointer, but need to deal | 25 | unsigned int sa_handler; /* Really a pointer, but need to deal |
26 | with 32 bits */ | 26 | with 32 bits */ |
27 | compat_old_sigset_t sa_mask; /* A 32 bit mask */ | 27 | compat_old_sigset_t sa_mask; /* A 32 bit mask */ |
28 | unsigned int sa_flags; | 28 | unsigned int sa_flags; |
29 | unsigned int sa_restorer; /* Another 32 bit pointer */ | 29 | unsigned int sa_restorer; /* Another 32 bit pointer */ |
30 | }; | 30 | }; |
31 | 31 | ||
32 | typedef struct sigaltstack_ia32 { | 32 | typedef struct sigaltstack_ia32 { |
@@ -65,7 +65,7 @@ struct stat64 { | |||
65 | long long st_size; | 65 | long long st_size; |
66 | unsigned int st_blksize; | 66 | unsigned int st_blksize; |
67 | 67 | ||
68 | long long st_blocks;/* Number 512-byte blocks allocated. */ | 68 | long long st_blocks;/* Number 512-byte blocks allocated */ |
69 | 69 | ||
70 | unsigned st_atime; | 70 | unsigned st_atime; |
71 | unsigned st_atime_nsec; | 71 | unsigned st_atime_nsec; |
@@ -77,13 +77,13 @@ struct stat64 { | |||
77 | unsigned long long st_ino; | 77 | unsigned long long st_ino; |
78 | } __attribute__((packed)); | 78 | } __attribute__((packed)); |
79 | 79 | ||
80 | typedef struct compat_siginfo{ | 80 | typedef struct compat_siginfo { |
81 | int si_signo; | 81 | int si_signo; |
82 | int si_errno; | 82 | int si_errno; |
83 | int si_code; | 83 | int si_code; |
84 | 84 | ||
85 | union { | 85 | union { |
86 | int _pad[((128/sizeof(int)) - 3)]; | 86 | int _pad[((128 / sizeof(int)) - 3)]; |
87 | 87 | ||
88 | /* kill() */ | 88 | /* kill() */ |
89 | struct { | 89 | struct { |
@@ -129,28 +129,26 @@ typedef struct compat_siginfo{ | |||
129 | } _sifields; | 129 | } _sifields; |
130 | } compat_siginfo_t; | 130 | } compat_siginfo_t; |
131 | 131 | ||
132 | struct sigframe32 | 132 | struct sigframe32 { |
133 | { | 133 | u32 pretcode; |
134 | u32 pretcode; | 134 | int sig; |
135 | int sig; | 135 | struct sigcontext_ia32 sc; |
136 | struct sigcontext_ia32 sc; | 136 | struct _fpstate_ia32 fpstate; |
137 | struct _fpstate_ia32 fpstate; | 137 | unsigned int extramask[_COMPAT_NSIG_WORDS-1]; |
138 | unsigned int extramask[_COMPAT_NSIG_WORDS-1]; | ||
139 | }; | 138 | }; |
140 | 139 | ||
141 | struct rt_sigframe32 | 140 | struct rt_sigframe32 { |
142 | { | 141 | u32 pretcode; |
143 | u32 pretcode; | 142 | int sig; |
144 | int sig; | 143 | u32 pinfo; |
145 | u32 pinfo; | 144 | u32 puc; |
146 | u32 puc; | 145 | compat_siginfo_t info; |
147 | compat_siginfo_t info; | 146 | struct ucontext_ia32 uc; |
148 | struct ucontext_ia32 uc; | 147 | struct _fpstate_ia32 fpstate; |
149 | struct _fpstate_ia32 fpstate; | ||
150 | }; | 148 | }; |
151 | 149 | ||
152 | struct ustat32 { | 150 | struct ustat32 { |
153 | __u32 f_tfree; | 151 | __u32 f_tfree; |
154 | compat_ino_t f_tinode; | 152 | compat_ino_t f_tinode; |
155 | char f_fname[6]; | 153 | char f_fname[6]; |
156 | char f_fpack[6]; | 154 | char f_fpack[6]; |
@@ -168,5 +166,5 @@ extern void ia32_pick_mmap_layout(struct mm_struct *mm); | |||
168 | #endif | 166 | #endif |
169 | 167 | ||
170 | #endif /* !CONFIG_IA32_SUPPORT */ | 168 | #endif /* !CONFIG_IA32_SUPPORT */ |
171 | 169 | ||
172 | #endif | 170 | #endif |