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

Commit 8091c1f8 authored by Andreas Ruprecht's avatar Andreas Ruprecht Committed by Ingo Molnar
Browse files

x86/apic/uv: Remove unnecessary #ifdef 



In the file x2apic_uv_x.c, some code is compiled conditionally
depending on CONFIG_SMP. However, the file is only built, if
CONFIG_X86_UV is enabled.

CONFIG_X86_UV depends on CONFIG_NUMA, which itself depends on
CONFIG_SMP, so the #ifdef will always evaluate to true, if the
file is compiled. Thus, it is unnecessary and can be removed.

Signed-off-by: default avatarAndreas Ruprecht <rupran@einserver.de>
Cc: David Rientjes <rientjes@google.com>
Cc: Dimitri Sivanich <sivanich@sgi.com>
Cc: Hedi Berriche <hedi@sgi.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Mike Travis <travis@sgi.com>
Cc: Russ Anderson <rja@sgi.com>
Link: http://lkml.kernel.org/r/1408522561-23389-1-git-send-email-rupran@einserver.de


Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parent 98a96f20

arch/x86/kernel/apic/x2apic_uv_x.c

+0 −2
Original line number Diff line number Diff line
@@ -204,7 +204,6 @@ EXPORT_SYMBOL(sn_rtc_cycles_per_second); 


static int uv_wakeup_secondary(int phys_apicid, unsigned long start_rip)

{

#ifdef CONFIG_SMP

	unsigned long val;

	int pnode;
@@ -223,7 +222,6 @@ static int uv_wakeup_secondary(int phys_apicid, unsigned long start_rip) 
	uv_write_global_mmr64(pnode, UVH_IPI_INT, val);



	atomic_set(&init_deasserted, 1);

#endif

	return 0;

}