From e5eb5904cc1566593dc85f1a2b4199bc5378ef58 Mon Sep 17 00:00:00 2001 From: Jan Beulich Date: Mon, 26 Jun 2006 13:57:38 +0200 Subject: [PATCH] --- yaml --- r: 30479 b: refs/heads/master c: dffead4e421e289c8434351400d24fd35723e874 h: refs/heads/master i: 30477: 75b482c92b2fc3c38545a3d0db67dadcbcd38ff0 30475: 40551a9b492d01ae82b429a30e2e100343a9d08f 30471: aec197469ea0f56943382462de7a001df6ba3358 30463: cefa3af1ae482653002ca7589f72a990fd73f898 v: v3 --- [refs] | 2 +- trunk/arch/x86_64/ia32/ia32entry.S | 2 +- trunk/arch/x86_64/kernel/entry.S | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 2ec9be3396af..3115cfb881a6 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1de9c3f67ec6fddfb85325bab551f4094f55f410 +refs/heads/master: dffead4e421e289c8434351400d24fd35723e874 diff --git a/trunk/arch/x86_64/ia32/ia32entry.S b/trunk/arch/x86_64/ia32/ia32entry.S index d073ca34d4f5..222777b26142 100644 --- a/trunk/arch/x86_64/ia32/ia32entry.S +++ b/trunk/arch/x86_64/ia32/ia32entry.S @@ -179,7 +179,7 @@ ENDPROC(ia32_sysenter_target) */ ENTRY(ia32_cstar_target) CFI_STARTPROC32 simple - CFI_DEF_CFA rsp,0 + CFI_DEF_CFA rsp,PDA_STACKOFFSET CFI_REGISTER rip,rcx /*CFI_REGISTER rflags,r11*/ swapgs diff --git a/trunk/arch/x86_64/kernel/entry.S b/trunk/arch/x86_64/kernel/entry.S index 4f407ef6b865..7290e72b9a34 100644 --- a/trunk/arch/x86_64/kernel/entry.S +++ b/trunk/arch/x86_64/kernel/entry.S @@ -189,7 +189,7 @@ END(ret_from_fork) ENTRY(system_call) CFI_STARTPROC simple - CFI_DEF_CFA rsp,0 + CFI_DEF_CFA rsp,PDA_STACKOFFSET CFI_REGISTER rip,rcx /*CFI_REGISTER rflags,r11*/ swapgs