Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 29ea23ff authored by Russell King's avatar Russell King
Browse files

ARM: Make consolidated PM sleep code depend on PM_SLEEP 



CONFIG_PM is now set whenever we support either runtime PM in addition
to suspend and hibernate.  This causes build errors when runtime PM is
enabled on a platform, but the CPU does not have the appropriate support
for suspend.

So, switch this code to use CONFIG_PM_SLEEP rather than CONFIG_PM to
allow runtime PM to be enabled without causing build errors.

Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent 78fca1b9

arch/arm/kernel/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -29,7 +29,7 @@ obj-$(CONFIG_MODULES) += armksyms.o module.o 
obj-$(CONFIG_ARTHUR)		+= arthur.o

obj-$(CONFIG_ISA_DMA)		+= dma-isa.o

obj-$(CONFIG_PCI)		+= bios32.o isa.o

obj-$(CONFIG_PM)		+= sleep.o

obj-$(CONFIG_PM_SLEEP)		+= sleep.o

obj-$(CONFIG_HAVE_SCHED_CLOCK)	+= sched_clock.o

obj-$(CONFIG_SMP)		+= smp.o smp_tlb.o

obj-$(CONFIG_HAVE_ARM_SCU)	+= smp_scu.o

arch/arm/mm/proc-arm920.S

+1 −1
Original line number Diff line number Diff line
@@ -390,7 +390,7 @@ ENTRY(cpu_arm920_set_pte_ext) 
/* Suspend/resume support: taken from arch/arm/plat-s3c24xx/sleep.S */

.globl	cpu_arm920_suspend_size

.equ	cpu_arm920_suspend_size, 4 * 3

#ifdef CONFIG_PM

#ifdef CONFIG_PM_SLEEP

ENTRY(cpu_arm920_do_suspend)

	stmfd	sp!, {r4 - r7, lr}

	mrc	p15, 0, r4, c13, c0, 0	@ PID

arch/arm/mm/proc-arm926.S

+1 −1
Original line number Diff line number Diff line
@@ -404,7 +404,7 @@ ENTRY(cpu_arm926_set_pte_ext) 
/* Suspend/resume support: taken from arch/arm/plat-s3c24xx/sleep.S */

.globl	cpu_arm926_suspend_size

.equ	cpu_arm926_suspend_size, 4 * 3

#ifdef CONFIG_PM

#ifdef CONFIG_PM_SLEEP

ENTRY(cpu_arm926_do_suspend)

	stmfd	sp!, {r4 - r7, lr}

	mrc	p15, 0, r4, c13, c0, 0	@ PID

arch/arm/mm/proc-sa1100.S

+1 −1
Original line number Diff line number Diff line
@@ -171,7 +171,7 @@ ENTRY(cpu_sa1100_set_pte_ext) 


.globl	cpu_sa1100_suspend_size

.equ	cpu_sa1100_suspend_size, 4*4

#ifdef CONFIG_PM

#ifdef CONFIG_PM_SLEEP

ENTRY(cpu_sa1100_do_suspend)

	stmfd	sp!, {r4 - r7, lr}

	mrc	p15, 0, r4, c3, c0, 0		@ domain ID

arch/arm/mm/proc-v6.S

+1 −1
Original line number Diff line number Diff line
@@ -124,7 +124,7 @@ ENTRY(cpu_v6_set_pte_ext) 
/* Suspend/resume support: taken from arch/arm/mach-s3c64xx/sleep.S */

.globl	cpu_v6_suspend_size

.equ	cpu_v6_suspend_size, 4 * 8

#ifdef CONFIG_PM

#ifdef CONFIG_PM_SLEEP

ENTRY(cpu_v6_do_suspend)

	stmfd	sp!, {r4 - r11, lr}

	mrc	p15, 0, r4, c13, c0, 0	@ FCSE/PID