Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 102bb9fe authored by Wei Jiangang's avatar Wei Jiangang Committed by Ingo Molnar
Browse files

x86/apic: Remove the unused struct apic::apic_id_mask field 



The only user verify_local_APIC() had been removed by commit:

  4399c03c ("x86/apic: Remove verify_local_APIC()")

... so there is no need to keep it.

Signed-off-by: default avatarWei Jiangang <weijg.fnst@cn.fujitsu.com>
Cc: Borislav Petkov <bp@alien8.de>
Cc: H. Peter Anvin <hpa@zytor.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: boris.ostrovsky@oracle.com
Cc: bsd@redhat.com
Cc: david.vrabel@citrix.com
Cc: jgross@suse.com
Cc: konrad.wilk@oracle.com
Cc: xen-devel@lists.xenproject.org
Link: http://lkml.kernel.org/r/1468463046-20849-1-git-send-email-weijg.fnst@cn.fujitsu.com


Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parent 07ccdcd3

arch/x86/include/asm/apic.h

+0 −1
Original line number Diff line number Diff line
@@ -300,7 +300,6 @@ struct apic { 


	unsigned int (*get_apic_id)(unsigned long x);

	unsigned long (*set_apic_id)(unsigned int id);

	unsigned long apic_id_mask;



	int (*cpu_mask_to_apicid_and)(const struct cpumask *cpumask,

				      const struct cpumask *andmask,

arch/x86/kernel/apic/apic_flat_64.c

+0 −2
Original line number Diff line number Diff line
@@ -181,7 +181,6 @@ static struct apic apic_flat = { 


	.get_apic_id			= flat_get_apic_id,

	.set_apic_id			= set_apic_id,

	.apic_id_mask			= 0xFFu << 24,



	.cpu_mask_to_apicid_and		= flat_cpu_mask_to_apicid_and,
@@ -278,7 +277,6 @@ static struct apic apic_physflat = { 


	.get_apic_id			= flat_get_apic_id,

	.set_apic_id			= set_apic_id,

	.apic_id_mask			= 0xFFu << 24,



	.cpu_mask_to_apicid_and		= default_cpu_mask_to_apicid_and,

arch/x86/kernel/apic/apic_noop.c

+0 −1
Original line number Diff line number Diff line
@@ -141,7 +141,6 @@ struct apic apic_noop = { 


	.get_apic_id			= noop_get_apic_id,

	.set_apic_id			= NULL,

	.apic_id_mask			= 0x0F << 24,



	.cpu_mask_to_apicid_and		= flat_cpu_mask_to_apicid_and,

arch/x86/kernel/apic/apic_numachip.c

+0 −2
Original line number Diff line number Diff line
@@ -269,7 +269,6 @@ static const struct apic apic_numachip1 __refconst = { 


	.get_apic_id			= numachip1_get_apic_id,

	.set_apic_id			= numachip1_set_apic_id,

	.apic_id_mask			= 0xffU << 24,



	.cpu_mask_to_apicid_and		= default_cpu_mask_to_apicid_and,
@@ -321,7 +320,6 @@ static const struct apic apic_numachip2 __refconst = { 


	.get_apic_id			= numachip2_get_apic_id,

	.set_apic_id			= numachip2_set_apic_id,

	.apic_id_mask			= 0xffU << 24,



	.cpu_mask_to_apicid_and		= default_cpu_mask_to_apicid_and,

arch/x86/kernel/apic/bigsmp_32.c

+0 −1
Original line number Diff line number Diff line
@@ -171,7 +171,6 @@ static struct apic apic_bigsmp = { 


	.get_apic_id			= bigsmp_get_apic_id,

	.set_apic_id			= NULL,

	.apic_id_mask			= 0xFF << 24,



	.cpu_mask_to_apicid_and		= default_cpu_mask_to_apicid_and,