From: Wu Zhangjin <wuzhangjin@gmail.com>
Date: Fri, 14 May 2010 11:08:26 +0000 (+0800)
Subject: MIPS: Tracing: Merge adjacent #ifdefs with same condition.
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=27b118342f2dcd6f0c2cd64453cc5a0289c4b3c9;p=openwrt%2Fstaging%2Fblogic.git

MIPS: Tracing: Merge adjacent #ifdefs with same condition.

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>
---

diff --git a/arch/mips/kernel/mcount.S b/arch/mips/kernel/mcount.S
index 6851fc97a511..e256bf98249a 100644
--- a/arch/mips/kernel/mcount.S
+++ b/arch/mips/kernel/mcount.S
@@ -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)