| From b70a9548a102628b97798ad565cba69d6c7ef5e5 Mon Sep 17 00:00:00 2001 |
| From: Paul Gortmaker <paul.gortmaker@windriver.com> |
| Date: Sat, 22 Jan 2011 21:07:28 -0500 |
| Subject: [PATCH] ratelimit: raw locks on state and name |
| |
| 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 include/linux/ratelimit.h |
| |
| 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/include/linux/ratelimit.h b/include/linux/ratelimit.h |
| index 668cf1b..7596e38 100644 |
| --- a/include/linux/ratelimit.h |
| +++ b/include/linux/ratelimit.h |
| @@ -8,7 +8,7 @@ |
| #define DEFAULT_RATELIMIT_BURST 10 |
| |
| struct ratelimit_state { |
| - spinlock_t lock; /* protect the state */ |
| + raw_spinlock_t lock; /* protect the state */ |
| |
| int interval; |
| int burst; |
| @@ -20,7 +20,7 @@ struct ratelimit_state { |
| #define DEFINE_RATELIMIT_STATE(name, interval_init, burst_init) \ |
| \ |
| struct ratelimit_state name = { \ |
| - .lock = __SPIN_LOCK_UNLOCKED(name.lock), \ |
| + .lock = __RAW_SPIN_LOCK_UNLOCKED(name.lock), \ |
| .interval = interval_init, \ |
| .burst = burst_init, \ |
| } |
| -- |
| 1.7.1.1 |
| |