From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Date: Tue, 6 Apr 2021 13:00:13 +0000 (+0200)
Subject: Merge back 'acpi-processor' material for v5.13.
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=1c29f6a0f0c6ed44863046b8a51c40d4df804dd9;p=linux.git

Merge back 'acpi-processor' material for v5.13.
---

1c29f6a0f0c6ed44863046b8a51c40d4df804dd9
diff --cc drivers/acpi/processor_idle.c
index 768a6b4d23680,418f0e26f4dd3..0925b14772309
--- a/drivers/acpi/processor_idle.c
+++ b/drivers/acpi/processor_idle.c
@@@ -29,12 -29,8 +29,9 @@@
   */
  #ifdef CONFIG_X86
  #include <asm/apic.h>
 +#include <asm/cpu.h>
  #endif
  
- #define _COMPONENT              ACPI_PROCESSOR_COMPONENT
- ACPI_MODULE_NAME("processor_idle");
- 
  #define ACPI_IDLE_STATE_START	(IS_ENABLED(CONFIG_ARCH_HAS_CPU_RELAX) ? 1 : 0)
  
  static unsigned int max_cstate __read_mostly = ACPI_PROCESSOR_MAX_POWER;