diff options
| author | Len Brown <len.brown@intel.com> | 2011-03-23 02:34:54 -0400 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2011-03-23 02:34:54 -0400 |
| commit | 02e2407858fd62053bf60349c0e72cd1c7a4a60e (patch) | |
| tree | 0ebdbddc97d3abbc675916010e7771065b70c137 /arch/x86/lib/atomic64_386_32.S | |
| parent | 96e1c408ea8a556c5b51e0e7d56bd2afbfbf5fe9 (diff) | |
| parent | 6447f55da90b77faec1697d499ed7986bb4f6de6 (diff) | |
Merge branch 'linus' into release
Conflicts:
arch/x86/kernel/acpi/sleep.c
Signed-off-by: Len Brown <len.brown@intel.com>
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) \ |