diff mbox

[GIT,PULL] vexpress: fixes for v3.8

Message ID 201211081405.23202.arnd@arndb.de (mailing list archive)
State New, archived
Headers show

Commit Message

Arnd Bergmann Nov. 8, 2012, 2:05 p.m. UTC 
On Thursday 18 October 2012, Pawel Moll wrote:

> ----------------------------------------------------------------
> Pawel Moll (1):
>       ARM: vexpress: Make the debug UART detection more specific
> 

Building allyesconfig in linux-next now gives me:

arch/arm/kernel/debug.S: Assembler messages:
arch/arm/kernel/debug.S:81: Error: selected processor does not support ARM mode `movw r2,#0xc 091'
arch/arm/kernel/debug.S:81: Error: selected processor does not support ARM mode `movt r2,#0x4 10f'
arch/arm/kernel/debug.S:97: Error: selected processor does not support ARM mode `movw r2,#0xc 091'
arch/arm/kernel/debug.S:97: Error: selected processor does not support ARM mode `movt r2,#0x4 10f'
arch/arm/kernel/debug.S:104: Error: selected processor does not support ARM mode `movw r3,#0x c091'
arch/arm/kernel/debug.S:104: Error: selected processor does not support ARM mode `movt r3,#0x 410f'

The patch below fixes this. Do you think it's appropriate?

Signed-off-by: Arnd Bergmann <arnd@arndb.de>

Comments

Pawel Moll Nov. 8, 2012, 3:14 p.m. UTC | #1 
On Thu, 2012-11-08 at 14:05 +0000, Arnd Bergmann wrote:
> diff --git a/arch/arm/include/debug/vexpress.S b/arch/arm/include/debug/vexpress.S
> index 0c6abbf..dc8e882 100644
> --- a/arch/arm/include/debug/vexpress.S
> +++ b/arch/arm/include/debug/vexpress.S
> @@ -21,6 +21,7 @@
>  #if defined(CONFIG_DEBUG_VEXPRESS_UART0_DETECT)
>  
>  		.macro	addruart,rp,rv,tmp
> +		.arch   armv7-a

Yes, will you apply it on your side (or fold it into the existing
change) or do you want me to post a patch (or to update the
vexpress-fixes branch?)

Thanks for spotting this!

Pawe?
Arnd Bergmann Nov. 8, 2012, 3:32 p.m. UTC | #2 
On Thursday 08 November 2012, Pawel Moll wrote:
> On Thu, 2012-11-08 at 14:05 +0000, Arnd Bergmann wrote:
> > diff --git a/arch/arm/include/debug/vexpress.S b/arch/arm/include/debug/vexpress.S
> > index 0c6abbf..dc8e882 100644
> > --- a/arch/arm/include/debug/vexpress.S
> > +++ b/arch/arm/include/debug/vexpress.S
> > @@ -21,6 +21,7 @@
> >  #if defined(CONFIG_DEBUG_VEXPRESS_UART0_DETECT)
> >  
> >               .macro  addruart,rp,rv,tmp
> > +             .arch   armv7-a
> 
> Yes, will you apply it on your side (or fold it into the existing
> change) or do you want me to post a patch (or to update the
> vexpress-fixes branch?)
> 
> Thanks for spotting this!

I've applied it manually now and added you Acked-by.

	Arnd
diff mbox

Patch

diff --git a/arch/arm/include/debug/vexpress.S b/arch/arm/include/debug/vexpress.S
index 0c6abbf..dc8e882 100644
--- a/arch/arm/include/debug/vexpress.S
+++ b/arch/arm/include/debug/vexpress.S
@@ -21,6 +21,7 @@ 
 #if defined(CONFIG_DEBUG_VEXPRESS_UART0_DETECT)
 
 		.macro	addruart,rp,rv,tmp
+		.arch   armv7-a
 
 		@ Make an educated guess regarding the memory map:
 		@ - the original A9 core tile (based on ARM Cortex-A9 r0p1)