Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bca14dd1 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'core-fixes-for-linus' of... 

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:
  x86/mce: Fix build bug with CONFIG_PROVE_LOCKING=y && CONFIG_X86_MCE_INTEL=y
parents 02ca6c40 2aa2b50d

arch/x86/kernel/cpu/mcheck/mce.c

+2 −2
Original line number Diff line number Diff line
@@ -46,6 +46,8 @@ 


#include "mce-internal.h"



static DEFINE_MUTEX(mce_read_mutex);



#define rcu_dereference_check_mce(p) \

	rcu_dereference_check((p), \

			      rcu_read_lock_sched_held() || \
@@ -1490,8 +1492,6 @@ static void collect_tscs(void *data) 
	rdtscll(cpu_tsc[smp_processor_id()]);

}



static DEFINE_MUTEX(mce_read_mutex);



static ssize_t mce_read(struct file *filp, char __user *ubuf, size_t usize,

			loff_t *off)

{