x86: signal: cosmetic unification of do_signal()
Make do_signal() same. Thia patch modifies only comments in signal_64.c. Signed-off-by: Hiroshi Shimamoto <h-shimamoto@ct.jp.nec.com> Signed-off-by: Ingo Molnar <mingo@elte.hu>
This commit is contained in:
Родитель
e6babb6b7f
Коммит
5fd933303b
|
@ -410,7 +410,8 @@ static void do_signal(struct pt_regs *regs)
|
||||||
|
|
||||||
signr = get_signal_to_deliver(&info, &ka, regs, NULL);
|
signr = get_signal_to_deliver(&info, &ka, regs, NULL);
|
||||||
if (signr > 0) {
|
if (signr > 0) {
|
||||||
/* Re-enable any watchpoints before delivering the
|
/*
|
||||||
|
* Re-enable any watchpoints before delivering the
|
||||||
* signal to user space. The processor register will
|
* signal to user space. The processor register will
|
||||||
* have been cleared if the watchpoint triggered
|
* have been cleared if the watchpoint triggered
|
||||||
* inside the kernel.
|
* inside the kernel.
|
||||||
|
@ -418,7 +419,7 @@ static void do_signal(struct pt_regs *regs)
|
||||||
if (current->thread.debugreg7)
|
if (current->thread.debugreg7)
|
||||||
set_debugreg(current->thread.debugreg7, 7);
|
set_debugreg(current->thread.debugreg7, 7);
|
||||||
|
|
||||||
/* Whee! Actually deliver the signal. */
|
/* Whee! Actually deliver the signal. */
|
||||||
if (handle_signal(signr, &info, &ka, oldset, regs) == 0) {
|
if (handle_signal(signr, &info, &ka, oldset, regs) == 0) {
|
||||||
/*
|
/*
|
||||||
* A signal was successfully delivered; the saved
|
* A signal was successfully delivered; the saved
|
||||||
|
@ -441,6 +442,7 @@ static void do_signal(struct pt_regs *regs)
|
||||||
regs->ax = regs->orig_ax;
|
regs->ax = regs->orig_ax;
|
||||||
regs->ip -= 2;
|
regs->ip -= 2;
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case -ERESTART_RESTARTBLOCK:
|
case -ERESTART_RESTARTBLOCK:
|
||||||
regs->ax = NR_restart_syscall;
|
regs->ax = NR_restart_syscall;
|
||||||
regs->ip -= 2;
|
regs->ip -= 2;
|
||||||
|
|
Загрузка…
Ссылка в новой задаче