git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branches 'x86/urgent', 'x86/amd-iommu', 'x86/apic', 'x86/cleanups', 'x86/core...
[pandora-kernel.git]
/
arch
/
x86
/
kernel
/
entry_32.S
diff --git
a/arch/x86/kernel/entry_32.S
b/arch/x86/kernel/entry_32.S
index
cadf73f
..
cdfd94c
100644
(file)
--- a/
arch/x86/kernel/entry_32.S
+++ b/
arch/x86/kernel/entry_32.S
@@
-1015,6
+1015,7
@@
ENDPROC(kernel_thread_helper)
ENTRY(xen_sysenter_target)
RING0_INT_FRAME
addl $5*4, %esp /* remove xen-provided frame */
+ CFI_ADJUST_CFA_OFFSET -5*4
jmp sysenter_past_esp
CFI_ENDPROC