Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2bd455db authored by Li Zefan's avatar Li Zefan Committed by Ingo Molnar
Browse files

x86: remove nesting CONFIG_HOTPLUG_CPU 



prefill_possible_map() is defined inside CONFIG_HOTPLUG_CPU,
so the nesting CONFIG_HOTPLUG_CPU is just redundant.

Signed-off-by: default avatarLi Zefan <lizf@cn.fujitsu.com>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent 59f09ba2

arch/x86/kernel/smpboot.c

+1 −4
Original line number Diff line number Diff line
@@ -1271,16 +1271,13 @@ __init void prefill_possible_map(void) 
	if (!num_processors)

		num_processors = 1;



#ifdef CONFIG_HOTPLUG_CPU

	if (additional_cpus == -1) {

		if (disabled_cpus > 0)

			additional_cpus = disabled_cpus;

		else

			additional_cpus = 0;

	}

#else

	additional_cpus = 0;

#endif



	possible = num_processors + additional_cpus;

	if (possible > NR_CPUS)

		possible = NR_CPUS;