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-sa1100.S | |
| parent | 07f1c295de593ec0b0dca3092299c048c03374da (diff) | |
| download | talos-obmc-linux-6645cb61f3a1186a71475385d33f875dd8fb38bf.tar.gz talos-obmc-linux-6645cb61f3a1186a71475385d33f875dd8fb38bf.zip | |
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-sa1100.S')
| -rw-r--r-- | arch/arm/mm/proc-sa1100.S | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/arch/arm/mm/proc-sa1100.S b/arch/arm/mm/proc-sa1100.S index c7e08cab55a8..e71587852cae 100644 --- a/arch/arm/mm/proc-sa1100.S +++ b/arch/arm/mm/proc-sa1100.S @@ -200,9 +200,6 @@ ENTRY(cpu_sa1100_do_resume) PMD_SECT_CACHEABLE | PMD_SECT_AP_WRITE b cpu_resume_mmu ENDPROC(cpu_sa1100_do_resume) -#else -#define cpu_sa1100_do_suspend 0 -#define cpu_sa1100_do_resume 0 #endif __CPUINIT |
