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

Commit 542a6724 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'fixes' of git://git.linaro.org/people/rmk/linux-arm 

Pull ARM fix from Russell King:
 "A build fix for an incomplete change to the ARM cpu suspend code"

* branch 'fixes' of git://git.linaro.org/people/rmk/linux-arm:
  ARM: Do 15e0d9e3 (ARM: pm: let platforms select cpu_suspend support) properly
parents 4be41343 b6c7aabd

arch/arm/mm/proc-arm920.S

+1 −1
Original line number Diff line number Diff line
@@ -387,7 +387,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_SLEEP

#ifdef CONFIG_ARM_CPU_SUSPEND

ENTRY(cpu_arm920_do_suspend)

	stmfd	sp!, {r4 - r6, 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
@@ -402,7 +402,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_SLEEP

#ifdef CONFIG_ARM_CPU_SUSPEND

ENTRY(cpu_arm926_do_suspend)

	stmfd	sp!, {r4 - r6, lr}

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

arch/arm/mm/proc-mohawk.S

+1 −1
Original line number Diff line number Diff line
@@ -350,7 +350,7 @@ ENTRY(cpu_mohawk_set_pte_ext) 


.globl	cpu_mohawk_suspend_size

.equ	cpu_mohawk_suspend_size, 4 * 6

#ifdef CONFIG_PM_SLEEP

#ifdef CONFIG_ARM_CPU_SUSPEND

ENTRY(cpu_mohawk_do_suspend)

	stmfd	sp!, {r4 - r9, lr}

	mrc	p14, 0, r4, c6, c0, 0	@ clock configuration, for turbo mode

arch/arm/mm/proc-sa1100.S

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


.globl	cpu_sa1100_suspend_size

.equ	cpu_sa1100_suspend_size, 4 * 3

#ifdef CONFIG_PM_SLEEP

#ifdef CONFIG_ARM_CPU_SUSPEND

ENTRY(cpu_sa1100_do_suspend)

	stmfd	sp!, {r4 - r6, 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
@@ -138,7 +138,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 * 6

#ifdef CONFIG_PM_SLEEP

#ifdef CONFIG_ARM_CPU_SUSPEND

ENTRY(cpu_v6_do_suspend)

	stmfd	sp!, {r4 - r9, lr}

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