From: Namhyung Kim <namhyung@gmail.com>
To: Jens Axboe <jaxboe@fusionio.com>, Ingo Molnar <mingo@elte.hu>,
Andrew Morton <akpm@linux-foundation.org>
Cc: Dan Carpenter <error27@gmail.com>,
Peter Zijlstra <peterz@infradead.org>,
linux-kernel@vger.kernel.org
Subject: [PATCH v2] generic-ipi: add lock context annotations
Date: Thu, 25 Nov 2010 00:57:52 +0900 [thread overview]
Message-ID: <1290614272-3213-1-git-send-email-namhyung@gmail.com> (raw)
The ipi_call_[un]lock[_irq] functions grab/release a spin lock
but were missing proper annotations. Add them. This fixes
following sparse warnings:
kernel/smp.c:513:6: warning: context imbalance in 'ipi_call_lock' - wrong count at exit
kernel/smp.c:518:6: warning: context imbalance in 'ipi_call_unlock' - unexpected unlock
kernel/smp.c:523:6: warning: context imbalance in 'ipi_call_lock_irq' - wrong count at exit
kernel/smp.c:528:6: warning: context imbalance in 'ipi_call_unlock_irq' - unexpected unlock
Signed-off-by: Namhyung Kim <namhyung@gmail.com>
---
include/linux/smp.h | 8 ++++----
kernel/smp.c | 4 ++++
2 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/include/linux/smp.h b/include/linux/smp.h
index 6dc95ca..f969345 100644
--- a/include/linux/smp.h
+++ b/include/linux/smp.h
@@ -86,10 +86,10 @@ int smp_call_function_any(const struct cpumask *mask,
#ifdef CONFIG_USE_GENERIC_SMP_HELPERS
void generic_smp_call_function_single_interrupt(void);
void generic_smp_call_function_interrupt(void);
-void ipi_call_lock(void);
-void ipi_call_unlock(void);
-void ipi_call_lock_irq(void);
-void ipi_call_unlock_irq(void);
+void ipi_call_lock(void) __acquires(call_function.lock);
+void ipi_call_unlock(void) __releases(call_function.lock);
+void ipi_call_lock_irq(void) __acquires(call_function.lock);
+void ipi_call_unlock_irq(void) __releases(call_function.lock);
#endif
/*
diff --git a/kernel/smp.c b/kernel/smp.c
index 12ed8b0..5a62f1f 100644
--- a/kernel/smp.c
+++ b/kernel/smp.c
@@ -511,21 +511,25 @@ int smp_call_function(smp_call_func_t func, void *info, int wait)
EXPORT_SYMBOL(smp_call_function);
void ipi_call_lock(void)
+ __acquires(call_function.lock)
{
raw_spin_lock(&call_function.lock);
}
void ipi_call_unlock(void)
+ __releases(call_function.lock)
{
raw_spin_unlock(&call_function.lock);
}
void ipi_call_lock_irq(void)
+ __acquires(call_function.lock)
{
raw_spin_lock_irq(&call_function.lock);
}
void ipi_call_unlock_irq(void)
+ __releases(call_function.lock)
{
raw_spin_unlock_irq(&call_function.lock);
}
--
1.7.0.4
reply other threads:[~2010-11-24 15:58 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1290614272-3213-1-git-send-email-namhyung@gmail.com \
--to=namhyung@gmail.com \
--cc=akpm@linux-foundation.org \
--cc=error27@gmail.com \
--cc=jaxboe@fusionio.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@elte.hu \
--cc=peterz@infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®