diff options
| author | Paul Bolle <pebolle@tiscali.nl> | 2014-02-09 08:32:25 -0500 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2014-03-14 12:49:16 -0400 |
| commit | f5868f05dc976ecd849d2a8115fab80301c127cd (patch) | |
| tree | 45399eb1d5b31953bf20f5cb53017cc64081465d /arch/mips/kernel/r4k_fpu.S | |
| parent | 51061b8876a3906aa5bf173582f180596f9d6455 (diff) | |
MIPS: Replace CONFIG_MIPS64 and CONFIG_MIPS32_R2
Commit 597ce1723e0f ("MIPS: Support for 64-bit FP with O32 binaries")
introduced references to two undefined Kconfig macros. CONFIG_MIPS32_R2
should clearly be replaced with CONFIG_CPU_MIPS32_R2. And CONFIG_MIPS64
should be replaced with CONFIG_64BIT.
Signed-off-by: Paul Bolle <pebolle@tiscali.nl>
Cc: linux-mips@linux-mips.org
Cc: linux-kernel@vger.kernel.org
Patchwork: https://patchwork.linux-mips.org/patch/6522/
Tested-by: Aaro Koskinen <aaro.koskinen@iki.fi>
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Diffstat (limited to 'arch/mips/kernel/r4k_fpu.S')
| -rw-r--r-- | arch/mips/kernel/r4k_fpu.S | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/mips/kernel/r4k_fpu.S b/arch/mips/kernel/r4k_fpu.S index 253b2fb52026..841ffc234464 100644 --- a/arch/mips/kernel/r4k_fpu.S +++ b/arch/mips/kernel/r4k_fpu.S | |||
| @@ -35,9 +35,9 @@ | |||
| 35 | LEAF(_save_fp_context) | 35 | LEAF(_save_fp_context) |
| 36 | cfc1 t1, fcr31 | 36 | cfc1 t1, fcr31 |
| 37 | 37 | ||
| 38 | #if defined(CONFIG_64BIT) || defined(CONFIG_MIPS32_R2) | 38 | #if defined(CONFIG_64BIT) || defined(CONFIG_CPU_MIPS32_R2) |
| 39 | .set push | 39 | .set push |
| 40 | #ifdef CONFIG_MIPS32_R2 | 40 | #ifdef CONFIG_CPU_MIPS32_R2 |
| 41 | .set mips64r2 | 41 | .set mips64r2 |
| 42 | mfc0 t0, CP0_STATUS | 42 | mfc0 t0, CP0_STATUS |
| 43 | sll t0, t0, 5 | 43 | sll t0, t0, 5 |
| @@ -148,9 +148,9 @@ LEAF(_save_fp_context32) | |||
| 148 | LEAF(_restore_fp_context) | 148 | LEAF(_restore_fp_context) |
| 149 | EX lw t0, SC_FPC_CSR(a0) | 149 | EX lw t0, SC_FPC_CSR(a0) |
| 150 | 150 | ||
| 151 | #if defined(CONFIG_64BIT) || defined(CONFIG_MIPS32_R2) | 151 | #if defined(CONFIG_64BIT) || defined(CONFIG_CPU_MIPS32_R2) |
| 152 | .set push | 152 | .set push |
| 153 | #ifdef CONFIG_MIPS32_R2 | 153 | #ifdef CONFIG_CPU_MIPS32_R2 |
| 154 | .set mips64r2 | 154 | .set mips64r2 |
| 155 | mfc0 t0, CP0_STATUS | 155 | mfc0 t0, CP0_STATUS |
| 156 | sll t0, t0, 5 | 156 | sll t0, t0, 5 |