ARM: Fix build errors caused by adding generic macros
authorRussell King <rmk+kernel@arm.linux.org.uk>
Thu, 21 Jul 2011 13:42:40 +0000 (14:42 +0100)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Thu, 21 Jul 2011 16:49:54 +0000 (17:49 +0100)
commit6645cb61f3a1186a71475385d33f875dd8fb38bf
tree8f5890157f5ff2dff55aa8b547b7fcf1dcb8d58d
parent07f1c295de593ec0b0dca3092299c048c03374da
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>
arch/arm/mm/proc-arm920.S
arch/arm/mm/proc-arm926.S
arch/arm/mm/proc-macros.S
arch/arm/mm/proc-sa1100.S
arch/arm/mm/proc-v6.S
arch/arm/mm/proc-v7.S
arch/arm/mm/proc-xsc3.S
arch/arm/mm/proc-xscale.S