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

Commit 861a6ee8 authored by Andy Shevchenko's avatar Andy Shevchenko Committed by Rafael J. Wysocki
Browse files

ACPI / boot: Don't define unused variables 



Some code in acpi_parse_x2apic() conditionally compiled, though parts of
it are being used in any case. This annoys gcc.

arch/x86/kernel/acpi/boot.c: In function ‘acpi_parse_x2apic’:
arch/x86/kernel/acpi/boot.c:203:5: warning: variable ‘enabled’ set but not used [-Wunused-but-set-variable]
  u8 enabled;
     ^~~~~~~
arch/x86/kernel/acpi/boot.c:202:6: warning: variable ‘apic_id’ set but not used [-Wunused-but-set-variable]
  int apic_id;
      ^~~~~~~

Re-arrange the code to avoid compiling unused variables.

Signed-off-by: default avatarAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
parent 520eccdf

arch/x86/kernel/acpi/boot.c

+4 −1
Original line number Diff line number Diff line
@@ -199,8 +199,10 @@ static int __init 
acpi_parse_x2apic(struct acpi_subtable_header *header, const unsigned long end)

{

	struct acpi_madt_local_x2apic *processor = NULL;

#ifdef CONFIG_X86_X2APIC

	int apic_id;

	u8 enabled;

#endif



	processor = (struct acpi_madt_local_x2apic *)header;
@@ -209,9 +211,10 @@ acpi_parse_x2apic(struct acpi_subtable_header *header, const unsigned long end) 


	acpi_table_print_madt_entry(header);



#ifdef CONFIG_X86_X2APIC

	apic_id = processor->local_apic_id;

	enabled = processor->lapic_flags & ACPI_MADT_ENABLED;

#ifdef CONFIG_X86_X2APIC



	/*

	 * We need to register disabled CPU as well to permit

	 * counting disabled CPUs. This allows us to size