diff options
author | Al Viro <viro@zeniv.linux.org.uk> | 2012-10-10 23:12:01 -0400 |
---|---|---|
committer | Al Viro <viro@zeniv.linux.org.uk> | 2012-10-12 13:35:23 -0400 |
commit | 5522be6a4624a5f505555569e4d9cee946630686 (patch) | |
tree | 27a240cfb4dd0966be2f819319ca44097950878d /arch/alpha/kernel | |
parent | 9fff2fa0db911b0b75ec1f9bec72460c0a676ef5 (diff) |
alpha: switch to saner kernel_execve() semantics
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'arch/alpha/kernel')
-rw-r--r-- | arch/alpha/kernel/entry.S | 17 |
1 files changed, 1 insertions, 16 deletions
diff --git a/arch/alpha/kernel/entry.S b/arch/alpha/kernel/entry.S index 16e074f9e581..a7607832dd4f 100644 --- a/arch/alpha/kernel/entry.S +++ b/arch/alpha/kernel/entry.S | |||
@@ -603,24 +603,9 @@ ret_from_kernel_thread: | |||
603 | mov $9, $27 | 603 | mov $9, $27 |
604 | mov $10, $16 | 604 | mov $10, $16 |
605 | jsr $26, ($9) | 605 | jsr $26, ($9) |
606 | ldgp $gp, 0($26) | ||
607 | mov $0, $16 | ||
608 | mov $31, $26 | ||
609 | jmp $31, sys_exit | ||
610 | .end ret_from_kernel_thread | ||
611 | |||
612 | .globl ret_from_kernel_execve | ||
613 | .align 4 | ||
614 | .ent ret_from_kernel_execve | ||
615 | ret_from_kernel_execve: | ||
616 | mov $16, $sp | ||
617 | /* Avoid the HAE being gratuitously wrong, to avoid restoring it. */ | ||
618 | ldq $2, alpha_mv+HAE_CACHE | ||
619 | stq $2, 152($sp) /* HAE */ | ||
620 | mov $31, $19 /* to disable syscall restarts */ | 606 | mov $31, $19 /* to disable syscall restarts */ |
621 | br $31, ret_to_user | 607 | br $31, ret_to_user |
622 | 608 | .end ret_from_kernel_thread | |
623 | .end ret_from_kernel_execve | ||
624 | 609 | ||
625 | 610 | ||
626 | /* | 611 | /* |