lkml.org 
[lkml]   [2007]   [Aug]   [10]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 8/25 -v2] use macro for sti/cli in spinlock definitions
    Date
    This patch switches the cli and sti instructions into macros.
    In this header, they're just defined to the instructions they
    refer to. Later on, when paravirt is defined, they will be
    defined to something with paravirt abilities.

    Signed-off-by: Glauber de Oliveira Costa <gcosta@redhat.com>
    Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
    ---
    include/asm-x86_64/spinlock.h | 16 +++++++++++++---
    1 files changed, 13 insertions(+), 3 deletions(-)
    diff --git a/include/asm-x86_64/spinlock.h b/include/asm-x86_64/spinlock.h
    index 88bf981..5bb5bf8 100644
    --- a/include/asm-x86_64/spinlock.h
    +++ b/include/asm-x86_64/spinlock.h
    @@ -5,6 +5,14 @@
    #include <asm/rwlock.h>
    #include <asm/page.h>
    #include <asm/processor.h>
    +#ifdef CONFIG_PARAVIRT
    +#include <asm/paravirt.h>
    +#else
    +#define CLI_STI_INPUT_ARGS
    +#define CLI_STI_CLOBBERS
    +#define CLI_STRING "cli"
    +#define STI_STRING "sti"
    +#endif

    /*
    * Your basic SMP spinlocks, allowing only a single CPU anywhere
    @@ -48,12 +56,12 @@ static inline void __raw_spin_lock_flags(raw_spinlock_t *lock, unsigned long fla
    "jns 5f\n"
    "testl $0x200, %1\n\t" /* interrupts were disabled? */
    "jz 4f\n\t"
    - "sti\n"
    + STI_STRING "\n\t"
    "3:\t"
    "rep;nop\n\t"
    "cmpl $0, %0\n\t"
    "jle 3b\n\t"
    - "cli\n\t"
    + CLI_STRING "\n\t"
    "jmp 1b\n"
    "4:\t"
    "rep;nop\n\t"
    @@ -61,7 +69,9 @@ static inline void __raw_spin_lock_flags(raw_spinlock_t *lock, unsigned long fla
    "jg 1b\n\t"
    "jmp 4b\n"
    "5:\n\t"
    - : "+m" (lock->slock) : "r" ((unsigned)flags) : "memory");
    + : "+m" (lock->slock)
    + : "r" ((unsigned)flags) CLI_STI_INPUT_ARGS
    + : "memory" CLI_STI_CLOBBERS);
    }
    #endif

    --
    1.4.4.2
    -
    To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
    the body of a message to majordomo@vger.kernel.org
    More majordomo info at http://vger.kernel.org/majordomo-info.html
    Please read the FAQ at http://www.tux.org/lkml/

    \
     
     \ /
      Last update: 2007-08-11 00:07    [from the cache]
    ©2003-2014 Jasper Spaans. Advertise on this site