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

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
...@@ -387,7 +387,7 @@ ENTRY(cpu_arm920_set_pte_ext) ...@@ -387,7 +387,7 @@ ENTRY(cpu_arm920_set_pte_ext)
/* Suspend/resume support: taken from arch/arm/plat-s3c24xx/sleep.S */ /* Suspend/resume support: taken from arch/arm/plat-s3c24xx/sleep.S */
.globl cpu_arm920_suspend_size .globl cpu_arm920_suspend_size
.equ cpu_arm920_suspend_size, 4 * 3 .equ cpu_arm920_suspend_size, 4 * 3
#ifdef CONFIG_PM_SLEEP #ifdef CONFIG_ARM_CPU_SUSPEND
ENTRY(cpu_arm920_do_suspend) ENTRY(cpu_arm920_do_suspend)
stmfd sp!, {r4 - r6, lr} stmfd sp!, {r4 - r6, lr}
mrc p15, 0, r4, c13, c0, 0 @ PID mrc p15, 0, r4, c13, c0, 0 @ PID
......
...@@ -402,7 +402,7 @@ ENTRY(cpu_arm926_set_pte_ext) ...@@ -402,7 +402,7 @@ ENTRY(cpu_arm926_set_pte_ext)
/* Suspend/resume support: taken from arch/arm/plat-s3c24xx/sleep.S */ /* Suspend/resume support: taken from arch/arm/plat-s3c24xx/sleep.S */
.globl cpu_arm926_suspend_size .globl cpu_arm926_suspend_size
.equ cpu_arm926_suspend_size, 4 * 3 .equ cpu_arm926_suspend_size, 4 * 3
#ifdef CONFIG_PM_SLEEP #ifdef CONFIG_ARM_CPU_SUSPEND
ENTRY(cpu_arm926_do_suspend) ENTRY(cpu_arm926_do_suspend)
stmfd sp!, {r4 - r6, lr} stmfd sp!, {r4 - r6, lr}
mrc p15, 0, r4, c13, c0, 0 @ PID mrc p15, 0, r4, c13, c0, 0 @ PID
......
...@@ -350,7 +350,7 @@ ENTRY(cpu_mohawk_set_pte_ext) ...@@ -350,7 +350,7 @@ ENTRY(cpu_mohawk_set_pte_ext)
.globl cpu_mohawk_suspend_size .globl cpu_mohawk_suspend_size
.equ cpu_mohawk_suspend_size, 4 * 6 .equ cpu_mohawk_suspend_size, 4 * 6
#ifdef CONFIG_PM_SLEEP #ifdef CONFIG_ARM_CPU_SUSPEND
ENTRY(cpu_mohawk_do_suspend) ENTRY(cpu_mohawk_do_suspend)
stmfd sp!, {r4 - r9, lr} stmfd sp!, {r4 - r9, lr}
mrc p14, 0, r4, c6, c0, 0 @ clock configuration, for turbo mode mrc p14, 0, r4, c6, c0, 0 @ clock configuration, for turbo mode
......
...@@ -172,7 +172,7 @@ ENTRY(cpu_sa1100_set_pte_ext) ...@@ -172,7 +172,7 @@ ENTRY(cpu_sa1100_set_pte_ext)
.globl cpu_sa1100_suspend_size .globl cpu_sa1100_suspend_size
.equ cpu_sa1100_suspend_size, 4 * 3 .equ cpu_sa1100_suspend_size, 4 * 3
#ifdef CONFIG_PM_SLEEP #ifdef CONFIG_ARM_CPU_SUSPEND
ENTRY(cpu_sa1100_do_suspend) ENTRY(cpu_sa1100_do_suspend)
stmfd sp!, {r4 - r6, lr} stmfd sp!, {r4 - r6, lr}
mrc p15, 0, r4, c3, c0, 0 @ domain ID mrc p15, 0, r4, c3, c0, 0 @ domain ID
......
...@@ -138,7 +138,7 @@ ENTRY(cpu_v6_set_pte_ext) ...@@ -138,7 +138,7 @@ ENTRY(cpu_v6_set_pte_ext)
/* Suspend/resume support: taken from arch/arm/mach-s3c64xx/sleep.S */ /* Suspend/resume support: taken from arch/arm/mach-s3c64xx/sleep.S */
.globl cpu_v6_suspend_size .globl cpu_v6_suspend_size
.equ cpu_v6_suspend_size, 4 * 6 .equ cpu_v6_suspend_size, 4 * 6
#ifdef CONFIG_PM_SLEEP #ifdef CONFIG_ARM_CPU_SUSPEND
ENTRY(cpu_v6_do_suspend) ENTRY(cpu_v6_do_suspend)
stmfd sp!, {r4 - r9, lr} stmfd sp!, {r4 - r9, lr}
mrc p15, 0, r4, c13, c0, 0 @ FCSE/PID mrc p15, 0, r4, c13, c0, 0 @ FCSE/PID
......
...@@ -413,7 +413,7 @@ ENTRY(cpu_xsc3_set_pte_ext) ...@@ -413,7 +413,7 @@ ENTRY(cpu_xsc3_set_pte_ext)
.globl cpu_xsc3_suspend_size .globl cpu_xsc3_suspend_size
.equ cpu_xsc3_suspend_size, 4 * 6 .equ cpu_xsc3_suspend_size, 4 * 6
#ifdef CONFIG_PM_SLEEP #ifdef CONFIG_ARM_CPU_SUSPEND
ENTRY(cpu_xsc3_do_suspend) ENTRY(cpu_xsc3_do_suspend)
stmfd sp!, {r4 - r9, lr} stmfd sp!, {r4 - r9, lr}
mrc p14, 0, r4, c6, c0, 0 @ clock configuration, for turbo mode mrc p14, 0, r4, c6, c0, 0 @ clock configuration, for turbo mode
......
...@@ -528,7 +528,7 @@ ENTRY(cpu_xscale_set_pte_ext) ...@@ -528,7 +528,7 @@ ENTRY(cpu_xscale_set_pte_ext)
.globl cpu_xscale_suspend_size .globl cpu_xscale_suspend_size
.equ cpu_xscale_suspend_size, 4 * 6 .equ cpu_xscale_suspend_size, 4 * 6
#ifdef CONFIG_PM_SLEEP #ifdef CONFIG_ARM_CPU_SUSPEND
ENTRY(cpu_xscale_do_suspend) ENTRY(cpu_xscale_do_suspend)
stmfd sp!, {r4 - r9, lr} stmfd sp!, {r4 - r9, lr}
mrc p14, 0, r4, c6, c0, 0 @ clock configuration, for turbo mode mrc p14, 0, r4, c6, c0, 0 @ clock configuration, for turbo mode
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment