linux-arm-kernel.lists.infradead.org archive mirror
 help / color / mirror / Atom feed
From: ard.biesheuvel@linaro.org (Ard Biesheuvel)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH v2 1/2] ARM: use ENDPROC() to annotate all v7 asm setup functions
Date: Tue, 21 Apr 2015 12:59:42 +0200	[thread overview]
Message-ID: <1429613983-22739-2-git-send-email-ard.biesheuvel@linaro.org> (raw)
In-Reply-To: <1429613983-22739-1-git-send-email-ard.biesheuvel@linaro.org>

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 <ard.biesheuvel@linaro.org>
---
 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:
-- 
1.8.3.2

  reply	other threads:[~2015-04-21 10:59 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-04-21 10:59 [PATCH v2 0/2] ARM: honor Thumb bit when calling procinfo setup functions Ard Biesheuvel
2015-04-21 10:59 ` Ard Biesheuvel [this message]
2015-04-21 10:59 ` [PATCH v2 2/2] ARM: Thumb2: use "bx reg" not "mov pc, reg" for all registers Ard Biesheuvel
2015-04-21 11:15   ` Dave P Martin
2015-04-21 11:19     ` Ard Biesheuvel

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1429613983-22739-2-git-send-email-ard.biesheuvel@linaro.org \
    --to=ard.biesheuvel@linaro.org \
    --cc=linux-arm-kernel@lists.infradead.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).