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: 6246581 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 99B4EBF4A7 for ; Tue, 21 Apr 2015 11:02:45 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id C4DBD20225 for ; Tue, 21 Apr 2015 11:02:44 +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 D3B8620396 for ; Tue, 21 Apr 2015 11:02:43 +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 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-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=InZOP+aguPDymOei240T6VlQECoNkHYHWggtHjjkbAg=; b=TU4TCjBHgTPzO0m4sBHnDY20oYcGi+XSX0JfJn4hYlsYfU8tmVd5OnNFUVsUHm1cjH BJEN9gQDFQs3du/3ghXktpbSRNmPJBqduIntyiKpR4IaXAB1pFkZFIbhDT3NxGwNpHRJ SImBPhJfYueQUEggcwehe4TofB+WLpZxebT/08aG8ZisvNAl1Mr+ZHrSrAt05QmSQfLK tM38VWWjvHnIk7NDMyYhhGwtk2y05VVFIRj4l/O26ryTXZ6baWqA7OB25zS9O5vdFi0V H3hDL8D1q6t5mLOSkciHIHIaXrqLSWuw7DQqiY7vSJcqKGIvbWKE3rRpHcrno7EMJtHT oevw== X-Gm-Message-State: ALoCoQl8vp92SFD3KOkrKo9ubKdIJU3cUNdOc0xMu+s2p91mArf87rpFlWTdXp/7z9FX2g2we5fg 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 (/) 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+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 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: