From: u.kleine-koenig@pengutronix.de (Uwe Kleine-König)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH] ARM: Thumb-2: Fix out-of-range offset for Thumb-2 in proc-v7.S
Date: Wed, 12 Jan 2011 09:14:46 +0100 [thread overview]
Message-ID: <20110112081446.GB24920@pengutronix.de> (raw)
In-Reply-To: <1294790613-17101-1-git-send-email-dave.martin@linaro.org>
On Tue, Jan 11, 2011 at 06:03:33PM -0600, Dave Martin wrote:
> The following patch introduces a pre-increment addressing
> offset which is out of range for Thumb-2:
> ARM: pgtable: switch order of Linux vs hardware page tables
a commit id would be nice here
Uwe
>
> 162: str r3, [r0, #2048]!
>
> Thumb-2 only permits offsets <256 for pre-increment addressing.
>
> This patch replaces the store instruction with a suitable add-str
> pair for the Thumb-2 case.
>
> Signed-off-by: Dave Martin <dave.martin@linaro.org>
> ---
> KernelVersion: v2.6.37
>
> arch/arm/mm/proc-v7.S | 4 +++-
> 1 files changed, 3 insertions(+), 1 deletions(-)
>
> diff --git a/arch/arm/mm/proc-v7.S b/arch/arm/mm/proc-v7.S
> index b49fab2..0c1172b 100644
> --- a/arch/arm/mm/proc-v7.S
> +++ b/arch/arm/mm/proc-v7.S
> @@ -159,7 +159,9 @@ ENTRY(cpu_v7_set_pte_ext)
> tstne r1, #L_PTE_PRESENT
> moveq r3, #0
>
> - str r3, [r0, #2048]!
> + ARM( str r3, [r0, #2048]! )
> + THUMB( add r0, r0, #2048 )
> + THUMB( str r3, [r0] )
> mcr p15, 0, r0, c7, c10, 1 @ flush_pte
> #endif
> mov pc, lr
> --
> 1.7.1
>
>
> _______________________________________________
> linux-arm-kernel mailing list
> linux-arm-kernel at lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
>
--
Pengutronix e.K. | Uwe Kleine-K?nig |
Industrial Linux Solutions | http://www.pengutronix.de/ |
next prev parent reply other threads:[~2011-01-12 8:14 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-01-12 0:03 [PATCH] ARM: Thumb-2: Fix out-of-range offset for Thumb-2 in proc-v7.S Dave Martin
2011-01-12 8:14 ` Uwe Kleine-König [this message]
2011-01-12 16:33 ` Dave Martin
2011-01-12 18:18 ` Uwe Kleine-König
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=20110112081446.GB24920@pengutronix.de \
--to=u.kleine-koenig@pengutronix.de \
--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).