| From 8c65176bc2e7a6085576e6e2c6c05cc0045f1e7c Mon Sep 17 00:00:00 2001 |
| From: Paul Gortmaker <paul.gortmaker@windriver.com> |
| Date: Sun, 23 Jan 2011 14:07:02 -0500 |
| Subject: [PATCH] relocate DEBUG_LOCKS_WARN_ON for mutexes |
| |
| This is one of several extractions from the merge up to 33-rc8. |
| |
| See it in a git tip repo with: |
| |
| git diff 5f854cfc024622e4aae14d7cf422f6ff86278688^2 \ |
| 5f854cfc024622e4aae14d7cf422f6ff86278688 \ |
| kernel/mutex-debug.h kernel/mutex.c |
| |
| You can find the origin of this change in the tip merge commit: |
| |
| commit 5f854cfc024622e4aae14d7cf422f6ff86278688 |
| Merge: cc24da0 4ec62b2 |
| Author: Thomas Gleixner <tglx@linutronix.de> |
| Date: Sun Feb 21 20:17:22 2010 +0100 |
| |
| Forward to 2.6.33-rc8 |
| |
| Merge branch 'linus' into rt/head with a pile of conflicts. |
| |
| Signed-off-by: Thomas Gleixner <tglx@linutronix.de> |
| |
| Normally there are not significant changes/additions in a merge commit that |
| are not from any other "normal" commit. But in this case there are, so |
| break them out into separate explicit commits. |
| |
| Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> |
| |
| diff --git a/kernel/mutex-debug.h b/kernel/mutex-debug.h |
| index 57d527a..6dc57dd 100644 |
| --- a/kernel/mutex-debug.h |
| +++ b/kernel/mutex-debug.h |
| @@ -41,7 +41,6 @@ static inline void mutex_clear_owner(struct mutex *lock) |
| do { \ |
| struct mutex *l = container_of(lock, struct mutex, wait_lock); \ |
| \ |
| - DEBUG_LOCKS_WARN_ON(in_interrupt()); \ |
| local_irq_save(flags); \ |
| arch_spin_lock(&(lock)->rlock.raw_lock);\ |
| DEBUG_LOCKS_WARN_ON(l->magic != l); \ |
| diff --git a/kernel/mutex.c b/kernel/mutex.c |
| index 432607a..e23f35e 100644 |
| --- a/kernel/mutex.c |
| +++ b/kernel/mutex.c |
| @@ -149,6 +149,8 @@ __mutex_lock_common(struct mutex *lock, long state, unsigned int subclass, |
| preempt_disable(); |
| mutex_acquire(&lock->dep_map, subclass, 0, ip); |
| |
| + DEBUG_LOCKS_WARN_ON(in_interrupt()); |
| + |
| #ifdef CONFIG_MUTEX_SPIN_ON_OWNER |
| /* |
| * Optimistic spinning. |
| -- |
| 1.7.1.1 |
| |