From 4bfc50cbf8d653f8b0a7bed33f5bab8fafdd9d7f Mon Sep 17 00:00:00 2001 From: Josh Triplett Date: Sat, 30 Sep 2006 23:28:21 -0700 Subject: [PATCH] --- yaml --- r: 37672 b: refs/heads/master c: c902e0a0102f1095eec4b3511c13c84ca2bc4577 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/include/linux/compiler.h | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index f091a66ee672..614fccbf0b8b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: df3fe8defedc52745526914e12eb4ba0b8a9f6ca +refs/heads/master: c902e0a0102f1095eec4b3511c13c84ca2bc4577 diff --git a/trunk/include/linux/compiler.h b/trunk/include/linux/compiler.h index 0780de440220..538423d4a865 100644 --- a/trunk/include/linux/compiler.h +++ b/trunk/include/linux/compiler.h @@ -10,10 +10,10 @@ # define __force __attribute__((force)) # define __nocast __attribute__((nocast)) # define __iomem __attribute__((noderef, address_space(2))) -# define __acquires(x) __attribute__((context(0,1))) -# define __releases(x) __attribute__((context(1,0))) -# define __acquire(x) __context__(1) -# define __release(x) __context__(-1) +# define __acquires(x) __attribute__((context(x,0,1))) +# define __releases(x) __attribute__((context(x,1,0))) +# define __acquire(x) __context__(x,1) +# define __release(x) __context__(x,-1) # define __cond_lock(x,c) ((c) ? ({ __acquire(x); 1; }) : 0) extern void __chk_user_ptr(void __user *); extern void __chk_io_ptr(void __iomem *);