Messages in this thread Patch in this message | | | Date | Fri, 19 Nov 2010 13:56:40 -0800 | From | Greg KH <> | Subject | [79/82] ARM: cns3xxx: Fixup the missing second parameter to addruart macro to allow them to build. |
| |
2.6.35-stable review patch. If anyone has any objections, please let us know.
------------------
From: Mac Lin <mkl0301@gmail.com>
It can't be merged into Linus' tree because this file has already been changed in incompatible ways.
Fixup the missing second parameter to addruart macro to allow them to build, according to to commit 0e17226f7cd289504724466f4298abc9bdfca3fe.
Enabling DEBUG in head.S would cause: rch/arm/boot/compressed/head.S: Assembler messages: arch/arm/boot/compressed/head.S:1037: Error: too many positional arguments arch/arm/boot/compressed/head.S:1055: Error: too many positional arguments
Signed-off-by: Mac Lin <mkl0301@gmail.com> Acked-by: Russell King <rmk+kernel@arm.linux.org.uk> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> --- arch/arm/mach-cns3xxx/include/mach/debug-macro.S | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
--- a/arch/arm/mach-cns3xxx/include/mach/debug-macro.S +++ b/arch/arm/mach-cns3xxx/include/mach/debug-macro.S @@ -10,7 +10,7 @@ * published by the Free Software Foundation. */ - .macro addruart,rx + .macro addruart,rx,rtmp mrc p15, 0, \rx, c1, c0 tst \rx, #1 @ MMU enabled? moveq \rx, #0x10000000
| |