Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit c902e0a0102f1095eec4b3511c13c84ca2bc4577

Authored by Josh Triplett
Committed by Linus Torvalds
1 parent df3fe8defe
Exists in master and in 7 other branches imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

[PATCH] Pass sparse the lock expression given to lock annotations 

The lock annotation macros __acquires, __releases, __acquire, and __release
all currently throw away the lock expression passed as an argument.  Now
that sparse can parse __context__ and __attribute__((context)) with a
context expression, pass the lock expression down to sparse as the context
expression.  This requires a version of sparse from GIT commit
37475a6c1c3e66219e68d912d5eb833f4098fd72 or later.

Signed-off-by: Josh Triplett <josh@freedesktop.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Showing 1 changed file with 4 additions and 4 deletions Side-by-side Diff

include/linux/compiler.h
Diff comments   View file @ c902e0a
... ... @@ -10,10 +10,10 @@
10 10 # define __force __attribute__((force))
11 11 # define __nocast __attribute__((nocast))
12 12 # define __iomem __attribute__((noderef, address_space(2)))
13   -# define __acquires(x) __attribute__((context(0,1)))
14   -# define __releases(x) __attribute__((context(1,0)))
15   -# define __acquire(x) __context__(1)
16   -# define __release(x) __context__(-1)
  13 +# define __acquires(x) __attribute__((context(x,0,1)))
  14 +# define __releases(x) __attribute__((context(x,1,0)))
  15 +# define __acquire(x) __context__(x,1)
  16 +# define __release(x) __context__(x,-1)
17 17 # define __cond_lock(x,c) ((c) ? ({ __acquire(x); 1; }) : 0)
18 18 extern void __chk_user_ptr(void __user *);
19 19 extern void __chk_io_ptr(void __iomem *);