diff options
Diffstat (limited to 'arch/x86/include/asm/apic.h')
-rw-r--r-- | arch/x86/include/asm/apic.h | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/arch/x86/include/asm/apic.h b/arch/x86/include/asm/apic.h index feb2dbdae9e..e3fecd50d5c 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 | void (*vector_allocation_domain)(int cpu, struct cpumask *retmask); | 309 | bool (*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); |
@@ -615,7 +615,7 @@ extern unsigned int | |||
615 | default_cpu_mask_to_apicid_and(const struct cpumask *cpumask, | 615 | default_cpu_mask_to_apicid_and(const struct cpumask *cpumask, |
616 | const struct cpumask *andmask); | 616 | const struct cpumask *andmask); |
617 | 617 | ||
618 | static inline void | 618 | static inline bool |
619 | flat_vector_allocation_domain(int cpu, struct cpumask *retmask) | 619 | flat_vector_allocation_domain(int cpu, struct cpumask *retmask) |
620 | { | 620 | { |
621 | /* Careful. Some cpus do not strictly honor the set of cpus | 621 | /* Careful. Some cpus do not strictly honor the set of cpus |
@@ -628,12 +628,14 @@ flat_vector_allocation_domain(int cpu, struct cpumask *retmask) | |||
628 | */ | 628 | */ |
629 | cpumask_clear(retmask); | 629 | cpumask_clear(retmask); |
630 | cpumask_bits(retmask)[0] = APIC_ALL_CPUS; | 630 | cpumask_bits(retmask)[0] = APIC_ALL_CPUS; |
631 | return false; | ||
631 | } | 632 | } |
632 | 633 | ||
633 | static inline void | 634 | static inline bool |
634 | default_vector_allocation_domain(int cpu, struct cpumask *retmask) | 635 | default_vector_allocation_domain(int cpu, struct cpumask *retmask) |
635 | { | 636 | { |
636 | cpumask_copy(retmask, cpumask_of(cpu)); | 637 | cpumask_copy(retmask, cpumask_of(cpu)); |
638 | return true; | ||
637 | } | 639 | } |
638 | 640 | ||
639 | static inline unsigned long default_check_apicid_used(physid_mask_t *map, int apicid) | 641 | static inline unsigned long default_check_apicid_used(physid_mask_t *map, int apicid) |