linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] [mtrr] Add lock annotations for prepare_set and post_set
@ 2006-07-25  0:24 Josh Triplett
  0 siblings, 0 replies; only message in thread
From: Josh Triplett @ 2006-07-25  0:24 UTC (permalink / raw)
  To: linux-kernel; +Cc: Andrew Morton, Richard Gooch

The functions prepare_set and post_set in kernel/cpu/mtrr/generic.c wrap the
spinlock set_atomicity_lock: prepare_set returns with the lock held, and
post_set releases the lock without acquiring it.  Add lock annotations to
these two functions so that sparse can check callers for lock pairing, and so
that sparse will not complain about these functions since they intentionally
use locks in this manner.

Signed-off-by: Josh Triplett <josh@freedesktop.org>
---
 arch/i386/kernel/cpu/mtrr/generic.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/arch/i386/kernel/cpu/mtrr/generic.c b/arch/i386/kernel/cpu/mtrr/generic.c
index 169ac8e..0b61eed 100644
--- a/arch/i386/kernel/cpu/mtrr/generic.c
+++ b/arch/i386/kernel/cpu/mtrr/generic.c
@@ -243,7 +243,7 @@ static DEFINE_SPINLOCK(set_atomicity_loc
  * has been called.
  */
 
-static void prepare_set(void)
+static void prepare_set(void) __acquires(set_atomicity_lock)
 {
 	unsigned long cr0;
 
@@ -274,7 +274,7 @@ static void prepare_set(void)
 	mtrr_wrmsr(MTRRdefType_MSR, deftype_lo & 0xf300UL, deftype_hi);
 }
 
-static void post_set(void)
+static void post_set(void) __releases(set_atomicity_lock)
 {
 	/*  Flush TLBs (no need to flush caches - they are disabled)  */
 	__flush_tlb();



^ permalink raw reply related	[flat|nested] only message in thread

only message in thread, other threads:[~2006-07-25  0:24 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2006-07-25  0:24 [PATCH] [mtrr] Add lock annotations for prepare_set and post_set Josh Triplett

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).