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/lib/atomic64_386_32.S | |
| 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/lib/atomic64_386_32.S')
| -rw-r--r-- | arch/x86/lib/atomic64_386_32.S | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/arch/x86/lib/atomic64_386_32.S b/arch/x86/lib/atomic64_386_32.S index 2cda60a06e65..e8e7e0d06f42 100644 --- a/arch/x86/lib/atomic64_386_32.S +++ b/arch/x86/lib/atomic64_386_32.S | |||
| @@ -15,14 +15,12 @@ | |||
| 15 | 15 | ||
| 16 | /* if you want SMP support, implement these with real spinlocks */ | 16 | /* if you want SMP support, implement these with real spinlocks */ |
| 17 | .macro LOCK reg | 17 | .macro LOCK reg |
| 18 | pushfl | 18 | pushfl_cfi |
| 19 | CFI_ADJUST_CFA_OFFSET 4 | ||
| 20 | cli | 19 | cli |
| 21 | .endm | 20 | .endm |
| 22 | 21 | ||
| 23 | .macro UNLOCK reg | 22 | .macro UNLOCK reg |
| 24 | popfl | 23 | popfl_cfi |
| 25 | CFI_ADJUST_CFA_OFFSET -4 | ||
| 26 | .endm | 24 | .endm |
| 27 | 25 | ||
| 28 | #define BEGIN(op) \ | 26 | #define BEGIN(op) \ |