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: 914082 Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) by demeter2.kernel.org (8.14.4/8.14.4) with ESMTP id p5NLkUdS007915 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO) for ; Thu, 23 Jun 2011 21:46:51 GMT Received: from canuck.infradead.org ([2001:4978:20e::1]) by merlin.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1QZrj5-0008I9-Nw; Thu, 23 Jun 2011 21:46:15 +0000 Received: from localhost ([127.0.0.1] helo=canuck.infradead.org) by canuck.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1QZrj5-0006zx-C4; Thu, 23 Jun 2011 21:46:15 +0000 Received: from na3sys009aog108.obsmtp.com ([74.125.149.199]) by canuck.infradead.org with smtps (Exim 4.76 #1 (Red Hat Linux)) id 1QZrj2-0006zd-L5 for linux-arm-kernel@lists.infradead.org; Thu, 23 Jun 2011 21:46:13 +0000 Received: from mail-pv0-f175.google.com ([74.125.83.175]) (using TLSv1) by na3sys009aob108.postini.com ([74.125.148.12]) with SMTP ID DSNKTgO0ITkhW67vZ5cLSCLWfHclZiIgvDpa@postini.com; Thu, 23 Jun 2011 14:46:12 PDT Received: by mail-pv0-f175.google.com with SMTP id 24so1489079pvf.6 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 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 X-CRM114-Version: 20090807-BlameThorstenAndJenny ( TRE 0.7.6 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20110623_174612_962890_4AD7F1BA X-CRM114-Status: GOOD ( 10.42 ) X-Spam-Score: -2.3 (--) X-Spam-Report: SpamAssassin version 3.3.1 on canuck.infradead.org summary: Content analysis details: (-2.3 points) pts rule name description ---- ---------------------- -------------------------------------------------- -2.3 RCVD_IN_DNSWL_MED RBL: Sender listed at http://www.dnswl.org/, medium trust [74.125.149.199 listed in list.dnswl.org] Cc: linux-omap@vger.kernel.org X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: linux-arm-kernel-bounces@lists.infradead.org Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.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:51 +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"