aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndy Lutomirski <luto@amacapital.net>2014-05-21 18:07:07 -0400
committerH. Peter Anvin <hpa@linux.intel.com>2014-05-21 19:22:51 -0400
commit1bd24efc8bd1e644b115cae51048c008bea76de1 (patch)
tree4e836322173ba483b84ca33e9af6feb72404bcc5
parent4b660a7f5c8099d88d1a43d8ae138965112592c7 (diff)
x86_64, entry: Add missing 'DEFAULT_FRAME 0' entry annotations
The paranoidzeroentry macros were missing them. I'm not at all convinced that these annotations are correct and/or necessary, but this makes the macros more consistent with each other. Signed-off-by: Andy Lutomirski <luto@amacapital.net> Link: http://lkml.kernel.org/r/10ad65f534f8bc62e77f74fe15f68e8d4a59d8b3.1400709717.git.luto@amacapital.net Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
-rw-r--r--arch/x86/kernel/entry_64.S2
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/x86/kernel/entry_64.S b/arch/x86/kernel/entry_64.S
index 1e96c3628bf2..39372ec11f94 100644
--- a/arch/x86/kernel/entry_64.S
+++ b/arch/x86/kernel/entry_64.S
@@ -1230,6 +1230,7 @@ ENTRY(\sym)
1230 subq $ORIG_RAX-R15, %rsp 1230 subq $ORIG_RAX-R15, %rsp
1231 CFI_ADJUST_CFA_OFFSET ORIG_RAX-R15 1231 CFI_ADJUST_CFA_OFFSET ORIG_RAX-R15
1232 call save_paranoid 1232 call save_paranoid
1233 DEFAULT_FRAME 0
1233 TRACE_IRQS_OFF 1234 TRACE_IRQS_OFF
1234 movq %rsp,%rdi /* pt_regs pointer */ 1235 movq %rsp,%rdi /* pt_regs pointer */
1235 xorl %esi,%esi /* no error code */ 1236 xorl %esi,%esi /* no error code */
@@ -1249,6 +1250,7 @@ ENTRY(\sym)
1249 subq $ORIG_RAX-R15, %rsp 1250 subq $ORIG_RAX-R15, %rsp
1250 CFI_ADJUST_CFA_OFFSET ORIG_RAX-R15 1251 CFI_ADJUST_CFA_OFFSET ORIG_RAX-R15
1251 call save_paranoid 1252 call save_paranoid
1253 DEFAULT_FRAME 0
1252 TRACE_IRQS_OFF_DEBUG 1254 TRACE_IRQS_OFF_DEBUG
1253 movq %rsp,%rdi /* pt_regs pointer */ 1255 movq %rsp,%rdi /* pt_regs pointer */
1254 xorl %esi,%esi /* no error code */ 1256 xorl %esi,%esi /* no error code */