| From 1eefbe2d3de1ebcf9a4d1b957ea52910d39e55c2 Mon Sep 17 00:00:00 2001 |
| From: Paul Gortmaker <paul.gortmaker@windriver.com> |
| Date: Sun, 23 Jan 2011 18:42:39 -0500 |
| Subject: [PATCH] __raw_read/write: use __preempt_enable, not preempt_enable |
| |
| 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/rwlock_api_smp.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/rwlock_api_smp.h b/include/linux/rwlock_api_smp.h |
| index 9c9f049..99d0eed 100644 |
| --- a/include/linux/rwlock_api_smp.h |
| +++ b/include/linux/rwlock_api_smp.h |
| @@ -250,7 +250,7 @@ static inline void __raw_read_unlock_bh(rwlock_t *lock) |
| { |
| rwlock_release(&lock->dep_map, 1, _RET_IP_); |
| do_raw_read_unlock(lock); |
| - preempt_enable_no_resched(); |
| + __preempt_enable_no_resched(); |
| local_bh_enable_ip((unsigned long)__builtin_return_address(0)); |
| } |
| |
| @@ -275,7 +275,7 @@ static inline void __raw_write_unlock_bh(rwlock_t *lock) |
| { |
| rwlock_release(&lock->dep_map, 1, _RET_IP_); |
| do_raw_write_unlock(lock); |
| - preempt_enable_no_resched(); |
| + __preempt_enable_no_resched(); |
| local_bh_enable_ip((unsigned long)__builtin_return_address(0)); |
| } |
| |
| -- |
| 1.7.1.1 |
| |