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

Commit 425dbc6d authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'x86-apic-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip 

Pull x86/apic updates from Ingo Molnar:
 "Misc cleanups and a small fix"

* 'x86-apic-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86/apic: Remove the unused struct apic::apic_id_mask field
  x86/apic: Fix misspelled APIC
  x86/ioapic: Simplify ioapic_setup_resources()
parents 766fd5f6 102bb9fe

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.c

+3 −3
Original line number Diff line number Diff line
@@ -2045,7 +2045,7 @@ int generic_processor_info(int apicid, int version) 
		int thiscpu = max + disabled_cpus - 1;



		pr_warning(

			"ACPI: NR_CPUS/possible_cpus limit of %i almost"

			"APIC: NR_CPUS/possible_cpus limit of %i almost"

			" reached. Keeping one slot for boot cpu."

			"  Processor %d/0x%x ignored.\n", max, thiscpu, apicid);
@@ -2057,7 +2057,7 @@ int generic_processor_info(int apicid, int version) 
		int thiscpu = max + disabled_cpus;



		pr_warning(

			"ACPI: NR_CPUS/possible_cpus limit of %i reached."

			"APIC: NR_CPUS/possible_cpus limit of %i reached."

			"  Processor %d/0x%x ignored.\n", max, thiscpu, apicid);



		disabled_cpus++;
@@ -2085,7 +2085,7 @@ int generic_processor_info(int apicid, int version) 
	if (topology_update_package_map(apicid, cpu) < 0) {

		int thiscpu = max + disabled_cpus;



		pr_warning("ACPI: Package limit reached. Processor %d/0x%x ignored.\n",

		pr_warning("APIC: Package limit reached. Processor %d/0x%x ignored.\n",

			   thiscpu, apicid);

		disabled_cpus++;

		return -ENOSPC;

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,