x86, apic: rename genapic::apic_destination_logical to genapic::dest_logical (bdb1a9b6) · Commits · 戴 / test

arch/x86/include/asm/genapic.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -30,7 +30,7 @@ struct genapic {

		int disable_esr;

		int apic_destination_logical;
		int dest_logical;
		unsigned long (*check_apicid_used)(physid_mask_t bitmap, int apicid);
		unsigned long (*check_apicid_present)(int apicid);

+5 −5

Original line number	Diff line number	Diff line
		@@ -74,7 +74,7 @@ static inline void _flat_send_IPI_mask(unsigned long mask, int vector)
		unsigned long flags;

		local_irq_save(flags);
		__send_IPI_dest_field(mask, vector, apic->apic_destination_logical);
		__send_IPI_dest_field(mask, vector, apic->dest_logical);
		local_irq_restore(flags);
		}

		@@ -114,7 +114,7 @@ static void flat_send_IPI_allbutself(int vector)
		_flat_send_IPI_mask(mask, vector);
		}
		} else if (num_online_cpus() > 1) {
		__send_IPI_shortcut(APIC_DEST_ALLBUT, vector, apic->apic_destination_logical);
		__send_IPI_shortcut(APIC_DEST_ALLBUT, vector, apic->dest_logical);
		}
		}

		@@ -123,7 +123,7 @@ static void flat_send_IPI_all(int vector)
		if (vector == NMI_VECTOR)
		flat_send_IPI_mask(cpu_online_mask, vector);
		else
		__send_IPI_shortcut(APIC_DEST_ALLINC, vector, apic->apic_destination_logical);
		__send_IPI_shortcut(APIC_DEST_ALLINC, vector, apic->dest_logical);
		}

		static unsigned int get_apic_id(unsigned long x)
		@@ -185,7 +185,7 @@ struct genapic apic_flat = {

		.target_cpus = flat_target_cpus,
		.disable_esr = 0,
		.apic_destination_logical = APIC_DEST_LOGICAL,
		.dest_logical = APIC_DEST_LOGICAL,
		.check_apicid_used = NULL,
		.check_apicid_present = NULL,

		@@ -331,7 +331,7 @@ struct genapic apic_physflat = {

		.target_cpus = physflat_target_cpus,
		.disable_esr = 0,
		.apic_destination_logical = 0,
		.dest_logical = 0,
		.check_apicid_used = NULL,
		.check_apicid_present = NULL,

+4 −4

Original line number	Diff line number	Diff line
		@@ -64,7 +64,7 @@ static void x2apic_send_IPI_mask(const struct cpumask *mask, int vector)
		for_each_cpu(query_cpu, mask)
		__x2apic_send_IPI_dest(
		per_cpu(x86_cpu_to_logical_apicid, query_cpu),
		vector, apic->apic_destination_logical);
		vector, apic->dest_logical);
		local_irq_restore(flags);
		}

		@@ -80,7 +80,7 @@ static void x2apic_send_IPI_mask_allbutself(const struct cpumask *mask,
		if (query_cpu != this_cpu)
		__x2apic_send_IPI_dest(
		per_cpu(x86_cpu_to_logical_apicid, query_cpu),
		vector, apic->apic_destination_logical);
		vector, apic->dest_logical);
		local_irq_restore(flags);
		}

		@@ -95,7 +95,7 @@ static void x2apic_send_IPI_allbutself(int vector)
		if (query_cpu != this_cpu)
		__x2apic_send_IPI_dest(
		per_cpu(x86_cpu_to_logical_apicid, query_cpu),
		vector, apic->apic_destination_logical);
		vector, apic->dest_logical);
		local_irq_restore(flags);
		}

		@@ -187,7 +187,7 @@ struct genapic apic_x2apic_cluster = {

		.target_cpus = x2apic_target_cpus,
		.disable_esr = 0,
		.apic_destination_logical = APIC_DEST_LOGICAL,
		.dest_logical = APIC_DEST_LOGICAL,
		.check_apicid_used = NULL,
		.check_apicid_present = NULL,

+1 −1

Original line number	Diff line number	Diff line
		@@ -183,7 +183,7 @@ struct genapic apic_x2apic_phys = {

		.target_cpus = x2apic_target_cpus,
		.disable_esr = 0,
		.apic_destination_logical = 0,
		.dest_logical = 0,
		.check_apicid_used = NULL,
		.check_apicid_present = NULL,

+1 −1

Original line number	Diff line number	Diff line
		@@ -248,7 +248,7 @@ struct genapic apic_x2apic_uv_x = {

		.target_cpus = uv_target_cpus,
		.disable_esr = 0,
		.apic_destination_logical = APIC_DEST_LOGICAL,
		.dest_logical = APIC_DEST_LOGICAL,
		.check_apicid_used = NULL,
		.check_apicid_present = NULL,