git.ipfire.org Git - thirdparty/kernel/stable-queue.git/blob

   1 From linux@arm.linux.org.uk  Fri Nov 19 13:04:48 2010
   2 From: Mac Lin <mkl0301@gmail.com>
   3 Date: Sun, 14 Nov 2010 22:17:23 +0000
   4 Subject: ARM: cns3xxx: Fixup the missing second parameter to addruart macro to allow them to build.
   5 To: stable@kernel.org
   6 Message-ID: <20101114221723.GA12389@n2100.arm.linux.org.uk>
   7 Content-Disposition: inline
   8
   9 From: Mac Lin <mkl0301@gmail.com>
  10
  11 It can't be merged into Linus' tree because this file has already been
  12 changed in incompatible ways.
  13
  14 Fixup the missing second parameter to addruart macro to allow them to build,
  15 according to to commit 0e17226f7cd289504724466f4298abc9bdfca3fe.
  16
  17 Enabling DEBUG in head.S would cause:
  18 rch/arm/boot/compressed/head.S: Assembler messages:
  19 arch/arm/boot/compressed/head.S:1037: Error: too many positional arguments
  20 arch/arm/boot/compressed/head.S:1055: Error: too many positional arguments
  21
  22 Signed-off-by: Mac Lin <mkl0301@gmail.com>
  23 Acked-by: Russell King <rmk+kernel@arm.linux.org.uk>
  24 Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  25 ---
  26  arch/arm/mach-cns3xxx/include/mach/debug-macro.S |    2 +-
  27  1 file changed, 1 insertion(+), 1 deletion(-)
  28
  29 --- a/arch/arm/mach-cns3xxx/include/mach/debug-macro.S
  30 +++ b/arch/arm/mach-cns3xxx/include/mach/debug-macro.S
  31 @@ -10,7 +10,7 @@
  32   * published by the Free Software Foundation.
  33   */
  34
  35 -               .macro  addruart,rx
  36 +               .macro  addruart,rx,rtmp
  37                 mrc     p15, 0, \rx, c1, c0
  38                 tst     \rx, #1                 @ MMU enabled?
  39                 moveq   \rx,      #0x10000000