diff options
-rw-r--r-- | include/asm-x86_64/system.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/include/asm-x86_64/system.h b/include/asm-x86_64/system.h index 0eacbefb7dd0..a73f0c789d8b 100644 --- a/include/asm-x86_64/system.h +++ b/include/asm-x86_64/system.h | |||
@@ -354,11 +354,6 @@ static inline unsigned long __cmpxchg(volatile void *ptr, unsigned long old, | |||
354 | #define local_irq_disable() __asm__ __volatile__("cli": : :"memory") | 354 | #define local_irq_disable() __asm__ __volatile__("cli": : :"memory") |
355 | #define local_irq_enable() __asm__ __volatile__("sti": : :"memory") | 355 | #define local_irq_enable() __asm__ __volatile__("sti": : :"memory") |
356 | 356 | ||
357 | /* used in the idle loop; sti takes one instruction cycle to complete */ | ||
358 | #define safe_halt() __asm__ __volatile__("sti; hlt": : :"memory") | ||
359 | /* used when interrupts are already enabled or to shutdown the processor */ | ||
360 | #define halt() __asm__ __volatile__("hlt": : :"memory") | ||
361 | |||
362 | #define irqs_disabled() \ | 357 | #define irqs_disabled() \ |
363 | ({ \ | 358 | ({ \ |
364 | unsigned long flags; \ | 359 | unsigned long flags; \ |
@@ -370,6 +365,11 @@ static inline unsigned long __cmpxchg(volatile void *ptr, unsigned long old, | |||
370 | #define local_irq_save(x) do { warn_if_not_ulong(x); __asm__ __volatile__("# local_irq_save \n\t pushfq ; popq %0 ; cli":"=g" (x): /* no input */ :"memory"); } while (0) | 365 | #define local_irq_save(x) do { warn_if_not_ulong(x); __asm__ __volatile__("# local_irq_save \n\t pushfq ; popq %0 ; cli":"=g" (x): /* no input */ :"memory"); } while (0) |
371 | #endif | 366 | #endif |
372 | 367 | ||
368 | /* used in the idle loop; sti takes one instruction cycle to complete */ | ||
369 | #define safe_halt() __asm__ __volatile__("sti; hlt": : :"memory") | ||
370 | /* used when interrupts are already enabled or to shutdown the processor */ | ||
371 | #define halt() __asm__ __volatile__("hlt": : :"memory") | ||
372 | |||
373 | void cpu_idle_wait(void); | 373 | void cpu_idle_wait(void); |
374 | 374 | ||
375 | extern unsigned long arch_align_stack(unsigned long sp); | 375 | extern unsigned long arch_align_stack(unsigned long sp); |