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

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

x86, apic: Remove multi_timer_check callback 



Since commit b5660ba7 ("x86, platforms: Remove NUMAQ") removed NUMAQ,
the multi_timer_check() apic callback has been obsolete.  Remove it.

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


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

arch/x86/include/asm/apic.h

+0 −1
Original line number Diff line number Diff line
@@ -300,7 +300,6 @@ struct apic { 
	void (*ioapic_phys_id_map)(physid_mask_t *phys_map, physid_mask_t *retmap);



	void (*setup_apic_routing)(void);

	int (*multi_timer_check)(int apic, int irq);

	int (*cpu_present_to_apicid)(int mps_cpu);

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

	void (*setup_portio_remap)(void);

arch/x86/kernel/apic/apic_flat_64.c

+0 −2
Original line number Diff line number Diff line
@@ -174,7 +174,6 @@ static struct apic apic_flat = { 


	.ioapic_phys_id_map		= NULL,

	.setup_apic_routing		= NULL,

	.multi_timer_check		= NULL,

	.cpu_present_to_apicid		= default_cpu_present_to_apicid,

	.apicid_to_cpu_present		= NULL,

	.setup_portio_remap		= NULL,
@@ -285,7 +284,6 @@ static struct apic apic_physflat = { 


	.ioapic_phys_id_map		= NULL,

	.setup_apic_routing		= NULL,

	.multi_timer_check		= NULL,

	.cpu_present_to_apicid		= default_cpu_present_to_apicid,

	.apicid_to_cpu_present		= NULL,

	.setup_portio_remap		= NULL,

arch/x86/kernel/apic/apic_noop.c

+0 −1
Original line number Diff line number Diff line
@@ -130,7 +130,6 @@ struct apic apic_noop = { 


	.ioapic_phys_id_map		= default_ioapic_phys_id_map,

	.setup_apic_routing		= NULL,

	.multi_timer_check		= NULL,



	.cpu_present_to_apicid		= default_cpu_present_to_apicid,

	.apicid_to_cpu_present		= physid_set_mask_of_physid,

arch/x86/kernel/apic/apic_numachip.c

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


	.ioapic_phys_id_map		= NULL,

	.setup_apic_routing		= NULL,

	.multi_timer_check		= NULL,

	.cpu_present_to_apicid		= default_cpu_present_to_apicid,

	.apicid_to_cpu_present		= NULL,

	.setup_portio_remap		= NULL,

arch/x86/kernel/apic/bigsmp_32.c

+0 −1
Original line number Diff line number Diff line
@@ -169,7 +169,6 @@ static struct apic apic_bigsmp = { 


	.ioapic_phys_id_map		= bigsmp_ioapic_phys_id_map,

	.setup_apic_routing		= bigsmp_setup_apic_routing,

	.multi_timer_check		= NULL,

	.cpu_present_to_apicid		= bigsmp_cpu_present_to_apicid,

	.apicid_to_cpu_present		= physid_set_mask_of_physid,

	.setup_portio_remap		= NULL,