From patchwork Mon Mar 16 17:38:43 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrey Konovalov X-Patchwork-Id: 6023401 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id D925D9F314 for ; Mon, 16 Mar 2015 17:41:32 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 1C80620434 for ; Mon, 16 Mar 2015 17:41:32 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 1A16E203E3 for ; Mon, 16 Mar 2015 17:41:31 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1YXYyu-0003cS-Bd; Mon, 16 Mar 2015 17:39:12 +0000 Received: from mail-la0-f41.google.com ([209.85.215.41]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1YXYyq-0003SJ-4G for linux-arm-kernel@lists.infradead.org; Mon, 16 Mar 2015 17:39:09 +0000 Received: by ladw1 with SMTP id w1so46400108lad.0 for ; Mon, 16 Mar 2015 10:38:44 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:message-id:date:from:user-agent:mime-version:to :cc:subject:content-type:content-transfer-encoding; bh=q8JBBQ6bEckSdSsWXAk+dB3FkOZFHpmf5kE2wNkZSNs=; b=LJCm7NBm3bGlH0J12NbVw9VboBsWKI8XYE+0IiFXRogFgows0EorU4p2qlvQSTGrQG xBMRiFCf0cwB+lgwCLaaEluHu+s9jtPN7edLHho4LpNjguVTnqrCULlI4nkpHrcY1D8A EisMnejjSoIysVPVY9KVcfzjzzKxCuEiUsUQO1wmp12tO/ntd0tGUzpHOV3HrT3LC1+y MZ5qQ4tN4yqZnqN28QdmGpra+UGjEBtP/EVLjJANFJvL9M21HvadicLM+E7lOCRWst/m dRVoMRSrhjMWJpSa/JuDEWxVDe6T7ms8siY9tc9XbrXjGUqA7JswMQ0xWq1mmA1StTpB W1Hg== X-Gm-Message-State: ALoCoQnhIjjy/QOY+6tHKAPfHmQBSQe5KHoQ4/ToYlOSs6N8gxv7i908tWUPwZUU/0agH2asKIbz X-Received: by 10.152.4.39 with SMTP id h7mr57623461lah.58.1426527524763; Mon, 16 Mar 2015 10:38:44 -0700 (PDT) Received: from [192.168.11.162] (mail.dev.rtsoft.ru. [213.79.90.226]) by mx.google.com with ESMTPSA id m4sm2308498lae.47.2015.03.16.10.38.43 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 16 Mar 2015 10:38:44 -0700 (PDT) Message-ID: <55071523.7060309@linaro.org> Date: Mon, 16 Mar 2015 20:38:43 +0300 From: Andrey Konovalov User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:31.0) Gecko/20100101 Thunderbird/31.5.0 MIME-Version: 1.0 To: linux-arm-kernel@lists.infradead.org, Kukjin Kim Subject: [PATCH] ARM: Exynos: Fix build error with thumb2 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20150316_103908_355823_84EAB06C X-CRM114-Status: UNSURE ( 8.81 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -0.7 (/) Cc: linux-samsung-soc@vger.kernel.org, "linaro-kernel@lists.linaro.org" X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Add non-global symbols to avoid build failure in thumb2 mode. Exact the same issue and the fix as in [1]; just the variables are different. [1] http://lists.linaro.org/pipermail/linaro-kernel/2014-June/015227.html Signed-off-by: Andrey Konovalov --- arch/arm/mach-exynos/sleep.S | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/arch/arm/mach-exynos/sleep.S b/arch/arm/mach-exynos/sleep.S index 31d2583..73f7fde 100644 --- a/arch/arm/mach-exynos/sleep.S +++ b/arch/arm/mach-exynos/sleep.S @@ -69,9 +69,9 @@ ENTRY(exynos_cpu_resume_ns) cmp r0, r1 bne skip_cp15 - adr r0, cp15_save_power + adr r0, .Lcp15_save_power ldr r1, [r0] - adr r0, cp15_save_diag + adr r0, .Lcp15_save_diag ldr r2, [r0] mov r0, #SMC_CMD_C15RESUME dsb @@ -118,9 +118,11 @@ skip_l2x0: skip_cp15: b cpu_resume ENDPROC(exynos_cpu_resume_ns) +.Lcp15_save_diag: .globl cp15_save_diag cp15_save_diag: .long 0 @ cp15 diagnostic +.Lcp15_save_power: .globl cp15_save_power cp15_save_power: .long 0 @ cp15 power control