aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--arch/arm64/Kconfig13
-rw-r--r--arch/arm64/kernel/Makefile1
2 files changed, 14 insertions, 0 deletions
diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig
index baab4eb8bfe4..a1c8f39cb009 100644
--- a/arch/arm64/Kconfig
+++ b/arch/arm64/Kconfig
@@ -12,6 +12,7 @@ config ARM64
12 select BUILDTIME_EXTABLE_SORT 12 select BUILDTIME_EXTABLE_SORT
13 select CLONE_BACKWARDS 13 select CLONE_BACKWARDS
14 select COMMON_CLK 14 select COMMON_CLK
15 select CPU_PM if (SUSPEND || CPU_IDLE)
15 select GENERIC_CLOCKEVENTS 16 select GENERIC_CLOCKEVENTS
16 select GENERIC_CLOCKEVENTS_BROADCAST if SMP 17 select GENERIC_CLOCKEVENTS_BROADCAST if SMP
17 select GENERIC_IOMAP 18 select GENERIC_IOMAP
@@ -277,6 +278,18 @@ config SYSVIPC_COMPAT
277 278
278endmenu 279endmenu
279 280
281menu "Power management options"
282
283source "kernel/power/Kconfig"
284
285config ARCH_SUSPEND_POSSIBLE
286 def_bool y
287
288config ARM64_CPU_SUSPEND
289 def_bool PM_SLEEP
290
291endmenu
292
280source "net/Kconfig" 293source "net/Kconfig"
281 294
282source "drivers/Kconfig" 295source "drivers/Kconfig"
diff --git a/arch/arm64/kernel/Makefile b/arch/arm64/kernel/Makefile
index 5ba2fd43a75b..1cd339d5037b 100644
--- a/arch/arm64/kernel/Makefile
+++ b/arch/arm64/kernel/Makefile
@@ -18,6 +18,7 @@ arm64-obj-$(CONFIG_SMP) += smp.o smp_spin_table.o
18arm64-obj-$(CONFIG_HW_PERF_EVENTS) += perf_event.o 18arm64-obj-$(CONFIG_HW_PERF_EVENTS) += perf_event.o
19arm64-obj-$(CONFIG_HAVE_HW_BREAKPOINT)+= hw_breakpoint.o 19arm64-obj-$(CONFIG_HAVE_HW_BREAKPOINT)+= hw_breakpoint.o
20arm64-obj-$(CONFIG_EARLY_PRINTK) += early_printk.o 20arm64-obj-$(CONFIG_EARLY_PRINTK) += early_printk.o
21arm64-obj-$(CONFIG_ARM64_CPU_SUSPEND) += sleep.o suspend.o
21 22
22obj-y += $(arm64-obj-y) vdso/ 23obj-y += $(arm64-obj-y) vdso/
23obj-m += $(arm64-obj-m) 24obj-m += $(arm64-obj-m)