diff options
Diffstat (limited to 'arch/s390/kernel/signal.c')
-rw-r--r-- | arch/s390/kernel/signal.c | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/arch/s390/kernel/signal.c b/arch/s390/kernel/signal.c index b3ae6f70c6d6..7fec60cb0b75 100644 --- a/arch/s390/kernel/signal.c +++ b/arch/s390/kernel/signal.c | |||
@@ -106,7 +106,6 @@ static void store_sigregs(void) | |||
106 | { | 106 | { |
107 | save_access_regs(current->thread.acrs); | 107 | save_access_regs(current->thread.acrs); |
108 | save_fp_ctl(¤t->thread.fp_regs.fpc); | 108 | save_fp_ctl(¤t->thread.fp_regs.fpc); |
109 | #ifdef CONFIG_64BIT | ||
110 | if (current->thread.vxrs) { | 109 | if (current->thread.vxrs) { |
111 | int i; | 110 | int i; |
112 | 111 | ||
@@ -115,7 +114,6 @@ static void store_sigregs(void) | |||
115 | current->thread.fp_regs.fprs[i] = | 114 | current->thread.fp_regs.fprs[i] = |
116 | *(freg_t *)(current->thread.vxrs + i); | 115 | *(freg_t *)(current->thread.vxrs + i); |
117 | } else | 116 | } else |
118 | #endif | ||
119 | save_fp_regs(current->thread.fp_regs.fprs); | 117 | save_fp_regs(current->thread.fp_regs.fprs); |
120 | } | 118 | } |
121 | 119 | ||
@@ -124,7 +122,6 @@ static void load_sigregs(void) | |||
124 | { | 122 | { |
125 | restore_access_regs(current->thread.acrs); | 123 | restore_access_regs(current->thread.acrs); |
126 | /* restore_fp_ctl is done in restore_sigregs */ | 124 | /* restore_fp_ctl is done in restore_sigregs */ |
127 | #ifdef CONFIG_64BIT | ||
128 | if (current->thread.vxrs) { | 125 | if (current->thread.vxrs) { |
129 | int i; | 126 | int i; |
130 | 127 | ||
@@ -133,7 +130,6 @@ static void load_sigregs(void) | |||
133 | current->thread.fp_regs.fprs[i]; | 130 | current->thread.fp_regs.fprs[i]; |
134 | restore_vx_regs(current->thread.vxrs); | 131 | restore_vx_regs(current->thread.vxrs); |
135 | } else | 132 | } else |
136 | #endif | ||
137 | restore_fp_regs(current->thread.fp_regs.fprs); | 133 | restore_fp_regs(current->thread.fp_regs.fprs); |
138 | } | 134 | } |
139 | 135 | ||
@@ -200,7 +196,6 @@ static int restore_sigregs(struct pt_regs *regs, _sigregs __user *sregs) | |||
200 | static int save_sigregs_ext(struct pt_regs *regs, | 196 | static int save_sigregs_ext(struct pt_regs *regs, |
201 | _sigregs_ext __user *sregs_ext) | 197 | _sigregs_ext __user *sregs_ext) |
202 | { | 198 | { |
203 | #ifdef CONFIG_64BIT | ||
204 | __u64 vxrs[__NUM_VXRS_LOW]; | 199 | __u64 vxrs[__NUM_VXRS_LOW]; |
205 | int i; | 200 | int i; |
206 | 201 | ||
@@ -215,14 +210,12 @@ static int save_sigregs_ext(struct pt_regs *regs, | |||
215 | sizeof(sregs_ext->vxrs_high))) | 210 | sizeof(sregs_ext->vxrs_high))) |
216 | return -EFAULT; | 211 | return -EFAULT; |
217 | } | 212 | } |
218 | #endif | ||
219 | return 0; | 213 | return 0; |
220 | } | 214 | } |
221 | 215 | ||
222 | static int restore_sigregs_ext(struct pt_regs *regs, | 216 | static int restore_sigregs_ext(struct pt_regs *regs, |
223 | _sigregs_ext __user *sregs_ext) | 217 | _sigregs_ext __user *sregs_ext) |
224 | { | 218 | { |
225 | #ifdef CONFIG_64BIT | ||
226 | __u64 vxrs[__NUM_VXRS_LOW]; | 219 | __u64 vxrs[__NUM_VXRS_LOW]; |
227 | int i; | 220 | int i; |
228 | 221 | ||
@@ -237,7 +230,6 @@ static int restore_sigregs_ext(struct pt_regs *regs, | |||
237 | for (i = 0; i < __NUM_VXRS_LOW; i++) | 230 | for (i = 0; i < __NUM_VXRS_LOW; i++) |
238 | *((__u64 *)(current->thread.vxrs + i) + 1) = vxrs[i]; | 231 | *((__u64 *)(current->thread.vxrs + i) + 1) = vxrs[i]; |
239 | } | 232 | } |
240 | #endif | ||
241 | return 0; | 233 | return 0; |
242 | } | 234 | } |
243 | 235 | ||
@@ -416,13 +408,11 @@ static int setup_rt_frame(struct ksignal *ksig, sigset_t *set, | |||
416 | * included in the signal frame on a 31-bit system. | 408 | * included in the signal frame on a 31-bit system. |
417 | */ | 409 | */ |
418 | uc_flags = 0; | 410 | uc_flags = 0; |
419 | #ifdef CONFIG_64BIT | ||
420 | if (MACHINE_HAS_VX) { | 411 | if (MACHINE_HAS_VX) { |
421 | frame_size += sizeof(_sigregs_ext); | 412 | frame_size += sizeof(_sigregs_ext); |
422 | if (current->thread.vxrs) | 413 | if (current->thread.vxrs) |
423 | uc_flags |= UC_VXRS; | 414 | uc_flags |= UC_VXRS; |
424 | } | 415 | } |
425 | #endif | ||
426 | frame = get_sigframe(&ksig->ka, regs, frame_size); | 416 | frame = get_sigframe(&ksig->ka, regs, frame_size); |
427 | if (frame == (void __user *) -1UL) | 417 | if (frame == (void __user *) -1UL) |
428 | return -EFAULT; | 418 | return -EFAULT; |