diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-01-10 18:51:06 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-01-10 18:51:06 -0500 |
| commit | 0811a433c61e85f895018239c4466a36311cd5de (patch) | |
| tree | 276933e518e5525d24ae37b02df2db9909679260 /arch/cris/include/asm/atomic.h | |
| parent | c299030765292434b73572f9bcfe84951ff06614 (diff) | |
| parent | 3d14bdad40315b54470cb7812293d14c8af2bf7d (diff) | |
Merge branch 'linus' into core/iommu
Diffstat (limited to 'arch/cris/include/asm/atomic.h')
| -rw-r--r-- | arch/cris/include/asm/atomic.h | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/arch/cris/include/asm/atomic.h b/arch/cris/include/asm/atomic.h index f71ea686a2ea..5718dd8902a1 100644 --- a/arch/cris/include/asm/atomic.h +++ b/arch/cris/include/asm/atomic.h | |||
| @@ -4,7 +4,7 @@ | |||
| 4 | #define __ASM_CRIS_ATOMIC__ | 4 | #define __ASM_CRIS_ATOMIC__ |
| 5 | 5 | ||
| 6 | #include <linux/compiler.h> | 6 | #include <linux/compiler.h> |
| 7 | 7 | #include <linux/types.h> | |
| 8 | #include <asm/system.h> | 8 | #include <asm/system.h> |
| 9 | #include <arch/atomic.h> | 9 | #include <arch/atomic.h> |
| 10 | 10 | ||
| @@ -13,8 +13,6 @@ | |||
| 13 | * resource counting etc.. | 13 | * resource counting etc.. |
| 14 | */ | 14 | */ |
| 15 | 15 | ||
| 16 | typedef struct { volatile int counter; } atomic_t; | ||
| 17 | |||
| 18 | #define ATOMIC_INIT(i) { (i) } | 16 | #define ATOMIC_INIT(i) { (i) } |
| 19 | 17 | ||
| 20 | #define atomic_read(v) ((v)->counter) | 18 | #define atomic_read(v) ((v)->counter) |