diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-07-21 14:42:40 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-07-21 17:49:54 +0100 |
| commit | 6645cb61f3a1186a71475385d33f875dd8fb38bf (patch) | |
| tree | 8f5890157f5ff2dff55aa8b547b7fcf1dcb8d58d /arch/arm/mm/proc-v7.S | |
| parent | 07f1c295de593ec0b0dca3092299c048c03374da (diff) | |
| download | op-kernel-dev-6645cb61f3a1186a71475385d33f875dd8fb38bf.zip op-kernel-dev-6645cb61f3a1186a71475385d33f875dd8fb38bf.tar.gz | |
ARM: Fix build errors caused by adding generic macros
Commit 66a625a (ARM: mm: proc-macros: Add generic proc/cache/tlb struct
definition macros) introduced build errors when PM_SLEEP is not enabled.
The per-CPU do_suspend/do_resume functions are defined via the
preprocessor to constant 0. However, the macros which use these were
converted to assembly, resulting in undefined references to these
functions. Fix that by moving the ! ifdef section into proc-macros.S
and deleting it from all effected proc-*.S files.
Acked-by: Dave Martin <dave.martin@linaro.org>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/mm/proc-v7.S')
| -rw-r--r-- | arch/arm/mm/proc-v7.S | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/arch/arm/mm/proc-v7.S b/arch/arm/mm/proc-v7.S index 54d1a63..a30e785 100644 --- a/arch/arm/mm/proc-v7.S +++ b/arch/arm/mm/proc-v7.S @@ -263,9 +263,6 @@ ENDPROC(cpu_v7_do_resume) cpu_resume_l1_flags: ALT_SMP(.long PMD_TYPE_SECT | PMD_SECT_AP_WRITE | PMD_FLAGS_SMP) ALT_UP(.long PMD_TYPE_SECT | PMD_SECT_AP_WRITE | PMD_FLAGS_UP) -#else -#define cpu_v7_do_suspend 0 -#define cpu_v7_do_resume 0 #endif __CPUINIT |
