Commit ad669ec1 authored by Borislav Petkov's avatar Borislav Petkov
Browse files

x86/mce: Remove function-local cpus variables 



Use num_online_cpus() directly.

No functional changes.

Signed-off-by: default avatarBorislav Petkov <bp@suse.de>
Link: https://lore.kernel.org/r/20211208111343.8130-3-bp@alien8.de
parent cd5e0d1f

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

+2 −6
Original line number Original line Diff line number Diff line
@@ -985,7 +985,6 @@ static atomic_t global_nwo; 
static int mce_start(int *no_way_out)

static int mce_start(int *no_way_out)

{

{

	int order;

	int order;

	int cpus = num_online_cpus();

	u64 timeout = (u64)mca_cfg.monarch_timeout * NSEC_PER_USEC;

	u64 timeout = (u64)mca_cfg.monarch_timeout * NSEC_PER_USEC;





	if (!timeout)

	if (!timeout)
@@ -1002,7 +1001,7 @@ static int mce_start(int *no_way_out) 
	/*

	/*

	 * Wait for everyone.

	 * Wait for everyone.

	 */

	 */

	while (atomic_read(&mce_callin) != cpus) {

	while (atomic_read(&mce_callin) != num_online_cpus()) {

		if (mce_timed_out(&timeout,

		if (mce_timed_out(&timeout,

				  "Timeout: Not all CPUs entered broadcast exception handler")) {

				  "Timeout: Not all CPUs entered broadcast exception handler")) {

			atomic_set(&global_nwo, 0);

			atomic_set(&global_nwo, 0);
@@ -1066,14 +1065,11 @@ static int mce_end(int order) 
	atomic_inc(&mce_executing);

	atomic_inc(&mce_executing);





	if (order == 1) {

	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

		 * Monarch: Wait for everyone to go through their scanning

		 * loops.

		 * loops.

		 */

		 */

		while (atomic_read(&mce_executing) <= cpus) {

		while (atomic_read(&mce_executing) <= num_online_cpus()) {

			if (mce_timed_out(&timeout,

			if (mce_timed_out(&timeout,

					  "Timeout: Monarch CPU unable to finish machine check processing"))

					  "Timeout: Monarch CPU unable to finish machine check processing"))

				goto reset;

				goto reset;