summaryrefslogtreecommitdiff
path: root/arch/x86
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2012-03-07 14:44:35 +0100
committerIngo Molnar <mingo@elte.hu>2012-03-07 14:44:35 +0100
commita5c2edf5765a6efedfd862bce6c616bfec46306a (patch)
tree3344e8dd7bd2311a63060b9f81f7eb38bb5770ab /arch/x86
parente37aade31601cdb9f078f6663cbf887f391bb110 (diff)
parentb11e3d782b9c065b3b2fb543bfb0d97801822dc0 (diff)
downloadlinux-rt-a5c2edf5765a6efedfd862bce6c616bfec46306a.tar.gz
Merge tag 'mce-fix-for-3.3-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/ras/ras into x86/urgent
Fix a reproducible RCU warning in the MCE code Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/x86')
-rw-r--r--arch/x86/kernel/cpu/mcheck/mce.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/kernel/cpu/mcheck/mce.c b/arch/x86/kernel/cpu/mcheck/mce.c
index 5a11ae2e9e91..db590aff874c 100644
--- a/arch/x86/kernel/cpu/mcheck/mce.c
+++ b/arch/x86/kernel/cpu/mcheck/mce.c
@@ -191,7 +191,7 @@ static void drain_mcelog_buffer(void)
{
unsigned int next, i, prev = 0;
- next = rcu_dereference_check_mce(mcelog.next);
+ next = ACCESS_ONCE(mcelog.next);
do {
struct mce *m;