From e4f228e98780cec2219d4345327416aa2995e9f2 Mon Sep 17 00:00:00 2001 From: Ravikiran G Thirumalai Date: Tue, 17 Jan 2006 07:03:47 +0100 Subject: [PATCH] --- yaml --- r: 18672 b: refs/heads/master c: 2ddb55f091a9c74a297d72b50f8310c0c8ed7d1d h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/include/asm-x86_64/system.h | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index d3650d74df39..a75fd332b20c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c09b42404d29c8a9266f8186632330dc8474bf2e +refs/heads/master: 2ddb55f091a9c74a297d72b50f8310c0c8ed7d1d diff --git a/trunk/include/asm-x86_64/system.h b/trunk/include/asm-x86_64/system.h index 0eacbefb7dd0..a73f0c789d8b 100644 --- a/trunk/include/asm-x86_64/system.h +++ b/trunk/include/asm-x86_64/system.h @@ -354,11 +354,6 @@ static inline unsigned long __cmpxchg(volatile void *ptr, unsigned long old, #define local_irq_disable() __asm__ __volatile__("cli": : :"memory") #define local_irq_enable() __asm__ __volatile__("sti": : :"memory") -/* used in the idle loop; sti takes one instruction cycle to complete */ -#define safe_halt() __asm__ __volatile__("sti; hlt": : :"memory") -/* used when interrupts are already enabled or to shutdown the processor */ -#define halt() __asm__ __volatile__("hlt": : :"memory") - #define irqs_disabled() \ ({ \ unsigned long flags; \ @@ -370,6 +365,11 @@ static inline unsigned long __cmpxchg(volatile void *ptr, unsigned long old, #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) #endif +/* used in the idle loop; sti takes one instruction cycle to complete */ +#define safe_halt() __asm__ __volatile__("sti; hlt": : :"memory") +/* used when interrupts are already enabled or to shutdown the processor */ +#define halt() __asm__ __volatile__("hlt": : :"memory") + void cpu_idle_wait(void); extern unsigned long arch_align_stack(unsigned long sp);