Skip to content

Commit 99e7a8a

Browse files
sudeep-hollactmarinas
authored andcommitted
arm64: cpuidle: Move ACPI specific code into drivers/acpi/arm64/
The ACPI cpuidle LPI FFH code can be moved out of arm64 arch code as it just uses SMCCC. Move all the ACPI cpuidle LPI FFH code into drivers/acpi/arm64/cpuidle.c Signed-off-by: Sudeep Holla <[email protected]> Acked-by: Catalin Marinas <[email protected]> Acked-by: Hanjun Guo <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Catalin Marinas <[email protected]>
1 parent f8c6c92 commit 99e7a8a

File tree

3 files changed

+1
-5
lines changed

3 files changed

+1
-5
lines changed

arch/arm64/kernel/Makefile

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,6 @@ obj-$(CONFIG_PERF_EVENTS) += perf_regs.o perf_callchain.o
4646
obj-$(CONFIG_HARDLOCKUP_DETECTOR_PERF) += watchdog_hld.o
4747
obj-$(CONFIG_HAVE_HW_BREAKPOINT) += hw_breakpoint.o
4848
obj-$(CONFIG_CPU_PM) += sleep.o suspend.o
49-
obj-$(CONFIG_CPU_IDLE) += cpuidle.o
5049
obj-$(CONFIG_JUMP_LABEL) += jump_label.o
5150
obj-$(CONFIG_KGDB) += kgdb.o
5251
obj-$(CONFIG_EFI) += efi.o efi-rt-wrapper.o

drivers/acpi/arm64/Makefile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ obj-$(CONFIG_ACPI_AGDI) += agdi.o
33
obj-$(CONFIG_ACPI_APMT) += apmt.o
44
obj-$(CONFIG_ACPI_GTDT) += gtdt.o
55
obj-$(CONFIG_ACPI_IORT) += iort.o
6+
obj-$(CONFIG_ACPI_PROCESSOR_IDLE) += cpuidle.o
67
obj-$(CONFIG_ARM_AMBA) += amba.o
78
obj-y += dma.o init.o
89
obj-y += thermal_cpufreq.o

arch/arm64/kernel/cpuidle.c renamed to drivers/acpi/arm64/cpuidle.c

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,6 @@
1010
#include <linux/cpuidle.h>
1111
#include <linux/cpu_pm.h>
1212
#include <linux/psci.h>
13-
14-
#ifdef CONFIG_ACPI_PROCESSOR_IDLE
15-
1613
#include <acpi/processor.h>
1714

1815
#define ARM64_LPI_IS_RETENTION_STATE(arch_flags) (!(arch_flags))
@@ -71,4 +68,3 @@ __cpuidle int acpi_processor_ffh_lpi_enter(struct acpi_lpi_state *lpi)
7168
return CPU_PM_CPU_IDLE_ENTER_PARAM_RCU(psci_cpu_suspend_enter,
7269
lpi->index, state);
7370
}
74-
#endif

0 commit comments

Comments
 (0)