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: 45864 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-la0-f72.google.com (mail-la0-f72.google.com [209.85.215.72]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id B785A21547 for ; Mon, 16 Mar 2015 17:38:51 +0000 (UTC) Received: by labgm9 with SMTP id gm9sf28262996lab.1 for ; Mon, 16 Mar 2015 10:38:50 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:delivered-to:message-id:date:from:user-agent :mime-version:to:cc:subject:content-type:content-transfer-encoding :sender:precedence:list-id:x-original-sender :x-original-authentication-results:mailing-list:list-post:list-help :list-archive:list-unsubscribe; bh=GcxsE21eUEOB6zvDuXaRA7+xvIqaCCp98pJVhm3dF5o=; b=Rq4MCxbxtX/1+5EDWmZhOgzSlozy3s1t0uYtRQcu57jo0eSQhblBfhpVyKcPFWw3LK b7N6vXe3bMg+b4s7HLMHAnyOs5SFyqDFmVzD5wjHK5XLBrd/wlpriGhKSBRAWQhPZG3X EwA0tIQASKk/kj9STncxlCOtT9o97h+8BR8Sz3OoHGSPF84eCsznz5kLrD4BDDW5BK5K uEQMifPA0oY2JNfzZt6AB7aBdAY+1gEfXnKJlWym8/8WcnZ2VWe9QIjZZrRIrf5TNyp3 2jJUUBl4q0Mgm5vk9Z3Tap/pOZbvhuDo0TaS0w6dRAhywPe8DveOWwzIiACjgJPpaBx9 UE1Q== X-Gm-Message-State: ALoCoQkHaJV7B0xhQc79cjAxUA3KFGOjWhAkQw7YdXw4lrnT4s4fXhAiKVRNeofnkQxDSDiJKKax X-Received: by 10.112.142.1 with SMTP id rs1mr7399461lbb.19.1426527530708; Mon, 16 Mar 2015 10:38:50 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.44.136 with SMTP id e8ls770101lam.91.gmail; Mon, 16 Mar 2015 10:38:50 -0700 (PDT) X-Received: by 10.152.87.115 with SMTP id w19mr51211891laz.66.1426527530294; Mon, 16 Mar 2015 10:38:50 -0700 (PDT) Received: from mail-la0-f48.google.com (mail-la0-f48.google.com. [209.85.215.48]) by mx.google.com with ESMTPS id lc16si8653645lbb.27.2015.03.16.10.38.50 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 16 Mar 2015 10:38:50 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.48 as permitted sender) client-ip=209.85.215.48; Received: by labjg1 with SMTP id jg1so46363279lab.2 for ; Mon, 16 Mar 2015 10:38:50 -0700 (PDT) X-Received: by 10.152.116.11 with SMTP id js11mr34440433lab.106.1426527530180; Mon, 16 Mar 2015 10:38:50 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.112.35.133 with SMTP id h5csp2737931lbj; Mon, 16 Mar 2015 10:38:49 -0700 (PDT) X-Received: by 10.70.18.97 with SMTP id v1mr111625543pdd.152.1426527528293; Mon, 16 Mar 2015 10:38:48 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id a3si15429329pdg.168.2015.03.16.10.38.47; Mon, 16 Mar 2015 10:38:48 -0700 (PDT) Received-SPF: none (google.com: linux-samsung-soc-owner@vger.kernel.org does not designate permitted sender hosts) client-ip=209.132.180.67; Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754268AbbCPRiq (ORCPT + 4 others); Mon, 16 Mar 2015 13:38:46 -0400 Received: from mail-lb0-f178.google.com ([209.85.217.178]:35986 "EHLO mail-lb0-f178.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756086AbbCPRiq (ORCPT ); Mon, 16 Mar 2015 13:38:46 -0400 Received: by lbcds1 with SMTP id ds1so36174031lbc.3 for ; Mon, 16 Mar 2015 10:38:44 -0700 (PDT) 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 CC: linux-samsung-soc@vger.kernel.org, "linaro-kernel@lists.linaro.org" Subject: [PATCH] ARM: Exynos: Fix build error with thumb2 Sender: linux-samsung-soc-owner@vger.kernel.org Precedence: list List-ID: X-Mailing-List: linux-samsung-soc@vger.kernel.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: andrey.konovalov@linaro.org X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.48 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , 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