diff options
| author | Ingo Molnar <mingo@elte.hu> | 2011-03-18 05:38:53 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2011-03-18 05:39:00 -0400 |
| commit | 8dd8997d2c56c9f248294805e129e1fc69444380 (patch) | |
| tree | 3b030a04295fc031db98746c4074c2df1ed6a19f /arch/x86/include/asm/frame.h | |
| parent | 1eda75c131ea42ec173323b6c34aeed78ae637c1 (diff) | |
| parent | 016aa2ed1cc9cf704cf76d8df07751b6daa9750f (diff) | |
Merge branch 'linus' into x86/urgent
Merge reason: Merge upstream commits to avoid conflicts in upcoming patches.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/x86/include/asm/frame.h')
| -rw-r--r-- | arch/x86/include/asm/frame.h | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/arch/x86/include/asm/frame.h b/arch/x86/include/asm/frame.h index 06850a7194e..2c6fc9e6281 100644 --- a/arch/x86/include/asm/frame.h +++ b/arch/x86/include/asm/frame.h | |||
| @@ -7,14 +7,12 @@ | |||
| 7 | frame pointer later */ | 7 | frame pointer later */ |
| 8 | #ifdef CONFIG_FRAME_POINTER | 8 | #ifdef CONFIG_FRAME_POINTER |
| 9 | .macro FRAME | 9 | .macro FRAME |
| 10 | pushl %ebp | 10 | pushl_cfi %ebp |
| 11 | CFI_ADJUST_CFA_OFFSET 4 | ||
| 12 | CFI_REL_OFFSET ebp,0 | 11 | CFI_REL_OFFSET ebp,0 |
| 13 | movl %esp,%ebp | 12 | movl %esp,%ebp |
| 14 | .endm | 13 | .endm |
| 15 | .macro ENDFRAME | 14 | .macro ENDFRAME |
| 16 | popl %ebp | 15 | popl_cfi %ebp |
| 17 | CFI_ADJUST_CFA_OFFSET -4 | ||
| 18 | CFI_RESTORE ebp | 16 | CFI_RESTORE ebp |
| 19 | .endm | 17 | .endm |
| 20 | #else | 18 | #else |