From patchwork Sat Dec 19 03:46:06 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tony Lindgren X-Patchwork-Id: 68901 X-Patchwork-Delegate: tony@atomide.com Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter.kernel.org (8.14.3/8.14.2) with ESMTP id nBJ3kCS4007438 for ; Sat, 19 Dec 2009 03:46:13 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755171AbZLSDqM (ORCPT ); Fri, 18 Dec 2009 22:46:12 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1755140AbZLSDqM (ORCPT ); Fri, 18 Dec 2009 22:46:12 -0500 Received: from mho-02-ewr.mailhop.org ([204.13.248.72]:55444 "EHLO mho-02-ewr.mailhop.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755076AbZLSDqK (ORCPT ); Fri, 18 Dec 2009 22:46:10 -0500 Received: from c-67-160-239-110.hsd1.ca.comcast.net ([67.160.239.110] helo=[127.0.0.1]) by mho-02-ewr.mailhop.org with esmtpa (Exim 4.68) (envelope-from ) id 1NLqGf-0000bP-0C; Sat, 19 Dec 2009 03:46:09 +0000 X-Mail-Handler: MailHop Outbound by DynDNS X-Originating-IP: 67.160.239.110 X-Report-Abuse-To: abuse@dyndns.com (see http://www.dyndns.com/services/mailhop/outbound_abuse.html for abuse reporting information) X-MHO-User: U2FsdGVkX18m0wQ3ulL4frUfoEVurntf Subject: [PATCH 2/5] arm: Fix cpu_proc_fin() for proc-v7.S and make kexec work To: linux-arm-kernel@lists.infradead.org From: Tony Lindgren Cc: linux-omap@vger.kernel.org Date: Fri, 18 Dec 2009 19:46:06 -0800 Message-ID: <20091219034606.26198.9336.stgit@localhost> In-Reply-To: <20091219034151.26198.26570.stgit@localhost> References: <20091219034151.26198.26570.stgit@localhost> User-Agent: StGit/0.15-6-gbbd0 MIME-Version: 1.0 Sender: linux-omap-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org diff --git a/arch/arm/mm/proc-v7.S b/arch/arm/mm/proc-v7.S index 3a28521..d2a8074 100644 --- a/arch/arm/mm/proc-v7.S +++ b/arch/arm/mm/proc-v7.S @@ -45,7 +45,14 @@ ENTRY(cpu_v7_proc_init) ENDPROC(cpu_v7_proc_init) ENTRY(cpu_v7_proc_fin) - mov pc, lr + stmfd sp!, {lr} + cpsid if @ disable interrupts + bl v7_flush_kern_cache_all + mrc p15, 0, r0, c1, c0, 0 @ ctrl register + bic r0, r0, #0x1000 @ ...i............ + bic r0, r0, #0x0006 @ .............ca. + mcr p15, 0, r0, c1, c0, 0 @ disable caches + ldmfd sp!, {pc} ENDPROC(cpu_v7_proc_fin) /*