Commit 38098f83 authored by liwei's avatar liwei
Browse files

Revert "ACPI: Rename ACPI_HOTPLUG_CPU to include 'present'" 

hulk inclusion
category: feature
bugzilla: https://gitee.com/openeuler/kernel/issues/I8XMTL


CVE: NA

------------------------------------------------------------------

This reverts commit 2eb3daf6.

To keep CONFIG unchanged, modify ACPI_HOTPLUG_PRESENT_CPU to
ACPI_HOTPLUG_CPU.

Conflicts:
	arch/x86/Kconfig
	drivers/acpi/acpi_processor.c
	include/linux/acpi.h
Signed-off-by: default avatarliwei <liwei728@huawei.com>
parent b51533d4

arch/loongarch/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ config LOONGARCH 
	select ACPI

	select ACPI_GENERIC_GSI if ACPI

	select ACPI_MCFG if ACPI

	select ACPI_HOTPLUG_PRESENT_CPU if ACPI_PROCESSOR && HOTPLUG_CPU

	select ACPI_HOTPLUG_CPU if ACPI_PROCESSOR && HOTPLUG_CPU

	select ACPI_PPTT if ACPI

	select ACPI_SYSTEM_POWER_STATES_SUPPORT	if ACPI

	select ARCH_BINFMT_ELF_STATE

arch/loongarch/kernel/acpi.c

+2 −2
Original line number Diff line number Diff line
@@ -291,7 +291,7 @@ void __init arch_reserve_mem_area(acpi_physical_address addr, size_t size) 
	memblock_reserve(addr, size);

}



#ifdef CONFIG_ACPI_HOTPLUG_PRESENT_CPU

#ifdef CONFIG_ACPI_HOTPLUG_CPU



#include <acpi/processor.h>
@@ -343,4 +343,4 @@ int acpi_unmap_cpu(int cpu) 
}

EXPORT_SYMBOL(acpi_unmap_cpu);



#endif /* CONFIG_ACPI_HOTPLUG_PRESENT_CPU */
 
#endif /* CONFIG_ACPI_HOTPLUG_CPU */

arch/x86/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -60,7 +60,7 @@ config X86 
	#

	select ACPI_LEGACY_TABLES_LOOKUP	if ACPI

	select ACPI_SYSTEM_POWER_STATES_SUPPORT	if ACPI

	select ACPI_HOTPLUG_PRESENT_CPU		if ACPI_PROCESSOR && HOTPLUG_CPU

	select ACPI_HOTPLUG_CPU			if ACPI_PROCESSOR && HOTPLUG_CPU

	select ACPI_HOTPLUG_IGNORE_OSC		if ACPI && HOTPLUG_CPU

	select ARCH_32BIT_OFF_T			if X86_32

	select ARCH_CLOCKSOURCE_INIT

arch/x86/configs/openeuler_defconfig

+1 −1
Original line number Diff line number Diff line
@@ -609,7 +609,7 @@ CONFIG_ACPI_PROCESSOR_IDLE=y 
CONFIG_ACPI_CPPC_LIB=y

CONFIG_ACPI_PROCESSOR=y

CONFIG_ACPI_IPMI=m

CONFIG_ACPI_HOTPLUG_PRESENT_CPU=y

CONFIG_ACPI_HOTPLUG_CPU=y

CONFIG_ACPI_HOTPLUG_IGNORE_OSC=y

CONFIG_ACPI_PROCESSOR_AGGREGATOR=m

CONFIG_ACPI_THERMAL=y

arch/x86/kernel/acpi/boot.c

+2 −2
Original line number Diff line number Diff line
@@ -817,7 +817,7 @@ static void __init acpi_set_irq_model_ioapic(void) 
/*

 *  ACPI based hotplug support for CPU

 */

#ifdef CONFIG_ACPI_HOTPLUG_PRESENT_CPU

#ifdef CONFIG_ACPI_HOTPLUG_CPU

#include <acpi/processor.h>



static int acpi_map_cpu2node(acpi_handle handle, int cpu, int physid)
@@ -866,7 +866,7 @@ int acpi_unmap_cpu(int cpu) 
	return (0);

}

EXPORT_SYMBOL(acpi_unmap_cpu);

#endif				/* CONFIG_ACPI_HOTPLUG_PRESENT_CPU */

#endif				/* CONFIG_ACPI_HOTPLUG_CPU */



int acpi_register_ioapic(acpi_handle handle, u64 phys_addr, u32 gsi_base)

{