From be8a52b0bc571f7905ef0917a88b77ff6d303968 Mon Sep 17 00:00:00 2001 From: Mark Wielaard Date: Fri, 24 Feb 2012 11:32:05 +0100 Subject: [PATCH] --- yaml --- r: 292727 b: refs/heads/master c: 928282e432ee584129a39da831ffa72c38e189b7 h: refs/heads/master i: 292725: f1946a44c24535f35891bec3b4d6fa337f37465a 292723: e9a22c726b266529ef694fbe1a65d3283f1e7377 292719: e3d7f54a774b57ee379b0021c8f0b91e29716162 v: v3 --- [refs] | 2 +- trunk/arch/x86/kernel/entry_64.S | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 7fefa563afc8..d1847ad6c680 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f0ba662a6e06f2fb58201800eff33dcad9246f97 +refs/heads/master: 928282e432ee584129a39da831ffa72c38e189b7 diff --git a/trunk/arch/x86/kernel/entry_64.S b/trunk/arch/x86/kernel/entry_64.S index 3fe8239fd8fb..54be36bf2620 100644 --- a/trunk/arch/x86/kernel/entry_64.S +++ b/trunk/arch/x86/kernel/entry_64.S @@ -813,7 +813,7 @@ ret_from_intr: /* Restore saved previous stack */ popq %rsi - CFI_DEF_CFA_REGISTER rsi + CFI_DEF_CFA rsi,SS+8-RBP /* reg/off reset after def_cfa_expr */ leaq ARGOFFSET-RBP(%rsi), %rsp CFI_DEF_CFA_REGISTER rsp CFI_ADJUST_CFA_OFFSET RBP-ARGOFFSET