aboutsummaryrefslogtreecommitdiffstats
path: root/arch/mips/kernel
diff options
context:
space:
mode:
authorWu Zhangjin <wuzhangjin@gmail.com>2010-05-14 07:08:26 -0400
committerRalf Baechle <ralf@linux-mips.org>2010-07-05 12:17:27 -0400
commit27b118342f2dcd6f0c2cd64453cc5a0289c4b3c9 (patch)
tree0c2e4d821a1ed01025d970efda6b9f0c78dc021b /arch/mips/kernel
parentcdf22a4e90ea3ea8e6a7dd9d2fa810b4a3cdfaed (diff)
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>
Diffstat (limited to 'arch/mips/kernel')
-rw-r--r--arch/mips/kernel/mcount.S2
1 files changed, 0 insertions, 2 deletions
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 @@
45 PTR_L a5, PT_R9(sp) 45 PTR_L a5, PT_R9(sp)
46 PTR_L a6, PT_R10(sp) 46 PTR_L a6, PT_R10(sp)
47 PTR_L a7, PT_R11(sp) 47 PTR_L a7, PT_R11(sp)
48#endif
49#ifdef CONFIG_64BIT
50 PTR_ADDIU sp, PT_SIZE 48 PTR_ADDIU sp, PT_SIZE
51#else 49#else
52 PTR_ADDIU sp, (PT_SIZE + 8) 50 PTR_ADDIU sp, (PT_SIZE + 8)