Prev: 2.6.34-rc1: regression: ^Z no longer stops sound
Next: perf: Also export the weak version of perf_arch_fetch_caller_regs
From: tip-bot for Ingo Molnar on 14 Mar 2010 04:10
Commit-ID: 2aa2b50dd62b5d0675bd7453fbeb5732dc2d7866
Gitweb: http://git.kernel.org/tip/2aa2b50dd62b5d0675bd7453fbeb5732dc2d7866
Author: Ingo Molnar <mingo(a)elte.hu>
AuthorDate: Sun, 14 Mar 2010 08:57:03 +0100
Committer: Ingo Molnar <mingo(a)elte.hu>
CommitDate: Sun, 14 Mar 2010 08:57:03 +0100

x86/mce: Fix build bug with CONFIG_PROVE_LOCKING=y && CONFIG_X86_MCE_INTEL=y

Commit f56e8a076 "x86/mce: Fix RCU lockdep splats" introduced the
following build bug:

arch/x86/kernel/cpu/mcheck/mce.c: In function 'mce_log':
arch/x86/kernel/cpu/mcheck/mce.c:166: error: 'mce_read_mutex' undeclared (first use in this function)
arch/x86/kernel/cpu/mcheck/mce.c:166: error: (Each undeclared identifier is reported only once
arch/x86/kernel/cpu/mcheck/mce.c:166: error: for each function it appears in.)

Move the in-the-middle-of-file lock variable up to the variable
definition section, the top of the .c file.

Cc: Paul E. McKenney <paulmck(a)linux.vnet.ibm.com>
Cc: "H. Peter Anvin" <hpa(a)zytor.com>
Cc: x86(a)kernel.org
Cc: laijs(a)cn.fujitsu.com
Cc: dipankar(a)in.ibm.com
Cc: mathieu.desnoyers(a)polymtl.ca
Cc: josh(a)joshtriplett.org
Cc: dvhltc(a)us.ibm.com
Cc: niv(a)us.ibm.com
Cc: peterz(a)infradead.org
Cc: rostedt(a)goodmis.org
Cc: Valdis.Kletnieks(a)vt.edu
Cc: dhowells(a)redhat.com
LKML-Reference: <1267830207-9474-3-git-send-email-paulmck(a)linux.vnet.ibm.com>
Signed-off-by: Ingo Molnar <mingo(a)elte.hu>
---
arch/x86/kernel/cpu/mcheck/mce.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/arch/x86/kernel/cpu/mcheck/mce.c b/arch/x86/kernel/cpu/mcheck/mce.c
index bd58de4..3ab9c88 100644
--- a/arch/x86/kernel/cpu/mcheck/mce.c
+++ b/arch/x86/kernel/cpu/mcheck/mce.c
@@ -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)
{
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo(a)vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
 | 
Pages: 1
Prev: 2.6.34-rc1: regression: ^Z no longer stops sound
Next: perf: Also export the weak version of perf_arch_fetch_caller_regs