[GIT PULL] vexpress: fixes for v3.8

[GIT PULL] vexpress: fixes for v3.8

[Pawel Moll]

Hi Arnd, Olof,

Could you, please, pull this small Versatile Express fix for 3.8?

Thanks!

Pawel

The following changes since commit ddffeb8c4d0331609ef2581d84de4d763607bd37:

  Linux 3.7-rc1 (2012-10-14 14:41:04 -0700)

are available in the git repository at:

  git://git.linaro.org/people/pawelmoll/linux.git vexpress-fixes

for you to fetch changes up to 852663d94f0cc44199c31c0e42d4801302f41705:

  ARM: vexpress: Make the debug UART detection more specific (2012-10-18 17:56:16 +0100)

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

 arch/arm/include/debug/vexpress.S |   10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

[GIT PULL] vexpress: fixes for v3.8

[Arnd Bergmann]

On Thursday 18 October 2012, Pawel Moll wrote:
> Hi Arnd, Olof,
> 
> Could you, please, pull this small Versatile Express fix for 3.8?
> 

Applied to next/fixes-non-critical

	Arnd

[GIT PULL] vexpress: fixes for v3.8

[Arnd Bergmann]

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>

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)

[GIT PULL] vexpress: fixes for v3.8

[Pawel Moll]

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?

[GIT PULL] vexpress: fixes for v3.8

[Arnd Bergmann]

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