summaryrefslogtreecommitdiffstats
path: root/arch/arm/mm/proc-xscale.S
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@arm.linux.org.uk>2011-07-21 14:42:40 +0100
committerRussell King <rmk+kernel@arm.linux.org.uk>2011-07-21 17:49:54 +0100
commit6645cb61f3a1186a71475385d33f875dd8fb38bf (patch)
tree8f5890157f5ff2dff55aa8b547b7fcf1dcb8d58d /arch/arm/mm/proc-xscale.S
parent07f1c295de593ec0b0dca3092299c048c03374da (diff)
downloadop-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-xscale.S')
-rw-r--r--arch/arm/mm/proc-xscale.S3
1 files changed, 0 insertions, 3 deletions
diff --git a/arch/arm/mm/proc-xscale.S b/arch/arm/mm/proc-xscale.S
index 76a8046..fbc06e5 100644
--- a/arch/arm/mm/proc-xscale.S
+++ b/arch/arm/mm/proc-xscale.S
@@ -554,9 +554,6 @@ ENTRY(cpu_xscale_do_resume)
PMD_SECT_CACHEABLE | PMD_SECT_AP_WRITE
b cpu_resume_mmu
ENDPROC(cpu_xscale_do_resume)
-#else
-#define cpu_xscale_do_suspend 0
-#define cpu_xscale_do_resume 0
#endif
__CPUINIT
OpenPOWER on IntegriCloud