diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2012-01-03 20:21:52 +0000 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2012-01-03 20:21:52 +0000 |
| commit | 8b69791215857e3e885d27b3945759ace820794a (patch) | |
| tree | 667b61e18807b0fe2cb884c480d5933a5e4db19a /arch/arm/mach-imx/head-v7.S | |
| parent | 5f0a6e2d503896062f641639dacfe5055c2f593b (diff) | |
| parent | 733d1724d7c5c79113d8063d3d9d93e8c80cea82 (diff) | |
Merge branch 'imx/pm' of git://git.linaro.org/people/shawnguo/linux-2.6 into imx6/pm
Diffstat (limited to 'arch/arm/mach-imx/head-v7.S')
| -rw-r--r-- | arch/arm/mach-imx/head-v7.S | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/arch/arm/mach-imx/head-v7.S b/arch/arm/mach-imx/head-v7.S index 6229efbc70c..cec23a857c7 100644 --- a/arch/arm/mach-imx/head-v7.S +++ b/arch/arm/mach-imx/head-v7.S @@ -71,6 +71,7 @@ ENTRY(v7_secondary_startup) ENDPROC(v7_secondary_startup) #endif +#ifdef CONFIG_PM /* * The following code is located into the .data section. This is to * allow phys_l2x0_saved_regs to be accessed with a relative load @@ -79,6 +80,7 @@ ENDPROC(v7_secondary_startup) .data .align +#ifdef CONFIG_CACHE_L2X0 .macro pl310_resume ldr r2, phys_l2x0_saved_regs ldr r0, [r2, #L2X0_R_PHY_BASE] @ get physical base of l2x0 @@ -88,12 +90,17 @@ ENDPROC(v7_secondary_startup) str r1, [r0, #L2X0_CTRL] @ re-enable L2 .endm + .globl phys_l2x0_saved_regs +phys_l2x0_saved_regs: + .long 0 +#else + .macro pl310_resume + .endm +#endif + ENTRY(v7_cpu_resume) bl v7_invalidate_l1 pl310_resume b cpu_resume ENDPROC(v7_cpu_resume) - - .globl phys_l2x0_saved_regs -phys_l2x0_saved_regs: - .long 0 +#endif |