linux-mips
[Top] [All Lists]

[PATCH 28/36] MIPS: move FPU emulator externs to fpu_emulator.h

To: linux-mips@linux-mips.org
Subject: [PATCH 28/36] MIPS: move FPU emulator externs to fpu_emulator.h
From: David Daney <ddaney@caviumnetworks.com>
Date: Mon, 27 Oct 2008 17:03:00 -0700
Cc: David Daney <ddaney@caviumnetworks.com>
In-reply-to: <1225152181-3221-27-git-send-email-ddaney@caviumnetworks.com>
Original-recipient: rfc822;linux-mips@linux-mips.org
References: <490655B6.4030406@caviumnetworks.com> <1225152181-3221-1-git-send-email-ddaney@caviumnetworks.com> <1225152181-3221-2-git-send-email-ddaney@caviumnetworks.com> <1225152181-3221-3-git-send-email-ddaney@caviumnetworks.com> <1225152181-3221-4-git-send-email-ddaney@caviumnetworks.com> <1225152181-3221-5-git-send-email-ddaney@caviumnetworks.com> <1225152181-3221-6-git-send-email-ddaney@caviumnetworks.com> <1225152181-3221-7-git-send-email-ddaney@caviumnetworks.com> <1225152181-3221-8-git-send-email-ddaney@caviumnetworks.com> <1225152181-3221-9-git-send-email-ddaney@caviumnetworks.com> <1225152181-3221-10-git-send-email-ddaney@caviumnetworks.com> <1225152181-3221-11-git-send-email-ddaney@caviumnetworks.com> <1225152181-3221-12-git-send-email-ddaney@caviumnetworks.com> <1225152181-3221-13-git-send-email-ddaney@caviumnetworks.com> <1225152181-3221-14-git-send-email-ddaney@caviumnetworks.com> <1225152181-3221-15-git-send-email-ddaney@caviumnetworks.com> <1225152181-3221-16-git-send-email-ddaney@caviumnetworks.com> <1225152181-3221-17-git-send-email-ddaney@caviumnetworks.com> <1225152181-3221-18-git-send-email-ddaney@caviumnetworks.com> <1225152181-3221-19-git-send-email-ddaney@caviumnetworks.com> <1225152181-3221-20-git-send-email-ddaney@caviumnetworks.com> <1225152181-3221-21-git-send-email-ddaney@caviumnetworks.com> <1225152181-3221-22-git-send-email-ddaney@caviumnetworks.com> <1225152181-3221-23-git-send-email-ddaney@caviumnetworks.com> <1225152181-3221-24-git-send-email-ddaney@caviumnetworks.com> <1225152181-3221-25-git-send-email-ddaney@caviumnetworks.com> <1225152181-3221-26-git-send-email-ddaney@caviumnetworks.com> <1225152181-3221-27-git-send-email-ddaney@caviumnetworks.com>
Sender: linux-mips-bounce@linux-mips.org
Signed-off-by: David Daney <ddaney@caviumnetworks.com>
---
 arch/mips/include/asm/fpu_emulator.h |    5 +++++
 arch/mips/kernel/traps.c             |    4 +---
 arch/mips/kernel/unaligned.c         |    2 +-
 arch/mips/math-emu/dsemul.h          |    1 -
 4 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/arch/mips/include/asm/fpu_emulator.h 
b/arch/mips/include/asm/fpu_emulator.h
index 2731c38..c8e1bb2 100644
--- a/arch/mips/include/asm/fpu_emulator.h
+++ b/arch/mips/include/asm/fpu_emulator.h
@@ -34,4 +34,9 @@ struct mips_fpu_emulator_stats {
 
 extern struct mips_fpu_emulator_stats fpuemustats;
 
+extern int do_dsemulret(struct pt_regs *);
+
+extern int fpu_emulator_cop1Handler(struct pt_regs *xcp,
+       struct mips_fpu_struct *ctx, int has_fpu);
+
 #endif /* _ASM_FPU_EMULATOR_H */
diff --git a/arch/mips/kernel/traps.c b/arch/mips/kernel/traps.c
index cfec89c..bf4b847 100644
--- a/arch/mips/kernel/traps.c
+++ b/arch/mips/kernel/traps.c
@@ -47,6 +47,7 @@
 #include <asm/types.h>
 #include <asm/stacktrace.h>
 #include <asm/irq.h>
+#include <asm/fpu_emulator.h>
 
 extern void check_wait(void);
 extern asmlinkage void r4k_wait(void);
@@ -75,9 +76,6 @@ extern asmlinkage void handle_dsp(void);
 extern asmlinkage void handle_mcheck(void);
 extern asmlinkage void handle_reserved(void);
 
-extern int fpu_emulator_cop1Handler(struct pt_regs *xcp,
-       struct mips_fpu_struct *ctx, int has_fpu);
-
 #ifdef CONFIG_CPU_CAVIUM_OCTEON
 extern asmlinkage void octeon_cop2_restore(struct octeon_cop2_state *task);
 #endif
diff --git a/arch/mips/kernel/unaligned.c b/arch/mips/kernel/unaligned.c
index 2070966..e4b0e39 100644
--- a/arch/mips/kernel/unaligned.c
+++ b/arch/mips/kernel/unaligned.c
@@ -84,6 +84,7 @@
 #include <asm/inst.h>
 #include <asm/uaccess.h>
 #include <asm/system.h>
+#include <asm/fpu_emulator.h>
 
 #define STR(x)  __STR(x)
 #define __STR(x)  #x
@@ -499,7 +500,6 @@ sigill:
 
 asmlinkage void do_ade(struct pt_regs *regs)
 {
-       extern int do_dsemulret(struct pt_regs *);
        unsigned int __user *pc;
        mm_segment_t seg;
 
diff --git a/arch/mips/math-emu/dsemul.h b/arch/mips/math-emu/dsemul.h
index 091f0e7..12e2ef1 100644
--- a/arch/mips/math-emu/dsemul.h
+++ b/arch/mips/math-emu/dsemul.h
@@ -1,5 +1,4 @@
 extern int mips_dsemul(struct pt_regs *regs, mips_instruction ir, unsigned 
long cpc);
-extern int do_dsemulret(struct pt_regs *xcp);
 
 /* Instruction which will always cause an address error */
 #define AdELOAD 0x8c000001     /* lw $0,1($0) */
-- 
1.5.6.5


<Prev in Thread] Current Thread [Next in Thread>