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

Commit 2f078b9c authored by David Rientjes's avatar David Rientjes Committed by H. Peter Anvin
Browse files

x86, apic: Remove enable_apic_mode callback 



The enable_apic_mode() apic callback is never called, so remove it.

Signed-off-by: default avatarDavid Rientjes <rientjes@google.com>
Link: http://lkml.kernel.org/r/alpine.DEB.2.02.1407302352320.17503@chino.kir.corp.google.com


Signed-off-by: default avatarH. Peter Anvin <hpa@zytor.com>
parent 11a8318e

arch/x86/include/asm/apic.h

+0 −1
Original line number Diff line number Diff line
@@ -303,7 +303,6 @@ struct apic { 
	int (*cpu_present_to_apicid)(int mps_cpu);

	void (*apicid_to_cpu_present)(int phys_apicid, physid_mask_t *retmap);

	int (*check_phys_apicid_present)(int phys_apicid);

	void (*enable_apic_mode)(void);

	int (*phys_pkg_id)(int cpuid_apic, int index_msb);



	unsigned int (*get_apic_id)(unsigned long x);

arch/x86/kernel/apic/apic.c

+0 −2
Original line number Diff line number Diff line
@@ -2042,8 +2042,6 @@ void __init connect_bsp_APIC(void) 
		imcr_pic_to_apic();

	}

#endif

	if (apic->enable_apic_mode)

		apic->enable_apic_mode();

}



/**

arch/x86/kernel/apic/apic_flat_64.c

+0 −2
Original line number Diff line number Diff line
@@ -177,7 +177,6 @@ static struct apic apic_flat = { 
	.cpu_present_to_apicid		= default_cpu_present_to_apicid,

	.apicid_to_cpu_present		= NULL,

	.check_phys_apicid_present	= default_check_phys_apicid_present,

	.enable_apic_mode		= NULL,

	.phys_pkg_id			= flat_phys_pkg_id,



	.get_apic_id			= flat_get_apic_id,
@@ -286,7 +285,6 @@ static struct apic apic_physflat = { 
	.cpu_present_to_apicid		= default_cpu_present_to_apicid,

	.apicid_to_cpu_present		= NULL,

	.check_phys_apicid_present	= default_check_phys_apicid_present,

	.enable_apic_mode		= NULL,

	.phys_pkg_id			= flat_phys_pkg_id,



	.get_apic_id			= flat_get_apic_id,

arch/x86/kernel/apic/apic_noop.c

+0 −1
Original line number Diff line number Diff line
@@ -135,7 +135,6 @@ struct apic apic_noop = { 
	.apicid_to_cpu_present		= physid_set_mask_of_physid,



	.check_phys_apicid_present	= default_check_phys_apicid_present,

	.enable_apic_mode		= NULL,



	.phys_pkg_id			= noop_phys_pkg_id,

arch/x86/kernel/apic/apic_numachip.c

+0 −1
Original line number Diff line number Diff line
@@ -226,7 +226,6 @@ static const struct apic apic_numachip __refconst = { 
	.cpu_present_to_apicid		= default_cpu_present_to_apicid,

	.apicid_to_cpu_present		= NULL,

	.check_phys_apicid_present	= default_check_phys_apicid_present,

	.enable_apic_mode		= NULL,

	.phys_pkg_id			= numachip_phys_pkg_id,



	.get_apic_id			= get_apic_id,