public inbox for linux-arm-kernel@lists.infradead.org 
 help / color / mirror / Atom feed
From: dave.martin@linaro•org (Dave Martin)
To: linux-arm-kernel@lists•infradead.org
Subject: [PATCH 1/3] ARM: tegra: fix build error when THUMB2_KERNEL enabled
Date: Wed, 17 Apr 2013 18:00:49 +0100	[thread overview]
Message-ID: <20130417170049.GE2249@linaro.org> (raw)
In-Reply-To: <1366066255-18192-1-git-send-email-swarren@wwwdotorg.org>

On Mon, Apr 15, 2013 at 04:50:53PM -0600, Stephen Warren wrote:
> From: Joseph Lo <josephl@nvidia•com>
> 
> This patch fix the build failure when CONFIG_THUBM2_KERNEL enabled. You
> clould see the error message below:
> 
> arch/arm/mach-tegra/sleep-tegra30.S:69: Error: shift must be constant --
> `orr r12,r12,r4,lsl r3'
> 
> Reported-by: Arnd Bergmann <arnd@arndb•de>
> Signed-off-by: Joseph Lo <josephl@nvidia•com>
> Signed-off-by: Stephen Warren <swarren@nvidia•com>

FWIW, Reviewed-by: Dave Martin <dave.martin@linaro•org>

> ---
> Arnd, Olof, here are 3 fixes from Joseph for some Tegra build issues,
> mostly exposed by multi-platform enablement and/or related randconfig
> testing.
> 
> Can you please apply these to arm-soc? For reference, I tested applying
> them to Tegra's for-3.10/fixes branch and they apply there fine, and
> merge with the other Tegra for-3.10 branches at least, without any issue.
> 
> Note: patch 3 triggers checkpatch, but I can't work out why; the code
> seems to be formatted the same as patch 1 and 2, and is consistent with
> other usage of ARM() and THUMB() macros in arch/arm/.
> 
>  arch/arm/mach-tegra/sleep-tegra30.S |    4 +++-
>  1 file changed, 3 insertions(+), 1 deletion(-)
> 
> diff --git a/arch/arm/mach-tegra/sleep-tegra30.S b/arch/arm/mach-tegra/sleep-tegra30.S
> index 63a15bd..d29dfcc 100644
> --- a/arch/arm/mach-tegra/sleep-tegra30.S
> +++ b/arch/arm/mach-tegra/sleep-tegra30.S
> @@ -66,7 +66,9 @@ ENTRY(tegra30_cpu_shutdown)
>  		FLOW_CTRL_CSR_INTR_FLAG | FLOW_CTRL_CSR_EVENT_FLAG | \
>  		FLOW_CTRL_CSR_ENABLE
>  	mov	r4, #(1 << 4)
> -	orr	r12, r12, r4, lsl r3
> + ARM(	orr	r12, r12, r4, lsl r3	)
> + THUMB(	lsl	r4, r4, r3		)
> + THUMB(	orr	r12, r12, r4		)
>  	str	r12, [r1]
>  
>  	/* Halt this CPU. */
> -- 
> 1.7.10.4
> 
> 
> _______________________________________________
> linux-arm-kernel mailing list
> linux-arm-kernel at lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

  parent reply	other threads:[~2013-04-17 17:00 UTC|newest]

Thread overview: 16+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-04-15 22:50 [PATCH 1/3] ARM: tegra: fix build error when THUMB2_KERNEL enabled Stephen Warren
2013-04-15 22:50 ` [PATCH 2/3] ARM: tegra: fix relocation truncated " Stephen Warren
2013-04-17 17:01   ` Dave Martin
2013-04-18 16:32   ` Olof Johansson
2013-04-15 22:50 ` [PATCH 3/3] ARM: tegra: make sure the pointer on 4 byte align " Stephen Warren
2013-04-16 14:13   ` Dave Martin
2013-04-16 16:20     ` Stephen Warren
2013-04-17 10:30       ` Dave Martin
2013-04-17 16:22         ` Stephen Warren
2013-04-17 16:57           ` Dave Martin
2013-04-18 16:32       ` Olof Johansson
2013-04-17 16:59   ` Dave Martin
2013-04-17 17:00 ` Dave Martin [this message]
2013-04-18 16:31 ` [PATCH 1/3] ARM: tegra: fix build error " Olof Johansson
  -- strict thread matches above, loose matches on Subject: below --
2013-04-15 12:42 Joseph Lo
2013-04-15 22:51 ` Stephen Warren

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=20130417170049.GE2249@linaro.org \
    --to=dave.martin@linaro$(echo .)org \
    --cc=linux-arm-kernel@lists$(echo .)infradead.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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