diff options
| author | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
|---|---|---|
| committer | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
| commit | c71c03bda1e86c9d5198c5d83f712e695c4f2a1e (patch) | |
| tree | ecb166cb3e2b7e2adb3b5e292245fefd23381ac8 /arch/x86/include/asm/frame.h | |
| parent | ea53c912f8a86a8567697115b6a0d8152beee5c8 (diff) | |
| parent | 6a00f206debf8a5c8899055726ad127dbeeed098 (diff) | |
Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp
Conflicts:
litmus/sched_cedf.c
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 06850a7194e1..2c6fc9e62812 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 |