diff options
author | Ralf Baechle <ralf@linux-mips.org> | 2012-11-02 10:38:34 -0400 |
---|---|---|
committer | Ralf Baechle <ralf@linux-mips.org> | 2012-12-12 10:52:07 -0500 |
commit | 90c9e79f5dc5af4ea16ad56dda8b648d21037486 (patch) | |
tree | e5fce1a8b103fa82a14b1f6ab919f90ee27ad896 | |
parent | 5456bd26ae0606a98bc937ec71c748f2de5a6a90 (diff) |
MIPS: Remove leftovers from the IRIX binary compat code.
2957c9e61ee9c37e7ebf2c8acab03e073fe942fd (kernel.org) rsp.
b934da913f236bca00c41d9e386e980586000461 (lmo) [[MIPS] IRIX: Goodbye and
thanks for all the fish] left two fields in struct thread_struct which
were only being used for the IRIX compat code. Remove them.
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
-rw-r--r-- | arch/mips/include/asm/processor.h | 4 | ||||
-rw-r--r-- | arch/mips/kernel/asm-offsets.c | 4 |
2 files changed, 0 insertions, 8 deletions
diff --git a/arch/mips/include/asm/processor.h b/arch/mips/include/asm/processor.h index 5e33fabe354d..8481c1a5219e 100644 --- a/arch/mips/include/asm/processor.h +++ b/arch/mips/include/asm/processor.h | |||
@@ -226,8 +226,6 @@ struct thread_struct { | |||
226 | unsigned long cp0_badvaddr; /* Last user fault */ | 226 | unsigned long cp0_badvaddr; /* Last user fault */ |
227 | unsigned long cp0_baduaddr; /* Last kernel fault accessing USEG */ | 227 | unsigned long cp0_baduaddr; /* Last kernel fault accessing USEG */ |
228 | unsigned long error_code; | 228 | unsigned long error_code; |
229 | unsigned long irix_trampoline; /* Wheee... */ | ||
230 | unsigned long irix_oldctx; | ||
231 | #ifdef CONFIG_CPU_CAVIUM_OCTEON | 229 | #ifdef CONFIG_CPU_CAVIUM_OCTEON |
232 | struct octeon_cop2_state cp2 __attribute__ ((__aligned__(128))); | 230 | struct octeon_cop2_state cp2 __attribute__ ((__aligned__(128))); |
233 | struct octeon_cvmseg_state cvmseg __attribute__ ((__aligned__(128))); | 231 | struct octeon_cvmseg_state cvmseg __attribute__ ((__aligned__(128))); |
@@ -297,8 +295,6 @@ struct thread_struct { | |||
297 | .cp0_badvaddr = 0, \ | 295 | .cp0_badvaddr = 0, \ |
298 | .cp0_baduaddr = 0, \ | 296 | .cp0_baduaddr = 0, \ |
299 | .error_code = 0, \ | 297 | .error_code = 0, \ |
300 | .irix_trampoline = 0, \ | ||
301 | .irix_oldctx = 0, \ | ||
302 | /* \ | 298 | /* \ |
303 | * Cavium Octeon specifics (null if not Octeon) \ | 299 | * Cavium Octeon specifics (null if not Octeon) \ |
304 | */ \ | 300 | */ \ |
diff --git a/arch/mips/kernel/asm-offsets.c b/arch/mips/kernel/asm-offsets.c index 0c4bce4882a6..9690998d4ef3 100644 --- a/arch/mips/kernel/asm-offsets.c +++ b/arch/mips/kernel/asm-offsets.c | |||
@@ -125,10 +125,6 @@ void output_thread_defines(void) | |||
125 | thread.cp0_baduaddr); | 125 | thread.cp0_baduaddr); |
126 | OFFSET(THREAD_ECODE, task_struct, \ | 126 | OFFSET(THREAD_ECODE, task_struct, \ |
127 | thread.error_code); | 127 | thread.error_code); |
128 | OFFSET(THREAD_TRAMP, task_struct, \ | ||
129 | thread.irix_trampoline); | ||
130 | OFFSET(THREAD_OLDCTX, task_struct, \ | ||
131 | thread.irix_oldctx); | ||
132 | BLANK(); | 128 | BLANK(); |
133 | } | 129 | } |
134 | 130 | ||