diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-11-09 01:07:12 -0500 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-11-09 01:07:12 -0500 |
| commit | a892acacd3a8546ac161526522f13b5174f2c471 (patch) | |
| tree | ee6d36f27f1388989ebfcabf90253fb7194112ac /include/asm-v850/atomic.h | |
| parent | 193515d51ccb363165d6b09e9ba5c21089e34bad (diff) | |
| parent | 330d57fb98a916fa8e1363846540dd420e99499a (diff) | |
| download | talos-op-linux-a892acacd3a8546ac161526522f13b5174f2c471.tar.gz talos-op-linux-a892acacd3a8546ac161526522f13b5174f2c471.zip | |
Merge branch 'master'
Diffstat (limited to 'include/asm-v850/atomic.h')
| -rw-r--r-- | include/asm-v850/atomic.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/asm-v850/atomic.h b/include/asm-v850/atomic.h index 8284aa7363f2..395268a8c0de 100644 --- a/include/asm-v850/atomic.h +++ b/include/asm-v850/atomic.h @@ -31,7 +31,7 @@ typedef struct { int counter; } atomic_t; #define atomic_read(v) ((v)->counter) #define atomic_set(v,i) (((v)->counter) = (i)) -extern __inline__ int atomic_add_return (int i, volatile atomic_t *v) +static inline int atomic_add_return (int i, volatile atomic_t *v) { unsigned long flags; int res; |
