diff options
| author | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2013-02-04 10:27:44 +0100 |
|---|---|---|
| committer | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2013-02-04 10:27:44 +0100 |
| commit | ba1b3afd50913473f3036a63b4a82d7ba5c42009 (patch) | |
| tree | 9dff0ddec4bf8b927a025b4bf9882cb1731170f3 /linux/dev/include/asm-i386/system.h | |
| parent | bfdb3be16e5a20eebc97b3ca613d9a4da4465533 (diff) | |
| parent | 51e87d005139a435cd846ac5c224eed5042c4fa0 (diff) | |
Merge branch 'master' into master-gdb_stubs
Diffstat (limited to 'linux/dev/include/asm-i386/system.h')
| -rw-r--r-- | linux/dev/include/asm-i386/system.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/linux/dev/include/asm-i386/system.h b/linux/dev/include/asm-i386/system.h index 3e17d2d1..f26a33e7 100644 --- a/linux/dev/include/asm-i386/system.h +++ b/linux/dev/include/asm-i386/system.h @@ -224,9 +224,9 @@ static inline unsigned long __xchg(unsigned long x, void * ptr, int size) #define __sti() __asm__ __volatile__ ("sti": : :"memory") #define __cli() __asm__ __volatile__ ("cli": : :"memory") #define __save_flags(x) \ -__asm__ __volatile__("pushfl ; popl %0":"=g" (x): /* no input */ :"memory") +__asm__ __volatile__("pushf ; pop %0" : "=r" (x): /* no input */ :"memory") #define __restore_flags(x) \ -__asm__ __volatile__("pushl %0 ; popfl": /* no output */ :"g" (x):"memory") +__asm__ __volatile__("push %0 ; popf": /* no output */ :"g" (x):"memory") #ifdef __SMP__ |