diff options
Diffstat (limited to 'arch/x86/include/asm/apic.h')
-rw-r--r-- | arch/x86/include/asm/apic.h | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/arch/x86/include/asm/apic.h b/arch/x86/include/asm/apic.h index eec240e12091..8bebeb8952fb 100644 --- a/arch/x86/include/asm/apic.h +++ b/arch/x86/include/asm/apic.h | |||
@@ -306,7 +306,7 @@ struct apic { | |||
306 | unsigned long (*check_apicid_used)(physid_mask_t *map, int apicid); | 306 | unsigned long (*check_apicid_used)(physid_mask_t *map, int apicid); |
307 | unsigned long (*check_apicid_present)(int apicid); | 307 | unsigned long (*check_apicid_present)(int apicid); |
308 | 308 | ||
309 | bool (*vector_allocation_domain)(int cpu, struct cpumask *retmask); | 309 | void (*vector_allocation_domain)(int cpu, struct cpumask *retmask); |
310 | void (*init_apic_ldr)(void); | 310 | void (*init_apic_ldr)(void); |
311 | 311 | ||
312 | void (*ioapic_phys_id_map)(physid_mask_t *phys_map, physid_mask_t *retmap); | 312 | void (*ioapic_phys_id_map)(physid_mask_t *phys_map, physid_mask_t *retmap); |
@@ -614,7 +614,7 @@ default_cpu_mask_to_apicid_and(const struct cpumask *cpumask, | |||
614 | const struct cpumask *andmask, | 614 | const struct cpumask *andmask, |
615 | unsigned int *apicid); | 615 | unsigned int *apicid); |
616 | 616 | ||
617 | static inline bool | 617 | static inline void |
618 | flat_vector_allocation_domain(int cpu, struct cpumask *retmask) | 618 | flat_vector_allocation_domain(int cpu, struct cpumask *retmask) |
619 | { | 619 | { |
620 | /* Careful. Some cpus do not strictly honor the set of cpus | 620 | /* Careful. Some cpus do not strictly honor the set of cpus |
@@ -627,14 +627,12 @@ flat_vector_allocation_domain(int cpu, struct cpumask *retmask) | |||
627 | */ | 627 | */ |
628 | cpumask_clear(retmask); | 628 | cpumask_clear(retmask); |
629 | cpumask_bits(retmask)[0] = APIC_ALL_CPUS; | 629 | cpumask_bits(retmask)[0] = APIC_ALL_CPUS; |
630 | return false; | ||
631 | } | 630 | } |
632 | 631 | ||
633 | static inline bool | 632 | static inline void |
634 | default_vector_allocation_domain(int cpu, struct cpumask *retmask) | 633 | default_vector_allocation_domain(int cpu, struct cpumask *retmask) |
635 | { | 634 | { |
636 | cpumask_copy(retmask, cpumask_of(cpu)); | 635 | cpumask_copy(retmask, cpumask_of(cpu)); |
637 | return true; | ||
638 | } | 636 | } |
639 | 637 | ||
640 | static inline unsigned long default_check_apicid_used(physid_mask_t *map, int apicid) | 638 | static inline unsigned long default_check_apicid_used(physid_mask_t *map, int apicid) |