[PATCH] Pass sparse the lock expression given to lock annotations (c902e0a0) · Commits · 戴 / test

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>

include/linux/compiler.h

+4 −4

Original line number	Diff line number	Diff line
		@@ -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 *);

Admin message