diff options
| author |   Borislav Petkov <bp@suse.de> | 2021-10-05 20:06:57 +0200 |
|---|---|---|
| committer | Borislav Petkov <bp@suse.de> | 2021-12-13 14:11:53 +0100 |
| commit | ad669ec16afeb0edb7d5bc4f92fdd059565281d2 (patch) | |
| tree | 0004168d84f80f874ba5aedd77b9370b87efaeda /arch/x86/kernel | |
| parent | x86/mce: Do not use memset to clear the banks bitmaps (diff) | |
| download | linux-dev-ad669ec16afeb0edb7d5bc4f92fdd059565281d2.tar.xz linux-dev-ad669ec16afeb0edb7d5bc4f92fdd059565281d2.zip | |
x86/mce: Remove function-local cpus variables
Use num_online_cpus() directly.
No functional changes.
Signed-off-by: Borislav Petkov <bp@suse.de>
Link: https://lore.kernel.org/r/20211208111343.8130-3-bp@alien8.de
Diffstat (limited to 'arch/x86/kernel')
| -rw-r--r-- | arch/x86/kernel/cpu/mce/core.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/arch/x86/kernel/cpu/mce/core.c b/arch/x86/kernel/cpu/mce/core.c index 7c264ee18c95..f15efa242f44 100644 --- a/arch/x86/kernel/cpu/mce/core.c +++ b/arch/x86/kernel/cpu/mce/core.c @@ -985,7 +985,6 @@ static atomic_t global_nwo; static int mce_start(int *no_way_out) { int order; - int cpus = num_online_cpus(); u64 timeout = (u64)mca_cfg.monarch_timeout * NSEC_PER_USEC; if (!timeout) @@ -1002,7 +1001,7 @@ static int mce_start(int *no_way_out) /* * Wait for everyone. */ - while (atomic_read(&mce_callin) != cpus) { + while (atomic_read(&mce_callin) != num_online_cpus()) { if (mce_timed_out(&timeout, "Timeout: Not all CPUs entered broadcast exception handler")) { atomic_set(&global_nwo, 0); @@ -1066,14 +1065,11 @@ static int mce_end(int order) atomic_inc(&mce_executing); if (order == 1) { - /* CHECKME: Can this race with a parallel hotplug? */ - int cpus = num_online_cpus(); - /* * Monarch: Wait for everyone to go through their scanning * loops. */ - while (atomic_read(&mce_executing) <= cpus) { + while (atomic_read(&mce_executing) <= num_online_cpus()) { if (mce_timed_out(&timeout, "Timeout: Monarch CPU unable to finish machine check processing")) goto reset; |