From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Date: Mon, 12 Apr 2021 12:55:23 +0000 (+0200)
Subject: Merge branches 'acpi-processor' and 'acpi-pci' into linux-next
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=cd9805cae6589aac3aa938a69a3e1cdfeab82be0;p=users%2Fjedix%2Flinux-maple.git

Merge branches 'acpi-processor' and 'acpi-pci' into linux-next

* acpi-processor:
  ACPI: processor: perflib: Eliminate redundant status check
  ACPI: processor: Get rid of ACPICA message printing
  ACPI: processor: idle: Drop extra prefix from pr_notice()
  ACPI: processor: Remove initialization of static variable

* acpi-pci:
  ACPI: PCI: Replace direct printk() invocations in pci_link.c
  ACPI: PCI: Drop ACPI_PCI_COMPONENT that is not used any more
  ACPI: PCI: Replace ACPI_DEBUG_PRINT() and ACPI_EXCEPTION()
  ACPI: PCI: IRQ: Consolidate printing diagnostic messages
---

cd9805cae6589aac3aa938a69a3e1cdfeab82be0
diff --cc drivers/acpi/processor_idle.c
index 4e2d76b8b697,0925b1477230,d93e400940a3..45a019619e4a
--- a/drivers/acpi/processor_idle.c
+++ b/drivers/acpi/processor_idle.c
@@@@ -29,12 -29,9 -29,11 +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;
@@@@ -542,10 -538,12 -541,6 +538,10 @@@@ static int acpi_idle_play_dead(struct c
   			wait_for_freeze();
   		} else
   			return -ENODEV;
  +
  +#if defined(CONFIG_X86) && defined(CONFIG_HOTPLUG_CPU)
 - 		/* If NMI wants to wake up CPU0, start CPU0. */
 - 		if (wakeup_cpu0())
 - 			start_cpu0();
 ++		cond_wakeup_cpu0();
  +#endif
   	}
   
   	/* Never reached */