Commit f6b0fa02e8b0708d17d631afce456524eadf87ff (ARM: pm: add generic CPU suspend/resume support) added v7 functions for suspend and resume but did not added them to v7_processor_functions which are used in the MULTI_CPU case. Add them in order to have working suspend/resume when using MULTI_CPU. Signed-off-by: Kevin Hilman <khilman@xxxxxx> --- arch/arm/mm/proc-v7.S | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/arch/arm/mm/proc-v7.S b/arch/arm/mm/proc-v7.S index 3c38678..e27c011 100644 --- a/arch/arm/mm/proc-v7.S +++ b/arch/arm/mm/proc-v7.S @@ -418,9 +418,9 @@ ENTRY(v7_processor_functions) .word cpu_v7_dcache_clean_area .word cpu_v7_switch_mm .word cpu_v7_set_pte_ext - .word 0 - .word 0 - .word 0 + .word cpu_v7_suspend_size + .word cpu_v7_do_suspend + .word cpu_v7_do_resume .size v7_processor_functions, . - v7_processor_functions .section ".rodata" -- 1.7.4 -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html