diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-04-04 08:36:15 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-04-04 08:36:15 -0700 |
| commit | fb9a7d76da108d120efb2258ea83b18dbbb2ecdd (patch) | |
| tree | f93f0eed000ed5d17cd728c7f8b05f489dde1e9a /arch/x86/kernel | |
| parent | 4acfaf829dacb8f8170b439d30065e8d2cfdaac9 (diff) | |
| parent | 5679027e74126e0dfc860869b0e7ceab1dd06318 (diff) | |
| download | blackbird-op-linux-fb9a7d76da108d120efb2258ea83b18dbbb2ecdd.tar.gz blackbird-op-linux-fb9a7d76da108d120efb2258ea83b18dbbb2ecdd.zip | |
Merge branch 'core-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'core-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
rcu: create new rcu_access_index() and use in mce
WARN_ON_SMP(): Add comment to explain ({0;})
Diffstat (limited to 'arch/x86/kernel')
| -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 5a05ef63eb4a..3385ea26f684 100644 --- a/arch/x86/kernel/cpu/mcheck/mce.c +++ b/arch/x86/kernel/cpu/mcheck/mce.c @@ -1626,7 +1626,7 @@ out: static unsigned int mce_poll(struct file *file, poll_table *wait) { poll_wait(file, &mce_wait, wait); - if (rcu_dereference_check_mce(mcelog.next)) + if (rcu_access_index(mcelog.next)) return POLLIN | POLLRDNORM; if (!mce_apei_read_done && apei_check_mce()) return POLLIN | POLLRDNORM; |
