On Fri, Feb 07, 2014 at 12:22:52PM +0800, Huacai Chen wrote:
> Commit 597ce1723e0f (MIPS: Support for 64-bit FP with O32 binaries)
> brings some CONFIG_MIPS64, but CONFIG_MIPS64 doesn't exist in any
> Kconfig file. I guess the correct thing is CONFIG_64BIT, so fix it.
>
> Signed-off-by: Huacai Chen <chenhc@xxxxxxxxxx>
> ---
> arch/mips/include/asm/asmmacro.h | 4 ++--
> arch/mips/include/asm/fpu.h | 2 +-
> 2 files changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/arch/mips/include/asm/asmmacro.h b/arch/mips/include/asm/asmmacro.h
> index 3220c93..69a9a22 100644
> --- a/arch/mips/include/asm/asmmacro.h
> +++ b/arch/mips/include/asm/asmmacro.h
> @@ -106,7 +106,7 @@
> .endm
>
> .macro fpu_save_double thread status tmp
> -#if defined(CONFIG_MIPS64) || defined(CONFIG_CPU_MIPS32_R2)
> +#if defined(CONFIG_64BIT) || defined(CONFIG_CPU_MIPS32_R2)
> sll \tmp, \status, 5
> bgez \tmp, 10f
> fpu_save_16odd \thread
> @@ -159,7 +159,7 @@
> .endm
>
> .macro fpu_restore_double thread status tmp
> -#if defined(CONFIG_MIPS64) || defined(CONFIG_CPU_MIPS32_R2)
> +#if defined(CONFIG_64BIT) || defined(CONFIG_CPU_MIPS32_R2)
> sll \tmp, \status, 5
> bgez \tmp, 10f # 16 register mode?
>
> diff --git a/arch/mips/include/asm/fpu.h b/arch/mips/include/asm/fpu.h
> index cfe092f..f80a07e 100644
> --- a/arch/mips/include/asm/fpu.h
> +++ b/arch/mips/include/asm/fpu.h
> @@ -57,7 +57,7 @@ static inline int __enable_fpu(enum fpu_mode mode)
> return 0;
>
> case FPU_64BIT:
> -#if !(defined(CONFIG_CPU_MIPS32_R2) || defined(CONFIG_MIPS64))
> +#if !(defined(CONFIG_CPU_MIPS32_R2) || defined(CONFIG_64BIT))
> /* we only have a 32-bit FPU */
> return SIGFPE;
> #endif
> --
> 1.7.7.3
>
>
Oops, right you are - looks good to me.
Thanks,
Paul
