Commit 182daa55 authored by Josh Triplett's avatar Josh Triplett Committed by Linus Torvalds

[PATCH] mtrr: Add lock annotations for prepare_set and post_set

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: default avatarJosh Triplett <josh@freedesktop.org>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent c7f40ff1
...@@ -243,7 +243,7 @@ static DEFINE_SPINLOCK(set_atomicity_lock); ...@@ -243,7 +243,7 @@ static DEFINE_SPINLOCK(set_atomicity_lock);
* has been called. * has been called.
*/ */
static void prepare_set(void) static void prepare_set(void) __acquires(set_atomicity_lock)
{ {
unsigned long cr0; unsigned long cr0;
...@@ -274,7 +274,7 @@ static void prepare_set(void) ...@@ -274,7 +274,7 @@ static void prepare_set(void)
mtrr_wrmsr(MTRRdefType_MSR, deftype_lo & 0xf300UL, deftype_hi); 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 TLBs (no need to flush caches - they are disabled) */
__flush_tlb(); __flush_tlb();
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment