diff options
Diffstat (limited to 'include/asm-mips/processor.h')
-rw-r--r-- | include/asm-mips/processor.h | 17 |
1 files changed, 3 insertions, 14 deletions
diff --git a/include/asm-mips/processor.h b/include/asm-mips/processor.h index 0fb75f0762e..5f80ba71ab9 100644 --- a/include/asm-mips/processor.h +++ b/include/asm-mips/processor.h | |||
@@ -11,7 +11,6 @@ | |||
11 | #ifndef _ASM_PROCESSOR_H | 11 | #ifndef _ASM_PROCESSOR_H |
12 | #define _ASM_PROCESSOR_H | 12 | #define _ASM_PROCESSOR_H |
13 | 13 | ||
14 | #include <linux/config.h> | ||
15 | #include <linux/cpumask.h> | 14 | #include <linux/cpumask.h> |
16 | #include <linux/threads.h> | 15 | #include <linux/threads.h> |
17 | 16 | ||
@@ -71,11 +70,6 @@ extern unsigned int vced_count, vcei_count; | |||
71 | 70 | ||
72 | typedef __u64 fpureg_t; | 71 | typedef __u64 fpureg_t; |
73 | 72 | ||
74 | struct mips_fpu_hard_struct { | ||
75 | fpureg_t fpr[NUM_FPU_REGS]; | ||
76 | unsigned int fcr31; | ||
77 | }; | ||
78 | |||
79 | /* | 73 | /* |
80 | * It would be nice to add some more fields for emulator statistics, but there | 74 | * It would be nice to add some more fields for emulator statistics, but there |
81 | * are a number of fixed offsets in offset.h and elsewhere that would have to | 75 | * are a number of fixed offsets in offset.h and elsewhere that would have to |
@@ -83,18 +77,13 @@ struct mips_fpu_hard_struct { | |||
83 | * the FPU emulator for now. See asm-mips/fpu_emulator.h. | 77 | * the FPU emulator for now. See asm-mips/fpu_emulator.h. |
84 | */ | 78 | */ |
85 | 79 | ||
86 | struct mips_fpu_soft_struct { | 80 | struct mips_fpu_struct { |
87 | fpureg_t fpr[NUM_FPU_REGS]; | 81 | fpureg_t fpr[NUM_FPU_REGS]; |
88 | unsigned int fcr31; | 82 | unsigned int fcr31; |
89 | }; | 83 | }; |
90 | 84 | ||
91 | union mips_fpu_union { | ||
92 | struct mips_fpu_hard_struct hard; | ||
93 | struct mips_fpu_soft_struct soft; | ||
94 | }; | ||
95 | |||
96 | #define INIT_FPU { \ | 85 | #define INIT_FPU { \ |
97 | {{0,},} \ | 86 | {0,} \ |
98 | } | 87 | } |
99 | 88 | ||
100 | #define NUM_DSP_REGS 6 | 89 | #define NUM_DSP_REGS 6 |
@@ -133,7 +122,7 @@ struct thread_struct { | |||
133 | unsigned long cp0_status; | 122 | unsigned long cp0_status; |
134 | 123 | ||
135 | /* Saved fpu/fpu emulator stuff. */ | 124 | /* Saved fpu/fpu emulator stuff. */ |
136 | union mips_fpu_union fpu; | 125 | struct mips_fpu_struct fpu; |
137 | #ifdef CONFIG_MIPS_MT_FPAFF | 126 | #ifdef CONFIG_MIPS_MT_FPAFF |
138 | /* Emulated instruction count */ | 127 | /* Emulated instruction count */ |
139 | unsigned long emulated_fp; | 128 | unsigned long emulated_fp; |