[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-Id: <1156466936.3418.58.camel@josh-work.beaverton.ibm.com>
Date: Thu, 24 Aug 2006 17:48:56 -0700
From: Josh Triplett <josht@...ibm.com>
To: linux-kernel@...r.kernel.org
Cc: Andrew Morton <akpm@...l.org>
Subject: [PATCH] Pass sparse the lock expression given to lock annotations
The lock annotation macros __acquires, __releases, __acquire, and __release
all currently throw 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.
Signed-off-by: Josh Triplett <josh@...edesktop.org>
---
This patch depends on the Linux patch "Make spinlock/rwlock annotations
more accurate by using parameters, not types" (currently in -mm as
make-spinlock-rwlock-annotations-more-accurate-by-using.patch) and on
the sparse patch "Parse and track multiple contexts by
expression" (Message-ID
1156447273.3418.34.camel@...h-work.beaverton.ibm.com , available at
http://marc.theaimsgroup.com/?i=1156447273.3418.34.camel@josh-work.beaverton.ibm.com ).
Starting from a base of 2.6.18-rc4 plus
make-spinlock-rwlock-annotations-more-accurate-by-using.patch, using
allyesconfig, I tested sparse -Wcontext with and without this patch, and
confirmed that it generates identical output.
include/linux/compiler.h | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/include/linux/compiler.h b/include/linux/compiler.h
index b3963cf..2ed6528 100644
--- a/include/linux/compiler.h
+++ b/include/linux/compiler.h
@@ -10,10 +10,10 @@ # define __safe __attribute__((safe))
# 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 *);
--
1.4.1.1
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists