Attachment 161730 Details for Bug 253190 – second patch needed to compile on recent userspace

[patch] second patch needed to compile on recent userspace

remove_duplicate_fake_stack_frame.patch (text/plain), 1.23 KB, created by Peter Zijlstra on 2007-08-17 12:06:56 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Peter Zijlstra

Created: 2007-08-17 12:06:56 UTC

Size: 1.23 KB

patch

obsolete

>Remove duplicated FAKE_STACK_FRAME macro.
>
>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).
>
>Signed-off-by: Chris Wright <chrisw@osdl.org>
>Signed-off-by: Andi Kleen <ak@suse.de>
>---
> include/asm-x86_64/calling.h |   16 ----------------
> 1 file changed, 16 deletions(-)
>
>Index: linux-2.6.9/include/asm-x86_64/calling.h
>===================================================================
>--- linux-2.6.9.orig/include/asm-x86_64/calling.h	2004-10-18 23:54:38.000000000 +0200
>+++ linux-2.6.9/include/asm-x86_64/calling.h	2007-08-17 12:07:47.000000000 +0200
>@@ -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

Actions: View | Diff

Attachments on bug 253190: 161728 | 161729 | 161730