Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

Merge tag 'acpi-5.12-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm

Pull ACPI fix from Rafael Wysocki:
"Fix a build issue introduced by a previous fix in the ACPI processor
driver (Vitaly Kuznetsov)"

* tag 'acpi-5.12-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
ACPI: processor: Fix build when CONFIG_ACPI_PROCESSOR=m

+14 -18
+1 -1
arch/x86/include/asm/smp.h
··· 132 132 void play_dead_common(void); 133 133 void wbinvd_on_cpu(int cpu); 134 134 int wbinvd_on_all_cpus(void); 135 - bool wakeup_cpu0(void); 135 + void cond_wakeup_cpu0(void); 136 136 137 137 void native_smp_send_reschedule(int cpu); 138 138 void native_send_call_func_ipi(const struct cpumask *mask);
+12 -14
arch/x86/kernel/smpboot.c
··· 1659 1659 local_irq_disable(); 1660 1660 } 1661 1661 1662 - bool wakeup_cpu0(void) 1662 + /** 1663 + * cond_wakeup_cpu0 - Wake up CPU0 if needed. 1664 + * 1665 + * If NMI wants to wake up CPU0, start CPU0. 1666 + */ 1667 + void cond_wakeup_cpu0(void) 1663 1668 { 1664 1669 if (smp_processor_id() == 0 && enable_start_cpu0) 1665 - return true; 1666 - 1667 - return false; 1670 + start_cpu0(); 1668 1671 } 1672 + EXPORT_SYMBOL_GPL(cond_wakeup_cpu0); 1669 1673 1670 1674 /* 1671 1675 * We need to flush the caches before going to sleep, lest we have ··· 1738 1734 __monitor(mwait_ptr, 0, 0); 1739 1735 mb(); 1740 1736 __mwait(eax, 0); 1741 - /* 1742 - * If NMI wants to wake up CPU0, start CPU0. 1743 - */ 1744 - if (wakeup_cpu0()) 1745 - start_cpu0(); 1737 + 1738 + cond_wakeup_cpu0(); 1746 1739 } 1747 1740 } 1748 1741 ··· 1750 1749 1751 1750 while (1) { 1752 1751 native_halt(); 1753 - /* 1754 - * If NMI wants to wake up CPU0, start CPU0. 1755 - */ 1756 - if (wakeup_cpu0()) 1757 - start_cpu0(); 1752 + 1753 + cond_wakeup_cpu0(); 1758 1754 } 1759 1755 } 1760 1756
+1 -3
drivers/acpi/processor_idle.c
··· 544 544 return -ENODEV; 545 545 546 546 #if defined(CONFIG_X86) && defined(CONFIG_HOTPLUG_CPU) 547 - /* If NMI wants to wake up CPU0, start CPU0. */ 548 - if (wakeup_cpu0()) 549 - start_cpu0(); 547 + cond_wakeup_cpu0(); 550 548 #endif 551 549 } 552 550