diff --git a/[refs] b/[refs] index f104f1deefab..a83c078198ac 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3ac805d2afd3fa4a07cb5bcf352fd7fa83f28935 +refs/heads/master: 3217120873598533234b6dedda9c371ce30001d0 diff --git a/trunk/arch/x86/include/asm/atomic_32.h b/trunk/arch/x86/include/asm/atomic_32.h index 311a43e47c0b..b551bb1ae3cf 100644 --- a/trunk/arch/x86/include/asm/atomic_32.h +++ b/trunk/arch/x86/include/asm/atomic_32.h @@ -19,7 +19,10 @@ * * Atomically reads the value of @v. */ -#define atomic_read(v) ((v)->counter) +static inline int atomic_read(const atomic_t *v) +{ + return v->counter; +} /** * atomic_set - set atomic variable