x86, apic: clean up check_apicid*() callbacks (d1d7cae8) · Commits · 戴 / test

arch/x86/include/asm/bigsmp/apic.h

+5 −4

Original line number	Diff line number	Diff line
		@@ -20,14 +20,15 @@ static inline const cpumask_t *bigsmp_target_cpus(void)
		#define APIC_DFR_VALUE (APIC_DFR_FLAT)
		#define NO_BALANCE_IRQ (0)

		static inline unsigned long check_apicid_used(physid_mask_t bitmap, int apicid)
		static inline unsigned long
		bigsmp_check_apicid_used(physid_mask_t bitmap, int apicid)
		{
		return (0);
		return 0;
		}

		static inline unsigned long check_apicid_present(int bit)
		static inline unsigned long bigsmp_check_apicid_present(int bit)
		{
		return (1);
		return 1;
		}

		static inline unsigned long calculate_ldr(int cpu)

+3 −2

Original line number	Diff line number	Diff line
		@@ -28,11 +28,12 @@ static inline const cpumask_t *es7000_target_cpus(void)
		#define APIC_DFR_VALUE (APIC_DFR_FLAT)
		#define NO_BALANCE_IRQ (0)

		static inline unsigned long check_apicid_used(physid_mask_t bitmap, int apicid)
		static inline unsigned long
		es7000_check_apicid_used(physid_mask_t bitmap, int apicid)
		{
		return 0;
		}
		static inline unsigned long check_apicid_present(int bit)
		static inline unsigned long es7000_check_apicid_present(int bit)
		{
		return physid_isset(bit, phys_cpu_present_map);
		}

+2 −2

Original line number	Diff line number	Diff line
		@@ -105,12 +105,12 @@ static inline void vector_allocation_domain(int cpu, struct cpumask *retmask)
		}
		#endif

		static inline unsigned long check_apicid_used(physid_mask_t bitmap, int apicid)
		static inline unsigned long default_check_apicid_used(physid_mask_t bitmap, int apicid)
		{
		return physid_isset(apicid, bitmap);
		}

		static inline unsigned long check_apicid_present(int bit)
		static inline unsigned long default_check_apicid_present(int bit)
		{
		return physid_isset(bit, phys_cpu_present_map);
		}

+0 −2

Original line number	Diff line number	Diff line
		@@ -13,9 +13,7 @@
		#define cpu_present_to_apicid (apic->cpu_present_to_apicid)
		#define apicid_to_cpu_present (apic->apicid_to_cpu_present)
		#define setup_portio_remap (apic->setup_portio_remap)
		#define check_apicid_present (apic->check_apicid_present)
		#define check_phys_apicid_present (apic->check_phys_apicid_present)
		#define check_apicid_used (apic->check_apicid_used)
		#define cpu_mask_to_apicid (apic->cpu_mask_to_apicid)
		#define cpu_mask_to_apicid_and (apic->cpu_mask_to_apicid_and)
		#define vector_allocation_domain (apic->vector_allocation_domain)

+3 −2

Original line number	Diff line number	Diff line
		@@ -14,11 +14,12 @@ static inline const cpumask_t *numaq_target_cpus(void)

		#define NO_BALANCE_IRQ (1)

		static inline unsigned long check_apicid_used(physid_mask_t bitmap, int apicid)
		static inline unsigned long
		numaq_check_apicid_used(physid_mask_t bitmap, int apicid)
		{
		return physid_isset(apicid, bitmap);
		}
		static inline unsigned long check_apicid_present(int bit)
		static inline unsigned long numaq_check_apicid_present(int bit)
		{
		return physid_isset(bit, phys_cpu_present_map);
		}