]> git.proxmox.com Git - mirror_ubuntu-bionic-kernel.git/commitdiff
ARM: w90x900: fix legacy assembly syntax
authorArnd Bergmann <arnd@arndb.de>
Mon, 14 Jan 2013 12:49:02 +0000 (12:49 +0000)
committerArnd Bergmann <arnd@arndb.de>
Thu, 14 Feb 2013 14:04:35 +0000 (15:04 +0100)
New ARM binutils don't allow extraneous whitespace inside
of brackets, which causes this error on all mach-w90x900
defconfigs:

arch/arm/kernel/entry-armv.S: Assembler messages:
arch/arm/kernel/entry-armv.S:214: Error: ARM register expected -- `ldr r0,[ r6,#(0x10C)]'
arch/arm/kernel/entry-armv.S:214: Error: ARM register expected -- `ldr r0,[ r6,#(0x110)]'
arch/arm/kernel/entry-armv.S:430: Error: ARM register expected -- `ldr r0,[ r6,#(0x10C)]'
arch/arm/kernel/entry-armv.S:430: Error: ARM register expected -- `ldr r0,[ r6,#(0x110)]'

This removes the whitespace in order to build the kernel
again.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Cc: Wan ZongShun <mcuos.com@gmail.com>
arch/arm/mach-w90x900/include/mach/entry-macro.S

index e286daca68279c5f8dd08efe30d5140b7c5d075c..0ff612ac95ba198eaf4964622abe17364d954694 100644 (file)
@@ -19,8 +19,8 @@
 
                mov     \base, #AIC_BA
 
-               ldr     \irqnr, [ \base, #AIC_IPER]
-               ldr     \irqnr, [ \base, #AIC_ISNR]
+               ldr     \irqnr, [\base, #AIC_IPER]
+               ldr     \irqnr, [\base, #AIC_ISNR]
                cmp     \irqnr, #0
 
        .endm