Skip to content

Commit

Permalink
ARM: cns3xxx: Fixup the missing second parameter to addruart macro to…
Browse files Browse the repository at this point in the history
… allow them to build.

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 0e17226.

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>
  • Loading branch information
Mac Lin authored and Greg Kroah-Hartman committed Nov 22, 2010
1 parent 91b0288 commit 1460758
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion arch/arm/mach-cns3xxx/include/mach/debug-macro.S
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 1460758

Please sign in to comment.