diff options
author | Ingo Molnar <mingo@elte.hu> | 2008-04-04 07:31:15 -0400 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-04-17 11:41:21 -0400 |
commit | d3463c5a66147bdd21b5865ea29fdca50ea28f7f (patch) | |
tree | 0e013cc5b45ed24f53307eec465ecf889946e291 | |
parent | dcfe946520719943fabd3e5ed13813956e48e37c (diff) |
undo "x86: fix breakage of vSMP irq operations"
revert:
"x86: fix breakage of vSMP irq operations"
the irqflags.h unification will solve this in a cleaner way.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
-rw-r--r-- | include/asm-x86/irqflags.h | 29 |
1 files changed, 0 insertions, 29 deletions
diff --git a/include/asm-x86/irqflags.h b/include/asm-x86/irqflags.h index 0e2292483b35..92021c1ffa3a 100644 --- a/include/asm-x86/irqflags.h +++ b/include/asm-x86/irqflags.h | |||
@@ -70,26 +70,6 @@ static inline void raw_local_irq_restore(unsigned long flags) | |||
70 | native_restore_fl(flags); | 70 | native_restore_fl(flags); |
71 | } | 71 | } |
72 | 72 | ||
73 | #ifdef CONFIG_X86_VSMP | ||
74 | |||
75 | /* | ||
76 | * Interrupt control for the VSMP architecture: | ||
77 | */ | ||
78 | |||
79 | static inline void raw_local_irq_disable(void) | ||
80 | { | ||
81 | unsigned long flags = __raw_local_save_flags(); | ||
82 | raw_local_irq_restore((flags & ~X86_EFLAGS_IF) | X86_EFLAGS_AC); | ||
83 | } | ||
84 | |||
85 | static inline void raw_local_irq_enable(void) | ||
86 | { | ||
87 | unsigned long flags = __raw_local_save_flags(); | ||
88 | raw_local_irq_restore((flags | X86_EFLAGS_IF) & (~X86_EFLAGS_AC)); | ||
89 | } | ||
90 | |||
91 | #else | ||
92 | |||
93 | static inline void raw_local_irq_disable(void) | 73 | static inline void raw_local_irq_disable(void) |
94 | { | 74 | { |
95 | native_irq_disable(); | 75 | native_irq_disable(); |
@@ -100,8 +80,6 @@ static inline void raw_local_irq_enable(void) | |||
100 | native_irq_enable(); | 80 | native_irq_enable(); |
101 | } | 81 | } |
102 | 82 | ||
103 | #endif | ||
104 | |||
105 | /* | 83 | /* |
106 | * Used in the idle loop; sti takes one instruction cycle | 84 | * Used in the idle loop; sti takes one instruction cycle |
107 | * to complete: | 85 | * to complete: |
@@ -159,17 +137,10 @@ static inline unsigned long __raw_local_irq_save(void) | |||
159 | #define raw_local_irq_save(flags) \ | 137 | #define raw_local_irq_save(flags) \ |
160 | do { (flags) = __raw_local_irq_save(); } while (0) | 138 | do { (flags) = __raw_local_irq_save(); } while (0) |
161 | 139 | ||
162 | #ifdef CONFIG_X86_VSMP | ||
163 | static inline int raw_irqs_disabled_flags(unsigned long flags) | ||
164 | { | ||
165 | return !(flags & X86_EFLAGS_IF) || (flags & X86_EFLAGS_AC); | ||
166 | } | ||
167 | #else | ||
168 | static inline int raw_irqs_disabled_flags(unsigned long flags) | 140 | static inline int raw_irqs_disabled_flags(unsigned long flags) |
169 | { | 141 | { |
170 | return !(flags & X86_EFLAGS_IF); | 142 | return !(flags & X86_EFLAGS_IF); |
171 | } | 143 | } |
172 | #endif | ||
173 | 144 | ||
174 | static inline int raw_irqs_disabled(void) | 145 | static inline int raw_irqs_disabled(void) |
175 | { | 146 | { |