diff options
author | David Rientjes <rientjes@google.com> | 2018-03-25 17:04:30 -0400 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2018-03-26 02:49:38 -0400 |
commit | e25283bf83bd97a61007ab383695f4872e2eb43f (patch) | |
tree | 2243ee3c7f898573786032c2991bd9183fb32d40 | |
parent | 8f1561680f42a5491b371b513f1ab8197f31fd62 (diff) |
x86/apic: Finish removing unused callbacks
The ->cpu_mask_to_apicid() and ->vector_allocation_domain() callbacks are
now unused, so remove them.
Signed-off-by: David Rientjes <rientjes@google.com>
Cc: Juergen Gross <jgross@suse.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Fixes: baab1e84b112 ("x86/apic: Remove unused callbacks")
Link: http://lkml.kernel.org/r/alpine.DEB.2.20.1803251403540.80485@chino.kir.corp.google.com
Signed-off-by: Ingo Molnar <mingo@kernel.org>
-rw-r--r-- | arch/x86/include/asm/apic.h | 16 |
1 files changed, 0 insertions, 16 deletions
diff --git a/arch/x86/include/asm/apic.h b/arch/x86/include/asm/apic.h index c6a32019ff54..40a3d3642f3a 100644 --- a/arch/x86/include/asm/apic.h +++ b/arch/x86/include/asm/apic.h | |||
@@ -304,12 +304,6 @@ struct apic { | |||
304 | u32 irq_delivery_mode; | 304 | u32 irq_delivery_mode; |
305 | u32 irq_dest_mode; | 305 | u32 irq_dest_mode; |
306 | 306 | ||
307 | /* Functions and data related to vector allocation */ | ||
308 | void (*vector_allocation_domain)(int cpu, struct cpumask *retmask, | ||
309 | const struct cpumask *mask); | ||
310 | int (*cpu_mask_to_apicid)(const struct cpumask *cpumask, | ||
311 | struct irq_data *irqdata, | ||
312 | unsigned int *apicid); | ||
313 | u32 (*calc_dest_apicid)(unsigned int cpu); | 307 | u32 (*calc_dest_apicid)(unsigned int cpu); |
314 | 308 | ||
315 | /* ICR related functions */ | 309 | /* ICR related functions */ |
@@ -499,17 +493,7 @@ extern void default_setup_apic_routing(void); | |||
499 | extern u32 apic_default_calc_apicid(unsigned int cpu); | 493 | extern u32 apic_default_calc_apicid(unsigned int cpu); |
500 | extern u32 apic_flat_calc_apicid(unsigned int cpu); | 494 | extern u32 apic_flat_calc_apicid(unsigned int cpu); |
501 | 495 | ||
502 | extern int flat_cpu_mask_to_apicid(const struct cpumask *cpumask, | ||
503 | struct irq_data *irqdata, | ||
504 | unsigned int *apicid); | ||
505 | extern int default_cpu_mask_to_apicid(const struct cpumask *cpumask, | ||
506 | struct irq_data *irqdata, | ||
507 | unsigned int *apicid); | ||
508 | extern bool default_check_apicid_used(physid_mask_t *map, int apicid); | 496 | extern bool default_check_apicid_used(physid_mask_t *map, int apicid); |
509 | extern void flat_vector_allocation_domain(int cpu, struct cpumask *retmask, | ||
510 | const struct cpumask *mask); | ||
511 | extern void default_vector_allocation_domain(int cpu, struct cpumask *retmask, | ||
512 | const struct cpumask *mask); | ||
513 | extern void default_ioapic_phys_id_map(physid_mask_t *phys_map, physid_mask_t *retmap); | 497 | extern void default_ioapic_phys_id_map(physid_mask_t *phys_map, physid_mask_t *retmap); |
514 | extern int default_cpu_present_to_apicid(int mps_cpu); | 498 | extern int default_cpu_present_to_apicid(int mps_cpu); |
515 | extern int default_check_phys_apicid_present(int phys_apicid); | 499 | extern int default_check_phys_apicid_present(int phys_apicid); |