From patchwork Tue Apr 21 10:59:42 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ard Biesheuvel X-Patchwork-Id: 47393 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-la0-f70.google.com (mail-la0-f70.google.com [209.85.215.70]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 005682121F for ; Tue, 21 Apr 2015 11:02:11 +0000 (UTC) Received: by laat2 with SMTP id t2sf45943591laa.2 for ; Tue, 21 Apr 2015 04:02:10 -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:from:to:subject:date:message-id :in-reply-to:references:cc:precedence:list-id:list-unsubscribe :list-archive:list-post:list-help:list-subscribe:mime-version :content-type:content-transfer-encoding:sender:errors-to :x-original-sender:x-original-authentication-results:mailing-list; bh=XwogtiRzCBhpVqTpgEHYqDY2XSNasuLwqUBy06qCAqQ=; b=dXcGc2e/E6HAOhm97k104mG+G9zXdueeuLbypl4DFLZAJnvzplk+1eYXbmJpV5KKty bWLkK5rTr2TMEdEnc6q8gNxx350uWN/JTO96Xea12WaoRHoWSudGwAp2GIOjxm62ayQZ QBkLvwxxT1AM+33oJfXj7fxNXwkxcqPE13kpRKFwX1uQp8T1td47443ZYuALFnzCR45u JC84UXn+b/P6BSjx8zTTM5RMBeaLRG5Iyv35JY88Vj9w5Dl9onfxaKSSKCouiYnLfhBb xLYXbn4pQYBofyid4/sEVzIVMgJ85Qa8YwK9E/YZUzbHZHtBIgVfIIx8crbUqReZXj3T oDaw== X-Gm-Message-State: ALoCoQm8AV4DUn2+4zCTD6/SbwwZ8Roo6oRJuf+W6jxRShRoetSiTJVOxZHzRxkWzM+ynffdhA6l X-Received: by 10.112.14.101 with SMTP id o5mr2223503lbc.3.1429614130558; Tue, 21 Apr 2015 04:02:10 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.204.168 with SMTP id kz8ls24313lac.105.gmail; Tue, 21 Apr 2015 04:02:10 -0700 (PDT) X-Received: by 10.112.166.139 with SMTP id zg11mr19329637lbb.93.1429614130349; Tue, 21 Apr 2015 04:02:10 -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 bj8si1076422lbc.93.2015.04.21.04.02.10 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 21 Apr 2015 04:02:10 -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 laat2 with SMTP id t2so148226152laa.1 for ; Tue, 21 Apr 2015 04:02:10 -0700 (PDT) X-Received: by 10.152.163.35 with SMTP id yf3mr19637044lab.86.1429614130220; Tue, 21 Apr 2015 04:02:10 -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.67.65 with SMTP id l1csp558396lbt; Tue, 21 Apr 2015 04:02:09 -0700 (PDT) X-Received: by 10.70.103.177 with SMTP id fx17mr36448253pdb.11.1429614129313; Tue, 21 Apr 2015 04:02:09 -0700 (PDT) Received: from bombadil.infradead.org (bombadil.infradead.org. [2001:1868:205::9]) by mx.google.com with ESMTPS id in5si2373809pbd.231.2015.04.21.04.02.08 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 21 Apr 2015 04:02:09 -0700 (PDT) Received-SPF: none (google.com: linux-arm-kernel-bounces+patch=linaro.org@lists.infradead.org does not designate permitted sender hosts) client-ip=2001:1868:205::9; 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 1YkVux-0002XU-Lx; Tue, 21 Apr 2015 11:00:39 +0000 Received: from mail-wi0-f174.google.com ([209.85.212.174]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1YkVul-0001xv-DK for linux-arm-kernel@lists.infradead.org; Tue, 21 Apr 2015 11:00:28 +0000 Received: by wizk4 with SMTP id k4so134474317wiz.1 for ; Tue, 21 Apr 2015 04:00:05 -0700 (PDT) X-Received: by 10.180.103.231 with SMTP id fz7mr4669264wib.35.1429614004959; Tue, 21 Apr 2015 04:00:04 -0700 (PDT) Received: from ards-macbook-pro.local ([90.174.5.83]) by mx.google.com with ESMTPSA id js3sm2112312wjc.5.2015.04.21.04.00.02 (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 21 Apr 2015 04:00:04 -0700 (PDT) From: Ard Biesheuvel To: linux-arm-kernel@lists.infradead.org, linux@arm.linux.org.uk, dave.martin@arm.com Subject: [PATCH v2 1/2] ARM: use ENDPROC() to annotate all v7 asm setup functions Date: Tue, 21 Apr 2015 12:59:42 +0200 Message-Id: <1429613983-22739-2-git-send-email-ard.biesheuvel@linaro.org> X-Mailer: git-send-email 1.8.3.2 In-Reply-To: <1429613983-22739-1-git-send-email-ard.biesheuvel@linaro.org> References: <1429613983-22739-1-git-send-email-ard.biesheuvel@linaro.org> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20150421_040027_605202_6A435577 X-CRM114-Status: UNSURE ( 8.73 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -0.7 (/) X-Spam-Report: SpamAssassin version 3.4.0 on bombadil.infradead.org summary: Content analysis details: (-0.7 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at http://www.dnswl.org/, low trust [209.85.212.174 listed in list.dnswl.org] -0.0 RCVD_IN_MSPIKE_H3 RBL: Good reputation (+3) [209.85.212.174 listed in wl.mailspike.net] -0.0 SPF_PASS SPF: sender matches SPF record -0.0 RCVD_IN_MSPIKE_WL Mailspike good senders Cc: Ard Biesheuvel , nico@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: , MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patch=linaro.org@lists.infradead.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: ard.biesheuvel@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 This declares all v7 setup functions as functions using ENDPROC() so that references to it will include the Thumb bit if the function was emitted in Thumb mode. This ensures that these function are always called in the correct mode. Signed-off-by: Ard Biesheuvel --- arch/arm/mm/proc-v7.S | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/arch/arm/mm/proc-v7.S b/arch/arm/mm/proc-v7.S index 3d1054f11a8a..f85993faeb05 100644 --- a/arch/arm/mm/proc-v7.S +++ b/arch/arm/mm/proc-v7.S @@ -278,6 +278,14 @@ __v7_ca17mp_setup: mcreq p15, 0, r0, c1, c0, 1 #endif b __v7_setup +ENDPROC(__v7_ca5mp_setup) +ENDPROC(__v7_ca9mp_setup) +ENDPROC(__v7_cr7mp_setup) +ENDPROC(__v7_ca7mp_setup) +ENDPROC(__v7_ca12mp_setup) +ENDPROC(__v7_ca15mp_setup) +ENDPROC(__v7_b15mp_setup) +ENDPROC(__v7_ca17mp_setup) __v7_pj4b_setup: #ifdef CONFIG_CPU_PJ4B @@ -457,6 +465,7 @@ __v7_setup: THUMB( orr r0, r0, #1 << 30 ) @ Thumb exceptions ret lr @ return to head.S:__ret ENDPROC(__v7_setup) +ENDPROC(__v7_pj4b_setup) .align 2 __v7_setup_stack: