aboutsummaryrefslogtreecommitdiffstats
path: root/arch/sh
diff options
context:
space:
mode:
authorAl Viro <viro@zeniv.linux.org.uk>2015-02-23 05:46:21 -0500
committerAl Viro <viro@zeniv.linux.org.uk>2015-04-11 22:24:31 -0400
commit74008b365dcb921781f7430c1fc279be7778327b (patch)
treed601ad67cae3c3f9a10af900eecbf330e956b83e /arch/sh
parenta555ad450f973528825201a5fedbe46374f86644 (diff)
whack-a-mole: there's no point doing set_fs(USER_DS) in sigframe setup
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'arch/sh')
-rw-r--r--arch/sh/kernel/signal_32.c4
-rw-r--r--arch/sh/kernel/signal_64.c4
2 files changed, 0 insertions, 8 deletions
diff --git a/arch/sh/kernel/signal_32.c b/arch/sh/kernel/signal_32.c
index 0b34f2a704fe..97292890b51b 100644
--- a/arch/sh/kernel/signal_32.c
+++ b/arch/sh/kernel/signal_32.c
@@ -329,8 +329,6 @@ static int setup_frame(struct ksignal *ksig, sigset_t *set,
329 if (err) 329 if (err)
330 return -EFAULT; 330 return -EFAULT;
331 331
332 set_fs(USER_DS);
333
334 pr_debug("SIG deliver (%s:%d): sp=%p pc=%08lx pr=%08lx\n", 332 pr_debug("SIG deliver (%s:%d): sp=%p pc=%08lx pr=%08lx\n",
335 current->comm, task_pid_nr(current), frame, regs->pc, regs->pr); 333 current->comm, task_pid_nr(current), frame, regs->pc, regs->pr);
336 334
@@ -408,8 +406,6 @@ static int setup_rt_frame(struct ksignal *ksig, sigset_t *set,
408 if (err) 406 if (err)
409 return -EFAULT; 407 return -EFAULT;
410 408
411 set_fs(USER_DS);
412
413 pr_debug("SIG deliver (%s:%d): sp=%p pc=%08lx pr=%08lx\n", 409 pr_debug("SIG deliver (%s:%d): sp=%p pc=%08lx pr=%08lx\n",
414 current->comm, task_pid_nr(current), frame, regs->pc, regs->pr); 410 current->comm, task_pid_nr(current), frame, regs->pc, regs->pr);
415 411
diff --git a/arch/sh/kernel/signal_64.c b/arch/sh/kernel/signal_64.c
index 71993c6a7d94..0462995d4d7f 100644
--- a/arch/sh/kernel/signal_64.c
+++ b/arch/sh/kernel/signal_64.c
@@ -457,8 +457,6 @@ static int setup_frame(struct ksignal *ksig, sigset_t *set, struct pt_regs *regs
457 457
458 regs->pc = neff_sign_extend((unsigned long)ksig->ka.sa.sa_handler); 458 regs->pc = neff_sign_extend((unsigned long)ksig->ka.sa.sa_handler);
459 459
460 set_fs(USER_DS);
461
462 /* Broken %016Lx */ 460 /* Broken %016Lx */
463 pr_debug("SIG deliver (#%d,%s:%d): sp=%p pc=%08Lx%08Lx link=%08Lx%08Lx\n", 461 pr_debug("SIG deliver (#%d,%s:%d): sp=%p pc=%08Lx%08Lx link=%08Lx%08Lx\n",
464 signal, current->comm, current->pid, frame, 462 signal, current->comm, current->pid, frame,
@@ -547,8 +545,6 @@ static int setup_rt_frame(struct ksignal *kig, sigset_t *set,
547 regs->regs[REG_ARG3] = (unsigned long long)(unsigned long)(signed long)&frame->uc.uc_mcontext; 545 regs->regs[REG_ARG3] = (unsigned long long)(unsigned long)(signed long)&frame->uc.uc_mcontext;
548 regs->pc = neff_sign_extend((unsigned long)ksig->ka.sa.sa_handler); 546 regs->pc = neff_sign_extend((unsigned long)ksig->ka.sa.sa_handler);
549 547
550 set_fs(USER_DS);
551
552 pr_debug("SIG deliver (#%d,%s:%d): sp=%p pc=%08Lx%08Lx link=%08Lx%08Lx\n", 548 pr_debug("SIG deliver (#%d,%s:%d): sp=%p pc=%08Lx%08Lx link=%08Lx%08Lx\n",
553 signal, current->comm, current->pid, frame, 549 signal, current->comm, current->pid, frame,
554 regs->pc >> 32, regs->pc & 0xffffffff, 550 regs->pc >> 32, regs->pc & 0xffffffff,