---

yaml --- r: 292727 b: refs/heads/master c: 928282e h: refs/heads/master i: 292725: f1946a4 292723: e9a22c7 292719: e3d7f54 v: v3
git-mirror · Feb 27, 2012 · be8a52b · be8a52b
1 parent 1502cab
commit be8a52b
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git 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
@@ -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