diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-05-12 21:05:59 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-05-12 21:05:59 +0000 |
| commit | ba2dacab305c598cd4c34a604f8e276bf5bab5ff (patch) | |
| tree | 78670a0139bf4d5ace617b29b7eba82bbc74d602 /include/asm-sparc/atomic.h | |
| parent | b77bf69998121e689c5e86cc5630d39a0a9ee6ca (diff) | |
Merge with Linux 2.3.99-pre7 and various other bits.
Diffstat (limited to 'include/asm-sparc/atomic.h')
| -rw-r--r-- | include/asm-sparc/atomic.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/include/asm-sparc/atomic.h b/include/asm-sparc/atomic.h index 5b96e139b..dc29a13cd 100644 --- a/include/asm-sparc/atomic.h +++ b/include/asm-sparc/atomic.h @@ -6,7 +6,9 @@ #ifndef __ARCH_SPARC_ATOMIC__ #define __ARCH_SPARC_ATOMIC__ -#ifdef __SMP__ +#include <linux/config.h> + +#ifdef CONFIG_SMP /* This is a temporary measure. -DaveM */ typedef struct { volatile int counter; } atomic_t; #define ATOMIC_INIT(i) { (i << 8) } @@ -19,7 +21,7 @@ typedef struct { int counter; } atomic_t; #include <asm/system.h> #include <asm/psr.h> -#ifndef __SMP__ +#ifndef CONFIG_SMP #define atomic_read(v) ((v)->counter) #define atomic_set(v, i) (((v)->counter) = i) |