diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-03-22 12:44:50 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-03-22 12:44:50 -0400 |
commit | 28f23d1f3b6a6078312b6e9585e583cc7326fe22 (patch) | |
tree | db366c75c2e2d12a2a2c3b7299c35ef7c72928a4 /arch/x86/kernel/cpu/mcheck | |
parent | 23904815461ba223a8baf7490051597fa054299b (diff) | |
parent | c7b738351ba92f48b943ac59aff6b5b0f17f37c9 (diff) |
Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull x86 "urgent" leftovers from Ingo Molnar:
"Pending x86/urgent bits that were not high prio enough to warrant
-rc-less v3.3-final inclusion."
* 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
x86, efi: Fix pointer math issue in handle_ramdisks()
x86/ioapic: Add register level checks to detect bogus io-apic entries
x86, mce: Fix rcu splat in drain_mce_log_buffer()
x86, memblock: Move mem_hole_size() to .init
Diffstat (limited to 'arch/x86/kernel/cpu/mcheck')
-rw-r--r-- | arch/x86/kernel/cpu/mcheck/mce.c | 2 |
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 c614bd4de0f3..d086a09c087d 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) | |||
191 | { | 191 | { |
192 | unsigned int next, i, prev = 0; | 192 | unsigned int next, i, prev = 0; |
193 | 193 | ||
194 | next = rcu_dereference_check_mce(mcelog.next); | 194 | next = ACCESS_ONCE(mcelog.next); |
195 | 195 | ||
196 | do { | 196 | do { |
197 | struct mce *m; | 197 | struct mce *m; |