From patchwork Wed May 8 12:18:04 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 2538751 Return-Path: X-Original-To: patchwork-linux-sh@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork1.kernel.org (Postfix) with ESMTP id 0EC803FC5A for ; Wed, 8 May 2013 12:18:14 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754169Ab3EHMSN (ORCPT ); Wed, 8 May 2013 08:18:13 -0400 Received: from moutng.kundenserver.de ([212.227.17.8]:62714 "EHLO moutng.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754119Ab3EHMSN (ORCPT ); Wed, 8 May 2013 08:18:13 -0400 Received: from klappe2.localnet (HSI-KBW-095-208-002-043.hsi5.kabel-badenwuerttemberg.de [95.208.2.43]) by mrelayeu.kundenserver.de (node=mreu1) with ESMTP (Nemesis) id 0M2pyk-1UJ4hM3CqM-00sw9C; Wed, 08 May 2013 14:18:06 +0200 From: Arnd Bergmann To: "linux-arm-kernel@lists.infradead.org" Subject: [PATCH] ARM: shmobile: fix sleep-r8a7740.S miscompiles Date: Wed, 8 May 2013 14:18:04 +0200 User-Agent: KMail/1.12.2 (Linux/3.8.0-18-generic; KDE/4.3.2; x86_64; ; ) Cc: Bastian Hecht , Simon Horman , linux-sh@vger.kernel.org, Magnus Damm MIME-Version: 1.0 Message-Id: <201305081418.05091.arnd@arndb.de> X-Provags-ID: V02:K0:lFx16kP+muUlrvo8KmGxz4HOsWNnp4z8k0nhZJmHOy/ LgZYuuftvT5dJYR0/1bv95uCe+/ZsGr7LUPIhsLkCHrAt54Ng/ 1zCxXqXrVmpDMIkTMQDMFEa+8Y883/NO2xL9LZMYv/AT8qhSpR WTLdmhwmDqZ63C6bBB/R6Tu9bhlDI/d7Z9PwqyPmnmwP3GeRa8 Fda3bY26kTMctu5FD3ygLk3CLc2dBoFTwrnWpDNbJYuXdj9bua 0MpSJB8i6NQ+/EHA0of76ryraxvnLUgR+wnVEQZWdXR9MtRswJ txXDSG0JOAnBzk3vYnxsHg/Gz44WmKIP0IVtAed6t4ybOEpp8a EJEXd8b5GMGPZ4g7kn20= Sender: linux-sh-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-sh@vger.kernel.org The newly added sleep-r8a7740.S file in shmobile does not actually build because of renamed symbols. Signed-off-by: Arnd Bergmann Cc: Bastian Hecht Cc: Simon Horman --- Simon, please apply to whichever branch of yours has the broken commit, or fold this patch into Bastian's patch. linux-next doesn't build for me because of this, mainline is still fine. -- To unsubscribe from this list: send the line "unsubscribe linux-sh" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/arch/arm/mach-shmobile/sleep-r8a7740.S b/arch/arm/mach-shmobile/sleep-r8a7740.S index 435531b..982eacb 100644 --- a/arch/arm/mach-shmobile/sleep-r8a7740.S +++ b/arch/arm/mach-shmobile/sleep-r8a7740.S @@ -32,7 +32,7 @@ ENTRY(r8a7740_shutdown) wfi_loop: bl cpu_v7_do_idle b wfi_loop -ENDPROC(r8a7740) +ENDPROC(r8a7740_shutdown) .text ENTRY(v7_cpu_resume) @@ -53,5 +53,5 @@ ENDPROC(v7_cpu_resume) ENTRY(r8a7740_resume) ldr pc, 1f 1: .long v7_cpu_resume - PAGE_OFFSET + PLAT_PHYS_OFFSET -ENDPROC(r8a7740_resume_core_standby) +ENDPROC(r8a7740_resume) #endif