diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-07-21 15:42:40 +0200 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-07-21 18:49:54 +0200 |
| commit | 6645cb61f3a1186a71475385d33f875dd8fb38bf (patch) | |
| tree | 8f5890157f5ff2dff55aa8b547b7fcf1dcb8d58d /arch/arm/mm/proc-macros.S | |
| parent | Merge branch 'dma' of http://git.linaro.org/git/people/nico/linux into devel-... (diff) | |
| download | linux-6645cb61f3a1186a71475385d33f875dd8fb38bf.tar.xz 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-macros.S')
| -rw-r--r-- | arch/arm/mm/proc-macros.S | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/arch/arm/mm/proc-macros.S b/arch/arm/mm/proc-macros.S index 4ae9b4407074..307a4def8d3a 100644 --- a/arch/arm/mm/proc-macros.S +++ b/arch/arm/mm/proc-macros.S @@ -276,8 +276,13 @@ ENTRY(\name\()_processor_functions) .if \suspend .word cpu_\name\()_suspend_size +#ifdef CONFIG_PM_SLEEP .word cpu_\name\()_do_suspend .word cpu_\name\()_do_resume +#else + .word 0 + .word 0 +#endif .else .word 0 .word 0 |