From patchwork Thu Jun 23 21:46:11 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kevin Hilman X-Patchwork-Id: 914072 X-Patchwork-Delegate: khilman@deeprootsystems.com Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter2.kernel.org (8.14.4/8.14.4) with ESMTP id p5NLkCJm007616 for ; Thu, 23 Jun 2011 21:46:12 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933315Ab1FWVqL (ORCPT ); Thu, 23 Jun 2011 17:46:11 -0400 Received: from na3sys009aog110.obsmtp.com ([74.125.149.203]:41369 "EHLO na3sys009aog110.obsmtp.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933154Ab1FWVqK (ORCPT ); Thu, 23 Jun 2011 17:46:10 -0400 Received: from mail-pv0-f181.google.com ([74.125.83.181]) (using TLSv1) by na3sys009aob110.postini.com ([74.125.148.12]) with SMTP ID DSNKTgO0ITkhW67vZ5cLSCLWfHclZiIgvDpa@postini.com; Thu, 23 Jun 2011 14:46:10 PDT Received: by mail-pv0-f181.google.com with SMTP id 13so1598656pvg.12 for ; Thu, 23 Jun 2011 14:46:09 -0700 (PDT) Received: by 10.68.26.201 with SMTP id n9mr1456530pbg.204.1308865569195; Thu, 23 Jun 2011 14:46:09 -0700 (PDT) Received: from localhost (c-24-19-7-36.hsd1.wa.comcast.net [24.19.7.36]) by mx.google.com with ESMTPS id k4sm1515779pbl.43.2011.06.23.14.46.08 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 23 Jun 2011 14:46:08 -0700 (PDT) From: Kevin Hilman To: linux-arm-kernel@lists.infradead.org Cc: linux-omap@vger.kernel.org Subject: [PATCH] ARM: pm: add v7 suspend/resume functions to v7_processor functions Date: Thu, 23 Jun 2011 14:46:11 -0700 Message-Id: <1308865571-16074-1-git-send-email-khilman@ti.com> X-Mailer: git-send-email 1.7.4 Sender: linux-omap-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter2.kernel.org [140.211.167.43]); Thu, 23 Jun 2011 21:46:12 +0000 (UTC) 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 --- 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"