projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc
[powerpc.git]
/
arch
/
i386
/
kernel
/
vsyscall-sysenter.S
diff --git
a/arch/i386/kernel/vsyscall-sysenter.S
b/arch/i386/kernel/vsyscall-sysenter.S
index
3b62baa
..
1a36d26
100644
(file)
--- a/
arch/i386/kernel/vsyscall-sysenter.S
+++ b/
arch/i386/kernel/vsyscall-sysenter.S
@@
-42,10
+42,10
@@
__kernel_vsyscall:
/* 7: align return point with nop's to make disassembly easier */
.space 7,0x90
/* 7: align return point with nop's to make disassembly easier */
.space 7,0x90
- /* 14: System call restart point is here! (SYSENTER_RETURN
-
2) */
+ /* 14: System call restart point is here! (SYSENTER_RETURN
-
2) */
jmp .Lenter_kernel
/* 16: System call normal return point is here! */
jmp .Lenter_kernel
/* 16: System call normal return point is here! */
- .globl SYSENTER_RETURN /* Symbol used by
entry.S.
*/
+ .globl SYSENTER_RETURN /* Symbol used by
sysenter.c
*/
SYSENTER_RETURN:
pop %ebp
.Lpop_ebp:
SYSENTER_RETURN:
pop %ebp
.Lpop_ebp: