Another day, another rcu_dereference warning. (#640673)

This commit is contained in:
Dave Jones 2010-10-06 14:04:29 -04:00
parent c71fd942c4
commit dd6df43713
2 changed files with 21 additions and 0 deletions

View File

@ -682,6 +682,7 @@ Patch2912: linux-2.6-v4l-dvb-ir-core-update.patch
Patch2917: hdpvr-ir-enable.patch Patch2917: hdpvr-ir-enable.patch
Patch3000: linux-2.6-rcu-sched-warning.patch Patch3000: linux-2.6-rcu-sched-warning.patch
Patch3010: linux-2.6-rcu-netpoll.patch
# fs fixes # fs fixes
@ -1295,6 +1296,7 @@ ApplyPatch hdpvr-ir-enable.patch
# silence another rcu_reference warning # silence another rcu_reference warning
ApplyPatch linux-2.6-rcu-sched-warning.patch ApplyPatch linux-2.6-rcu-sched-warning.patch
ApplyPatch linux-2.6-rcu-netpoll.patch
# Patches headed upstream # Patches headed upstream
ApplyPatch disable-i8042-check-on-apple-mac.patch ApplyPatch disable-i8042-check-on-apple-mac.patch
@ -1940,6 +1942,9 @@ fi
# || || # || ||
%changelog %changelog
* Wed Oct 06 2010 Dave Jones <davej@redhat.com>
- Another day, another rcu_dereference warning. (#640673)
* Tue Oct 05 2010 Kyle McMartin <kyle@redhat.com> 2.6.36-0.34.rc6.git3 * Tue Oct 05 2010 Kyle McMartin <kyle@redhat.com> 2.6.36-0.34.rc6.git3
- Linux 2.6.36-rc6-git3 - Linux 2.6.36-rc6-git3
- Drop intel_ips patches merged upstream. - Drop intel_ips patches merged upstream.

View File

@ -0,0 +1,16 @@
diff --git a/include/linux/rcupdate.h b/include/linux/rcupdate.h
index 9fbc54a..435c502 100644
--- a/include/linux/rcupdate.h
+++ b/include/linux/rcupdate.h
@@ -454,7 +454,7 @@ static inline notrace void rcu_read_unlock_sched_notrace(void)
* Makes rcu_dereference_check() do the dirty work.
*/
#define rcu_dereference_bh(p) \
- rcu_dereference_check(p, rcu_read_lock_bh_held())
+ rcu_dereference_check(p, rcu_read_lock_bh_held() || irqs_disabled())
/**
* rcu_dereference_sched - fetch RCU-protected pointer, checking for RCU-sched