From 6d6e4c3ce35a0fb30072c54467208d6724ecfa4c Mon Sep 17 00:00:00 2001 From: Huang Ying Date: Tue, 22 Sep 2009 14:35:57 +0800 Subject: [PATCH] --- yaml --- r: 166409 b: refs/heads/master c: 14c0abf14a5e67e793131116bd97f57da37ccce3 h: refs/heads/master i: 166407: aae6cd4dca6c0e1cbd14ba472c41fd93fb47d0ab v: v3 --- [refs] | 2 +- trunk/arch/x86/kernel/cpu/mcheck/mce-inject.c | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 1669f6a9131f..8d28e38dd5c8 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b417c9fd8690637f0c91479435ab3e2bf450c038 +refs/heads/master: 14c0abf14a5e67e793131116bd97f57da37ccce3 diff --git a/trunk/arch/x86/kernel/cpu/mcheck/mce-inject.c b/trunk/arch/x86/kernel/cpu/mcheck/mce-inject.c index 7029f0e2acad..472763d92098 100644 --- a/trunk/arch/x86/kernel/cpu/mcheck/mce-inject.c +++ b/trunk/arch/x86/kernel/cpu/mcheck/mce-inject.c @@ -98,8 +98,9 @@ static struct notifier_block mce_raise_nb = { }; /* Inject mce on current CPU */ -static int raise_local(struct mce *m) +static int raise_local(void) { + struct mce *m = &__get_cpu_var(injectm); int context = MCJ_CTX(m->inject_flags); int ret = 0; int cpu = m->extcpu; @@ -167,12 +168,12 @@ static void raise_mce(struct mce *m) } cpu_relax(); } - raise_local(m); + raise_local(); put_cpu(); put_online_cpus(); } else #endif - raise_local(m); + raise_local(); } /* Error injection interface */