diff options
author | Joe Perches <joe@perches.com> | 2008-03-23 04:02:30 -0400 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-04-17 11:41:24 -0400 |
commit | cf7f7191cf20011e47243b594e433275a6db811b (patch) | |
tree | 1b2ebaf5f6bb3c3796ca0601b7b61665bffba58d /include/asm-x86/irqflags.h | |
parent | 3ff3522497d7ad383df9770e812fbaf75d19b214 (diff) |
include/asm-x86/irqflags.h: checkpatch cleanups - formatting only
Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'include/asm-x86/irqflags.h')
-rw-r--r-- | include/asm-x86/irqflags.h | 30 |
1 files changed, 13 insertions, 17 deletions
diff --git a/include/asm-x86/irqflags.h b/include/asm-x86/irqflags.h index 92021c1ffa3a..c242527f970e 100644 --- a/include/asm-x86/irqflags.h +++ b/include/asm-x86/irqflags.h | |||
@@ -12,25 +12,21 @@ static inline unsigned long native_save_fl(void) | |||
12 | { | 12 | { |
13 | unsigned long flags; | 13 | unsigned long flags; |
14 | 14 | ||
15 | __asm__ __volatile__( | 15 | asm volatile("# __raw_save_flags\n\t" |
16 | "# __raw_save_flags\n\t" | 16 | "pushf ; pop %0" |
17 | "pushf ; pop %0" | 17 | : "=g" (flags) |
18 | : "=g" (flags) | 18 | : /* no input */ |
19 | : /* no input */ | 19 | : "memory"); |
20 | : "memory" | ||
21 | ); | ||
22 | 20 | ||
23 | return flags; | 21 | return flags; |
24 | } | 22 | } |
25 | 23 | ||
26 | static inline void native_restore_fl(unsigned long flags) | 24 | static inline void native_restore_fl(unsigned long flags) |
27 | { | 25 | { |
28 | __asm__ __volatile__( | 26 | asm volatile("push %0 ; popf" |
29 | "push %0 ; popf" | 27 | : /* no output */ |
30 | : /* no output */ | 28 | :"g" (flags) |
31 | :"g" (flags) | 29 | :"memory", "cc"); |
32 | :"memory", "cc" | ||
33 | ); | ||
34 | } | 30 | } |
35 | 31 | ||
36 | static inline void native_irq_disable(void) | 32 | static inline void native_irq_disable(void) |
@@ -131,11 +127,11 @@ static inline unsigned long __raw_local_irq_save(void) | |||
131 | #endif /* CONFIG_PARAVIRT */ | 127 | #endif /* CONFIG_PARAVIRT */ |
132 | 128 | ||
133 | #ifndef __ASSEMBLY__ | 129 | #ifndef __ASSEMBLY__ |
134 | #define raw_local_save_flags(flags) \ | 130 | #define raw_local_save_flags(flags) \ |
135 | do { (flags) = __raw_local_save_flags(); } while (0) | 131 | do { (flags) = __raw_local_save_flags(); } while (0) |
136 | 132 | ||
137 | #define raw_local_irq_save(flags) \ | 133 | #define raw_local_irq_save(flags) \ |
138 | do { (flags) = __raw_local_irq_save(); } while (0) | 134 | do { (flags) = __raw_local_irq_save(); } while (0) |
139 | 135 | ||
140 | static inline int raw_irqs_disabled_flags(unsigned long flags) | 136 | static inline int raw_irqs_disabled_flags(unsigned long flags) |
141 | { | 137 | { |