MIPS: Tracing: Merge adjacent #ifdefs with same condition.
authorWu Zhangjin <wuzhangjin@gmail.com>
Fri, 14 May 2010 11:08:26 +0000 (19:08 +0800)
committerRalf Baechle <ralf@linux-mips.org>
Mon, 5 Jul 2010 16:17:27 +0000 (17:17 +0100)
Signed-off-by: Wu Zhangjin <wuzhangjin@gmail.com>
Cc: linux-mips <linux-mips@linux-mips.org>
Cc: David Daney <david.s.daney@gmail.com>
Patchwork: http://patchwork.linux-mips.org/patch/1224/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
arch/mips/kernel/mcount.S

index 6851fc97a5111736b88a4a3d6f6c9d3d95ddbe6e..e256bf98249a269f069f4f4c11bf25b67cbb941d 100644 (file)
@@ -45,8 +45,6 @@
        PTR_L   a5, PT_R9(sp)
        PTR_L   a6, PT_R10(sp)
        PTR_L   a7, PT_R11(sp)
-#endif
-#ifdef CONFIG_64BIT
        PTR_ADDIU       sp, PT_SIZE
 #else
        PTR_ADDIU       sp, (PT_SIZE + 8)