diff options
| -rw-r--r-- | arch/x86/kernel/cpu/mcheck/mce-inject.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/arch/x86/kernel/cpu/mcheck/mce-inject.c b/arch/x86/kernel/cpu/mcheck/mce-inject.c index 7029f0e2acad..472763d92098 100644 --- a/arch/x86/kernel/cpu/mcheck/mce-inject.c +++ b/arch/x86/kernel/cpu/mcheck/mce-inject.c | |||
| @@ -98,8 +98,9 @@ static struct notifier_block mce_raise_nb = { | |||
| 98 | }; | 98 | }; |
| 99 | 99 | ||
| 100 | /* Inject mce on current CPU */ | 100 | /* Inject mce on current CPU */ |
| 101 | static int raise_local(struct mce *m) | 101 | static int raise_local(void) |
| 102 | { | 102 | { |
| 103 | struct mce *m = &__get_cpu_var(injectm); | ||
| 103 | int context = MCJ_CTX(m->inject_flags); | 104 | int context = MCJ_CTX(m->inject_flags); |
| 104 | int ret = 0; | 105 | int ret = 0; |
| 105 | int cpu = m->extcpu; | 106 | int cpu = m->extcpu; |
| @@ -167,12 +168,12 @@ static void raise_mce(struct mce *m) | |||
| 167 | } | 168 | } |
| 168 | cpu_relax(); | 169 | cpu_relax(); |
| 169 | } | 170 | } |
| 170 | raise_local(m); | 171 | raise_local(); |
| 171 | put_cpu(); | 172 | put_cpu(); |
| 172 | put_online_cpus(); | 173 | put_online_cpus(); |
| 173 | } else | 174 | } else |
| 174 | #endif | 175 | #endif |
| 175 | raise_local(m); | 176 | raise_local(); |
| 176 | } | 177 | } |
| 177 | 178 | ||
| 178 | /* Error injection interface */ | 179 | /* Error injection interface */ |
