[PATCH] remove duplicate FAKE_STACK_FRAME macro

[PATCH] remove duplicate FAKE_STACK_FRAME macro

[Chris Wright]

Hi Andi,

FAKE_STACK_FRAME macro is defined twice.  The one that gets used is in
arch/x86_64/kernel/entry.S, and is slightly different codewise, although
should have the same end result (uses pushq rather than addq %rsp + movq
and has the extra dwarf annotations).  Looks like we can remove the dups?

Signed-off-by: Chris Wright <chrisw@osdl.org>

===== include/asm-x86_64/calling.h 1.10 vs edited =====
--- 1.10/include/asm-x86_64/calling.h	2004-03-21 12:35:48 -08:00
+++ edited/include/asm-x86_64/calling.h	2004-10-28 17:00:53 -07:00
@@ -143,22 +143,6 @@
 	RESTORE_ARGS 0,\addskip
 	.endm
 
-	/* push in order ss, rsp, eflags, cs, rip */
-	.macro FAKE_STACK_FRAME child_rip
-	xorl %eax,%eax
-	subq $6*8,%rsp
-	movq %rax,5*8(%rsp)  /* ss */
-	movq %rax,4*8(%rsp)  /* rsp */
-	movq $(1<<9),3*8(%rsp)  /* eflags */
-	movq $__KERNEL_CS,2*8(%rsp) /* cs */
-	movq \child_rip,1*8(%rsp)  /* rip */ 
-	movq %rax,(%rsp)   /* orig_rax */ 
-	.endm
-
-	.macro UNFAKE_STACK_FRAME
-	addq $8*6, %rsp
-	.endm
-
 	.macro icebp
 	.byte 0xf1
 	.endm

Re: [PATCH] remove duplicate FAKE_STACK_FRAME macro

[Andi Kleen]

On Fri, Oct 29, 2004 at 04:14:56PM -0700, Chris Wright wrote:
> Hi Andi,
> 
> FAKE_STACK_FRAME macro is defined twice.  The one that gets used is in
> arch/x86_64/kernel/entry.S, and is slightly different codewise, although
> should have the same end result (uses pushq rather than addq %rsp + movq
> and has the extra dwarf annotations).  Looks like we can remove the dups?

Yes. Thanks. I added it to my tree.

-Andi